diff --git a/.eslintrc.json b/.eslintrc.json
index 5fb4c12171..6ee63b269f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -293,7 +293,9 @@
       ],
       "rules": {
         // Custom DSpace Angular rules
-        "dspace-angular-html/themed-component-usages": "error"
+        "dspace-angular-html/themed-component-usages": "error",
+        "dspace-angular-html/no-disabled-attribute-on-button": "error",
+        "@angular-eslint/template/prefer-control-flow": "error"
       }
     },
     {
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b26f5a7c06..ab03cb3885 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,8 @@ name: Build
 on: [push, pull_request]
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
+  packages: read  # to fetch private images from GitHub Container Registry (GHCR)
 
 jobs:
   tests:
@@ -35,6 +36,9 @@ jobs:
       NODE_OPTIONS: '--max-old-space-size=4096'
       # Project name to use when running "docker compose" prior to e2e tests
       COMPOSE_PROJECT_NAME: 'ci'
+      # Docker Registry to use for Docker compose scripts below.
+      # We use GitHub's Container Registry to avoid aggressive rate limits at DockerHub.
+      DOCKER_REGISTRY: ghcr.io
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
@@ -114,6 +118,14 @@ jobs:
           path: 'coverage/dspace-angular/lcov.info'
           retention-days: 14
 
+      # Login to our Docker registry, so that we can access private Docker images using "docker compose" below.
+      - name: Login to ${{ env.DOCKER_REGISTRY }}
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       # Using "docker compose" start backend using CI configuration
       # and load assetstore from a cached copy
       - name: Start DSpace REST Backend via Docker (for e2e tests)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d0b4cd0939..bae8c01300 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,7 +16,8 @@ on:
   pull_request:
 
 permissions:
-  contents: read  #  to fetch code (actions/checkout)
+  contents: read  # to fetch code (actions/checkout)
+  packages: write # to write images to GitHub Container Registry (GHCR)
 
 jobs:
   #############################################################
diff --git a/Dockerfile b/Dockerfile
index cd29d762f8..a2a7841396 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # This image will be published as dspace/dspace-angular
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM node:18-alpine
+FROM docker.io/node:18-alpine
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -22,5 +22,5 @@ ENV NODE_OPTIONS="--max_old_space_size=4096"
 # Listen / accept connections from all IP addresses.
 # NOTE: At this time it is only possible to run Docker container in Production mode
 # if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
-ENV NODE_ENV development
+ENV NODE_ENV=development
 CMD npm run serve -- --host 0.0.0.0
diff --git a/Dockerfile.dist b/Dockerfile.dist
index cb6e1bbd30..9bb7b1519b 100644
--- a/Dockerfile.dist
+++ b/Dockerfile.dist
@@ -4,7 +4,7 @@
 # Test build:
 # docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
 
-FROM node:18-alpine AS build
+FROM docker.io/node:18-alpine AS build
 
 # Ensure Python and other build tools are available
 # These are needed to install some node modules, especially on linux/arm64
@@ -26,6 +26,6 @@ COPY --chown=node:node docker/dspace-ui.json /app/dspace-ui.json
 
 WORKDIR /app
 USER node
-ENV NODE_ENV production
+ENV NODE_ENV=production
 EXPOSE 4000
 CMD pm2-runtime start dspace-ui.json --json
diff --git a/README.md b/README.md
index 783e60efba..c5ad7fc7ed 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 Quick start
 -----------
 
-**Ensure you're running [Node](https://nodejs.org) `v16.x` or `v18.x`, [npm](https://www.npmjs.com/) >= `v5.x`**
+**Ensure you're running [Node](https://nodejs.org) `v18.x` or `v20.x`, [npm](https://www.npmjs.com/) >= `v10.x`**
 
 ```bash
 # clone the repo
@@ -90,7 +90,7 @@ Requirements
 ------------
 
 -	[Node.js](https://nodejs.org)
--	Ensure you're running node `v16.x` or `v18.x`
+-	Ensure you're running node `v18.x` or `v20.x`
 
 If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
 
diff --git a/config/config.example.yml b/config/config.example.yml
index 3b46b8403f..5fa2e74cbb 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -23,6 +23,31 @@ ssr:
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
+  # Path prefixes to enable SSR for. By default these are limited to paths of primary DSpace objects.
+  # NOTE: The "/handle/" path ensures Handle redirects work via SSR.  The "/reload/" path ensures
+  # hard refreshes (e.g. after login) trigger SSR while fully reloading the page.
+  paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ]
+  # Whether to enable rendering of Search component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableSearchComponent: false
+  # Whether to enable rendering of Browse component on SSR.
+  # If set to true the component will be included in the HTML returned from the server side rendering.
+  # If set to false the component will not be included in the HTML returned from the server side rendering.
+  enableBrowseComponent: false
+  # Enable state transfer from the server-side application to the client-side application.
+  # Defaults to true.
+  # Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+  # Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+  # ensure that users always use the most up-to-date state.
+  transferState: true
+  # When a different REST base URL is used for the server-side application, the generated state contains references to
+  # REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+  # Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
+  replaceRestUrl: true
+  # Enable request performance profiling data collection and printing the results in the server console.
+  # Defaults to false. Enabling in production is NOT recommended
+  #enablePerformanceProfiler: false
 
 # The REST API server settings
 # NOTE: these settings define which (publicly available) REST API to use. They are usually
@@ -33,6 +58,9 @@ rest:
   port: 443
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /server
+  # Provide a different REST url to be used during SSR execution. It must contain the whole url including protocol, server port and
+  # server namespace (uncomment to use it).
+  #ssrBaseUrl: http://localhost:8080/server
 
 # Caching settings
 cache:
@@ -448,6 +476,12 @@ search:
     enabled: false
     # List of filters to enable in "Advanced Search" dropdown
     filter: [ 'title', 'author', 'subject', 'entityType' ]
+  #
+  # Number used to render n UI elements called loading skeletons that act as placeholders.
+  # These elements indicate that some content will be loaded in their stead.
+  # Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+  # e.g. If we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+  defaultFiltersCount: 5
 
 
 # Notify metrics
diff --git a/cypress/e2e/admin-add-new-modals.cy.ts b/cypress/e2e/admin-add-new-modals.cy.ts
index c783972b75..e2ade53488 100644
--- a/cypress/e2e/admin-add-new-modals.cy.ts
+++ b/cypress/e2e/admin-add-new-modals.cy.ts
@@ -9,9 +9,11 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
+    cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
     cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_community"]').click();
@@ -22,9 +24,11 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
+    cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
     cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_collection"]').click();
@@ -35,9 +39,11 @@ describe('Admin Add New Modals', () => {
 
   it('Add new Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
+    cy.get('[data-test="admin-menu-section-new-title"]').should('be.visible');
     cy.get('[data-test="admin-menu-section-new-title"]').click();
 
     cy.get('a[data-test="menu.section.new_item"]').click();
diff --git a/cypress/e2e/admin-edit-modals.cy.ts b/cypress/e2e/admin-edit-modals.cy.ts
index f2f18de877..d4e2438061 100644
--- a/cypress/e2e/admin-edit-modals.cy.ts
+++ b/cypress/e2e/admin-edit-modals.cy.ts
@@ -9,10 +9,12 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Community modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-edit-title').click();
+    cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-edit-title"]').click();
 
     cy.get('a[data-test="menu.section.edit_community"]').click();
 
@@ -22,10 +24,12 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Collection modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-edit-title').click();
+    cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-edit-title"]').click();
 
     cy.get('a[data-test="menu.section.edit_collection"]').click();
 
@@ -35,10 +39,12 @@ describe('Admin Edit Modals', () => {
 
   it('Edit Item modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-edit-title').click();
+    cy.get('[data-test="admin-menu-section-edit-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-edit-title"]').click();
 
     cy.get('a[data-test="menu.section.edit_item"]').click();
 
diff --git a/cypress/e2e/admin-export-modals.cy.ts b/cypress/e2e/admin-export-modals.cy.ts
index 0efe040fc8..873d16535f 100644
--- a/cypress/e2e/admin-export-modals.cy.ts
+++ b/cypress/e2e/admin-export-modals.cy.ts
@@ -9,10 +9,12 @@ describe('Admin Export Modals', () => {
 
   it('Export metadata modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-export-title').click();
+    cy.get('[data-test="admin-menu-section-export-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-export-title"]').click();
 
     cy.get('a[data-test="menu.section.export_metadata"]').click();
 
@@ -22,10 +24,12 @@ describe('Admin Export Modals', () => {
 
   it('Export batch modal should pass accessibility tests', () => {
     // Pin the sidebar open
+    cy.get('[data-test="sidebar-collapse-toggle"]').trigger('mouseover');
     cy.get('[data-test="sidebar-collapse-toggle"]').click();
 
     // Click on entry of menu
-    cy.get('#admin-menu-section-export-title').click();
+    cy.get('[data-test="admin-menu-section-export-title"]').should('be.visible');
+    cy.get('[data-test="admin-menu-section-export-title"]').click();
 
     cy.get('a[data-test="menu.section.export_batch"]').click();
 
diff --git a/cypress/e2e/community-list.cy.ts b/cypress/e2e/community-list.cy.ts
index 9b9c87b112..a5c255de04 100644
--- a/cypress/e2e/community-list.cy.ts
+++ b/cypress/e2e/community-list.cy.ts
@@ -12,6 +12,13 @@ describe('Community List Page', () => {
     cy.get('[data-test="expand-button"]').click({ multiple: true });
 
     // Analyze <ds-community-list-page> for accessibility issues
-    testA11y('ds-community-list-page');
+    testA11y('ds-community-list-page', {
+      rules: {
+        // When expanding a cdk node on the community-list page, the 'aria-posinset' property becomes 0.
+        // 0 is not a valid value for 'aria-posinset' so the test fails.
+        // see https://github.com/DSpace/dspace-angular/issues/4068
+        'aria-valid-attr-value': { enabled: false },
+      },
+    });
   });
 });
diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
index 45131baace..ad5d8ea093 100644
--- a/cypress/e2e/item-edit.cy.ts
+++ b/cypress/e2e/item-edit.cy.ts
@@ -9,18 +9,15 @@ beforeEach(() => {
 
   // This page is restricted, so we will be shown the login form. Fill it out & submit.
   cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
-
-  // We need to wait for the correction types allowed for the item to be loaded to be sure that each tab is fully loaded.
-  // This because the edit item page causes often tests to fails due to timeout.
-  cy.intercept('GET', 'server/api/config/correctiontypes/search/findByItem*').as('correctionTypes');
-  cy.wait('@correctionTypes');
 });
 
 describe('Edit Item > Edit Metadata tab', () => {
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="metadata"]').should('be.visible');
     cy.get('a[data-test="metadata"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="metadata"]').should('be.visible');
     cy.get('a[data-test="metadata"]').should('have.class', 'active');
 
     // <ds-edit-item-page> tag must be loaded
@@ -39,9 +36,11 @@ describe('Edit Item > Edit Metadata tab', () => {
 describe('Edit Item > Status tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="status"]').should('be.visible');
     cy.get('a[data-test="status"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="status"]').should('be.visible');
     cy.get('a[data-test="status"]').should('have.class', 'active');
 
     // <ds-item-status> tag must be loaded
@@ -55,9 +54,11 @@ describe('Edit Item > Status tab', () => {
 describe('Edit Item > Bitstreams tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
     cy.get('a[data-test="bitstreams"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="bitstreams"]').should('be.visible');
     cy.get('a[data-test="bitstreams"]').should('have.class', 'active');
 
     // <ds-item-bitstreams> tag must be loaded
@@ -82,9 +83,11 @@ describe('Edit Item > Bitstreams tab', () => {
 describe('Edit Item > Curate tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="curate"]').should('be.visible');
     cy.get('a[data-test="curate"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="curate"]').should('be.visible');
     cy.get('a[data-test="curate"]').should('have.class', 'active');
 
     // <ds-item-curate> tag must be loaded
@@ -98,9 +101,11 @@ describe('Edit Item > Curate tab', () => {
 describe('Edit Item > Relationships tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="relationships"]').should('be.visible');
     cy.get('a[data-test="relationships"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="relationships"]').should('be.visible');
     cy.get('a[data-test="relationships"]').should('have.class', 'active');
 
     // <ds-item-relationships> tag must be loaded
@@ -114,9 +119,11 @@ describe('Edit Item > Relationships tab', () => {
 describe('Edit Item > Version History tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
     cy.get('a[data-test="versionhistory"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="versionhistory"]').should('be.visible');
     cy.get('a[data-test="versionhistory"]').should('have.class', 'active');
 
     // <ds-item-version-history> tag must be loaded
@@ -130,9 +137,11 @@ describe('Edit Item > Version History tab', () => {
 describe('Edit Item > Access Control tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="access-control"]').should('be.visible');
     cy.get('a[data-test="access-control"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="access-control"]').should('be.visible');
     cy.get('a[data-test="access-control"]').should('have.class', 'active');
 
     // <ds-item-access-control> tag must be loaded
@@ -146,9 +155,11 @@ describe('Edit Item > Access Control tab', () => {
 describe('Edit Item > Collection Mapper tab', () => {
 
   it('should pass accessibility tests', () => {
+    cy.get('a[data-test="mapper"]').should('be.visible');
     cy.get('a[data-test="mapper"]').click();
 
-    // Our selected tab should be active
+    // Our selected tab should be both visible & active
+    cy.get('a[data-test="mapper"]').should('be.visible');
     cy.get('a[data-test="mapper"]').should('have.class', 'active');
 
     // <ds-item-collection-mapper> tag must be loaded
diff --git a/cypress/e2e/submission.cy.ts b/cypress/e2e/submission.cy.ts
index ebdabbde2e..d46bb9fc0d 100644
--- a/cypress/e2e/submission.cy.ts
+++ b/cypress/e2e/submission.cy.ts
@@ -217,7 +217,7 @@ describe('New Submission page', () => {
     });
 
     // Close popup window
-    cy.get('ds-dynamic-lookup-relation-modal button.close').click();
+    cy.get('ds-dynamic-lookup-relation-modal button.btn-close').click();
 
     // Back on the form, click the discard button to remove new submission
     // Clicking it will display a confirmation, which we will confirm with another click
diff --git a/docker/cli.yml b/docker/cli.yml
index 9b1973426f..bbb9bd5619 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -21,7 +21,7 @@ networks:
     external: true
 services:
   dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
diff --git a/docker/db.entities.yml b/docker/db.entities.yml
index b3cf5bd86f..c532d15857 100644
--- a/docker/db.entities.yml
+++ b/docker/db.entities.yml
@@ -14,7 +14,7 @@
 # # Therefore, it should be kept in sync with that file
 services:
   dspacedb:
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the URL in DSpace/DSpace
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
diff --git a/docker/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index c5c419a4a7..98825605d3 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -33,7 +33,7 @@ services:
       # This allows us to generate statistics in e2e tests so that statistics pages can be tested thoroughly.
       solr__D__statistics__P__autoCommit: 'false'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
     networks:
@@ -60,7 +60,7 @@ services:
   # NOTE: This is customized to use our loadsql image, so that we are using a database with existing test data
   dspacedb:
     container_name: dspacedb
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql"
     environment:
       # This LOADSQL should be kept in sync with the LOADSQL in
       # https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/db.entities.yml
@@ -81,7 +81,7 @@ services:
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose-dist.yml b/docker/docker-compose-dist.yml
index 67eba16785..5b06faa6a2 100644
--- a/docker/docker-compose-dist.yml
+++ b/docker/docker-compose-dist.yml
@@ -26,7 +26,7 @@ services:
       DSPACE_REST_HOST: sandbox.dspace.org
       DSPACE_REST_PORT: 443
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-latest}-dist
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-latest}-dist"
     build:
       context: ..
       dockerfile: Dockerfile.dist
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index 09dfcf2a5f..e650f09eb5 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -40,7 +40,7 @@ services:
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
     networks:
@@ -68,7 +68,7 @@ services:
   dspacedb:
     container_name: dspacedb
     # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
     environment:
       PGDATA: /pgdata
       POSTGRES_PASSWORD: dspace
@@ -85,7 +85,7 @@ services:
   # DSpace Solr container  
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
       - dspacenet
     ports:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 1c268b84b7..b13ab505f1 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -23,7 +23,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:${DSPACE_VER:-latest}
+    image: "${DOCKER_REGISTRY:-docker.io}/${DOCKER_OWNER:-dspace}/dspace-angular:${DSPACE_VER:-latest}"
     build:
       context: ..
       dockerfile: Dockerfile
diff --git a/docs/lint/html/index.md b/docs/lint/html/index.md
index 15d693843c..e134e1070f 100644
--- a/docs/lint/html/index.md
+++ b/docs/lint/html/index.md
@@ -2,3 +2,4 @@
 _______
 
 - [`dspace-angular-html/themed-component-usages`](./rules/themed-component-usages.md): Themeable components should be used via the selector of their `ThemedComponent` wrapper class
+- [`dspace-angular-html/no-disabled-attribute-on-button`](./rules/no-disabled-attribute-on-button.md): Buttons should use the `dsBtnDisabled` directive instead of the HTML `disabled` attribute.
diff --git a/docs/lint/html/rules/no-disabled-attribute-on-button.md b/docs/lint/html/rules/no-disabled-attribute-on-button.md
new file mode 100644
index 0000000000..d9d39ce82c
--- /dev/null
+++ b/docs/lint/html/rules/no-disabled-attribute-on-button.md
@@ -0,0 +1,78 @@
+[DSpace ESLint plugins](../../../../lint/README.md) > [HTML rules](../index.md) > `dspace-angular-html/no-disabled-attribute-on-button`
+_______
+
+Buttons should use the `dsBtnDisabled` directive instead of the HTML `disabled` attribute.
+      This should be done to ensure that users with a screen reader are able to understand that the a button button is present, and that it is disabled.
+      The native html disabled attribute does not allow users to navigate to the button by keyboard, and thus they have no way of knowing that the button is present.
+
+_______
+
+[Source code](../../../../lint/src/rules/html/no-disabled-attribute-on-button.ts)
+
+### Examples
+
+
+#### Valid code
+    
+##### should use [dsBtnDisabled] in HTML templates
+        
+```html
+<button [dsBtnDisabled]="true">Submit</button>
+```
+    
+##### disabled attribute is still valid on non-button elements
+        
+```html
+<input disabled>
+```
+    
+##### [disabled] attribute is still valid on non-button elements
+        
+```html
+<input [disabled]="true">
+```
+    
+##### angular dynamic attributes that use disabled are still valid
+        
+```html
+<button [class.disabled]="isDisabled">Submit</button>
+```
+    
+
+
+
+#### Invalid code  &amp; automatic fixes
+    
+##### should not use disabled attribute in HTML templates
+        
+```html
+<button disabled>Submit</button>
+```
+Will produce the following error(s):
+```
+Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.
+```
+        
+Result of `yarn lint --fix`:
+```html
+<button [dsBtnDisabled]="true">Submit</button>
+```
+        
+    
+##### should not use [disabled] attribute in HTML templates
+        
+```html
+<button [disabled]="true">Submit</button>
+```
+Will produce the following error(s):
+```
+Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.
+```
+        
+Result of `yarn lint --fix`:
+```html
+<button [dsBtnDisabled]="true">Submit</button>
+```
+        
+    
+
diff --git a/lint/src/rules/html/index.ts b/lint/src/rules/html/index.ts
index 7c1370ae2d..3d425c3ad4 100644
--- a/lint/src/rules/html/index.ts
+++ b/lint/src/rules/html/index.ts
@@ -10,10 +10,13 @@ import {
   bundle,
   RuleExports,
 } from '../../util/structure';
+import * as noDisabledAttributeOnButton from './no-disabled-attribute-on-button';
 import * as themedComponentUsages from './themed-component-usages';
 
 const index = [
   themedComponentUsages,
+  noDisabledAttributeOnButton,
+
 ] as unknown as RuleExports[];
 
 export = {
diff --git a/lint/src/rules/html/no-disabled-attribute-on-button.ts b/lint/src/rules/html/no-disabled-attribute-on-button.ts
new file mode 100644
index 0000000000..bf1a72d70d
--- /dev/null
+++ b/lint/src/rules/html/no-disabled-attribute-on-button.ts
@@ -0,0 +1,147 @@
+import {
+  TmplAstBoundAttribute,
+  TmplAstTextAttribute,
+} from '@angular-eslint/bundled-angular-compiler';
+import { TemplateParserServices } from '@angular-eslint/utils';
+import {
+  ESLintUtils,
+  TSESLint,
+} from '@typescript-eslint/utils';
+
+import {
+  DSpaceESLintRuleInfo,
+  NamedTests,
+} from '../../util/structure';
+import { getSourceCode } from '../../util/typescript';
+
+export enum Message {
+  USE_DSBTN_DISABLED = 'mustUseDsBtnDisabled',
+}
+
+export const info = {
+  name: 'no-disabled-attribute-on-button',
+  meta: {
+    docs: {
+      description: `Buttons should use the \`dsBtnDisabled\` directive instead of the HTML \`disabled\` attribute.
+      This should be done to ensure that users with a screen reader are able to understand that the a button button is present, and that it is disabled.
+      The native html disabled attribute does not allow users to navigate to the button by keyboard, and thus they have no way of knowing that the button is present.`,
+    },
+    type: 'problem',
+    fixable: 'code',
+    schema: [],
+    messages: {
+      [Message.USE_DSBTN_DISABLED]: 'Buttons should use the `dsBtnDisabled` directive instead of the `disabled` attribute.',
+    },
+  },
+  defaultOptions: [],
+} as DSpaceESLintRuleInfo;
+
+export const rule = ESLintUtils.RuleCreator.withoutDocs({
+  ...info,
+  create(context: TSESLint.RuleContext<Message, unknown[]>) {
+    const parserServices = getSourceCode(context).parserServices as TemplateParserServices;
+
+    /**
+     * Some dynamic angular inputs will have disabled as name because of how Angular handles this internally (e.g [class.disabled]="isDisabled")
+     * But these aren't actually the disabled attribute we're looking for, we can determine this by checking the details of the keySpan
+     */
+    function isOtherAttributeDisabled(node: TmplAstBoundAttribute | TmplAstTextAttribute): boolean {
+      // if the details are not null, and the details are not 'disabled', then it's not the disabled attribute we're looking for
+      return node.keySpan?.details !== null && node.keySpan?.details !== 'disabled';
+    }
+
+    /**
+     * Replace the disabled text with [dsBtnDisabled] in the template
+     */
+    function replaceDisabledText(text: string ): string {
+      const hasBrackets = text.includes('[') && text.includes(']');
+      const newDisabledText = hasBrackets ? 'dsBtnDisabled' : '[dsBtnDisabled]="true"';
+      return text.replace('disabled', newDisabledText);
+    }
+
+    function inputIsChildOfButton(node: any): boolean {
+      return (node.parent?.tagName === 'button' || node.parent?.name === 'button');
+    }
+
+    function reportAndFix(node: TmplAstBoundAttribute | TmplAstTextAttribute) {
+      if (!inputIsChildOfButton(node) || isOtherAttributeDisabled(node)) {
+        return;
+      }
+
+      const sourceSpan = node.sourceSpan;
+      context.report({
+        messageId: Message.USE_DSBTN_DISABLED,
+        loc: parserServices.convertNodeSourceSpanToLoc(sourceSpan),
+        fix(fixer) {
+          const templateText = sourceSpan.start.file.content;
+          const disabledText = templateText.slice(sourceSpan.start.offset, sourceSpan.end.offset);
+          const newText = replaceDisabledText(disabledText);
+          return fixer.replaceTextRange([sourceSpan.start.offset, sourceSpan.end.offset], newText);
+        },
+      });
+    }
+
+    return {
+      'BoundAttribute[name="disabled"]'(node: TmplAstBoundAttribute) {
+        reportAndFix(node);
+      },
+      'TextAttribute[name="disabled"]'(node: TmplAstTextAttribute) {
+        reportAndFix(node);
+      },
+    };
+  },
+});
+
+export const tests = {
+  plugin: info.name,
+  valid: [
+    {
+      name: 'should use [dsBtnDisabled] in HTML templates',
+      code: `
+<button [dsBtnDisabled]="true">Submit</button>
+      `,
+    },
+    {
+      name: 'disabled attribute is still valid on non-button elements',
+      code: `
+<input disabled>
+      `,
+    },
+    {
+      name: '[disabled] attribute is still valid on non-button elements',
+      code: `
+<input [disabled]="true">
+      `,
+    },
+    {
+      name: 'angular dynamic attributes that use disabled are still valid',
+      code: `
+<button [class.disabled]="isDisabled">Submit</button>
+      `,
+    },
+  ],
+  invalid: [
+    {
+      name: 'should not use disabled attribute in HTML templates',
+      code: `
+<button disabled>Submit</button>
+      `,
+      errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
+      output: `
+<button [dsBtnDisabled]="true">Submit</button>
+      `,
+    },
+    {
+      name: 'should not use [disabled] attribute in HTML templates',
+      code: `
+<button [disabled]="true">Submit</button>
+      `,
+      errors: [{ messageId: Message.USE_DSBTN_DISABLED }],
+      output: `
+<button [dsBtnDisabled]="true">Submit</button>
+      `,
+    },
+  ],
+} as NamedTests;
+
+export default rule;
diff --git a/package-lock.json b/package-lock.json
index 79455f7256..27a9b18050 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,67 +9,69 @@
       "version": "9.0.0-next",
       "hasInstallScript": true,
       "dependencies": {
-        "@angular/animations": "^17.3.12",
-        "@angular/cdk": "^17.3.10",
-        "@angular/common": "^17.3.12",
-        "@angular/compiler": "^17.3.12",
-        "@angular/core": "^17.3.12",
-        "@angular/forms": "^17.3.12",
-        "@angular/localize": "^17.3.12",
-        "@angular/platform-browser": "^17.3.12",
-        "@angular/platform-browser-dynamic": "^17.3.12",
-        "@angular/platform-server": "^17.3.12",
-        "@angular/router": "^17.3.12",
-        "@angular/ssr": "^17.3.11",
+        "@angular/animations": "^18.2.12",
+        "@angular/cdk": "^18.2.12",
+        "@angular/common": "^18.2.12",
+        "@angular/compiler": "^18.2.12",
+        "@angular/core": "^18.2.12",
+        "@angular/forms": "^18.2.12",
+        "@angular/localize": "^18.2.12",
+        "@angular/platform-browser": "^18.2.12",
+        "@angular/platform-browser-dynamic": "^18.2.12",
+        "@angular/platform-server": "^18.2.12",
+        "@angular/router": "^18.2.12",
+        "@angular/ssr": "^18.2.12",
         "@babel/runtime": "7.26.0",
         "@kolkov/ngx-gallery": "^2.0.1",
-        "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+        "@ng-bootstrap/ng-bootstrap": "^12.0.0",
         "@ng-dynamic-forms/core": "^16.0.0",
         "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
-        "@ngrx/effects": "^17.1.1",
-        "@ngrx/router-store": "^17.1.1",
-        "@ngrx/store": "^17.1.1",
-        "@ngx-translate/core": "^14.0.0",
+        "@ngrx/effects": "^18.1.1",
+        "@ngrx/operators": "^18.0.0",
+        "@ngrx/router-store": "^18.1.1",
+        "@ngrx/store": "^18.1.1",
+        "@ngx-translate/core": "^16.0.3",
         "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
         "angulartics2": "^12.2.0",
-        "axios": "^1.7.4",
-        "bootstrap": "^4.6.1",
+        "axios": "^1.7.9",
+        "bootstrap": "^5.3",
         "cerialize": "0.1.18",
         "cli-progress": "^3.12.0",
         "colors": "^1.4.0",
         "compression": "^1.7.5",
         "cookie-parser": "1.4.7",
-        "core-js": "^3.38.1",
+        "core-js": "^3.40.0",
         "date-fns": "^2.29.3",
         "date-fns-tz": "^1.3.7",
         "deepmerge": "^4.3.1",
         "ejs": "^3.1.10",
-        "express": "^4.21.1",
+        "express": "^4.21.2",
         "express-rate-limit": "^5.1.3",
         "fast-json-patch": "^3.1.1",
         "filesize": "^6.1.0",
         "http-proxy-middleware": "^2.0.7",
         "http-terminator": "^3.2.0",
-        "isbot": "^5.1.17",
+        "isbot": "^5.1.22",
         "js-cookie": "2.2.1",
         "js-yaml": "^4.1.0",
         "json5": "^2.2.3",
-        "jsonschema": "1.4.1",
+        "jsonschema": "1.5.0",
         "jwt-decode": "^3.1.2",
         "lodash": "^4.17.21",
         "lru-cache": "^7.14.1",
         "markdown-it": "^13.0.1",
-        "mirador": "^3.3.0",
+        "mirador": "^3.4.3",
         "mirador-dl-plugin": "^0.13.0",
         "mirador-share-plugin": "^0.16.0",
         "morgan": "^1.10.0",
-        "ng2-file-upload": "5.0.0",
+        "ng2-file-upload": "7.0.1",
         "ng2-nouislider": "^2.0.0",
-        "ngx-infinite-scroll": "^16.0.0",
+        "ngx-infinite-scroll": "^18.0.0",
         "ngx-pagination": "6.0.3",
-        "ngx-ui-switch": "^14.1.0",
+        "ngx-skeleton-loader": "^9.0.0",
+        "ngx-ui-switch": "^15.0.0",
         "nouislider": "^15.7.1",
-        "orejime": "^2.3.0",
+        "orejime": "^2.3.1",
         "pem": "1.14.8",
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.0",
@@ -77,29 +79,29 @@
         "zone.js": "~0.14.10"
       },
       "devDependencies": {
-        "@angular-builders/custom-webpack": "~17.0.2",
-        "@angular-devkit/build-angular": "^17.3.11",
-        "@angular-eslint/builder": "^17.5.3",
-        "@angular-eslint/bundled-angular-compiler": "^17.5.3",
-        "@angular-eslint/eslint-plugin": "^17.5.3",
-        "@angular-eslint/eslint-plugin-template": "^17.5.3",
-        "@angular-eslint/schematics": "^17.5.3",
-        "@angular-eslint/template-parser": "^17.5.3",
-        "@angular-eslint/utils": "^17.5.3",
-        "@angular/cli": "^17.3.11",
-        "@angular/compiler-cli": "^17.3.11",
-        "@angular/language-service": "^17.3.12",
+        "@angular-builders/custom-webpack": "~18.0.0",
+        "@angular-devkit/build-angular": "^18.2.12",
+        "@angular-eslint/builder": "^18.4.1",
+        "@angular-eslint/bundled-angular-compiler": "^18.4.1",
+        "@angular-eslint/eslint-plugin": "^18.4.1",
+        "@angular-eslint/eslint-plugin-template": "^18.4.1",
+        "@angular-eslint/schematics": "^18.4.1",
+        "@angular-eslint/template-parser": "^18.4.1",
+        "@angular-eslint/utils": "^18.4.1",
+        "@angular/cli": "^18.2.12",
+        "@angular/compiler-cli": "^18.2.12",
+        "@angular/language-service": "^18.2.12",
         "@cypress/schematic": "^1.5.0",
-        "@fortawesome/fontawesome-free": "^6.6.0",
-        "@ngrx/store-devtools": "^17.1.1",
-        "@ngtools/webpack": "^16.2.16",
+        "@fortawesome/fontawesome-free": "^6.7.2",
+        "@ngrx/store-devtools": "^18.1.1",
+        "@ngtools/webpack": "^18.2.12",
         "@types/deep-freeze": "0.1.5",
         "@types/ejs": "^3.1.2",
         "@types/express": "^4.17.17",
         "@types/grecaptcha": "^3.0.9",
         "@types/jasmine": "~3.6.0",
         "@types/js-cookie": "2.2.6",
-        "@types/lodash": "^4.17.13",
+        "@types/lodash": "^4.17.15",
         "@types/node": "^14.14.9",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",
@@ -109,8 +111,8 @@
         "compression-webpack-plugin": "^9.2.0",
         "copy-webpack-plugin": "^6.4.1",
         "cross-env": "^7.0.3",
-        "cypress": "^13.16.0",
-        "cypress-axe": "^1.5.0",
+        "cypress": "^13.17.0",
+        "cypress-axe": "^1.6.0",
         "deep-freeze": "0.0.1",
         "eslint": "^8.39.0",
         "eslint-plugin-deprecation": "^1.4.1",
@@ -119,12 +121,12 @@
         "eslint-plugin-import": "^2.31.0",
         "eslint-plugin-import-newlines": "^1.3.1",
         "eslint-plugin-jsdoc": "^45.0.0",
-        "eslint-plugin-jsonc": "^2.6.0",
+        "eslint-plugin-jsonc": "^2.19.1",
         "eslint-plugin-lodash": "^7.4.0",
         "eslint-plugin-rxjs": "^5.0.3",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unused-imports": "^3.2.0",
-        "express-static-gzip": "^2.1.8",
+        "express-static-gzip": "^2.2.0",
         "jasmine": "^3.8.0",
         "jasmine-core": "^3.8.0",
         "jasmine-marbles": "0.9.2",
@@ -134,20 +136,20 @@
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.5.0",
         "karma-mocha-reporter": "2.2.5",
-        "ng-mocks": "^14.13.1",
+        "ng-mocks": "^14.13.2",
         "ngx-mask": "14.2.4",
         "nodemon": "^2.0.22",
-        "postcss": "^8.4",
+        "postcss": "^8.5",
         "postcss-import": "^14.0.0",
         "postcss-loader": "^4.0.3",
         "postcss-preset-env": "^7.4.2",
         "rimraf": "^3.0.2",
-        "sass": "~1.80.6",
+        "sass": "~1.84.0",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.2.5",
         "ts-node": "^8.10.2",
         "typescript": "~5.4.5",
-        "webpack": "5.96.1",
+        "webpack": "5.97.1",
         "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.15.1"
       }
@@ -175,12 +177,12 @@
       }
     },
     "node_modules/@angular-builders/common": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-builders/common/-/common-1.0.2.tgz",
-      "integrity": "sha512-lUusRq6jN1It5LcUTLS6Q+AYAYGTo/EEN8hV0M6Ek9qXzweAouJaSEnwv7p04/pD7yJTl0YOCbN79u+wGm3x4g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-builders/common/-/common-2.0.0.tgz",
+      "integrity": "sha512-O5YJc++DtJVJhqA/OomRKN2jGYzvU/YXtfrPAqcA9Is3Ob5jvV0L0JHSAjSw/KaLvk/FjBIqoRVcYdLp5LKddA==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "^17.1.0",
+        "@angular-devkit/core": "^18.0.0",
         "ts-node": "^10.0.0",
         "tsconfig-paths": "^4.1.0"
       },
@@ -232,15 +234,15 @@
       }
     },
     "node_modules/@angular-builders/custom-webpack": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-17.0.2.tgz",
-      "integrity": "sha512-K0jqdW5UdVIeKiZXO4nLiiiVt0g6PKJELdxgjsBGMtyRk+RLEY+pIp1061oy/Yf09nGYseZ7Mdx3XASYHQjNwA==",
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-18.0.0.tgz",
+      "integrity": "sha512-XSynPSXHq5+nrh7J2snfrcbvm6YGwUGQRzr7OuO3wURJ6CHOD9C+xEAmvEUWW8c1YjEslVNG7aLtCGz7LA4ymw==",
       "dev": true,
       "dependencies": {
-        "@angular-builders/common": "1.0.2",
-        "@angular-devkit/architect": ">=0.1700.0 < 0.1800.0",
-        "@angular-devkit/build-angular": "^17.0.0",
-        "@angular-devkit/core": "^17.0.0",
+        "@angular-builders/common": "2.0.0",
+        "@angular-devkit/architect": ">=0.1800.0 < 0.1900.0",
+        "@angular-devkit/build-angular": "^18.0.0",
+        "@angular-devkit/core": "^18.0.0",
         "lodash": "^4.17.15",
         "webpack-merge": "^5.7.3"
       },
@@ -248,116 +250,123 @@
         "node": "^14.20.0 || ^16.13.0 || >=18.10.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^17.0.0"
+        "@angular/compiler-cli": "^18.0.0"
       }
     },
     "node_modules/@angular-devkit/architect": {
-      "version": "0.1703.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1703.11.tgz",
-      "integrity": "sha512-YNasVZk4rYdcM6M+KRH8PUBhVyJfqzUYLpO98GgRokW+taIDgifckSlmfDZzQRbw45qiwei1IKCLqcpC8nM5Tw==",
+      "version": "0.1802.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.14.tgz",
+      "integrity": "sha512-eplaGCXSlPwf1f4XwyzsYTd8/lJ0/Adm6XsODsBxvkZlIpLcps80/h2lH5MVJpoDREzIFu1BweDpYCoNK5yYZg==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.11",
+        "@angular-devkit/core": "18.2.14",
         "rxjs": "7.8.1"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
+    "node_modules/@angular-devkit/architect/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-17.3.11.tgz",
-      "integrity": "sha512-lHX5V2dSts328yvo/9E2u9QMGcvJhbEKKDDp9dBecwvIG9s+4lTOJgi9DPUE7W+AtmPcmbbhwC2JRQ/SLQhAoA==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.14.tgz",
+      "integrity": "sha512-ycie4OhvNv8eNVqvq46pCIf6kB50xbMOdnAVqmlj+BaQjWbGjUQPjAmp4VGqeDZZ/lW82xkfTmJZxc6pYp7YdQ==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "2.3.0",
-        "@angular-devkit/architect": "0.1703.11",
-        "@angular-devkit/build-webpack": "0.1703.11",
-        "@angular-devkit/core": "17.3.11",
-        "@babel/core": "7.24.0",
-        "@babel/generator": "7.23.6",
-        "@babel/helper-annotate-as-pure": "7.22.5",
-        "@babel/helper-split-export-declaration": "7.22.6",
-        "@babel/plugin-transform-async-generator-functions": "7.23.9",
-        "@babel/plugin-transform-async-to-generator": "7.23.3",
-        "@babel/plugin-transform-runtime": "7.24.0",
-        "@babel/preset-env": "7.24.0",
-        "@babel/runtime": "7.24.0",
-        "@discoveryjs/json-ext": "0.5.7",
-        "@ngtools/webpack": "17.3.11",
+        "@angular-devkit/architect": "0.1802.14",
+        "@angular-devkit/build-webpack": "0.1802.14",
+        "@angular-devkit/core": "18.2.14",
+        "@angular/build": "18.2.14",
+        "@babel/core": "7.25.2",
+        "@babel/generator": "7.25.0",
+        "@babel/helper-annotate-as-pure": "7.24.7",
+        "@babel/helper-split-export-declaration": "7.24.7",
+        "@babel/plugin-transform-async-generator-functions": "7.25.0",
+        "@babel/plugin-transform-async-to-generator": "7.24.7",
+        "@babel/plugin-transform-runtime": "7.24.7",
+        "@babel/preset-env": "7.25.3",
+        "@babel/runtime": "7.25.0",
+        "@discoveryjs/json-ext": "0.6.1",
+        "@ngtools/webpack": "18.2.14",
         "@vitejs/plugin-basic-ssl": "1.1.0",
         "ansi-colors": "4.1.3",
-        "autoprefixer": "10.4.18",
+        "autoprefixer": "10.4.20",
         "babel-loader": "9.1.3",
-        "babel-plugin-istanbul": "6.1.1",
         "browserslist": "^4.21.5",
-        "copy-webpack-plugin": "11.0.0",
-        "critters": "0.0.22",
-        "css-loader": "6.10.0",
-        "esbuild-wasm": "0.20.1",
+        "copy-webpack-plugin": "12.0.2",
+        "critters": "0.0.24",
+        "css-loader": "7.1.2",
+        "esbuild-wasm": "0.23.0",
         "fast-glob": "3.3.2",
-        "http-proxy-middleware": "2.0.7",
-        "https-proxy-agent": "7.0.4",
-        "inquirer": "9.2.15",
-        "jsonc-parser": "3.2.1",
+        "http-proxy-middleware": "3.0.3",
+        "https-proxy-agent": "7.0.5",
+        "istanbul-lib-instrument": "6.0.3",
+        "jsonc-parser": "3.3.1",
         "karma-source-map-support": "1.4.0",
         "less": "4.2.0",
-        "less-loader": "11.1.0",
+        "less-loader": "12.2.0",
         "license-webpack-plugin": "4.0.2",
-        "loader-utils": "3.2.1",
-        "magic-string": "0.30.8",
-        "mini-css-extract-plugin": "2.8.1",
+        "loader-utils": "3.3.1",
+        "magic-string": "0.30.11",
+        "mini-css-extract-plugin": "2.9.0",
         "mrmime": "2.0.0",
-        "open": "8.4.2",
+        "open": "10.1.0",
         "ora": "5.4.1",
         "parse5-html-rewriting-stream": "7.0.0",
-        "picomatch": "4.0.1",
-        "piscina": "4.4.0",
-        "postcss": "8.4.35",
+        "picomatch": "4.0.2",
+        "piscina": "4.6.1",
+        "postcss": "8.4.41",
         "postcss-loader": "8.1.1",
         "resolve-url-loader": "5.0.0",
         "rxjs": "7.8.1",
-        "sass": "1.71.1",
-        "sass-loader": "14.1.1",
-        "semver": "7.6.0",
+        "sass": "1.77.6",
+        "sass-loader": "16.0.0",
+        "semver": "7.6.3",
         "source-map-loader": "5.0.0",
         "source-map-support": "0.5.21",
-        "terser": "5.29.1",
+        "terser": "5.31.6",
         "tree-kill": "1.2.2",
-        "tslib": "2.6.2",
-        "undici": "6.11.1",
-        "vite": "5.1.8",
-        "watchpack": "2.4.0",
+        "tslib": "2.6.3",
+        "watchpack": "2.4.1",
         "webpack": "5.94.0",
-        "webpack-dev-middleware": "6.1.2",
-        "webpack-dev-server": "4.15.1",
-        "webpack-merge": "5.10.0",
+        "webpack-dev-middleware": "7.4.2",
+        "webpack-dev-server": "5.0.4",
+        "webpack-merge": "6.0.1",
         "webpack-subresource-integrity": "5.1.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
       "optionalDependencies": {
-        "esbuild": "0.20.1"
+        "esbuild": "0.23.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^17.0.0",
-        "@angular/localize": "^17.0.0",
-        "@angular/platform-server": "^17.0.0",
-        "@angular/service-worker": "^17.0.0",
+        "@angular/compiler-cli": "^18.0.0",
+        "@angular/localize": "^18.0.0",
+        "@angular/platform-server": "^18.0.0",
+        "@angular/service-worker": "^18.0.0",
         "@web/test-runner": "^0.18.0",
         "browser-sync": "^3.0.2",
         "jest": "^29.5.0",
         "jest-environment-jsdom": "^29.5.0",
         "karma": "^6.3.0",
-        "ng-packagr": "^17.0.0",
+        "ng-packagr": "^18.0.0",
         "protractor": "^7.0.0",
         "tailwindcss": "^2.0.0 || ^3.0.0",
-        "typescript": ">=5.2 <5.5"
+        "typescript": ">=5.4 <5.6"
       },
       "peerDependenciesMeta": {
         "@angular/localize": {
@@ -395,10 +404,29 @@
         }
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/@angular-devkit/build-webpack": {
+      "version": "0.1802.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.14.tgz",
+      "integrity": "sha512-cccne0SG4BaQHsKRRZCi/wMLJ7yFXrwvE8w+Kug3HdpJJoyH3FeG386EQuca/azslQlK+c5g4ywSZdXeNkGazA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": "0.1802.14",
+        "rxjs": "7.8.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "webpack": "^5.30.0",
+        "webpack-dev-server": "^5.0.2"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/@babel/runtime": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.0.tgz",
-      "integrity": "sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
+      "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -408,9 +436,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/aix-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz",
-      "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
       "cpu": [
         "ppc64"
       ],
@@ -419,14 +447,15 @@
       "os": [
         "aix"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz",
-      "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
       "cpu": [
         "arm"
       ],
@@ -435,14 +464,15 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz",
-      "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
       "cpu": [
         "arm64"
       ],
@@ -451,14 +481,15 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/android-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz",
-      "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
       "cpu": [
         "x64"
       ],
@@ -467,14 +498,15 @@
       "os": [
         "android"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz",
-      "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
       "cpu": [
         "arm64"
       ],
@@ -483,14 +515,15 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/darwin-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz",
-      "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
       "cpu": [
         "x64"
       ],
@@ -499,14 +532,15 @@
       "os": [
         "darwin"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz",
-      "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
       "cpu": [
         "arm64"
       ],
@@ -515,14 +549,15 @@
       "os": [
         "freebsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/freebsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz",
-      "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
       "cpu": [
         "x64"
       ],
@@ -531,14 +566,15 @@
       "os": [
         "freebsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz",
-      "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
       "cpu": [
         "arm"
       ],
@@ -547,14 +583,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz",
-      "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
       "cpu": [
         "arm64"
       ],
@@ -563,14 +600,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz",
-      "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
       "cpu": [
         "ia32"
       ],
@@ -579,14 +617,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-loong64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz",
-      "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
       "cpu": [
         "loong64"
       ],
@@ -595,14 +634,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-mips64el": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz",
-      "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
       "cpu": [
         "mips64el"
       ],
@@ -611,14 +651,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-ppc64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz",
-      "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
       "cpu": [
         "ppc64"
       ],
@@ -627,14 +668,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-riscv64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz",
-      "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
       "cpu": [
         "riscv64"
       ],
@@ -643,14 +685,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-s390x": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz",
-      "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
       "cpu": [
         "s390x"
       ],
@@ -659,14 +702,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/linux-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz",
-      "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
       "cpu": [
         "x64"
       ],
@@ -675,14 +719,15 @@
       "os": [
         "linux"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/netbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
       "cpu": [
         "x64"
       ],
@@ -691,14 +736,15 @@
       "os": [
         "netbsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/openbsd-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz",
-      "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
       "cpu": [
         "x64"
       ],
@@ -707,14 +753,15 @@
       "os": [
         "openbsd"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/sunos-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz",
-      "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
       "cpu": [
         "x64"
       ],
@@ -723,14 +770,15 @@
       "os": [
         "sunos"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-arm64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz",
-      "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
       "cpu": [
         "arm64"
       ],
@@ -739,14 +787,15 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-ia32": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz",
-      "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
       "cpu": [
         "ia32"
       ],
@@ -755,14 +804,15 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/@esbuild/win32-x64": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz",
-      "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
       "cpu": [
         "x64"
       ],
@@ -771,37 +821,28 @@
       "os": [
         "win32"
       ],
+      "peer": true,
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/@ngtools/webpack": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-17.3.11.tgz",
-      "integrity": "sha512-SfTCbplt4y6ak5cf2IfqdoVOsnoNdh/j6Vu+wb8WWABKwZ5yfr2S/Gk6ithSKcdIZhAF8DNBOoyk1EJuf8Xkfg==",
-      "dev": true,
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "@angular/compiler-cli": "^17.0.0",
-        "typescript": ">=5.2 <5.5",
-        "webpack": "^5.54.0"
-      }
-    },
     "node_modules/@angular-devkit/build-angular/node_modules/@types/node": {
-      "version": "22.7.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.7.tgz",
-      "integrity": "sha512-SRxCrrg9CL/y54aiMCG3edPKdprgMVGDXjA3gB8UmmBW5TcXzRUYAh8EWzTnSJFAd1rgImPELza+A3bJ+qxz8Q==",
+      "version": "22.13.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.9.tgz",
+      "integrity": "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==",
       "dev": true,
       "optional": true,
       "peer": true,
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~6.20.0"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/@types/retry": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
+      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
+      "dev": true
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/@vitejs/plugin-basic-ssl": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
@@ -839,30 +880,30 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+    "node_modules/@angular-devkit/build-angular/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "engines": {
-        "node": ">=0.8"
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/copy-webpack-plugin": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz",
-      "integrity": "sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==",
+      "version": "12.0.2",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-12.0.2.tgz",
+      "integrity": "sha512-SNwdBeHyII+rWvee/bTnAYyO8vfVdcSTud4EIb6jcZ8inLeWucJE0DnxXQBjlQ5zlteuuvooGQy3LIyGxhvlOA==",
       "dev": true,
       "dependencies": {
-        "fast-glob": "^3.2.11",
+        "fast-glob": "^3.3.2",
         "glob-parent": "^6.0.1",
-        "globby": "^13.1.1",
+        "globby": "^14.0.0",
         "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
+        "schema-utils": "^4.2.0",
+        "serialize-javascript": "^6.0.2"
       },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
@@ -920,6 +961,26 @@
         "node": ">=4.0"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "dev": true,
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -933,24 +994,79 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/globby": {
-      "version": "13.2.2",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-13.2.2.tgz",
-      "integrity": "sha512-Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==",
+      "version": "14.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz",
+      "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==",
       "dev": true,
       "dependencies": {
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.3.0",
-        "ignore": "^5.2.4",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.3",
+        "ignore": "^7.0.3",
+        "path-type": "^6.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.3.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/globby/node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "dev": true,
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/globby/node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dev": true,
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/http-proxy-middleware": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.3.tgz",
+      "integrity": "sha512-usY0HG5nyDUwtqpiZdETNbmKtw3QQ1jwYFZ9wi5iHzX2BcILwQKtYDJPo7XHTsu5Z0B2Hj3W9NNnbd+AjFWjqg==",
+      "dev": true,
+      "dependencies": {
+        "@types/http-proxy": "^1.17.15",
+        "debug": "^4.3.6",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.3",
+        "is-plain-object": "^5.0.0",
+        "micromatch": "^4.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/ignore": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.3.tgz",
+      "integrity": "sha512-bAH5jbK/F3T3Jls4I0SO1hmPR0dKU0a7+SY6n1yzRtG54FLO8d6w/nxLFX2Nb7dBu6cCWXPaAME6cYqFUMmuCA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/immutable": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
@@ -966,6 +1082,15 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
@@ -978,10 +1103,63 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "dev": true,
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/p-retry": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
+      "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/path-type": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz",
+      "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/postcss": {
-      "version": "8.4.35",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz",
-      "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==",
+      "version": "8.4.41",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
       "dev": true,
       "funding": [
         {
@@ -999,8 +1177,8 @@
       ],
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
+        "picocolors": "^1.0.1",
+        "source-map-js": "^1.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -1037,10 +1215,43 @@
         }
       }
     },
+    "node_modules/@angular-devkit/build-angular/node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/rimraf": {
+      "version": "5.0.10",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
+      "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+      "dev": true,
+      "dependencies": {
+        "glob": "^10.3.7"
+      },
+      "bin": {
+        "rimraf": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/@angular-devkit/build-angular/node_modules/sass": {
-      "version": "1.71.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.71.1.tgz",
-      "integrity": "sha512-wovtnV2PxzteLlfNzbgm1tFXPLoZILYAMJtvoXXkD7/+1uP41eKkIt1ypWq5/q2uT94qHjXehEYfmjKOvjL9sg==",
+      "version": "1.77.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
+      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -1055,9 +1266,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/sass-loader": {
-      "version": "14.1.1",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.1.1.tgz",
-      "integrity": "sha512-QX8AasDg75monlybel38BZ49JP5Z+uSKfKwF2rO7S74BywaRmGQMUBw9dtkS+ekyM/QnP+NOrRYq8ABMZ9G8jw==",
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.0.tgz",
+      "integrity": "sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==",
       "dev": true,
       "dependencies": {
         "neo-async": "^2.6.2"
@@ -1095,26 +1306,27 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
       "dev": true,
       "engines": {
-        "node": ">=12"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/vite": {
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.8.tgz",
-      "integrity": "sha512-mB8ToUuSmzODSpENgvpFk2fTiU/YQ1tmcVJJ4WZbq4fPdGJkFNVcmVL5k7iDug6xzWjjuGDKAuSievIsD6H7Xw==",
+      "version": "5.4.14",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz",
+      "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "esbuild": "^0.19.3",
-        "postcss": "^8.4.35",
-        "rollup": "^4.2.0"
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -1133,6 +1345,7 @@
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
         "terser": "^5.4.0"
@@ -1150,6 +1363,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },
@@ -1162,11 +1378,12 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/vite/node_modules/esbuild": {
-      "version": "0.19.12",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
-      "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==",
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
       "dev": true,
       "hasInstallScript": true,
+      "peer": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -1174,29 +1391,58 @@
         "node": ">=12"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.19.12",
-        "@esbuild/android-arm": "0.19.12",
-        "@esbuild/android-arm64": "0.19.12",
-        "@esbuild/android-x64": "0.19.12",
-        "@esbuild/darwin-arm64": "0.19.12",
-        "@esbuild/darwin-x64": "0.19.12",
-        "@esbuild/freebsd-arm64": "0.19.12",
-        "@esbuild/freebsd-x64": "0.19.12",
-        "@esbuild/linux-arm": "0.19.12",
-        "@esbuild/linux-arm64": "0.19.12",
-        "@esbuild/linux-ia32": "0.19.12",
-        "@esbuild/linux-loong64": "0.19.12",
-        "@esbuild/linux-mips64el": "0.19.12",
-        "@esbuild/linux-ppc64": "0.19.12",
-        "@esbuild/linux-riscv64": "0.19.12",
-        "@esbuild/linux-s390x": "0.19.12",
-        "@esbuild/linux-x64": "0.19.12",
-        "@esbuild/netbsd-x64": "0.19.12",
-        "@esbuild/openbsd-x64": "0.19.12",
-        "@esbuild/sunos-x64": "0.19.12",
-        "@esbuild/win32-arm64": "0.19.12",
-        "@esbuild/win32-ia32": "0.19.12",
-        "@esbuild/win32-x64": "0.19.12"
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/vite/node_modules/postcss": {
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "peer": true,
+      "dependencies": {
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack": {
@@ -1246,54 +1492,54 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server": {
-      "version": "4.15.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
-      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz",
+      "integrity": "sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==",
       "dev": true,
       "dependencies": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/serve-static": "^1.13.10",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.5",
+        "@types/bonjour": "^3.5.13",
+        "@types/connect-history-api-fallback": "^1.5.4",
+        "@types/express": "^4.17.21",
+        "@types/serve-index": "^1.9.4",
+        "@types/serve-static": "^1.15.5",
+        "@types/sockjs": "^0.3.36",
+        "@types/ws": "^8.5.10",
         "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
+        "bonjour-service": "^1.2.1",
+        "chokidar": "^3.6.0",
         "colorette": "^2.0.10",
         "compression": "^1.7.4",
         "connect-history-api-fallback": "^2.0.0",
         "default-gateway": "^6.0.3",
         "express": "^4.17.3",
         "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
+        "html-entities": "^2.4.0",
         "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "launch-editor": "^2.6.0",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
+        "ipaddr.js": "^2.1.0",
+        "launch-editor": "^2.6.1",
+        "open": "^10.0.3",
+        "p-retry": "^6.2.0",
+        "rimraf": "^5.0.5",
+        "schema-utils": "^4.2.0",
+        "selfsigned": "^2.4.1",
         "serve-index": "^1.9.1",
         "sockjs": "^0.3.24",
         "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.13.0"
+        "webpack-dev-middleware": "^7.1.0",
+        "ws": "^8.16.0"
       },
       "bin": {
         "webpack-dev-server": "bin/webpack-dev-server.js"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
+        "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
         "webpack": {
@@ -1304,27 +1550,42 @@
         }
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-dev-server/node_modules/http-proxy-middleware": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
       "dev": true,
       "dependencies": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
       },
       "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "node": ">=12.0.0"
       },
       "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular-devkit/build-angular/node_modules/webpack-merge": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+      "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
+      "dev": true,
+      "dependencies": {
+        "clone-deep": "^4.0.1",
+        "flat": "^5.0.2",
+        "wildcard": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=18.0.0"
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/webpack-sources": {
@@ -1354,53 +1615,21 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/@angular-devkit/build-angular/node_modules/webpack/node_modules/watchpack": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-      "dev": true,
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/@angular-devkit/build-webpack": {
-      "version": "0.1703.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1703.11.tgz",
-      "integrity": "sha512-qbCiiHuoVkD7CtLyWoRi/Vzz6nrEztpF5XIyWUcQu67An1VlxbMTE4yoSQiURjCQMnB/JvS1GPVed7wOq3SJ/w==",
-      "dev": true,
-      "dependencies": {
-        "@angular-devkit/architect": "0.1703.11",
-        "rxjs": "7.8.1"
-      },
-      "engines": {
-        "node": "^18.13.0 || >=20.9.0",
-        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
-        "yarn": ">= 1.13.0"
-      },
-      "peerDependencies": {
-        "webpack": "^5.30.0",
-        "webpack-dev-server": "^4.0.0"
-      }
-    },
     "node_modules/@angular-devkit/core": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-17.3.11.tgz",
-      "integrity": "sha512-vTNDYNsLIWpYk2I969LMQFH29GTsLzxNk/0cLw5q56ARF0v5sIWfHYwGTS88jdDqIpuuettcSczbxeA7EuAmqQ==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.14.tgz",
+      "integrity": "sha512-UGIGOjXuOyCW+5S4tINu7e6LOu738CmTw3h7Ui1I8OzdTIYJcYJrei8sgrwDwOYADRal+p0MeMlnykH3TM5XBA==",
       "dev": true,
       "dependencies": {
-        "ajv": "8.12.0",
-        "ajv-formats": "2.1.1",
-        "jsonc-parser": "3.2.1",
-        "picomatch": "4.0.1",
+        "ajv": "8.17.1",
+        "ajv-formats": "3.0.1",
+        "jsonc-parser": "3.3.1",
+        "picomatch": "4.0.2",
         "rxjs": "7.8.1",
         "source-map": "0.7.4"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
@@ -1413,426 +1642,735 @@
         }
       }
     },
-    "node_modules/@angular-devkit/schematics": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-17.3.11.tgz",
-      "integrity": "sha512-I5wviiIqiFwar9Pdk30Lujk8FczEEc18i22A5c6Z9lbmhPQdTroDnEQdsfXjy404wPe8H62s0I15o4pmMGfTYQ==",
+    "node_modules/@angular-devkit/core/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.11",
-        "jsonc-parser": "3.2.1",
-        "magic-string": "0.30.8",
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@angular-devkit/schematics": {
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.14.tgz",
+      "integrity": "sha512-mukjZIHHB7gWratq8fZwUq5WZ+1bF4feG/idXr1wgQ+/FqWjs2PP7HDesHVcPymmRulpTyCpB7TNB1O1fgnCpA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/core": "18.2.14",
+        "jsonc-parser": "3.3.1",
+        "magic-string": "0.30.11",
         "ora": "5.4.1",
         "rxjs": "7.8.1"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
-    "node_modules/@angular-eslint/builder": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-17.5.3.tgz",
-      "integrity": "sha512-DoPCwt8qp5oMkfxY8V3wygf6/E7zzgXkPCwTRhIelklfpB3nYwLnbRSD8G5hueAU4eyASKiIuhR79E996AuUSw==",
+    "node_modules/@angular-devkit/schematics/node_modules/rxjs": {
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/@angular-eslint/builder": {
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.4.3.tgz",
+      "integrity": "sha512-NzmrXlr7GFE+cjwipY/CxBscZXNqnuK0us1mO6Z2T6MeH6m+rRcdlY/rZyKoRniyNNvuzl6vpEsfMIMmnfebrA==",
+      "dev": true,
+      "dependencies": {
+        "@angular-devkit/architect": ">= 0.1800.0 < 0.1900.0",
+        "@angular-devkit/core": ">= 18.0.0 < 19.0.0"
+      },
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/bundled-angular-compiler": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-17.5.3.tgz",
-      "integrity": "sha512-x9jZ6mME9wxumErPGonWERXX/9TJ7mzEkQhOKt3BxBFm0sy9XQqLMAenp1PBSg3RF3rH7EEVdB2+jb75RtHp0g==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.4.3.tgz",
+      "integrity": "sha512-zdrA8mR98X+U4YgHzUKmivRU+PxzwOL/j8G7eTOvBuq8GPzsP+hvak+tyxlgeGm9HsvpFj9ERHLtJ0xDUPs8fg==",
       "dev": true
     },
     "node_modules/@angular-eslint/eslint-plugin": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-17.5.3.tgz",
-      "integrity": "sha512-2gMRZ+SkiygrPDtCJwMfjmwIFOcvxxC4NRX/MqRo6udsa0gtqPrc8acRbwrmAXlullmhzmaeUfkHpGDSzW8pFw==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.4.3.tgz",
+      "integrity": "sha512-AyJbupiwTBR81P6T59v+aULEnPpZBCBxL2S5QFWfAhNCwWhcof4GihvdK2Z87yhvzDGeAzUFSWl/beJfeFa+PA==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "@angular-eslint/utils": "17.5.3",
-        "@typescript-eslint/utils": "7.11.0"
+        "@angular-eslint/bundled-angular-compiler": "18.4.3",
+        "@angular-eslint/utils": "18.4.3"
       },
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/eslint-plugin-template": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-17.5.3.tgz",
-      "integrity": "sha512-RkRFagxqBPV2xdNyeQQROUm6I1Izto1Z3Wy73lCk2zq1RhVgbznniH/epmOIE8PMkHmMKmZ765FV++J/90p4Ig==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.4.3.tgz",
+      "integrity": "sha512-ijGlX2N01ayMXTpeQivOA31AszO8OEbu9ZQUCxnu9AyMMhxyi2q50bujRChAvN9YXQfdQtbxuajxV6+aiWb5BQ==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "@angular-eslint/utils": "17.5.3",
-        "@typescript-eslint/type-utils": "7.11.0",
-        "@typescript-eslint/utils": "7.11.0",
-        "aria-query": "5.3.0",
-        "axobject-query": "4.0.0"
+        "@angular-eslint/bundled-angular-compiler": "18.4.3",
+        "@angular-eslint/utils": "18.4.3",
+        "aria-query": "5.3.2",
+        "axobject-query": "4.1.0"
       },
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "@typescript-eslint/types": "^7.11.0 || ^8.0.0",
+        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
-      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
-      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.11.0",
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/typescript-estree": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin-template/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
-      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
-      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
-      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.11.0",
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/typescript-estree": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@angular-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
-      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@angular-eslint/schematics": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-17.5.3.tgz",
-      "integrity": "sha512-a0MlOjNLIM18l/66S+CzhANQR3QH3jDUa1MC50E4KBf1mwjQyfqd6RdfbOTMDjgFlPrfB+5JvoWOHHGj7FFM1A==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.4.3.tgz",
+      "integrity": "sha512-D5maKn5e6n58+8n7jLFLD4g+RGPOPeDSsvPc1sqial5tEKLxAJQJS9WZ28oef3bhkob6C60D+1H0mMmEEVvyVA==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/eslint-plugin": "17.5.3",
-        "@angular-eslint/eslint-plugin-template": "17.5.3",
-        "ignore": "5.3.1",
-        "strip-json-comments": "3.1.1",
-        "tmp": "0.2.3"
-      },
-      "peerDependencies": {
-        "@angular/cli": ">= 17.0.0 < 18.0.0"
+        "@angular-devkit/core": ">= 18.0.0 < 19.0.0",
+        "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0",
+        "@angular-eslint/eslint-plugin": "18.4.3",
+        "@angular-eslint/eslint-plugin-template": "18.4.3",
+        "ignore": "6.0.2",
+        "semver": "7.6.3",
+        "strip-json-comments": "3.1.1"
       }
     },
     "node_modules/@angular-eslint/template-parser": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-17.5.3.tgz",
-      "integrity": "sha512-NYybOsMkJUtFOW2JWALicipq0kK5+jGwA1MYyRoXjdbDlXltHUb9qkXj7p0fE6uRutBGXDl4288s8g/fZCnAIA==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.4.3.tgz",
+      "integrity": "sha512-JZMPtEB8yNip3kg4WDEWQyObSo2Hwf+opq2ElYuwe85GQkGhfJSJ2CQYo4FSwd+c5MUQAqESNRg9QqGYauDsiw==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "eslint-scope": "^8.0.0"
+        "@angular-eslint/bundled-angular-compiler": "18.4.3",
+        "eslint-scope": "^8.0.2"
       },
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
     "node_modules/@angular-eslint/utils": {
-      "version": "17.5.3",
-      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-17.5.3.tgz",
-      "integrity": "sha512-0nNm1FUOLhVHrdK2PP5dZCYYVmTIkEJ4CmlwpuC4JtCLbD5XAHQpY/ZW5Ff5n1b7KfJt1Zy//jlhkkIaw3LaBQ==",
+      "version": "18.4.3",
+      "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.4.3.tgz",
+      "integrity": "sha512-w0bJ9+ELAEiPBSTPPm9bvDngfu1d8JbzUhvs2vU+z7sIz/HMwUZT5S4naypj2kNN0gZYGYrW0lt+HIbW87zTAQ==",
       "dev": true,
       "dependencies": {
-        "@angular-eslint/bundled-angular-compiler": "17.5.3",
-        "@typescript-eslint/utils": "7.11.0"
+        "@angular-eslint/bundled-angular-compiler": "18.4.3"
       },
       "peerDependencies": {
-        "eslint": "^7.20.0 || ^8.0.0",
+        "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0",
         "typescript": "*"
       }
     },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
-      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
-      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.11.0",
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/typescript-estree": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@angular-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
-      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@angular/animations": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-17.3.12.tgz",
-      "integrity": "sha512-9hsdWF4gRRcVJtPcCcYLaX1CIyM9wUu6r+xRl6zU5hq8qhl35hig6ounz7CXFAzLf0WDBdM16bPHouVGaG76lg==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.13.tgz",
+      "integrity": "sha512-rG5J5Ek5Hg+Tz2NjkNOaG6PupiNK/lPfophXpsR1t/nWujqnMWX2krahD/i6kgD+jNWNKCJCYSOVvCx/BHOtKA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.12"
+        "@angular/core": "18.2.13"
+      }
+    },
+    "node_modules/@angular/build": {
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.14.tgz",
+      "integrity": "sha512-9g24Oe/ZLULacW3hEpRCjSZIJPJTzN5BeFbA27epSV5NsrQOoeUGsEpRs90Zmt6eReO0fW1BGshWRoZtpSedcw==",
+      "dev": true,
+      "dependencies": {
+        "@ampproject/remapping": "2.3.0",
+        "@angular-devkit/architect": "0.1802.14",
+        "@babel/core": "7.25.2",
+        "@babel/helper-annotate-as-pure": "7.24.7",
+        "@babel/helper-split-export-declaration": "7.24.7",
+        "@babel/plugin-syntax-import-attributes": "7.24.7",
+        "@inquirer/confirm": "3.1.22",
+        "@vitejs/plugin-basic-ssl": "1.1.0",
+        "browserslist": "^4.23.0",
+        "critters": "0.0.24",
+        "esbuild": "0.23.0",
+        "fast-glob": "3.3.2",
+        "https-proxy-agent": "7.0.5",
+        "listr2": "8.2.4",
+        "lmdb": "3.0.13",
+        "magic-string": "0.30.11",
+        "mrmime": "2.0.0",
+        "parse5-html-rewriting-stream": "7.0.0",
+        "picomatch": "4.0.2",
+        "piscina": "4.6.1",
+        "rollup": "4.22.4",
+        "sass": "1.77.6",
+        "semver": "7.6.3",
+        "vite": "5.4.14",
+        "watchpack": "2.4.1"
+      },
+      "engines": {
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
+        "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
+        "yarn": ">= 1.13.0"
+      },
+      "peerDependencies": {
+        "@angular/compiler-cli": "^18.0.0",
+        "@angular/localize": "^18.0.0",
+        "@angular/platform-server": "^18.0.0",
+        "@angular/service-worker": "^18.0.0",
+        "less": "^4.2.0",
+        "postcss": "^8.4.0",
+        "tailwindcss": "^2.0.0 || ^3.0.0",
+        "typescript": ">=5.4 <5.6"
+      },
+      "peerDependenciesMeta": {
+        "@angular/localize": {
+          "optional": true
+        },
+        "@angular/platform-server": {
+          "optional": true
+        },
+        "@angular/service-worker": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        },
+        "tailwindcss": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@types/node": {
+      "version": "22.13.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.9.tgz",
+      "integrity": "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==",
+      "dev": true,
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "node_modules/@angular/build/node_modules/@vitejs/plugin-basic-ssl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-basic-ssl/-/plugin-basic-ssl-1.1.0.tgz",
+      "integrity": "sha512-wO4Dk/rm8u7RNhOf95ZzcEmC9rYOncYgvq4z3duaJrCgjN8BxAnDVyndanfcJZ0O6XZzHz6Q0hTimxTg8Y9g/A==",
+      "dev": true,
+      "engines": {
+        "node": ">=14.6.0"
+      },
+      "peerDependencies": {
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/@angular/build/node_modules/immutable": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",
+      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==",
+      "dev": true
+    },
+    "node_modules/@angular/build/node_modules/sass": {
+      "version": "1.77.6",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.6.tgz",
+      "integrity": "sha512-ByXE1oLD79GVq9Ht1PeHWCPMPB8XHpBuz1r85oByKHjZY6qV6rWnQovQzXJXuQ/XyE1Oj3iPk3lo28uzaRA2/Q==",
+      "dev": true,
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0",
+        "immutable": "^4.0.0",
+        "source-map-js": ">=0.6.2 <2.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@angular/build/node_modules/vite": {
+      "version": "5.4.14",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz",
+      "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@angular/build/node_modules/vite/node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
       }
     },
     "node_modules/@angular/cdk": {
-      "version": "17.3.10",
-      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-17.3.10.tgz",
-      "integrity": "sha512-b1qktT2c1TTTe5nTji/kFAVW92fULK0YhYAvJ+BjZTPKu2FniZNe8o4qqQ0pUuvtMu+ZQxp/QqFYoidIVCjScg==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.14.tgz",
+      "integrity": "sha512-vDyOh1lwjfVk9OqoroZAP8pf3xxKUvyl+TVR8nJxL4c5fOfUFkD7l94HaanqKSRwJcI2xiztuu92IVoHn8T33Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -1840,33 +2378,32 @@
         "parse5": "^7.1.2"
       },
       "peerDependencies": {
-        "@angular/common": "^17.0.0 || ^18.0.0",
-        "@angular/core": "^17.0.0 || ^18.0.0",
+        "@angular/common": "^18.0.0 || ^19.0.0",
+        "@angular/core": "^18.0.0 || ^19.0.0",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/cli": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-17.3.11.tgz",
-      "integrity": "sha512-8R9LwAGL8hGAWJ4mNG9ZPUrBUzIdmst0Ldua6RJJ+PrqgjX+8IbO+lNnfrOY/XY+Z3LXbCEJflL26f9czCvTPQ==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.14.tgz",
+      "integrity": "sha512-kWgRRQtJPkr8iwN7DMbTi3sXOnv7H5QhbU/GgD3nNX3D8YCSPmnby4PAE/P3wn7FsIK9JsSchsCt7MZ37Urh9A==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/architect": "0.1703.11",
-        "@angular-devkit/core": "17.3.11",
-        "@angular-devkit/schematics": "17.3.11",
-        "@schematics/angular": "17.3.11",
+        "@angular-devkit/architect": "0.1802.14",
+        "@angular-devkit/core": "18.2.14",
+        "@angular-devkit/schematics": "18.2.14",
+        "@inquirer/prompts": "5.3.8",
+        "@listr2/prompt-adapter-inquirer": "2.0.15",
+        "@schematics/angular": "18.2.14",
         "@yarnpkg/lockfile": "1.1.0",
-        "ansi-colors": "4.1.3",
-        "ini": "4.1.2",
-        "inquirer": "9.2.15",
-        "jsonc-parser": "3.2.1",
-        "npm-package-arg": "11.0.1",
-        "npm-pick-manifest": "9.0.0",
-        "open": "8.4.2",
-        "ora": "5.4.1",
-        "pacote": "17.0.6",
+        "ini": "4.1.3",
+        "jsonc-parser": "3.3.1",
+        "listr2": "8.2.4",
+        "npm-package-arg": "11.0.3",
+        "npm-pick-manifest": "9.1.0",
+        "pacote": "18.0.6",
         "resolve": "1.22.8",
-        "semver": "7.6.0",
+        "semver": "7.6.3",
         "symbol-observable": "4.0.0",
         "yargs": "17.7.2"
       },
@@ -1874,38 +2411,38 @@
         "ng": "bin/ng.js"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
     },
     "node_modules/@angular/common": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-17.3.12.tgz",
-      "integrity": "sha512-vabJzvrx76XXFrm1RJZ6o/CyG32piTB/1sfFfKHdlH1QrmArb8It4gyk9oEjZ1IkAD0HvBWlfWmn+T6Vx3pdUw==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.13.tgz",
+      "integrity": "sha512-4ZqrNp1PoZo7VNvW+sbSc2CB2axP1sCH2wXl8B0wdjsj8JY1hF1OhuugwhpAHtGxqewed2kCXayE+ZJqSTV4jw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.12",
+        "@angular/core": "18.2.13",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/compiler": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-17.3.12.tgz",
-      "integrity": "sha512-vwI8oOL/gM+wPnptOVeBbMfZYwzRxQsovojZf+Zol9szl0k3SZ3FycWlxxXZGFu3VIEfrP6pXplTmyODS/Lt1w==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.13.tgz",
+      "integrity": "sha512-TzWcrkopyjFF+WeDr2cRe8CcHjU72KfYV3Sm2TkBkcXrkYX5sDjGWrBGrG3hRB4e4okqchrOCvm1MiTdy2vKMA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "17.3.12"
+        "@angular/core": "18.2.13"
       },
       "peerDependenciesMeta": {
         "@angular/core": {
@@ -1914,13 +2451,13 @@
       }
     },
     "node_modules/@angular/compiler-cli": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-17.3.12.tgz",
-      "integrity": "sha512-1F8M7nWfChzurb7obbvuE7mJXlHtY1UG58pcwcomVtpPb+kPavgAO8OEvJHYBMV+bzSxkXt5UIwL9lt9jHUxZA==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.13.tgz",
+      "integrity": "sha512-DBSh4AQwkiJDSiVvJATRmjxf6wyUs9pwQLgaFdSlfuTRO+sdb0J2z1r3BYm8t0IqdoyXzdZq2YCH43EmyvD71g==",
       "dependencies": {
-        "@babel/core": "7.23.9",
+        "@babel/core": "7.25.2",
         "@jridgewell/sourcemap-codec": "^1.4.14",
-        "chokidar": "^3.0.0",
+        "chokidar": "^4.0.0",
         "convert-source-map": "^1.5.1",
         "reflect-metadata": "^0.2.0",
         "semver": "^7.0.0",
@@ -1933,102 +2470,86 @@
         "ngcc": "bundles/ngcc/index.js"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "17.3.12",
-        "typescript": ">=5.2 <5.5"
+        "@angular/compiler": "18.2.13",
+        "typescript": ">=5.4 <5.6"
       }
     },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
-      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
+    "node_modules/@angular/compiler-cli/node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
+        "readdirp": "^4.0.1"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">= 14.16.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
+        "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
-    },
-    "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/@angular/compiler-cli/node_modules/readdirp": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
       }
     },
     "node_modules/@angular/core": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-17.3.12.tgz",
-      "integrity": "sha512-MuFt5yKi161JmauUta4Dh0m8ofwoq6Ino+KoOtkYMBGsSx+A7dSm+DUxxNwdj7+DNyg3LjVGCFgBFnq4g8z06A==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.13.tgz",
+      "integrity": "sha512-8mbWHMgO95OuFV1Ejy4oKmbe9NOJ3WazQf/f7wks8Bck7pcihd0IKhlPBNjFllbF5o+04EYSwFhEtvEgjMDClA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
         "rxjs": "^6.5.3 || ^7.4.0",
-        "zone.js": "~0.14.0"
+        "zone.js": "~0.14.10"
       }
     },
     "node_modules/@angular/forms": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-17.3.12.tgz",
-      "integrity": "sha512-tV6r12Q3yEUlXwpVko4E+XscunTIpPkLbaiDn/MTL3Vxi2LZnsLgHyd/i38HaHN+e/H3B0a1ToSOhV5wf3ay4Q==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.13.tgz",
+      "integrity": "sha512-A67D867fu3DSBhdLWWZl/F5pr7v2+dRM2u3U7ZJ0ewh4a+sv+0yqWdJW+a8xIoiHxS+btGEJL2qAKJiH+MCFfg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.12",
-        "@angular/core": "17.3.12",
-        "@angular/platform-browser": "17.3.12",
+        "@angular/common": "18.2.13",
+        "@angular/core": "18.2.13",
+        "@angular/platform-browser": "18.2.13",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/language-service": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-17.3.12.tgz",
-      "integrity": "sha512-MVmEXonXwdhFtIpU4q8qbXHsrAsdTjZcPPuWCU0zXVQ+VaB/y6oF7BVpmBtfyBcBCums1guEncPP+AZVvulXmQ==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.13.tgz",
+      "integrity": "sha512-4E4VJDrbOAxS69F9C1twQPbR9AjY47Qlz8+lwg5lJOyUJ4GoEThLbXKfadt/vIeYBwMJ7fIsYWXD0Dlmxh4k+w==",
       "dev": true,
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       }
     },
     "node_modules/@angular/localize": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-17.3.12.tgz",
-      "integrity": "sha512-b7J7zY/CgJhFVPtmu/pEjefU5SHuTy7lQgX6kTrJPaUSJ5i578R17xr4SwrWe7G4jzQwO6GXZZd17a62uNRyOA==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.13.tgz",
+      "integrity": "sha512-qQaIYdDS/l1w6tr/wpOoimjpmoJU0WmB8AGbNeKLoM36K+ix6hkvn67+UgkpZtaDHZylm8GsGW1NjzpM2tr3pA==",
       "dependencies": {
-        "@babel/core": "7.23.9",
+        "@babel/core": "7.25.2",
         "@types/babel__core": "7.20.5",
         "fast-glob": "3.3.2",
         "yargs": "^17.2.1"
@@ -2039,69 +2560,27 @@
         "localize-translate": "tools/bundles/src/translate/cli.js"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/compiler": "17.3.12",
-        "@angular/compiler-cli": "17.3.12"
-      }
-    },
-    "node_modules/@angular/localize/node_modules/@babel/core": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz",
-      "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
-      "dependencies": {
-        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@babel/template": "^7.23.9",
-        "@babel/traverse": "^7.23.9",
-        "@babel/types": "^7.23.9",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@angular/localize/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
-    },
-    "node_modules/@angular/localize/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "bin": {
-        "semver": "bin/semver.js"
+        "@angular/compiler": "18.2.13",
+        "@angular/compiler-cli": "18.2.13"
       }
     },
     "node_modules/@angular/platform-browser": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-17.3.12.tgz",
-      "integrity": "sha512-DYY04ptWh/ulMHzd+y52WCE8QnEYGeIiW3hEIFjCN8z0kbIdFdUtEB0IK5vjNL3ejyhUmphcpeT5PYf3YXtqWQ==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.13.tgz",
+      "integrity": "sha512-tu7ZzY6qD3ATdWFzcTcsAKe7M6cJeWbT/4/bF9unyGO3XBPcNYDKoiz10+7ap2PUd0fmPwvuvTvSNJiFEBnB8Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "17.3.12",
-        "@angular/common": "17.3.12",
-        "@angular/core": "17.3.12"
+        "@angular/animations": "18.2.13",
+        "@angular/common": "18.2.13",
+        "@angular/core": "18.2.13"
       },
       "peerDependenciesMeta": {
         "@angular/animations": {
@@ -2110,77 +2589,78 @@
       }
     },
     "node_modules/@angular/platform-browser-dynamic": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-17.3.12.tgz",
-      "integrity": "sha512-DQwV7B2x/DRLRDSisngZRdLqHdYbbrqZv2Hmu4ZbnNYaWPC8qvzgE/0CvY+UkDat3nCcsfwsMnlDeB6TL7/IaA==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.13.tgz",
+      "integrity": "sha512-kbQCf9+8EpuJC7buBxhSiwBtXvjAwAKh6MznD6zd2pyCYqfY6gfRCZQRtK59IfgVtKmEONWI9grEyNIRoTmqJg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.12",
-        "@angular/compiler": "17.3.12",
-        "@angular/core": "17.3.12",
-        "@angular/platform-browser": "17.3.12"
+        "@angular/common": "18.2.13",
+        "@angular/compiler": "18.2.13",
+        "@angular/core": "18.2.13",
+        "@angular/platform-browser": "18.2.13"
       }
     },
     "node_modules/@angular/platform-server": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-17.3.12.tgz",
-      "integrity": "sha512-P3xBzyeT2w/iiGsqGUNuLRYdqs2e+5nRnVYU9tc/TjhYDAgwEgq946U7Nie1xq5Ts/8b7bhxcK9maPKWG237Kw==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-18.2.13.tgz",
+      "integrity": "sha512-eYYhFQkjg3rIBY0kG0XLZ3v6ObvDq9SMsGVtsddhlmdhkdO0Sdu9d8hjP7LmioO+60vUG2jNW02ROVMhSNBR5A==",
       "dependencies": {
         "tslib": "^2.3.0",
         "xhr2": "^0.2.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/animations": "17.3.12",
-        "@angular/common": "17.3.12",
-        "@angular/compiler": "17.3.12",
-        "@angular/core": "17.3.12",
-        "@angular/platform-browser": "17.3.12"
+        "@angular/animations": "18.2.13",
+        "@angular/common": "18.2.13",
+        "@angular/compiler": "18.2.13",
+        "@angular/core": "18.2.13",
+        "@angular/platform-browser": "18.2.13"
       }
     },
     "node_modules/@angular/router": {
-      "version": "17.3.12",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-17.3.12.tgz",
-      "integrity": "sha512-dg7PHBSW9fmPKTVzwvHEeHZPZdpnUqW/U7kj8D29HTP9ur8zZnx9QcnbplwPeYb8yYa62JMnZSEel2X4PxdYBg==",
+      "version": "18.2.13",
+      "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.13.tgz",
+      "integrity": "sha512-VKmfgi/r/CkyBq9nChQ/ptmfu0JT/8ONnLVJ5H+SkFLRYJcIRyHLKjRihMCyVm6xM5yktOdCaW73NTQrFz7+bg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0"
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "17.3.12",
-        "@angular/core": "17.3.12",
-        "@angular/platform-browser": "17.3.12",
+        "@angular/common": "18.2.13",
+        "@angular/core": "18.2.13",
+        "@angular/platform-browser": "18.2.13",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
     "node_modules/@angular/ssr": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-17.3.11.tgz",
-      "integrity": "sha512-8AslXZnj5bu0fJrSSoZf202HXptc+vS8hSvEIobK1+UpEVmtrk3StiBxYTdbN4Pe76r7RGRmBt40fHe+88AZoA==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@angular/ssr/-/ssr-18.2.14.tgz",
+      "integrity": "sha512-UrOT76jeNBc396/lcNg+IrVSlp58WL57150uDQh50EIkzS6a7Id0hUN6bzkbedFf5pWn07bMWqCF5RNLse5Vng==",
       "dependencies": {
-        "critters": "0.0.22",
+        "critters": "0.0.24",
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "^17.0.0",
-        "@angular/core": "^17.0.0"
+        "@angular/common": "^18.0.0",
+        "@angular/core": "^18.0.0"
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
-      "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dependencies": {
-        "@babel/highlight": "^7.25.7",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -2188,28 +2668,28 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
-      "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
+      "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.0.tgz",
-      "integrity": "sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==",
+      "version": "7.25.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+      "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.23.5",
-        "@babel/generator": "^7.23.6",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.24.0",
-        "@babel/parser": "^7.24.0",
-        "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.0",
-        "@babel/types": "^7.24.0",
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.25.0",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-module-transforms": "^7.25.2",
+        "@babel/helpers": "^7.25.0",
+        "@babel/parser": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.2",
+        "@babel/types": "^7.25.2",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -2238,13 +2718,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz",
-      "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
+      "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
       "dependencies": {
-        "@babel/types": "^7.23.6",
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "@jridgewell/trace-mapping": "^0.3.17",
+        "@babel/types": "^7.25.0",
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
       },
       "engines": {
@@ -2252,37 +2732,24 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
-      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz",
+      "integrity": "sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.7.tgz",
-      "integrity": "sha512-12xfNeKNH7jubQNm7PAkzlLwEmCs1tfuX3UjIw6vP6QXi+leKh6+LyC/+Ed4EIQermwd58wsyh070yjDHFlNGg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
-      "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
       "dependencies": {
-        "@babel/compat-data": "^7.25.7",
-        "@babel/helper-validator-option": "^7.25.7",
+        "@babel/compat-data": "^7.26.5",
+        "@babel/helper-validator-option": "^7.25.9",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -2313,17 +2780,17 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.7.tgz",
-      "integrity": "sha512-bD4WQhbkx80mAyj/WCm4ZHcF4rDxkoLFO6ph8/5/mQ3z4vAzltQXAmbc7GvVJx5H+lk5Mi5EmbTeox5nMGCsbw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.26.9.tgz",
+      "integrity": "sha512-ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/traverse": "^7.26.9",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -2334,12 +2801,12 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2355,13 +2822,13 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.7.tgz",
-      "integrity": "sha512-byHhumTj/X47wJ6C6eLpK7wW/WBEcnUeb7D0FNc/jFQnQVw7DOso3Zz5u9x/zLrFVkHa89ZGDbkAa1D54NdrCQ==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.26.3.tgz",
+      "integrity": "sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "regexpu-core": "^6.1.1",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "regexpu-core": "^6.2.0",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -2372,12 +2839,12 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2393,9 +2860,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.2.tgz",
-      "integrity": "sha512-LV76g+C502biUK6AyZ3LK10vDpDyCzZnhZFXkH1L75zHPj68+qc8Zfpx2th+gzwA2MzyK+1g/3EPl62yFnVttQ==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+      "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -2408,52 +2875,39 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
-      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.7.tgz",
-      "integrity": "sha512-O31Ssjd5K6lPbTX9AAYpSKrZmLeagt9uwschJd+Ixo6QiRyfpvgtVQp8qrDR9UNFjZ8+DO34ZkdrN+BnPXemeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+      "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.7.tgz",
-      "integrity": "sha512-o0xCgpNmRohmnoWKQ0Ij8IdddjyBFE4T2kagL/x6M3+4zUgc+4qTOUBoNe4XxDskt1HPKO007ZPiMgLDq2s7Kw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+      "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.7.tgz",
-      "integrity": "sha512-k/6f8dKG3yDz/qCwSM+RKovjMix563SLxQFo0UhRNo239SP6n9u5/eLtKD6EAjwta2JHJ49CsD8pms2HdNiMMQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+      "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-imports": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2463,35 +2917,35 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.7.tgz",
-      "integrity": "sha512-VAwcwuYhv/AT+Vfr28c9y6SHzTan1ryqrydSTFGjU0uDJHw3uZ+PduI8plCLkRsDnqK2DMEDmwrOQRsK/Ykjng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+      "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.7.tgz",
-      "integrity": "sha512-eaPZai0PiqCi09pPs3pAFfl/zYgGaE6IdXtYvmf0qlcDTd3WCtO7JWCcRd64e0EQrcYgiHibEZnOGsSY4QSgaw==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.7.tgz",
-      "integrity": "sha512-kRGE89hLnPfcz6fTrlNU+uhgcwv0mBE4Gv3P9Ke9kLVJYpi4AMVVEElXvB5CabrPZW4nCM8P8UyyjrzCM0O2sw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+      "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-wrap-function": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-wrap-function": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2501,26 +2955,26 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.7.tgz",
-      "integrity": "sha512-iy8JhqlUW9PtZkd4pHM96v6BdJ66Ba9yWSE4z0W4TvSZwLBPkyDsiIU3ENe4SmrzRBs76F7rQXTy1lYC49n6Lw==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz",
+      "integrity": "sha512-bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-member-expression-to-functions": "^7.25.7",
-        "@babel/helper-optimise-call-expression": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-member-expression-to-functions": "^7.25.9",
+        "@babel/helper-optimise-call-expression": "^7.25.9",
+        "@babel/traverse": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2529,113 +2983,87 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.7.tgz",
-      "integrity": "sha512-FPGAkJmyoChQeM+ruBGIDyrT2tKfZJO8NcxdC+CWNJi7N8/rZpSxK7yvBJ5O/nF1gfu5KzN7VKG3YVSLFfRSxQ==",
-      "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.7.tgz",
-      "integrity": "sha512-pPbNbchZBkPMD50K0p3JGcFMNLVUCuU/ABybm/PGNj4JiHrpmNyqqCphBk4i19xXtNV0JhldQJJtbSW5aUvbyA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+      "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
       "dev": true,
       "dependencies": {
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
-      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.22.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
-      "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
-      "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
-      "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-wrap-function": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.7.tgz",
-      "integrity": "sha512-MA0roW3JF2bD1ptAaJnvcabsVlNQShUaThyJbCDD4bCp8NEgiFvpoqRI2YS22hHlc2thjO/fTg2ShLMC3jygAg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/template": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
-        "@babel/types": "^7.25.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
       "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz",
-      "integrity": "sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz",
+      "integrity": "sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==",
+      "dev": true,
       "dependencies": {
-        "@babel/template": "^7.24.7",
         "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/highlight": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
-      "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+      "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+      "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
+      "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "@babel/template": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
+      "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
+      "dependencies": {
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
-      "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.9.tgz",
+      "integrity": "sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==",
       "dependencies": {
-        "@babel/types": "^7.25.8"
+        "@babel/types": "^7.26.9"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -2644,13 +3072,44 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.7.tgz",
-      "integrity": "sha512-wxyWg2RYaSUYgmd9MR0FyRGyeOMQE/Uzr1wzd/g5cf5bwi9A4v6HFdDm7y1MgDtod/fLOSTZY6jDgV0xU9d5bA==",
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+      "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+      "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+      "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2660,14 +3119,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.7.tgz",
-      "integrity": "sha512-Xwg6tZpLxc4iQjorYsyGMyfJE7nP5MV8t/Ka58BgiA7Jw0fRqQNcANlLfdJ/yvBt9z9LD2We+BEkT7vLqZRWng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7",
-        "@babel/plugin-transform-optional-chaining": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+        "@babel/plugin-transform-optional-chaining": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2677,13 +3136,13 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.7.tgz",
-      "integrity": "sha512-UVATLMidXrnH+GMUIuxq55nejlj02HP7F5ETyBONzP6G87fPBogG4CH6kxrSrdIuAjdwNO9VzyaYsrZPscWUrw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+      "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2768,12 +3227,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.7.tgz",
-      "integrity": "sha512-ZvZQRmME0zfJnDQnVBKYzHxXT7lYBB3Revz1GuS7oLXWMgqUPX4G+DDbT30ICClht9WKV34QVrZhSw6WdklwZQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+      "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2783,12 +3242,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.25.7.tgz",
-      "integrity": "sha512-AqVo+dguCgmpi/3mYBdu9lkngOBlQ2w2vnNpa6gfiCxQZLzV4ZbhsXitJ2Yblkoe1VQwtHSaNmIaGll/26YWRw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.7.tgz",
+      "integrity": "sha512-hbX+lKKeUMGihnK8nvKqmXBInriT3GVjzXKFriV3YC6APGxMbP8RZNFwy91+hocLXq90Mta+HshoB31802bb8A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2940,12 +3399,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.7.tgz",
-      "integrity": "sha512-EJN2mKxDwfOUCPxMO6MUI58RN3ganiRAG/MS/S3HfB6QFNjroAMelQo/gybyYq97WerCBAZoyrAoW8Tzdq2jWg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+      "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2955,15 +3414,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.23.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.23.9.tgz",
-      "integrity": "sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==",
+      "version": "7.25.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz",
+      "integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/helper-remap-async-to-generator": "^7.25.0",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/traverse": "^7.25.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2973,14 +3432,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.23.3.tgz",
-      "integrity": "sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.7.tgz",
+      "integrity": "sha512-SQY01PcJfmQ+4Ash7NE+rpbLFbmqA2GPIgqzxfFTL4t1FKRq4zTms/7htKpoCUI9OcFYgzqfmCdH53s6/jn5fA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-remap-async-to-generator": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2990,12 +3449,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.7.tgz",
-      "integrity": "sha512-xHttvIM9fvqW+0a3tZlYcZYSBpSWzGBFIt/sYG3tcdSzBB8ZeVgz2gBP7Df+sM0N1850jrviYSSeUuc+135dmQ==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
+      "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3005,12 +3464,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.7.tgz",
-      "integrity": "sha512-ZEPJSkVZaeTFG/m2PARwLZQ+OG0vFIhPlKHK/JdIMy8DbRJ/htz6LRrTFtdzxi9EHmcwbNPAKDnadpNSIW+Aow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+      "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3020,13 +3479,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.7.tgz",
-      "integrity": "sha512-mhyfEW4gufjIqYFo9krXHJ3ElbFLIze5IDp+wQTxoPd+mwFb1NxatNAwmv8Q8Iuxv7Zc+q8EkiMQwc9IhyGf4g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+      "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3036,13 +3495,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.25.8.tgz",
-      "integrity": "sha512-e82gl3TCorath6YLf9xUwFehVvjvfqFhdOo4+0iVIVju+6XOi5XHkqB3P2AXnSwoeTX0HBoXq5gJFtvotJzFnQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+      "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3052,16 +3511,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.7.tgz",
-      "integrity": "sha512-9j9rnl+YCQY0IGoeipXvnk3niWicIB6kCsWRGLwX241qSXpbA4MKxtp/EdvFxsc4zI5vqfLxzOd0twIJ7I99zg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+      "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7",
-        "@babel/traverse": "^7.25.7",
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9",
+        "@babel/traverse": "^7.25.9",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -3072,25 +3531,25 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.7.tgz",
-      "integrity": "sha512-QIv+imtM+EtNxg/XBKL3hiWjgdLjMOmZ+XzQwSgmBfKbfxUjBzGgVPklUuE55eq5/uVoh8gg3dqlrwR/jw3ZeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+      "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/template": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/template": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3100,12 +3559,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.7.tgz",
-      "integrity": "sha512-xKcfLTlJYUczdaM1+epcdh1UGewJqr9zATgrNHcLBcV2QmfvPPEixo/sK/syql9cEmbr7ulu5HMFG5vbbt/sEA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+      "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3115,13 +3574,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.7.tgz",
-      "integrity": "sha512-kXzXMMRzAtJdDEgQBLF4oaiT6ZCU3oWHgpARnTKDAqPkDJ+bs3NrZb310YYevR5QlRo3Kn7dzzIdHbZm1VzJdQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+      "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3131,12 +3590,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.7.tgz",
-      "integrity": "sha512-by+v2CjoL3aMnWDOyCIg+yxU9KXSRa9tN6MbqggH5xvymmr9p4AMjYkNlQy4brMceBnUyHZ9G8RnpvT8wP7Cfg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+      "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3145,13 +3604,29 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.8.tgz",
-      "integrity": "sha512-gznWY+mr4ZQL/EWPcbBQUP3BXS5FwZp8RUOw06BaRn8tQLzN4XLIxXejpHN9Qo8x8jjBmAAKp6FoS51AgkSA/A==",
+    "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+      "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3161,13 +3636,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.7.tgz",
-      "integrity": "sha512-yjqtpstPfZ0h/y40fAXRv2snciYr0OAoMXY/0ClC7tm4C/nG5NJKmIItlaYlLbIVAWNfrYuy9dq1bE0SbX0PEg==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3177,12 +3651,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.8.tgz",
-      "integrity": "sha512-sPtYrduWINTQTW7FtOy99VCTWp4H23UX7vYcut7S4CIMEXU+54zKX9uCoGkLsWXteyaMXzVHgzWbLfQ1w4GZgw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+      "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3192,13 +3666,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.7.tgz",
-      "integrity": "sha512-n/TaiBGJxYFWvpJDfsxSj9lEEE44BFM1EPGz4KEiTipTgkoFVVcCmzAL3qA7fdQU96dpo4gGf5HBx/KnDvqiHw==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.26.9.tgz",
+      "integrity": "sha512-Hry8AusVm8LW5BVFgiyUReuoGzPUpdHQQqJY5bZnbbf+ngOHWuCuYFKw/BqaaWlvEUrF91HMhDtEaI1hZzNbLg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.26.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3208,14 +3682,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.7.tgz",
-      "integrity": "sha512-5MCTNcjCMxQ63Tdu9rxyN6cAWurqfrDZ76qvVPrGYdBxIj+EawuuxTu/+dgJlhK5eRz3v1gLwp6XwS8XaX2NiQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+      "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3225,12 +3699,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.8.tgz",
-      "integrity": "sha512-4OMNv7eHTmJ2YXs3tvxAfa/I43di+VcF+M4Wt66c88EAED1RoGaf1D64cL5FkRpNL+Vx9Hds84lksWvd/wMIdA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+      "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3240,12 +3714,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.7.tgz",
-      "integrity": "sha512-fwzkLrSu2fESR/cm4t6vqd7ebNIopz2QHGtjoU+dswQo/P6lwAG04Q98lliE3jkz/XqnbGFLnUcE0q0CVUf92w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+      "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3255,12 +3729,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.8.tgz",
-      "integrity": "sha512-f5W0AhSbbI+yY6VakT04jmxdxz+WsID0neG7+kQZbCOjuyJNdL5Nn4WIBm4hRpKnUcO9lP0eipUhFN12JpoH8g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+      "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3270,12 +3744,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.7.tgz",
-      "integrity": "sha512-Std3kXwpXfRV0QtQy5JJcRpkqP8/wG4XL7hSKZmGlxPlDqmpXtEPRmhF7ztnlTCtUN3eXRUJp+sBEZjaIBVYaw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+      "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3285,13 +3759,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.7.tgz",
-      "integrity": "sha512-CgselSGCGzjQvKzghCvDTxKHP3iooenLpJDO842ehn5D2G5fJB222ptnDwQho0WjEvg7zyoxb9P+wiYxiJX5yA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+      "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3301,14 +3775,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.7.tgz",
-      "integrity": "sha512-L9Gcahi0kKFYXvweO6n0wc3ZG1ChpSFdgG+eV1WYZ3/dGbJK7vvk91FgGgak8YwRgrCuihF8tE/Xg07EkL5COg==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-simple-access": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3318,15 +3791,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.7.tgz",
-      "integrity": "sha512-t9jZIvBmOXJsiuyOwhrIGs8dVcD6jDyg2icw1VL4A/g+FnWyJKwUfSSU2nwJuMV2Zqui856El9u+ElB+j9fV1g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+      "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "@babel/traverse": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/traverse": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3336,13 +3809,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.7.tgz",
-      "integrity": "sha512-p88Jg6QqsaPh+EB7I9GJrIqi1Zt4ZBHUQtjw3z1bzEXcLh6GfPqzZJ6G+G1HBGKUNukT58MnKG7EN7zXQBCODw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+      "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-module-transforms": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3352,13 +3825,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.7.tgz",
-      "integrity": "sha512-BtAT9LzCISKG3Dsdw5uso4oV1+v2NlVXIIomKJgQybotJY3OwCwJmkongjHgwGKoZXd0qG5UZ12JUlDQ07W6Ow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+      "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3368,12 +3841,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.7.tgz",
-      "integrity": "sha512-CfCS2jDsbcZaVYxRFo2qtavW8SpdzmBXC2LOI4oO0rP+JSRDxxF3inF4GcPsLgfb5FjkhXG5/yR/lxuRs2pySA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+      "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3383,12 +3856,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.8.tgz",
-      "integrity": "sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==",
+      "version": "7.26.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
+      "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3398,12 +3871,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.8.tgz",
-      "integrity": "sha512-rm9a5iEFPS4iMIy+/A/PiS0QN0UyjPIeVvbU5EMZFKJZHt8vQnasbpo3T3EFcxzCeYO0BHfc4RqooCZc51J86Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+      "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3413,14 +3886,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.8.tgz",
-      "integrity": "sha512-LkUu0O2hnUKHKE7/zYOIjByMa4VRaV2CD/cdGz0AxU9we+VA3kDDggKEzI0Oz1IroG+6gUP6UmWEHBMWZU316g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+      "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/plugin-transform-parameters": "^7.25.7"
+        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/plugin-transform-parameters": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3430,13 +3903,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.7.tgz",
-      "integrity": "sha512-pWT6UXCEW3u1t2tcAGtE15ornCBvopHj9Bps9D2DsH15APgNVOTwwczGckX+WkAvBmuoYKRCFa4DK+jM8vh5AA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+      "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-replace-supers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-replace-supers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3446,12 +3919,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.8.tgz",
-      "integrity": "sha512-EbQYweoMAHOn7iJ9GgZo14ghhb9tTjgOc88xFgYngifx7Z9u580cENCV159M4xDh3q/irbhSjZVpuhpC2gKBbg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+      "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3461,13 +3934,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.8.tgz",
-      "integrity": "sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+      "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3477,12 +3950,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.7.tgz",
-      "integrity": "sha512-FYiTvku63me9+1Nz7TOx4YMtW3tWXzfANZtrzHhUZrz4d47EEtMQhzFoZWESfXuAMMT5mwzD4+y1N8ONAX6lMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+      "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3492,13 +3965,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.7.tgz",
-      "integrity": "sha512-KY0hh2FluNxMLwOCHbxVOKfdB5sjWG4M183885FmaqWWiGMhRZq4DQRKH6mHdEucbJnyDyYiZNwNG424RymJjA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+      "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3508,14 +3981,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.8.tgz",
-      "integrity": "sha512-8Uh966svuB4V8RHHg0QJOB32QK287NBksJOByoKmHMp1TAobNniNalIkI2i5IPj5+S9NYCG4VIjbEuiSN8r+ow==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+      "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.25.7",
-        "@babel/helper-create-class-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-annotate-as-pure": "^7.25.9",
+        "@babel/helper-create-class-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3525,24 +3998,24 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object/node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.7.tgz",
-      "integrity": "sha512-4xwU8StnqnlIhhioZf1tqnVWeQ9pvH/ujS8hRfw/WOza+/a+1qv69BWNy+oY231maTCWgKWhfBU7kDpsds6zAA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+      "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.25.7"
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.7.tgz",
-      "integrity": "sha512-lQEeetGKfFi0wHbt8ClQrUSUMfEeI3MMm74Z73T9/kuz990yYVtfofjf3NuA42Jy3auFOpbjDyCSiIkTs1VIYw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+      "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3552,12 +4025,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.7.tgz",
-      "integrity": "sha512-mgDoQCRjrY3XK95UuV60tZlFCQGXEtMg8H+IsW72ldw1ih1jZhzYXbJvghmAEpg5UVhhnCeia1CkGttUvCkiMQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+      "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
+        "@babel/helper-plugin-utils": "^7.25.9",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -3568,12 +4041,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.7.tgz",
-      "integrity": "sha512-3OfyfRRqiGeOvIWSagcwUTVk2hXBsr/ww7bLn6TRTuXnexA+Udov2icFOxFX9abaj4l96ooYkcNN1qi2Zvqwng==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+      "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3583,16 +4056,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.0.tgz",
-      "integrity": "sha512-zc0GA5IitLKJrSfXlXmp8KDqLrnGECK7YRfQBmEKg1NmBOQ7e+KuclBEKJgzifQeUYLdNiAw4B4bjyvzWVLiSA==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.7.tgz",
+      "integrity": "sha512-YqXjrk4C+a1kZjewqt+Mmu2UuV1s07y8kqcUf4qYLnoqemhR4gRQikhdAhSVJioMjVTu6Mo6pAbaypEA3jY6fw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "babel-plugin-polyfill-corejs2": "^0.4.8",
-        "babel-plugin-polyfill-corejs3": "^0.9.0",
-        "babel-plugin-polyfill-regenerator": "^0.5.5",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.1",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -3612,12 +4085,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.7.tgz",
-      "integrity": "sha512-uBbxNwimHi5Bv3hUccmOFlUy3ATO6WagTApenHz9KzoIdn0XeACdB12ZJ4cjhuB2WSi80Ez2FWzJnarccriJeA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+      "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3627,13 +4100,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.7.tgz",
-      "integrity": "sha512-Mm6aeymI0PBh44xNIv/qvo8nmbkpZze1KvR8MkEqbIREDxoiWTi18Zr2jryfRMwDfVZF9foKh060fWgni44luw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+      "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3643,12 +4116,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.7.tgz",
-      "integrity": "sha512-ZFAeNkpGuLnAQ/NCsXJ6xik7Id+tHuS+NT+ue/2+rn/31zcdnupCdmunOizEaP0JsUmTFSTOPoQY7PkK2pttXw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+      "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3658,12 +4131,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.7.tgz",
-      "integrity": "sha512-SI274k0nUsFFmyQupiO7+wKATAmMFf8iFgq2O+vVFXZ0SV9lNfT1NGzBEhjquFmD8I9sqHLguH+gZVN3vww2AA==",
+      "version": "7.26.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.26.8.tgz",
+      "integrity": "sha512-OmGDL5/J0CJPJZTHZbi2XpO0tyT2Ia7fzpW5GURwdtp2X3fMmN8au/ej6peC/T33/+CRiIpA8Krse8hFGVmT5Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3673,12 +4146,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.7.tgz",
-      "integrity": "sha512-OmWmQtTHnO8RSUbL0NTdtpbZHeNTnm68Gj5pA4Y2blFNh+V4iZR68V1qL9cI37J21ZN7AaCnkfdHtLExQPf2uA==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz",
+      "integrity": "sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3688,12 +4161,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.7.tgz",
-      "integrity": "sha512-BN87D7KpbdiABA+t3HbVqHzKWUDN3dymLaTnPFAMyc8lV+KN3+YzNhVRNdinaCPA4AUqx7ubXbQ9shRjYBl3SQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+      "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3703,13 +4176,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.7.tgz",
-      "integrity": "sha512-IWfR89zcEPQGB/iB408uGtSPlQd3Jpq11Im86vUgcmSTcoWAiQMCTOa2K2yNNqFJEBVICKhayctee65Ka8OB0w==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+      "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3719,13 +4192,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.7.tgz",
-      "integrity": "sha512-8JKfg/hiuA3qXnlLx8qtv5HWRbgyFx2hMMtpDDuU2rTckpKkGu4ycK5yYHwuEa16/quXfoxHBIApEsNyMWnt0g==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+      "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3735,13 +4208,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.7.tgz",
-      "integrity": "sha512-YRW8o9vzImwmh4Q3Rffd09bH5/hvY0pxg+1H1i0f7APoUeg12G7+HhLj9ZFNIrYkgBXhIijPJ+IXypN0hLTIbw==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+      "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.25.7",
-        "@babel/helper-plugin-utils": "^7.25.7"
+        "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3751,26 +4224,28 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.0.tgz",
-      "integrity": "sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==",
+      "version": "7.25.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz",
+      "integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.23.3",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.23.3",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.23.7",
+        "@babel/compat-data": "^7.25.2",
+        "@babel/helper-compilation-targets": "^7.25.2",
+        "@babel/helper-plugin-utils": "^7.24.8",
+        "@babel/helper-validator-option": "^7.24.8",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3",
+        "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.23.3",
-        "@babel/plugin-syntax-import-attributes": "^7.23.3",
+        "@babel/plugin-syntax-import-assertions": "^7.24.7",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -3782,59 +4257,60 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.23.3",
-        "@babel/plugin-transform-async-generator-functions": "^7.23.9",
-        "@babel/plugin-transform-async-to-generator": "^7.23.3",
-        "@babel/plugin-transform-block-scoped-functions": "^7.23.3",
-        "@babel/plugin-transform-block-scoping": "^7.23.4",
-        "@babel/plugin-transform-class-properties": "^7.23.3",
-        "@babel/plugin-transform-class-static-block": "^7.23.4",
-        "@babel/plugin-transform-classes": "^7.23.8",
-        "@babel/plugin-transform-computed-properties": "^7.23.3",
-        "@babel/plugin-transform-destructuring": "^7.23.3",
-        "@babel/plugin-transform-dotall-regex": "^7.23.3",
-        "@babel/plugin-transform-duplicate-keys": "^7.23.3",
-        "@babel/plugin-transform-dynamic-import": "^7.23.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.23.3",
-        "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-        "@babel/plugin-transform-for-of": "^7.23.6",
-        "@babel/plugin-transform-function-name": "^7.23.3",
-        "@babel/plugin-transform-json-strings": "^7.23.4",
-        "@babel/plugin-transform-literals": "^7.23.3",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.23.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.23.3",
-        "@babel/plugin-transform-modules-amd": "^7.23.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.23.9",
-        "@babel/plugin-transform-modules-umd": "^7.23.3",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.23.3",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.23.4",
-        "@babel/plugin-transform-numeric-separator": "^7.23.4",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.0",
-        "@babel/plugin-transform-object-super": "^7.23.3",
-        "@babel/plugin-transform-optional-catch-binding": "^7.23.4",
-        "@babel/plugin-transform-optional-chaining": "^7.23.4",
-        "@babel/plugin-transform-parameters": "^7.23.3",
-        "@babel/plugin-transform-private-methods": "^7.23.3",
-        "@babel/plugin-transform-private-property-in-object": "^7.23.4",
-        "@babel/plugin-transform-property-literals": "^7.23.3",
-        "@babel/plugin-transform-regenerator": "^7.23.3",
-        "@babel/plugin-transform-reserved-words": "^7.23.3",
-        "@babel/plugin-transform-shorthand-properties": "^7.23.3",
-        "@babel/plugin-transform-spread": "^7.23.3",
-        "@babel/plugin-transform-sticky-regex": "^7.23.3",
-        "@babel/plugin-transform-template-literals": "^7.23.3",
-        "@babel/plugin-transform-typeof-symbol": "^7.23.3",
-        "@babel/plugin-transform-unicode-escapes": "^7.23.3",
-        "@babel/plugin-transform-unicode-property-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-regex": "^7.23.3",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.23.3",
+        "@babel/plugin-transform-arrow-functions": "^7.24.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.25.0",
+        "@babel/plugin-transform-async-to-generator": "^7.24.7",
+        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
+        "@babel/plugin-transform-block-scoping": "^7.25.0",
+        "@babel/plugin-transform-class-properties": "^7.24.7",
+        "@babel/plugin-transform-class-static-block": "^7.24.7",
+        "@babel/plugin-transform-classes": "^7.25.0",
+        "@babel/plugin-transform-computed-properties": "^7.24.7",
+        "@babel/plugin-transform-destructuring": "^7.24.8",
+        "@babel/plugin-transform-dotall-regex": "^7.24.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
+        "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0",
+        "@babel/plugin-transform-dynamic-import": "^7.24.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
+        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
+        "@babel/plugin-transform-for-of": "^7.24.7",
+        "@babel/plugin-transform-function-name": "^7.25.1",
+        "@babel/plugin-transform-json-strings": "^7.24.7",
+        "@babel/plugin-transform-literals": "^7.25.2",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
+        "@babel/plugin-transform-modules-amd": "^7.24.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.24.8",
+        "@babel/plugin-transform-modules-systemjs": "^7.25.0",
+        "@babel/plugin-transform-modules-umd": "^7.24.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
+        "@babel/plugin-transform-new-target": "^7.24.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+        "@babel/plugin-transform-numeric-separator": "^7.24.7",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
+        "@babel/plugin-transform-object-super": "^7.24.7",
+        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.8",
+        "@babel/plugin-transform-parameters": "^7.24.7",
+        "@babel/plugin-transform-private-methods": "^7.24.7",
+        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
+        "@babel/plugin-transform-property-literals": "^7.24.7",
+        "@babel/plugin-transform-regenerator": "^7.24.7",
+        "@babel/plugin-transform-reserved-words": "^7.24.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
+        "@babel/plugin-transform-spread": "^7.24.7",
+        "@babel/plugin-transform-sticky-regex": "^7.24.7",
+        "@babel/plugin-transform-template-literals": "^7.24.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.24.8",
+        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
+        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "babel-plugin-polyfill-corejs2": "^0.4.8",
-        "babel-plugin-polyfill-corejs3": "^0.9.0",
-        "babel-plugin-polyfill-regenerator": "^0.5.5",
-        "core-js-compat": "^3.31.0",
+        "babel-plugin-polyfill-corejs2": "^0.4.10",
+        "babel-plugin-polyfill-corejs3": "^0.10.4",
+        "babel-plugin-polyfill-regenerator": "^0.6.1",
+        "core-js-compat": "^3.37.1",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -3879,28 +4355,28 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
-      "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/types": "^7.25.7"
+        "@babel/code-frame": "^7.26.2",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
-      "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.9.tgz",
+      "integrity": "sha512-ZYW7L+pL8ahU5fXmNbPF+iZFHCv5scFak7MZ9bwaRPLUhHh7QQEMjZUg0HevihoqCM5iSYHN61EyCoZvqC+bxg==",
       "dependencies": {
-        "@babel/code-frame": "^7.25.7",
-        "@babel/generator": "^7.25.7",
-        "@babel/parser": "^7.25.7",
-        "@babel/template": "^7.25.7",
-        "@babel/types": "^7.25.7",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.9",
+        "@babel/parser": "^7.26.9",
+        "@babel/template": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -3909,11 +4385,12 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/@babel/generator": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
-      "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.9.tgz",
+      "integrity": "sha512-kEWdzjOAUMW4hAyrzJ0ZaTOu9OmpyDIQicIh0zg0EEcEkYXZb2TjtBhnHi2ViX7PKwZqF4xwqfAm299/QMP3lg==",
       "dependencies": {
-        "@babel/types": "^7.25.7",
+        "@babel/parser": "^7.26.9",
+        "@babel/types": "^7.26.9",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -3923,9 +4400,9 @@
       }
     },
     "node_modules/@babel/traverse/node_modules/jsesc": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
-      "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -3934,13 +4411,12 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.25.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
-      "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
+      "version": "7.26.9",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
+      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.7",
-        "@babel/helper-validator-identifier": "^7.25.7",
-        "to-fast-properties": "^2.0.0"
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -3997,6 +4473,35 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/@csstools/postcss-cascade-layers/node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@csstools/postcss-cascade-layers/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@csstools/postcss-color-function": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz",
@@ -4095,6 +4600,35 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/@csstools/postcss-is-pseudo-class/node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/@csstools/postcss-is-pseudo-class/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@csstools/postcss-nested-calc": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz",
@@ -4241,26 +4775,10 @@
         "postcss": "^8.2"
       }
     },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
-      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
-      "dev": true,
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/csstools"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^6.0.10"
-      }
-    },
     "node_modules/@cypress/request": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.6.tgz",
-      "integrity": "sha512-fi0eVdCOtKu5Ed6+E8mYxUF6ZTFJDZvHogCBelM0xVXmrDEkyM22gRArQzq1YcHPm1V47Vf/iAD+WgVdUlJCGg==",
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.8.tgz",
+      "integrity": "sha512-h0NFgh1mJmm1nr4jCwkGHwKneVYKghUyWe6TMNrk0B9zsjAJxpg8C4/+BAcmLgCPa1vj1V8rNUaILl+zYRUWBQ==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -4276,7 +4794,7 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.13.0",
+        "qs": "6.14.0",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "^5.0.0",
         "tunnel-agent": "^0.6.0",
@@ -4465,12 +4983,12 @@
       }
     },
     "node_modules/@discoveryjs/json-ext": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.1.tgz",
+      "integrity": "sha512-boghen8F0Q8D+0/Q1/1r6DUEieUJ8w2a1gIknExMSHBsJFOr2+0KUfHiVYBvucPwl3+RU5PFBK833FjFCh3BhA==",
       "dev": true,
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=14.17.0"
       }
     },
     "node_modules/@edsilv/http-status-codes": {
@@ -4498,9 +5016,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz",
-      "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
+      "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==",
       "cpu": [
         "ppc64"
       ],
@@ -4510,13 +5028,13 @@
         "aix"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz",
-      "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz",
+      "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==",
       "cpu": [
         "arm"
       ],
@@ -4526,13 +5044,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz",
-      "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz",
+      "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==",
       "cpu": [
         "arm64"
       ],
@@ -4542,13 +5060,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz",
-      "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz",
+      "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==",
       "cpu": [
         "x64"
       ],
@@ -4558,13 +5076,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz",
-      "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz",
+      "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==",
       "cpu": [
         "arm64"
       ],
@@ -4574,13 +5092,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz",
-      "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz",
+      "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==",
       "cpu": [
         "x64"
       ],
@@ -4590,13 +5108,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz",
-      "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==",
       "cpu": [
         "arm64"
       ],
@@ -4606,13 +5124,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz",
-      "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz",
+      "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==",
       "cpu": [
         "x64"
       ],
@@ -4622,13 +5140,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz",
-      "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz",
+      "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==",
       "cpu": [
         "arm"
       ],
@@ -4638,13 +5156,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz",
-      "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz",
+      "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==",
       "cpu": [
         "arm64"
       ],
@@ -4654,13 +5172,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz",
-      "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz",
+      "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==",
       "cpu": [
         "ia32"
       ],
@@ -4670,13 +5188,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz",
-      "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz",
+      "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==",
       "cpu": [
         "loong64"
       ],
@@ -4686,13 +5204,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz",
-      "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz",
+      "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==",
       "cpu": [
         "mips64el"
       ],
@@ -4702,13 +5220,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz",
-      "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz",
+      "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==",
       "cpu": [
         "ppc64"
       ],
@@ -4718,13 +5236,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz",
-      "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz",
+      "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==",
       "cpu": [
         "riscv64"
       ],
@@ -4734,13 +5252,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz",
-      "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz",
+      "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==",
       "cpu": [
         "s390x"
       ],
@@ -4750,13 +5268,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz",
-      "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz",
+      "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==",
       "cpu": [
         "x64"
       ],
@@ -4766,13 +5284,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==",
       "cpu": [
         "x64"
       ],
@@ -4782,13 +5300,29 @@
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz",
+      "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz",
-      "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz",
+      "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==",
       "cpu": [
         "x64"
       ],
@@ -4798,13 +5332,13 @@
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz",
-      "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz",
+      "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==",
       "cpu": [
         "x64"
       ],
@@ -4814,13 +5348,13 @@
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz",
-      "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz",
+      "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==",
       "cpu": [
         "arm64"
       ],
@@ -4830,13 +5364,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz",
-      "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz",
+      "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==",
       "cpu": [
         "ia32"
       ],
@@ -4846,13 +5380,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz",
-      "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz",
+      "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==",
       "cpu": [
         "x64"
       ],
@@ -4862,43 +5396,47 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
       "dev": true,
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz",
-      "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
+      "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
         "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
         "js-yaml": "^4.1.0",
@@ -4906,7 +5444,7 @@
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -4917,6 +5455,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -4928,74 +5467,49 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "peer": true
     },
     "node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
+      "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.6.0.tgz",
-      "integrity": "sha512-60G28ke/sXdtS9KZCpZSHHkCbdsOGEhIUGlwq6yhY74UpTiToIh8np7A8yphhM4BWsvNFtIvLpi4co+h9Mr9Ow==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
+      "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -5008,13 +5522,13 @@
       "dev": true
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
+      "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
       "deprecated": "Use @eslint/config-array instead",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
+        "@humanwhocodes/object-schema": "^2.0.3",
         "debug": "^4.3.1",
         "minimatch": "^3.0.5"
       },
@@ -5022,28 +5536,6 @@
         "node": ">=10.10.0"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -5069,6 +5561,234 @@
       "resolved": "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz",
       "integrity": "sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg=="
     },
+    "node_modules/@inquirer/checkbox": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz",
+      "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.3",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/confirm": {
+      "version": "3.1.22",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz",
+      "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.0.10",
+        "@inquirer/type": "^1.5.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/core": {
+      "version": "9.2.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.2.1.tgz",
+      "integrity": "sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/figures": "^1.0.6",
+        "@inquirer/type": "^2.0.0",
+        "@types/mute-stream": "^0.0.4",
+        "@types/node": "^22.5.5",
+        "@types/wrap-ansi": "^3.0.0",
+        "ansi-escapes": "^4.3.2",
+        "cli-width": "^4.1.0",
+        "mute-stream": "^1.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^6.2.0",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/@inquirer/type": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-2.0.0.tgz",
+      "integrity": "sha512-XvJRx+2KR3YXyYtPUUy+qd9i7p+GO9Ko6VIIpWlBrpWwXDv8WLFeHTxz35CfQFUiBMLXlGHhGzys7lqit9gWag==",
+      "dev": true,
+      "dependencies": {
+        "mute-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/core/node_modules/@types/node": {
+      "version": "22.13.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.9.tgz",
+      "integrity": "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==",
+      "dev": true,
+      "dependencies": {
+        "undici-types": "~6.20.0"
+      }
+    },
+    "node_modules/@inquirer/editor": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz",
+      "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3",
+        "external-editor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/expand": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.3.0.tgz",
+      "integrity": "sha512-qnJsUcOGCSG1e5DTOErmv2BPQqrtT6uzqn1vI/aYGiPKq+FgslGZmtdnXbhuI7IlT7OByDoEEqdnhUnVR2hhLw==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/figures": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.10.tgz",
+      "integrity": "sha512-Ey6176gZmeqZuY/W/nZiUyvmb1/qInjcpiZjXWi6nON+nxJpD1bxtSoBxNliGISae32n6OwbY+TSXPZ1CfS4bw==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/input": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz",
+      "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/number": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz",
+      "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/password": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz",
+      "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3",
+        "ansi-escapes": "^4.3.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/prompts": {
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz",
+      "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/checkbox": "^2.4.7",
+        "@inquirer/confirm": "^3.1.22",
+        "@inquirer/editor": "^2.1.22",
+        "@inquirer/expand": "^2.1.22",
+        "@inquirer/input": "^2.2.9",
+        "@inquirer/number": "^1.0.10",
+        "@inquirer/password": "^2.1.22",
+        "@inquirer/rawlist": "^2.2.4",
+        "@inquirer/search": "^1.0.7",
+        "@inquirer/select": "^2.4.7"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/rawlist": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz",
+      "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/type": "^1.5.3",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/search": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz",
+      "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.3",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/select": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz",
+      "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==",
+      "dev": true,
+      "dependencies": {
+        "@inquirer/core": "^9.1.0",
+        "@inquirer/figures": "^1.0.5",
+        "@inquirer/type": "^1.5.3",
+        "ansi-escapes": "^4.3.2",
+        "yoctocolors-cjs": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.5.tgz",
+      "integrity": "sha512-MzICLu4yS7V8AA61sANROZ9vT1H3ooca5dSmI1FjZkzq7o/koMsRfQSzRtFo+F3Ao4Sf1C0bpLKejpKB/+j6MA==",
+      "dev": true,
+      "dependencies": {
+        "mute-stream": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -5087,9 +5807,9 @@
       }
     },
     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -5165,50 +5885,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/@istanbuljs/load-nyc-config": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
-      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^5.3.1",
-        "find-up": "^4.1.0",
-        "get-package-type": "^0.1.0",
-        "js-yaml": "^3.13.1",
-        "resolve-from": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/@istanbuljs/load-nyc-config/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
-    },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
@@ -5219,9 +5895,9 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -5258,9 +5934,9 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
@@ -5271,6 +5947,60 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@jsonjoy.com/base64": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-q6XAnWQDIMA3+FTiOYajoYqySkO+JSat0ytXGSuRdq9uXE7o92gzuQwQM14xaCRlBLGq3v5miDGC4vkVTn54xA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/json-pack": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/json-pack/-/json-pack-1.1.1.tgz",
+      "integrity": "sha512-osjeBqMJ2lb/j/M8NCPjs1ylqWIcTRTycIhVB5pt6LgzgeRSb0YRZ7j9RfA8wIUrsr/medIuhVyonXRZWLyfdw==",
+      "dev": true,
+      "dependencies": {
+        "@jsonjoy.com/base64": "^1.1.1",
+        "@jsonjoy.com/util": "^1.1.2",
+        "hyperdyperid": "^1.2.0",
+        "thingies": "^1.20.0"
+      },
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/@jsonjoy.com/util": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.5.0.tgz",
+      "integrity": "sha512-ojoNsrIuPI9g6o8UxhraZQSyF2ByJanAY4cTFbc8Mf2AXEF4aQRGY1dJxyJpuyav8r9FGflEt/Ff3u5Nt6YMPA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
     "node_modules/@kolkov/ngx-gallery": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/@kolkov/ngx-gallery/-/ngx-gallery-2.0.1.tgz",
@@ -5290,18 +6020,99 @@
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
       "dev": true
     },
-    "node_modules/@ljharb/through": {
-      "version": "2.3.13",
-      "resolved": "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz",
-      "integrity": "sha512-/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==",
+    "node_modules/@listr2/prompt-adapter-inquirer": {
+      "version": "2.0.15",
+      "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.15.tgz",
+      "integrity": "sha512-MZrGem/Ujjd4cPTLYDfCZK2iKKeiO/8OX13S6jqxldLs0Prf2aGqVlJ77nMBqMv7fzqgXEgjrNHLXcKR8l9lOg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7"
+        "@inquirer/type": "^1.5.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "@inquirer/prompts": ">= 3 < 6"
       }
     },
+    "node_modules/@lmdb/lmdb-darwin-arm64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.13.tgz",
+      "integrity": "sha512-uiKPB0Fv6WEEOZjruu9a6wnW/8jrjzlZbxXscMB8kuCJ1k6kHpcBnuvaAWcqhbI7rqX5GKziwWEdD+wi2gNLfA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-darwin-x64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.0.13.tgz",
+      "integrity": "sha512-bEVIIfK5mSQoG1R19qA+fJOvCB+0wVGGnXHT3smchBVahYBdlPn2OsZZKzlHWfb1E+PhLBmYfqB5zQXFP7hJig==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-linux-arm": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.0.13.tgz",
+      "integrity": "sha512-Yml1KlMzOnXj/tnW7yX8U78iAzTk39aILYvCPbqeewAq1kSzl+w59k/fiVkTBfvDi/oW/5YRxL+Fq+Y1Fr1r2Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-linux-arm64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.0.13.tgz",
+      "integrity": "sha512-afbVrsMgZ9dUTNUchFpj5VkmJRxvht/u335jUJ7o23YTbNbnpmXif3VKQGCtnjSh+CZaqm6N3CPG8KO3zwyZ1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-linux-x64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.0.13.tgz",
+      "integrity": "sha512-vOtxu0xC0SLdQ2WRXg8Qgd8T32ak4SPqk5zjItRszrJk2BdeXqfGxBJbP7o4aOvSPSmSSv46Lr1EP4HXU8v7Kg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@lmdb/lmdb-win32-x64": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.0.13.tgz",
+      "integrity": "sha512-UCrMJQY/gJnOl3XgbWRZZUvGGBuKy6i0YNSptgMzHBjs+QYDYR1Mt/RLTOPy4fzzves65O1EDmlL//OzEqoLlA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@material-ui/core": {
       "version": "4.12.4",
       "resolved": "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz",
@@ -5339,12 +6150,6 @@
         }
       }
     },
-    "node_modules/@material-ui/core/node_modules/popper.js": {
-      "version": "1.16.1-lts",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
-      "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==",
-      "license": "MIT"
-    },
     "node_modules/@material-ui/icons": {
       "version": "4.11.3",
       "resolved": "https://registry.npmjs.org/@material-ui/icons/-/icons-4.11.3.tgz",
@@ -5493,10 +6298,88 @@
         "react-dom": "^16.8.0 || ^17.0.0"
       }
     },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
+      "integrity": "sha512-QZHtlVgbAdy2zAqNA9Gu1UpIuI8Xvsd1v8ic6B2pZmeFnFcMWiPLfWXh7TVw4eGEZ/C9TH281KwhVoeQUKbyjw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-darwin-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.3.tgz",
+      "integrity": "sha512-mdzd3AVzYKuUmiWOQ8GNhl64/IoFGol569zNRdkLReh6LRLHOXxU4U8eq0JwaD8iFHdVGqSy4IjFL4reoWCDFw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.3.tgz",
+      "integrity": "sha512-fg0uy/dG/nZEXfYilKoRe7yALaNmHoYeIoJuJ7KJ+YyU2bvY8vPv27f7UKhGRpY6euFYqEVhxCFZgAUNQBM3nw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-arm64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.3.tgz",
+      "integrity": "sha512-YxQL+ax0XqBJDZiKimS2XQaf+2wDGVa1enVRGzEvLLVFeqa5kx2bWbtcSXgsxjQB7nRqqIGFIcLteF/sHeVtQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-linux-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.3.tgz",
+      "integrity": "sha512-cvwNfbP07pKUfq1uH+S6KJ7dT9K8WOE4ZiAcsrSes+UY55E/0jLYc+vq+DO7jlmqRb5zAggExKm0H7O/CBaesg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@msgpackr-extract/msgpackr-extract-win32-x64": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.3.tgz",
+      "integrity": "sha512-x0fWaQtYp4E6sktbsdAqnehxDgEc/VwM7uLsRCYWaiGu0ykYdZPiS8zCWdnjHwyiumousxfBm4SO31eXqwEZhQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@ng-bootstrap/ng-bootstrap": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-11.0.1.tgz",
-      "integrity": "sha512-xpXpW2x2S9ZQhEu5kCmEAFf8WvkVD+rcKb1NLQiLuiZgAQR7GXVexXy5Y+RIvTjAQmPEVyxaSgYiJA6sWNJLNw==",
+      "version": "12.1.2",
+      "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-12.1.2.tgz",
+      "integrity": "sha512-p27c+mYVdHiJMYrj5hwClVJxLdiZxafAqlbw1sdJh2xJ1rGOe+H/kCf5YDRbhlHqRN+34Gr0RQqIUeD1I2V8hg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -5505,6 +6388,7 @@
         "@angular/core": "^13.0.0",
         "@angular/forms": "^13.0.0",
         "@angular/localize": "^13.0.0",
+        "@popperjs/core": "^2.10.2",
         "rxjs": "^6.5.3 || ^7.4.0"
       }
     },
@@ -5538,23 +6422,22 @@
       }
     },
     "node_modules/@ngrx/effects": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-17.2.0.tgz",
-      "integrity": "sha512-tXDJNsuBtbvI/7+vYnkDKKpUvLbopw1U5G6LoPnKNrbTPsPcUGmCqF5Su/ZoRN3BhXjt2j+eoeVdpBkxdxMRgg==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/effects/-/effects-18.1.1.tgz",
+      "integrity": "sha512-XXob8kYEvYMaZwgHtrrTW0XZargbu5PloEpNHLnzB8jPk0yWEw6keryxaF09Ylws1779MWvMmF/YP2rPl04nHQ==",
       "dependencies": {
-        "@ngrx/operators": "17.0.0-beta.0",
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "^17.0.0",
-        "@ngrx/store": "17.2.0",
+        "@angular/core": "^18.0.0",
+        "@ngrx/store": "18.1.1",
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
     "node_modules/@ngrx/operators": {
-      "version": "17.0.0-beta.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-17.0.0-beta.0.tgz",
-      "integrity": "sha512-EbO8AONuQ6zo2v/mPyBOi4y0CTAp1x4Z+bx7ZF+Pd8BL5ma53BTCL1TmzaeK5zPUe0yApudLk9/ZbHXPnVox5A==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/operators/-/operators-18.1.1.tgz",
+      "integrity": "sha512-RB156PouKI/E79jxvJLaDFYMHz9JVFR8f4ogfAeT7sh2dDGoK4A+B0n1Cl0iYW9fpcJCdfB/mu7TkH6auFv1aQ==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -5563,71 +6446,72 @@
       }
     },
     "node_modules/@ngrx/router-store": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-17.2.0.tgz",
-      "integrity": "sha512-Vynfg2xsB57Oedf0Bb6mjC4MIeaF2OtAewsSnppGIM2b8pwL5W89r2+q2SGc2D6Mp3/pZF3HRI6NxhnHWJdYmg==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/router-store/-/router-store-18.1.1.tgz",
+      "integrity": "sha512-S1/09T8EJHso1keOZ2Q3hb1oAsdJ/FSEWkn24yWJXftbXOKJq1jnrYhNaVm5gPnxGzdQ1mqRtLuMKaDClyxP5A==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/common": "^17.0.0",
-        "@angular/core": "^17.0.0",
-        "@angular/router": "^17.0.0",
-        "@ngrx/store": "17.2.0",
+        "@angular/common": "^18.0.0",
+        "@angular/core": "^18.0.0",
+        "@angular/router": "^18.0.0",
+        "@ngrx/store": "18.1.1",
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
     "node_modules/@ngrx/store": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-17.2.0.tgz",
-      "integrity": "sha512-7wKgZ59B/6yQSvvsU0DQXipDqpkAXv7LwcXLD5Ww7nvqN0fQoRPThMh4+Wv55DCJhE0bQc1NEMciLA47uRt7Wg==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/store/-/store-18.1.1.tgz",
+      "integrity": "sha512-K0v1akJ2sEnIeb1AUA064+ksgRgbMgVG9HbSsLBxENbFjK2ZvKRxo1bpOw6WHW9+hyDTlhZGl7+gUtjmo3497g==",
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@angular/core": "^17.0.0",
+        "@angular/core": "^18.0.0",
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
     "node_modules/@ngrx/store-devtools": {
-      "version": "17.2.0",
-      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-17.2.0.tgz",
-      "integrity": "sha512-ig0qr6hMexZGnrlxfHvZmu5CanRjH7hhx60XUbB5BdBvWJIIRaWKPLcsniiDUhljAD87gvzrrilbCTiML38+CA==",
+      "version": "18.1.1",
+      "resolved": "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-18.1.1.tgz",
+      "integrity": "sha512-tfn9Ms1q2bl7VDWwHyj7dUbwmGiiVzIpOKZs39rsms8tG8hbvsxoczyQAp2w5erVtoJb8ltIh1/birKkS7HmuQ==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.0.0"
       },
       "peerDependencies": {
-        "@ngrx/store": "17.2.0",
+        "@angular/core": "^18.0.0",
+        "@ngrx/store": "18.1.1",
         "rxjs": "^6.5.3 || ^7.5.0"
       }
     },
     "node_modules/@ngtools/webpack": {
-      "version": "16.2.16",
-      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-16.2.16.tgz",
-      "integrity": "sha512-4gm2allK0Pjy/Lxb9IGRnhEZNEOJSOTWwy09VOdHouV2ODRK7Tto2LgteaFJUUSLkuvWRsI7pfuA6yrz8KDfHw==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.14.tgz",
+      "integrity": "sha512-rT+Y4WR8QTVsijtb+YRqHcPTpd1ZiwRbklQXRTxU0YGFHpxpi+bhjmY8FjpPoAtdPO1Lg3l3KIZPZa0thG0FNg==",
       "dev": true,
       "engines": {
-        "node": "^16.14.0 || >=18.10.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       },
       "peerDependencies": {
-        "@angular/compiler-cli": "^16.0.0",
-        "typescript": ">=4.9.3 <5.2",
+        "@angular/compiler-cli": "^18.0.0",
+        "typescript": ">=5.4 <5.6",
         "webpack": "^5.54.0"
       }
     },
     "node_modules/@ngx-translate/core": {
-      "version": "14.0.0",
-      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-14.0.0.tgz",
-      "integrity": "sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==",
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@ngx-translate/core/-/core-16.0.4.tgz",
+      "integrity": "sha512-s8llTL2SJvROhqttxvEs7Cg+6qSf4kvZPFYO+cTOY1d8DWTjlutRkWAleZcPPoeX927Dm7ALfL07G7oYDJ7z6w==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/core": ">=13.0.0",
-        "rxjs": "^6.5.3 || ^7.4.0"
+        "@angular/common": ">=16",
+        "@angular/core": ">=16"
       }
     },
     "node_modules/@nicky-lenaers/ngx-scroll-to": {
@@ -5695,13 +6579,10 @@
       }
     },
     "node_modules/@npmcli/agent/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/@npmcli/fs": {
       "version": "1.1.1",
@@ -5714,12 +6595,13 @@
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.7.tgz",
-      "integrity": "sha512-WaOVvto604d5IpdCRV2KjQu8PzkfE96d50CQGKgywXh2GxXmDeUO5EWcBC4V57uFyrNqx83+MewuJh3WTR3xPA==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz",
+      "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==",
       "dev": true,
       "dependencies": {
         "@npmcli/promise-spawn": "^7.0.0",
+        "ini": "^4.1.3",
         "lru-cache": "^10.0.1",
         "npm-pick-manifest": "^9.0.0",
         "proc-log": "^4.0.0",
@@ -5742,22 +6624,10 @@
       }
     },
     "node_modules/@npmcli/git/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@npmcli/git/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/@npmcli/git/node_modules/which": {
       "version": "4.0.0",
@@ -5814,9 +6684,9 @@
       }
     },
     "node_modules/@npmcli/package-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.0.tgz",
-      "integrity": "sha512-qe/kiqqkW0AGtvBjL8TJKZk/eBBSpnJkUWvHdQ9jM2lKHXRYYJuyNpJPlJw3c8QjC2ow6NZYiLExhUaeJelbxQ==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz",
+      "integrity": "sha512-f7zYC6kQautXHvNbLEWgD/uGu1+xCn9izgqBfgItWSx22U0ZDekxN08A1vM8cTxj/cRVe0Q94Ode+tdoYmIOOQ==",
       "dev": true,
       "dependencies": {
         "@npmcli/git": "^5.0.0",
@@ -5831,10 +6701,19 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/@npmcli/package-json/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/@npmcli/package-json/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -5847,8 +6726,20 @@
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@npmcli/package-json/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -5863,15 +6754,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/@npmcli/package-json/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/@npmcli/promise-spawn": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
@@ -5909,24 +6791,25 @@
       }
     },
     "node_modules/@npmcli/redact": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-1.1.0.tgz",
-      "integrity": "sha512-PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz",
+      "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==",
       "dev": true,
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/run-script": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.4.tgz",
-      "integrity": "sha512-9ApYM/3+rBt9V80aYg6tZfzj3UWdiYyCt7gJUD1VJKvWF5nwKDSICXbYIQbspFTq6TOpbsEtIC0LArB8d9PFmg==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz",
+      "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==",
       "dev": true,
       "dependencies": {
         "@npmcli/node-gyp": "^3.0.0",
         "@npmcli/package-json": "^5.0.0",
         "@npmcli/promise-spawn": "^7.0.0",
         "node-gyp": "^10.0.0",
+        "proc-log": "^4.0.0",
         "which": "^4.0.0"
       },
       "engines": {
@@ -5958,10 +6841,11 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
-      "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
+      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
       "dev": true,
+      "hasInstallScript": true,
       "optional": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
@@ -5977,24 +6861,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.4.1",
-        "@parcel/watcher-darwin-arm64": "2.4.1",
-        "@parcel/watcher-darwin-x64": "2.4.1",
-        "@parcel/watcher-freebsd-x64": "2.4.1",
-        "@parcel/watcher-linux-arm-glibc": "2.4.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.4.1",
-        "@parcel/watcher-linux-arm64-musl": "2.4.1",
-        "@parcel/watcher-linux-x64-glibc": "2.4.1",
-        "@parcel/watcher-linux-x64-musl": "2.4.1",
-        "@parcel/watcher-win32-arm64": "2.4.1",
-        "@parcel/watcher-win32-ia32": "2.4.1",
-        "@parcel/watcher-win32-x64": "2.4.1"
+        "@parcel/watcher-android-arm64": "2.5.1",
+        "@parcel/watcher-darwin-arm64": "2.5.1",
+        "@parcel/watcher-darwin-x64": "2.5.1",
+        "@parcel/watcher-freebsd-x64": "2.5.1",
+        "@parcel/watcher-linux-arm-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm-musl": "2.5.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
+        "@parcel/watcher-linux-arm64-musl": "2.5.1",
+        "@parcel/watcher-linux-x64-glibc": "2.5.1",
+        "@parcel/watcher-linux-x64-musl": "2.5.1",
+        "@parcel/watcher-win32-arm64": "2.5.1",
+        "@parcel/watcher-win32-ia32": "2.5.1",
+        "@parcel/watcher-win32-x64": "2.5.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
-      "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
+      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
       "cpu": [
         "arm64"
       ],
@@ -6012,9 +6897,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz",
-      "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
+      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
       "cpu": [
         "arm64"
       ],
@@ -6032,9 +6917,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz",
-      "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
+      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
       "cpu": [
         "x64"
       ],
@@ -6052,9 +6937,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz",
-      "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
+      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
       "cpu": [
         "x64"
       ],
@@ -6072,9 +6957,29 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz",
-      "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
+      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-musl": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
+      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
       "cpu": [
         "arm"
       ],
@@ -6092,9 +6997,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz",
-      "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
+      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
       "cpu": [
         "arm64"
       ],
@@ -6112,9 +7017,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz",
-      "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
+      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
       "cpu": [
         "arm64"
       ],
@@ -6132,9 +7037,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz",
-      "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
+      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
       "cpu": [
         "x64"
       ],
@@ -6152,9 +7057,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz",
-      "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
+      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
       "cpu": [
         "x64"
       ],
@@ -6172,9 +7077,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz",
-      "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
+      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
       "cpu": [
         "arm64"
       ],
@@ -6192,9 +7097,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz",
-      "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
+      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
       "cpu": [
         "ia32"
       ],
@@ -6212,9 +7117,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz",
-      "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
+      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
       "cpu": [
         "x64"
       ],
@@ -6231,6 +7136,19 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/@parcel/watcher/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/@parcel/watcher/node_modules/node-addon-api": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
@@ -6248,6 +7166,16 @@
         "node": ">=14"
       }
     },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/@react-dnd/asap": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz",
@@ -6326,9 +7254,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
-      "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.4.tgz",
+      "integrity": "sha512-Fxamp4aEZnfPOcGA8KSNEohV8hX7zVHOemC8jVBoBUHu5zpJK/Eu3uJwt6BMgy9fkvzxDaurgj96F/NiLukF2w==",
       "cpu": [
         "arm"
       ],
@@ -6339,9 +7267,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
-      "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.4.tgz",
+      "integrity": "sha512-VXoK5UMrgECLYaMuGuVTOx5kcuap1Jm8g/M83RnCHBKOqvPPmROFJGQaZhGccnsFtfXQ3XYa4/jMCJvZnbJBdA==",
       "cpu": [
         "arm64"
       ],
@@ -6352,9 +7280,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
-      "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.4.tgz",
+      "integrity": "sha512-xMM9ORBqu81jyMKCDP+SZDhnX2QEVQzTcC6G18KlTQEzWK8r/oNZtKuZaCcHhnsa6fEeOBionoyl5JsAbE/36Q==",
       "cpu": [
         "arm64"
       ],
@@ -6365,9 +7293,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
-      "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.4.tgz",
+      "integrity": "sha512-aJJyYKQwbHuhTUrjWjxEvGnNNBCnmpHDvrb8JFDbeSH3m2XdHcxDd3jthAzvmoI8w/kSjd2y0udT+4okADsZIw==",
       "cpu": [
         "x64"
       ],
@@ -6378,9 +7306,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
-      "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.4.tgz",
+      "integrity": "sha512-j63YtCIRAzbO+gC2L9dWXRh5BFetsv0j0va0Wi9epXDgU/XUi5dJKo4USTttVyK7fGw2nPWK0PbAvyliz50SCQ==",
       "cpu": [
         "arm"
       ],
@@ -6391,9 +7319,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
-      "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.4.tgz",
+      "integrity": "sha512-dJnWUgwWBX1YBRsuKKMOlXCzh2Wu1mlHzv20TpqEsfdZLb3WoJW2kIEsGwLkroYf24IrPAvOT/ZQ2OYMV6vlrg==",
       "cpu": [
         "arm"
       ],
@@ -6404,9 +7332,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
-      "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.4.tgz",
+      "integrity": "sha512-AdPRoNi3NKVLolCN/Sp4F4N1d98c4SBnHMKoLuiG6RXgoZ4sllseuGioszumnPGmPM2O7qaAX/IJdeDU8f26Aw==",
       "cpu": [
         "arm64"
       ],
@@ -6417,9 +7345,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
-      "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.4.tgz",
+      "integrity": "sha512-Gl0AxBtDg8uoAn5CCqQDMqAx22Wx22pjDOjBdmG0VIWX3qUBHzYmOKh8KXHL4UpogfJ14G4wk16EQogF+v8hmA==",
       "cpu": [
         "arm64"
       ],
@@ -6430,9 +7358,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
-      "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.4.tgz",
+      "integrity": "sha512-3aVCK9xfWW1oGQpTsYJJPF6bfpWfhbRnhdlyhak2ZiyFLDaayz0EP5j9V1RVLAAxlmWKTDfS9wyRyY3hvhPoOg==",
       "cpu": [
         "ppc64"
       ],
@@ -6443,9 +7371,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
-      "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.4.tgz",
+      "integrity": "sha512-ePYIir6VYnhgv2C5Xe9u+ico4t8sZWXschR6fMgoPUK31yQu7hTEJb7bCqivHECwIClJfKgE7zYsh1qTP3WHUA==",
       "cpu": [
         "riscv64"
       ],
@@ -6456,9 +7384,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
-      "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.4.tgz",
+      "integrity": "sha512-GqFJ9wLlbB9daxhVlrTe61vJtEY99/xB3C8e4ULVsVfflcpmR6c8UZXjtkMA6FhNONhj2eA5Tk9uAVw5orEs4Q==",
       "cpu": [
         "s390x"
       ],
@@ -6469,9 +7397,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
-      "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.4.tgz",
+      "integrity": "sha512-87v0ol2sH9GE3cLQLNEy0K/R0pz1nvg76o8M5nhMR0+Q+BBGLnb35P0fVz4CQxHYXaAOhE8HhlkaZfsdUOlHwg==",
       "cpu": [
         "x64"
       ],
@@ -6482,9 +7410,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
-      "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.4.tgz",
+      "integrity": "sha512-UV6FZMUgePDZrFjrNGIWzDo/vABebuXBhJEqrHxrGiU6HikPy0Z3LfdtciIttEUQfuDdCn8fqh7wiFJjCNwO+g==",
       "cpu": [
         "x64"
       ],
@@ -6495,9 +7423,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
-      "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.4.tgz",
+      "integrity": "sha512-BjI+NVVEGAXjGWYHz/vv0pBqfGoUH0IGZ0cICTn7kB9PyjrATSkX+8WkguNjWoj2qSr1im/+tTGRaY+4/PdcQw==",
       "cpu": [
         "arm64"
       ],
@@ -6508,9 +7436,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
-      "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.4.tgz",
+      "integrity": "sha512-SiWG/1TuUdPvYmzmYnmd3IEifzR61Tragkbx9D3+R8mzQqDBz8v+BvZNDlkiTtI9T15KYZhP0ehn3Dld4n9J5g==",
       "cpu": [
         "ia32"
       ],
@@ -6521,9 +7449,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
-      "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.4.tgz",
+      "integrity": "sha512-j8pPKp53/lq9lMXN57S8cFz0MynJk8OWNuUnXct/9KCpKU7DgU3bYMJhwWmcqC0UU29p8Lr0/7KEVcaM6bf47Q==",
       "cpu": [
         "x64"
       ],
@@ -6540,17 +7468,17 @@
       "dev": true
     },
     "node_modules/@schematics/angular": {
-      "version": "17.3.11",
-      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-17.3.11.tgz",
-      "integrity": "sha512-tvJpTgYC+hCnTyLszYRUZVyNTpPd+C44gh5CPTcG3qkqStzXQwynQAf6X/DjtwXbUiPQF0XfF0+0R489GpdZPA==",
+      "version": "18.2.14",
+      "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.14.tgz",
+      "integrity": "sha512-CHh6ew2Az71UlvVcnYeuMEwjwkZqR7y/9ebLzFRvczC71ZL8qPVBpBTVGbCpGBd54VEbCZVWRxBQoZZ5LP/aBw==",
       "dev": true,
       "dependencies": {
-        "@angular-devkit/core": "17.3.11",
-        "@angular-devkit/schematics": "17.3.11",
-        "jsonc-parser": "3.2.1"
+        "@angular-devkit/core": "18.2.14",
+        "@angular-devkit/schematics": "18.2.14",
+        "jsonc-parser": "3.3.1"
       },
       "engines": {
-        "node": "^18.13.0 || >=20.9.0",
+        "node": "^18.19.1 || ^20.11.1 || >=22.0.0",
         "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
         "yarn": ">= 1.13.0"
       }
@@ -6577,12 +7505,12 @@
       }
     },
     "node_modules/@sigstore/protobuf-specs": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.2.tgz",
-      "integrity": "sha512-c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.3.tgz",
+      "integrity": "sha512-RpacQhBlwpBWd7KEJsRKcBQalbV28fvkxwTOJIqhIuDysMMaJW47V4OqW30iJB9uRpqOSxxEAQFdr8tTattReQ==",
       "dev": true,
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": "^18.17.0 || >=20.5.0"
       }
     },
     "node_modules/@sigstore/sign": {
@@ -6602,15 +7530,6 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/@sigstore/sign/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/@sigstore/tuf": {
       "version": "2.3.4",
       "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz",
@@ -6638,6 +7557,18 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+      "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/@socket.io/component-emitter": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
@@ -6690,6 +7621,30 @@
         "node": "^16.14.0 || >=18.0.0"
       }
     },
+    "node_modules/@tufjs/models/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@tufjs/models/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -6765,12 +7720,6 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/cookie": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz",
-      "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==",
-      "dev": true
-    },
     "node_modules/@types/cors": {
       "version": "2.8.17",
       "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.17.tgz",
@@ -6813,9 +7762,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+      "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
       "dev": true
     },
     "node_modules/@types/express": {
@@ -6831,9 +7780,9 @@
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.19.5",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz",
-      "integrity": "sha512-y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==",
+      "version": "4.19.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
       "devOptional": true,
       "dependencies": {
         "@types/node": "*",
@@ -6846,13 +7795,12 @@
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.9.tgz",
       "integrity": "sha512-fFxMtjAvXXMYTzDFK5NpcVB7WHnrHVLl00QzEGpuFxSAC789io6M+vjcn+g5FTEamIJtJr/IHkCDsqvJxeWDyw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/hoist-non-react-statics": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz",
-      "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz",
+      "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==",
       "dependencies": {
         "@types/react": "*",
         "hoist-non-react-statics": "^3.3.0"
@@ -6865,9 +7813,9 @@
       "devOptional": true
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.14",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.14.tgz",
-      "integrity": "sha512-SSrD0c1OQzlFX7pGu1eXxSEjemej64aaNPRhhVYUGqXh0BtldAAx37MG8btcumvpgKyZp1F5Gn3JkktdxiFv6w==",
+      "version": "1.17.16",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
+      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -6897,9 +7845,9 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.13",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz",
-      "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==",
+      "version": "4.17.16",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.16.tgz",
+      "integrity": "sha512-HX7Em5NYQAXKW+1T+FiuG27NGwzJfCX3s1GjOa7ujxZa52kjJLOr4FUxT+giF6Tgxv1e+/czV/iTtBw27WTU9g==",
       "dev": true
     },
     "node_modules/@types/mime": {
@@ -6908,6 +7856,15 @@
       "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==",
       "devOptional": true
     },
+    "node_modules/@types/mute-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mute-stream/-/mute-stream-0.0.4.tgz",
+      "integrity": "sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/node": {
       "version": "14.18.63",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
@@ -6929,14 +7886,14 @@
       "dev": true
     },
     "node_modules/@types/prop-types": {
-      "version": "15.7.12",
-      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz",
-      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q=="
+      "version": "15.7.14",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
+      "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ=="
     },
     "node_modules/@types/qs": {
-      "version": "6.9.15",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.15.tgz",
-      "integrity": "sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==",
+      "version": "6.9.18",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
+      "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
       "devOptional": true
     },
     "node_modules/@types/range-parser": {
@@ -6946,10 +7903,9 @@
       "devOptional": true
     },
     "node_modules/@types/react": {
-      "version": "17.0.80",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.80.tgz",
-      "integrity": "sha512-LrgHIu2lEtIo8M7d1FcI3BdwXWoRQwMoXOZ7+dPTW0lYREjmlHl3P0U1VD0i/9tppOuv8/sam7sOjx34TxSFbA==",
-      "license": "MIT",
+      "version": "17.0.83",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.83.tgz",
+      "integrity": "sha512-l0m4ArKJvmFtR4e8UmKrj1pB4tUgOhJITf+mADyF/p69Ts1YAR/E+G9XEM0mHXKVRa1dQNHseyyDNzeuAXfXQw==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "^0.16",
@@ -6957,9 +7913,9 @@
       }
     },
     "node_modules/@types/react-redux": {
-      "version": "7.1.33",
-      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz",
-      "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==",
+      "version": "7.1.34",
+      "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.34.tgz",
+      "integrity": "sha512-GdFaVjEbYv4Fthm2ZLvj1VSCedV7TqE5y1kNwnjSdBOTXuRSgowux6J8TAct15T3CKBr63UMk+2CO7ilRhyrAQ==",
       "dependencies": {
         "@types/hoist-non-react-statics": "^3.3.0",
         "@types/react": "*",
@@ -6968,10 +7924,10 @@
       }
     },
     "node_modules/@types/react-transition-group": {
-      "version": "4.4.10",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
-      "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==",
-      "dependencies": {
+      "version": "4.4.12",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.12.tgz",
+      "integrity": "sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==",
+      "peerDependencies": {
         "@types/react": "*"
       }
     },
@@ -6989,8 +7945,7 @@
     "node_modules/@types/scheduler": {
       "version": "0.16.8",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz",
-      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==",
-      "license": "MIT"
+      "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A=="
     },
     "node_modules/@types/semver": {
       "version": "7.5.8",
@@ -7035,9 +7990,9 @@
       "dev": true
     },
     "node_modules/@types/sizzle": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz",
-      "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==",
+      "version": "2.3.9",
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.9.tgz",
+      "integrity": "sha512-xzLEyKB50yqCUPUJkIsrVvoWNfFUbIZI+RspLWt8u+tIW/BetMBZtgV2LY/2o+tYH8dRvQ+eoPf3NdhQCcLE2w==",
       "dev": true
     },
     "node_modules/@types/sockjs": {
@@ -7049,19 +8004,25 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/wrap-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz",
+      "integrity": "sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==",
+      "dev": true
+    },
     "node_modules/@types/ws": {
-      "version": "8.5.10",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
-      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+      "version": "17.0.33",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
+      "integrity": "sha512-WpxBCKWPLr4xSsHgz511rFJAM+wS28w2zEO1QDNY5zM/S8ok70NNfztH0xwhqKyaK0OHCbN98LDAZuy1ctxDkA==",
       "dev": true,
       "dependencies": {
         "@types/yargs-parser": "*"
@@ -7116,31 +8077,13 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/type-utils": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
-      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.18.0",
-        "@typescript-eslint/utils": "7.18.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
-      },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "node": ">= 4"
       }
     },
     "node_modules/@typescript-eslint/experimental-utils": {
@@ -7312,6 +8255,19 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/rule-tester": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/rule-tester/-/rule-tester-7.18.0.tgz",
@@ -7376,131 +8332,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz",
-      "integrity": "sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.11.0",
-        "@typescript-eslint/utils": "7.11.0",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz",
-      "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz",
-      "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/visitor-keys": "7.11.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "^9.0.4",
-        "semver": "^7.6.0",
-        "ts-api-utils": "^1.3.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz",
-      "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.11.0",
-        "@typescript-eslint/types": "7.11.0",
-        "@typescript-eslint/typescript-estree": "7.11.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      }
-    },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz",
-      "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.11.0",
-        "eslint-visitor-keys": "^3.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/types": {
+    "node_modules/@typescript-eslint/scope-manager/node_modules/@typescript-eslint/types": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
       "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
@@ -7513,6 +8345,47 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/types": {
+      "version": "8.26.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.26.0.tgz",
+      "integrity": "sha512-89B1eP3tnpr9A8L6PZlSjBvnJhWXtYfZhECqlBl1D9Lme9mHO6iWlsprBtVenQvY1HMhax1mWOjhtL3fh/u+pA==",
+      "dev": true,
+      "peer": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/typescript-estree": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
@@ -7541,6 +8414,43 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
@@ -7563,6 +8473,19 @@
         "eslint": "^8.56.0"
       }
     },
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "7.18.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
@@ -7580,155 +8503,168 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
       "dev": true
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-      "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+      "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@webassemblyjs/helper-numbers": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-      "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+      "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+        "@webassemblyjs/helper-api-error": "1.13.2",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-      "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+      "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/wasm-gen": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+      "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+      "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-      "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+      "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-opt": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1",
-        "@webassemblyjs/wast-printer": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/helper-wasm-section": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-opt": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1",
+        "@webassemblyjs/wast-printer": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-      "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+      "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-      "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+      "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-buffer": "1.12.1",
-        "@webassemblyjs/wasm-gen": "1.12.1",
-        "@webassemblyjs/wasm-parser": "1.12.1"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-buffer": "1.14.1",
+        "@webassemblyjs/wasm-gen": "1.14.1",
+        "@webassemblyjs/wasm-parser": "1.14.1"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-      "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+      "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@webassemblyjs/ast": "1.14.1",
+        "@webassemblyjs/helper-api-error": "1.13.2",
+        "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+        "@webassemblyjs/ieee754": "1.13.2",
+        "@webassemblyjs/leb128": "1.13.2",
+        "@webassemblyjs/utf8": "1.13.2"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.12.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-      "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+      "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.12.1",
+        "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -7815,10 +8751,18 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/accepts/node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.14.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
+      "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -7832,7 +8776,6 @@
       "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
       "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "acorn": "^8"
       }
@@ -7847,9 +8790,9 @@
       }
     },
     "node_modules/acorn-walk": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.3.tgz",
-      "integrity": "sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==",
+      "version": "8.3.4",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+      "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.11.0"
@@ -7886,13 +8829,10 @@
       }
     },
     "node_modules/agent-base": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-      "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
+      "version": "7.1.3",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+      "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
       "dev": true,
-      "dependencies": {
-        "debug": "^4.3.4"
-      },
       "engines": {
         "node": ">= 14"
       }
@@ -7911,15 +8851,15 @@
       }
     },
     "node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+      "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "dev": true,
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
         "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "require-from-string": "^2.0.2"
       },
       "funding": {
         "type": "github",
@@ -7927,9 +8867,9 @@
       }
     },
     "node_modules/ajv-formats": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
-      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "dev": true,
       "dependencies": {
         "ajv": "^8.0.0"
@@ -7992,18 +8932,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/ansi-html-community": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
@@ -8025,20 +8953,24 @@
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
       "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -8051,6 +8983,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -8099,22 +9032,22 @@
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
     },
     "node_modules/aria-query": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.2.tgz",
+      "integrity": "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==",
       "dev": true,
-      "dependencies": {
-        "dequal": "^2.0.3"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/array-buffer-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz",
-      "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
+      "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
-        "is-array-buffer": "^3.0.4"
+        "call-bound": "^1.0.3",
+        "is-array-buffer": "^3.0.5"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8178,15 +9111,15 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz",
+      "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8196,15 +9129,15 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz",
+      "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.5",
+        "es-shim-unscopables": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8214,19 +9147,18 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz",
-      "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
+      "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.2.1",
-        "get-intrinsic": "^1.2.3",
-        "is-array-buffer": "^3.0.4",
-        "is-shared-array-buffer": "^1.0.2"
+        "es-abstract": "^1.23.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8263,19 +9195,17 @@
       }
     },
     "node_modules/async": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg=="
+      "version": "3.2.6",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA=="
     },
-    "node_modules/async-each-series": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz",
-      "integrity": "sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==",
+    "node_modules/async-function": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
+      "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/asynckit": {
@@ -8293,9 +9223,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.18",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
-      "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
+      "version": "10.4.20",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+      "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
       "dev": true,
       "funding": [
         {
@@ -8312,11 +9242,11 @@
         }
       ],
       "dependencies": {
-        "browserslist": "^4.23.0",
-        "caniuse-lite": "^1.0.30001591",
+        "browserslist": "^4.23.3",
+        "caniuse-lite": "^1.0.30001646",
         "fraction.js": "^4.3.7",
         "normalize-range": "^0.1.2",
-        "picocolors": "^1.0.0",
+        "picocolors": "^1.0.1",
         "postcss-value-parser": "^4.2.0"
       },
       "bin": {
@@ -8360,19 +9290,18 @@
       "dev": true
     },
     "node_modules/axe-core": {
-      "version": "4.10.2",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.2.tgz",
-      "integrity": "sha512-RE3mdQ7P3FRSe7eqCWoeQ/Z9QXrtniSjp1wUjt5nRC3WIpz5rSCve6o3fsZ2aCpJtrZjSZgjwXAoTO5k4tEI0w==",
+      "version": "4.10.3",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.10.3.tgz",
+      "integrity": "sha512-Xm7bpRXnDSX2YE2YFfBk2FnF0ep6tmG7xPh8iHee8MIcrgq762Nkce856dYtJYLkuIoYZvGfTs/PbZhideTcEg==",
       "dev": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/axios": {
-      "version": "1.7.7",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
-      "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
-      "license": "MIT",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.1.tgz",
+      "integrity": "sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -8380,12 +9309,12 @@
       }
     },
     "node_modules/axobject-query": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz",
-      "integrity": "sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
+      "integrity": "sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==",
       "dev": true,
-      "dependencies": {
-        "dequal": "^2.0.3"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/babel-loader": {
@@ -8405,30 +9334,14 @@
         "webpack": ">=5"
       }
     },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
-      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.11.tgz",
-      "integrity": "sha512-sMEJ27L0gRHShOh5G54uAAPaiCOygY/5ratXuiyb2G46FmlSpc9eFCzYVyDiPxfNbwzA7mYahmjQc5q+CZQ09Q==",
+      "version": "0.4.12",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+      "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
-        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "@babel/helper-define-polyfill-provider": "^0.6.3",
         "semver": "^6.3.1"
       },
       "peerDependencies": {
@@ -8445,57 +9358,25 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.9.0.tgz",
-      "integrity": "sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==",
+      "version": "0.10.6",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+      "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0",
-        "core-js-compat": "^3.34.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-corejs3/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
+        "@babel/helper-define-polyfill-provider": "^0.6.2",
+        "core-js-compat": "^3.38.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.5.tgz",
-      "integrity": "sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==",
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
+      "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.5.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
-      }
-    },
-    "node_modules/babel-plugin-polyfill-regenerator/node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.5.0.tgz",
-      "integrity": "sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-compilation-targets": "^7.22.6",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2"
+        "@babel/helper-define-polyfill-provider": "^0.6.3"
       },
       "peerDependencies": {
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
@@ -8546,6 +9427,11 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/basic-auth/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
     "node_modules/batch": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
@@ -8590,6 +9476,7 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
       "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       },
@@ -8656,10 +9543,24 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/body-parser/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/bonjour-service": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
-      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -8671,15 +9572,10 @@
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
     },
-    "node_modules/boolean": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
-      "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="
-    },
     "node_modules/bootstrap": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
-      "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
+      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
       "funding": [
         {
           "type": "github",
@@ -8691,16 +9587,16 @@
         }
       ],
       "peerDependencies": {
-        "jquery": "1.9.1 - 3",
-        "popper.js": "^1.16.1"
+        "@popperjs/core": "^2.11.8"
       }
     },
     "node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
       }
     },
     "node_modules/braces": {
@@ -8714,251 +9610,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/browser-sync": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-3.0.3.tgz",
-      "integrity": "sha512-91hoBHKk1C4pGeD+oE9Ld222k2GNQEAsI5AElqR8iLLWNrmZR2LPP8B0h8dpld9u7kro5IEUB3pUb0DJ3n1cRQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "browser-sync-client": "^3.0.3",
-        "browser-sync-ui": "^3.0.3",
-        "bs-recipes": "1.3.4",
-        "chalk": "4.1.2",
-        "chokidar": "^3.5.1",
-        "connect": "3.6.6",
-        "connect-history-api-fallback": "^1",
-        "dev-ip": "^1.0.1",
-        "easy-extender": "^2.3.4",
-        "eazy-logger": "^4.0.1",
-        "etag": "^1.8.1",
-        "fresh": "^0.5.2",
-        "fs-extra": "3.0.1",
-        "http-proxy": "^1.18.1",
-        "immutable": "^3",
-        "micromatch": "^4.0.8",
-        "opn": "5.3.0",
-        "portscanner": "2.2.0",
-        "raw-body": "^2.3.2",
-        "resp-modifier": "6.0.2",
-        "rx": "4.1.0",
-        "send": "^0.19.0",
-        "serve-index": "^1.9.1",
-        "serve-static": "^1.16.2",
-        "server-destroy": "1.0.1",
-        "socket.io": "^4.4.1",
-        "ua-parser-js": "^1.0.33",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "browser-sync": "dist/bin.js"
-      },
-      "engines": {
-        "node": ">= 8.0.0"
-      }
-    },
-    "node_modules/browser-sync-client": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-3.0.3.tgz",
-      "integrity": "sha512-TOEXaMgYNjBYIcmX5zDlOdjEqCeCN/d7opf/fuyUD/hhGVCfP54iQIDhENCi012AqzYZm3BvuFl57vbwSTwkSQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "etag": "1.8.1",
-        "fresh": "0.5.2",
-        "mitt": "^1.1.3"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/browser-sync-ui": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-3.0.3.tgz",
-      "integrity": "sha512-FcGWo5lP5VodPY6O/f4pXQy5FFh4JK0f2/fTBsp0Lx1NtyBWs/IfPPJbW8m1ujTW/2r07oUXKTF2LYZlCZktjw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "async-each-series": "0.1.1",
-        "chalk": "4.1.2",
-        "connect-history-api-fallback": "^1",
-        "immutable": "^3",
-        "server-destroy": "1.0.1",
-        "socket.io-client": "^4.4.1",
-        "stream-throttle": "^0.1.3"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/browser-sync-ui/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-sync-ui/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-sync/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/browser-sync/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/browser-sync/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/browser-sync/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/browser-sync/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/browser-sync/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/browserslist": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-      "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+      "version": "4.24.4",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
+      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
       "funding": [
         {
           "type": "opencollective",
@@ -8974,10 +9629,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001663",
-        "electron-to-chromium": "^1.5.28",
-        "node-releases": "^2.0.18",
-        "update-browserslist-db": "^1.1.0"
+        "caniuse-lite": "^1.0.30001688",
+        "electron-to-chromium": "^1.5.73",
+        "node-releases": "^2.0.19",
+        "update-browserslist-db": "^1.1.1"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -8986,14 +9641,6 @@
         "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
       }
     },
-    "node_modules/bs-recipes": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz",
-      "integrity": "sha512-BXvDkqhDNxXEjeGM8LFkSbR+jzmP/CYpCiVKYn+soB1dDldeU15EBNDkwVXndKuX35wnNUaPd0qSoQEAkmQtMw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/buffer": {
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
@@ -9033,6 +9680,21 @@
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
+    "node_modules/bundle-name": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
+      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
+      "dev": true,
+      "dependencies": {
+        "run-applescript": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -9098,15 +9760,42 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
-      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
+      "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "dev": true,
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2",
         "get-intrinsic": "^1.2.4",
-        "set-function-length": "^1.2.1"
+        "set-function-length": "^1.2.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9124,19 +9813,10 @@
         "node": ">=6"
       }
     },
-    "node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001668",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
-      "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
+      "version": "1.0.30001702",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001702.tgz",
+      "integrity": "sha512-LoPe/D7zioC0REI5W73PeR1e1MLCipRGq/VkovJnd6Df+QVqT+vT33OXCp8QUd7kA7RZrHWxb1B36OQKI/0gOA==",
       "funding": [
         {
           "type": "opencollective",
@@ -9179,16 +9859,18 @@
       }
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/chardet": {
@@ -9218,6 +9900,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
       "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+      "dev": true,
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -9308,9 +9991,9 @@
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-      "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz",
+      "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -9335,21 +10018,71 @@
       }
     },
     "node_modules/cli-truncate": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
+      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
       "dev": true,
       "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
+        "slice-ansi": "^5.0.0",
+        "string-width": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/cli-truncate/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
+      "dev": true
+    },
+    "node_modules/cli-truncate/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/cli-width": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
@@ -9372,36 +10105,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/cliui/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cliui/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/cliui/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/cliui/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -9441,18 +10144,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/clone-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/clsx": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
@@ -9462,17 +10153,20 @@
       }
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/colorette": {
       "version": "2.0.20",
@@ -9550,9 +10244,9 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.5",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
-      "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
+      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
       "dependencies": {
         "bytes": "3.1.2",
         "compressible": "~2.0.18",
@@ -9599,49 +10293,20 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/compression/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
     },
     "node_modules/connect": {
-      "version": "3.6.6",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
-      "integrity": "sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "debug": "2.6.9",
-        "finalhandler": "1.1.0",
-        "parseurl": "~1.3.2",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
         "utils-merge": "1.0.1"
       },
       "engines": {
@@ -9649,12 +10314,10 @@
       }
     },
     "node_modules/connect-history-api-fallback": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
-      "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": ">=0.8"
       }
@@ -9664,19 +10327,63 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
     },
+    "node_modules/connect/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/connect/node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+      "dev": true,
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/connect/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true
+    },
+    "node_modules/connect/node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dev": true,
-      "optional": true,
-      "peer": true
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/connect/node_modules/statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
@@ -9689,25 +10396,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/content-type": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
@@ -9837,6 +10525,19 @@
         "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
+    "node_modules/copy-webpack-plugin/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/copy-webpack-plugin/node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -9857,6 +10558,18 @@
         "node": ">=8.9.0"
       }
     },
+    "node_modules/copy-webpack-plugin/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/copy-webpack-plugin/node_modules/make-dir": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
@@ -9872,6 +10585,33 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/copy-webpack-plugin/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/copy-webpack-plugin/node_modules/p-locate/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/copy-webpack-plugin/node_modules/pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -9921,9 +10661,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
-      "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
+      "version": "3.41.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.41.0.tgz",
+      "integrity": "sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==",
       "hasInstallScript": true,
       "funding": {
         "type": "opencollective",
@@ -9931,12 +10671,12 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.38.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
-      "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
+      "version": "3.41.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.41.0.tgz",
+      "integrity": "sha512-RFsU9LySVue9RTwdDVX/T0e2Y6jRYWXERKElIjpuEOEnxaXffI0X7RUwVzfYLfzuLXSNJDYoRYUAmRUcyln20A==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.23.3"
+        "browserslist": "^4.24.4"
       },
       "funding": {
         "type": "opencollective",
@@ -9985,9 +10725,10 @@
       "dev": true
     },
     "node_modules/critters": {
-      "version": "0.0.22",
-      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.22.tgz",
-      "integrity": "sha512-NU7DEcQZM2Dy8XTKFHxtdnIM/drE312j2T4PCVaSUcS0oBeyT/NImpRw/Ap0zOr/1SE7SgPK9tGPg1WK/sVakw==",
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/critters/-/critters-0.0.24.tgz",
+      "integrity": "sha512-Oyqew0FGM0wYUSNqR0L6AteO5MpMoUU0rhKRieXeiKs+PmRTxiJMyaunYB2KF6fQ3dzChXKCpbFOEJx3OQ1v/Q==",
+      "deprecated": "Ownership of Critters has moved to the Nuxt team, who will be maintaining the project going forward. If you'd like to keep using Critters, please switch to the actively-maintained fork at https://github.com/danielroe/beasties",
       "dependencies": {
         "chalk": "^4.1.0",
         "css-select": "^5.1.0",
@@ -9998,70 +10739,6 @@
         "postcss-media-query-parser": "^0.2.3"
       }
     },
-    "node_modules/critters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/critters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/critters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/critters/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/critters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cross-env": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
@@ -10081,9 +10758,9 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
@@ -10120,6 +10797,19 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/css-blank-pseudo/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/css-box-model": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz",
@@ -10146,23 +10836,36 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/css-has-pseudo/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/css-loader": {
-      "version": "6.10.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.10.0.tgz",
-      "integrity": "sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz",
+      "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.1.0",
         "postcss": "^8.4.33",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.4",
-        "postcss-modules-scope": "^3.1.1",
+        "postcss-modules-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
         "postcss-modules-values": "^4.0.0",
         "postcss-value-parser": "^4.2.0",
         "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
@@ -10170,7 +10873,7 @@
       },
       "peerDependencies": {
         "@rspack/core": "0.x || 1.x",
-        "webpack": "^5.0.0"
+        "webpack": "^5.27.0"
       },
       "peerDependenciesMeta": {
         "@rspack/core": {
@@ -10271,9 +10974,9 @@
       "dev": true
     },
     "node_modules/cypress": {
-      "version": "13.16.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.16.0.tgz",
-      "integrity": "sha512-g6XcwqnvzXrqiBQR/5gN+QsyRmKRhls1y5E42fyOvsmU7JuY+wM6uHJWj4ZPttjabzbnRvxcik2WemR8+xT6FA==",
+      "version": "13.17.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.17.0.tgz",
+      "integrity": "sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -10329,113 +11032,120 @@
       }
     },
     "node_modules/cypress-axe": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-1.5.0.tgz",
-      "integrity": "sha512-Hy/owCjfj+25KMsecvDgo4fC/781ccL+e8p+UUYoadGVM2ogZF9XIKbiM6KI8Y3cEaSreymdD6ZzccbI2bY0lQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/cypress-axe/-/cypress-axe-1.6.0.tgz",
+      "integrity": "sha512-C/ij50G8eebBrl/WsGT7E+T/SFyIsRZ3Epx9cRTLrPL9Y1GcxlQGFoAVdtSFWRrHSCWXq9HC6iJQMaI89O9yvQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
       },
       "peerDependencies": {
         "axe-core": "^3 || ^4",
-        "cypress": "^10 || ^11 || ^12 || ^13"
+        "cypress": "^10 || ^11 || ^12 || ^13 || ^14"
       }
     },
-    "node_modules/cypress/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/cypress/node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cypress/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/cypress/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cypress/node_modules/listr2": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
+      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.5.1",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "enquirer": ">= 2.3.0 < 3"
+      },
+      "peerDependenciesMeta": {
+        "enquirer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/cypress/node_modules/listr2/node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/cypress/node_modules/chalk/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cypress/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/cypress/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/cypress/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cypress/node_modules/has-flag": {
+    "node_modules/cypress/node_modules/log-update": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cypress/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "dev": true,
       "dependencies": {
-        "universalify": "^2.0.0"
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cypress/node_modules/log-update/node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
     "node_modules/cypress/node_modules/proxy-from-env": {
@@ -10444,6 +11154,20 @@
       "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
       "dev": true
     },
+    "node_modules/cypress/node_modules/slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/cypress/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -10459,15 +11183,6 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/cypress/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
     "node_modules/dashdash": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -10481,14 +11196,14 @@
       }
     },
     "node_modules/data-view-buffer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz",
-      "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10498,29 +11213,29 @@
       }
     },
     "node_modules/data-view-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz",
-      "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "is-data-view": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/inspect-js"
       }
     },
     "node_modules/data-view-byte-offset": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz",
-      "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
         "is-data-view": "^1.0.1"
       },
@@ -10564,17 +11279,17 @@
       }
     },
     "node_modules/dayjs": {
-      "version": "1.11.11",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz",
-      "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==",
+      "version": "1.11.13",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
-      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dependencies": {
-        "ms": "2.1.2"
+        "ms": "^2.1.3"
       },
       "engines": {
         "node": ">=6.0"
@@ -10617,6 +11332,34 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/default-browser": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
+      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
+      "dev": true,
+      "dependencies": {
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/default-browser-id": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
+      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/default-gateway": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
@@ -10673,6 +11416,12 @@
         "node": ">=10.17.0"
       }
     },
+    "node_modules/default-gateway/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
     "node_modules/defaults": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
@@ -10689,6 +11438,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -10702,12 +11452,15 @@
       }
     },
     "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/define-properties": {
@@ -10754,15 +11507,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/dequal": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/destroy": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
@@ -10773,16 +11517,12 @@
       }
     },
     "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
       "dev": true,
-      "optional": true,
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
-      },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=8"
       }
     },
     "node_modules/detect-node": {
@@ -10791,20 +11531,6 @@
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
-    "node_modules/dev-ip": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz",
-      "integrity": "sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "dev-ip": "lib/dev-ip.js"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
     "node_modules/di": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
@@ -10936,14 +11662,14 @@
       }
     },
     "node_modules/dompurify": {
-      "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.6.tgz",
-      "integrity": "sha512-zUTaUBO8pY4+iJMPE1B9XlO2tXVYIcEA4SNGtvDELzTSCQO7RzH+j7S180BmhmJId78lqGU2z19vgVx2Sxs/PQ=="
+      "version": "2.5.8",
+      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.5.8.tgz",
+      "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw=="
     },
     "node_modules/domutils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-      "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
       "dependencies": {
         "dom-serializer": "^2.0.0",
         "domelementtype": "^2.3.0",
@@ -10953,122 +11679,25 @@
         "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
       "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
       "dev": true
     },
-    "node_modules/easy-extender": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz",
-      "integrity": "sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "lodash": "^4.17.10"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      }
-    },
-    "node_modules/eazy-logger": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.1.tgz",
-      "integrity": "sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "chalk": "4.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/eazy-logger/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/eazy-logger/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
@@ -11105,9 +11734,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.38",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.38.tgz",
-      "integrity": "sha512-VbeVexmZ1IFh+5EfrYz1I0HTzHVIlJa112UEWhciPyeOcKJGeTv6N8WnG4wsQB81DGCaVEGhpSb6o6a8WYFXXg=="
+      "version": "1.5.112",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.112.tgz",
+      "integrity": "sha512-oen93kVyqSb3l+ziUgzIOlWt/oOuy4zRmpwestMn4rhFWAoFJeFuCVte9F2fASjeZZo7l/Cif9TiyrdW4CwEMA=="
     },
     "node_modules/element-resize-detector": {
       "version": "1.2.4",
@@ -11132,9 +11761,9 @@
       }
     },
     "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "engines": {
         "node": ">= 0.8"
       }
@@ -11170,12 +11799,11 @@
       }
     },
     "node_modules/engine.io": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.2.tgz",
-      "integrity": "sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==",
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz",
+      "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==",
       "dev": true,
       "dependencies": {
-        "@types/cookie": "^0.4.1",
         "@types/cors": "^2.8.12",
         "@types/node": ">=10.0.0",
         "accepts": "~1.3.4",
@@ -11190,36 +11818,37 @@
         "node": ">=10.2.0"
       }
     },
-    "node_modules/engine.io-client": {
-      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.1.tgz",
-      "integrity": "sha512-aYuoak7I+R83M/BBPIOs2to51BmFIpC1wZe6zZzMrT2llVsHy5cvcmdsJgP2Qz6smHu+sD9oexiSUAVd8OfBPw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.2.1",
-        "ws": "~8.17.1",
-        "xmlhttprequest-ssl": "~2.1.1"
-      }
-    },
     "node_modules/engine.io-parser": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz",
-      "integrity": "sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==",
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
-      "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==",
+    "node_modules/engine.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -11229,24 +11858,28 @@
       }
     },
     "node_modules/enquirer": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
       "dependencies": {
-        "ansi-colors": "^4.1.1"
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=8.6"
       }
     },
     "node_modules/ent": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.1.tgz",
-      "integrity": "sha512-QHuXVeZx9d+tIQAz/XztU0ZwZf2Agg9CcXcgE1rurqvdBeDBrpSwjl8/6XUqMg7tw2Y7uAdKb2sRv+bSEFqQ5A==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.2.tgz",
+      "integrity": "sha512-kKvD1tO6BM+oK9HzCPpUdRb4vKFQY/FPTFmurMvh6LlN68VMrdj77w8yp51/kDbpkFOS9J8w5W6zIzgM2H8/hw==",
       "dev": true,
       "dependencies": {
-        "punycode": "^1.4.1"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "punycode": "^1.4.1",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11273,9 +11906,9 @@
       }
     },
     "node_modules/envinfo": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz",
-      "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz",
+      "integrity": "sha512-CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==",
       "dev": true,
       "bin": {
         "envinfo": "dist/cli.js"
@@ -11284,6 +11917,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/environment": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
+      "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/err-code": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
@@ -11313,57 +11958,62 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.23.3",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz",
-      "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==",
+      "version": "1.23.9",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
+      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
       "dev": true,
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.1",
-        "arraybuffer.prototype.slice": "^1.0.3",
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
-        "data-view-buffer": "^1.0.1",
-        "data-view-byte-length": "^1.0.1",
-        "data-view-byte-offset": "^1.0.0",
-        "es-define-property": "^1.0.0",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
         "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.0.3",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
-        "get-intrinsic": "^1.2.4",
-        "get-symbol-description": "^1.0.2",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.0",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
         "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.0.3",
-        "has-symbols": "^1.0.3",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
         "hasown": "^2.0.2",
-        "internal-slot": "^1.0.7",
-        "is-array-buffer": "^3.0.4",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
         "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.1",
-        "is-negative-zero": "^2.0.3",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.3",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.13",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.13.1",
+        "is-data-view": "^1.0.2",
+        "is-regex": "^1.2.1",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.3",
         "object-keys": "^1.1.1",
-        "object.assign": "^4.1.5",
-        "regexp.prototype.flags": "^1.5.2",
-        "safe-array-concat": "^1.1.2",
-        "safe-regex-test": "^1.0.3",
-        "string.prototype.trim": "^1.2.9",
-        "string.prototype.trimend": "^1.0.8",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
         "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.2",
-        "typed-array-byte-length": "^1.0.1",
-        "typed-array-byte-offset": "^1.0.2",
-        "typed-array-length": "^1.0.6",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.15"
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.18"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11373,12 +12023,9 @@
       }
     },
     "node_modules/es-define-property": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
-      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
-      "dependencies": {
-        "get-intrinsic": "^1.2.4"
-      },
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "engines": {
         "node": ">= 0.4"
       }
@@ -11392,16 +12039,15 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz",
-      "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
       "dev": true
     },
     "node_modules/es-object-atoms": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz",
-      "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==",
-      "dev": true,
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dependencies": {
         "es-errors": "^1.3.0"
       },
@@ -11410,37 +12056,40 @@
       }
     },
     "node_modules/es-set-tostringtag": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz",
-      "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==",
-      "dev": true,
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dependencies": {
-        "get-intrinsic": "^1.2.4",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
         "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.1"
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/es-shim-unscopables": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz",
-      "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
       "dev": true,
       "dependencies": {
-        "hasown": "^2.0.0"
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "dev": true,
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11458,60 +12107,60 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz",
-      "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz",
+      "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==",
       "dev": true,
       "hasInstallScript": true,
-      "optional": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.1",
-        "@esbuild/android-arm": "0.20.1",
-        "@esbuild/android-arm64": "0.20.1",
-        "@esbuild/android-x64": "0.20.1",
-        "@esbuild/darwin-arm64": "0.20.1",
-        "@esbuild/darwin-x64": "0.20.1",
-        "@esbuild/freebsd-arm64": "0.20.1",
-        "@esbuild/freebsd-x64": "0.20.1",
-        "@esbuild/linux-arm": "0.20.1",
-        "@esbuild/linux-arm64": "0.20.1",
-        "@esbuild/linux-ia32": "0.20.1",
-        "@esbuild/linux-loong64": "0.20.1",
-        "@esbuild/linux-mips64el": "0.20.1",
-        "@esbuild/linux-ppc64": "0.20.1",
-        "@esbuild/linux-riscv64": "0.20.1",
-        "@esbuild/linux-s390x": "0.20.1",
-        "@esbuild/linux-x64": "0.20.1",
-        "@esbuild/netbsd-x64": "0.20.1",
-        "@esbuild/openbsd-x64": "0.20.1",
-        "@esbuild/sunos-x64": "0.20.1",
-        "@esbuild/win32-arm64": "0.20.1",
-        "@esbuild/win32-ia32": "0.20.1",
-        "@esbuild/win32-x64": "0.20.1"
+        "@esbuild/aix-ppc64": "0.23.0",
+        "@esbuild/android-arm": "0.23.0",
+        "@esbuild/android-arm64": "0.23.0",
+        "@esbuild/android-x64": "0.23.0",
+        "@esbuild/darwin-arm64": "0.23.0",
+        "@esbuild/darwin-x64": "0.23.0",
+        "@esbuild/freebsd-arm64": "0.23.0",
+        "@esbuild/freebsd-x64": "0.23.0",
+        "@esbuild/linux-arm": "0.23.0",
+        "@esbuild/linux-arm64": "0.23.0",
+        "@esbuild/linux-ia32": "0.23.0",
+        "@esbuild/linux-loong64": "0.23.0",
+        "@esbuild/linux-mips64el": "0.23.0",
+        "@esbuild/linux-ppc64": "0.23.0",
+        "@esbuild/linux-riscv64": "0.23.0",
+        "@esbuild/linux-s390x": "0.23.0",
+        "@esbuild/linux-x64": "0.23.0",
+        "@esbuild/netbsd-x64": "0.23.0",
+        "@esbuild/openbsd-arm64": "0.23.0",
+        "@esbuild/openbsd-x64": "0.23.0",
+        "@esbuild/sunos-x64": "0.23.0",
+        "@esbuild/win32-arm64": "0.23.0",
+        "@esbuild/win32-ia32": "0.23.0",
+        "@esbuild/win32-x64": "0.23.0"
       }
     },
     "node_modules/esbuild-wasm": {
-      "version": "0.20.1",
-      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.20.1.tgz",
-      "integrity": "sha512-6v/WJubRsjxBbQdz6izgvx7LsVFvVaGmSdwrFHmEzoVgfXL89hkKPoQHsnVI2ngOkcBUQT9kmAM1hVL1k/Av4A==",
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.23.0.tgz",
+      "integrity": "sha512-6jP8UmWy6R6TUUV8bMuC3ZyZ6lZKI56x0tkxyCIqWwRRJ/DgeQKneh/Oid5EoGoPFLrGNkz47ZEtWAYuiY/u9g==",
       "dev": true,
       "bin": {
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/escalade": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-      "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "engines": {
         "node": ">=6"
       }
@@ -11522,24 +12171,29 @@
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
     "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "8.57.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
+      "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
+      "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint/js": "8.57.1",
+        "@humanwhocodes/config-array": "^0.13.0",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -11585,9 +12239,9 @@
       }
     },
     "node_modules/eslint-compat-utils": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz",
-      "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.6.4.tgz",
+      "integrity": "sha512-/u+GQt8NMfXO8w17QendT4gvO5acfxQsAKirAt0LVxDnr2N8YLCVbregaNc/Yhp7NM128DwCaRvr8PLDfeNkQw==",
       "dev": true,
       "dependencies": {
         "semver": "^7.5.4"
@@ -11634,6 +12288,27 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/eslint-json-compat-utils": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-json-compat-utils/-/eslint-json-compat-utils-0.2.1.tgz",
+      "integrity": "sha512-YzEodbDyW8DX8bImKhAcCeu/L31Dd/70Bidx2Qex9OFUtgzXLqtfWL4Hr5fM/aCCB8QUZLuJur0S9k6UfgFkfg==",
+      "dev": true,
+      "dependencies": {
+        "esquery": "^1.6.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "jsonc-eslint-parser": "^2.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@eslint/json": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/eslint-module-utils": {
       "version": "2.12.0",
       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.0.tgz",
@@ -11853,16 +12528,6 @@
         "eslint": ">=6.0.0"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -11896,18 +12561,6 @@
         "json5": "lib/cli.js"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/eslint-plugin-import/node_modules/semver": {
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@@ -11951,26 +12604,15 @@
         "eslint": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint-plugin-jsonc": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.16.0.tgz",
-      "integrity": "sha512-Af/ZL5mgfb8FFNleH6KlO4/VdmDuTqmM+SPnWcdoWywTetv7kq+vQe99UyQb9XO3b0OWLVuTH7H0d/PXYCMdSg==",
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsonc/-/eslint-plugin-jsonc-2.19.1.tgz",
+      "integrity": "sha512-MmlAOaZK1+Lg7YoCZPGRjb88ZjT+ct/KTsvcsbZdBm+w8WMzGx+XEmexk0m40P1WV9G2rFV7X3klyRGRpFXEjA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "eslint-compat-utils": "^0.5.0",
+        "eslint-compat-utils": "^0.6.0",
+        "eslint-json-compat-utils": "^0.2.1",
         "espree": "^9.6.1",
         "graphemer": "^1.4.0",
         "jsonc-eslint-parser": "^2.0.4",
@@ -11987,6 +12629,23 @@
         "eslint": ">=6.0.0"
       }
     },
+    "node_modules/eslint-plugin-jsonc/node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint-plugin-lodash": {
       "version": "7.4.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz",
@@ -12037,7 +12696,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-3.2.0.tgz",
       "integrity": "sha512-6uXyn6xdINEpxE1MtDjxQsyXB37lfyO2yKGVVgtD7WEWQGORSOZjgrD6hBhvGv4/SO+TOlS+UnC6JppRqbuwGQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eslint-rule-composer": "^0.3.0"
       },
@@ -12064,9 +12722,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.1.tgz",
-      "integrity": "sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
       "dev": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -12091,6 +12749,29 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/eslint/node_modules/@eslint/eslintrc": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
+      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint/node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -12107,77 +12788,6 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/eslint/node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/eslint/node_modules/eslint-scope": {
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -12194,20 +12804,21 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "node_modules/eslint/node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/eslint/node_modules/glob-parent": {
@@ -12237,13 +12848,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+    "node_modules/eslint/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">= 4"
       }
     },
     "node_modules/eslint/node_modules/json-schema-traverse": {
@@ -12252,60 +12863,6 @@
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
       "dev": true
     },
-    "node_modules/eslint/node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/eslint/node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -12319,39 +12876,40 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
       "dev": true,
+      "peer": true,
       "dependencies": {
-        "acorn": "^8.9.0",
+        "acorn": "^8.14.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
+      "peer": true,
       "engines": {
-        "node": ">=4"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/esquery": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
-      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -12441,6 +12999,12 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
+    "node_modules/execa/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
     "node_modules/executable": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
@@ -12459,15 +13023,15 @@
       "integrity": "sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw=="
     },
     "node_modules/exponential-backoff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.1.tgz",
-      "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
+      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==",
       "dev": true
     },
     "node_modules/express": {
-      "version": "4.21.1",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz",
-      "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==",
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
@@ -12488,7 +13052,7 @@
         "methods": "~1.1.2",
         "on-finished": "2.4.1",
         "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.10",
+        "path-to-regexp": "0.1.12",
         "proxy-addr": "~2.0.7",
         "qs": "6.13.0",
         "range-parser": "~1.2.1",
@@ -12503,6 +13067,10 @@
       },
       "engines": {
         "node": ">= 0.10.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
     "node_modules/express-rate-limit": {
@@ -12511,11 +13079,12 @@
       "integrity": "sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg=="
     },
     "node_modules/express-static-gzip": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.1.8.tgz",
-      "integrity": "sha512-g8tiJuI9Y9Ffy59ehVXvqb0hhP83JwZiLxzanobPaMbkB5qBWA8nuVgd+rcd5qzH3GkgogTALlc0BaADYwnMbQ==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/express-static-gzip/-/express-static-gzip-2.2.0.tgz",
+      "integrity": "sha512-4ZQ0pHX0CAauxmzry2/8XFLM6aZA4NBvg9QezSlsEO1zLnl7vMFa48/WIcjzdfOiEUS4S1npPPKP2NHHYAp6qg==",
       "dev": true,
       "dependencies": {
+        "parseurl": "^1.3.3",
         "serve-static": "^1.16.2"
       }
     },
@@ -12535,54 +13104,24 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/express/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/express/node_modules/finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+    "node_modules/express/node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/extend": {
       "version": "3.0.2",
@@ -12684,16 +13223,29 @@
       "dev": true
     },
     "node_modules/fast-printf": {
-      "version": "1.6.9",
-      "resolved": "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.9.tgz",
-      "integrity": "sha512-FChq8hbz65WMj4rstcQsFB0O7Cy++nmbNfLYnD9cYv2cRn8EG6k/MGn9kO/tjO66t09DLDugj3yL+V2o6Qftrg==",
-      "dependencies": {
-        "boolean": "^3.1.4"
-      },
+      "version": "1.6.10",
+      "resolved": "https://registry.npmjs.org/fast-printf/-/fast-printf-1.6.10.tgz",
+      "integrity": "sha512-GwTgG9O4FVIdShhbVF3JxOgSBY2+ePGsu2V/UONgoCPzF9VY6ZdBMKsHKCYQHZwNk3qNouUolRDsgVxcVA5G1w==",
       "engines": {
         "node": ">=10.0"
       }
     },
+    "node_modules/fast-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ]
+    },
     "node_modules/fastest-levenshtein": {
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
@@ -12704,9 +13256,9 @@
       }
     },
     "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -12747,6 +13299,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/figures/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -12767,6 +13328,14 @@
         "minimatch": "^5.0.1"
       }
     },
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/filelist/node_modules/minimatch": {
       "version": "5.1.6",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
@@ -12798,19 +13367,16 @@
       }
     },
     "node_modules/finalhandler": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
-      "integrity": "sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dependencies": {
         "debug": "2.6.9",
-        "encodeurl": "~1.0.1",
+        "encodeurl": "~2.0.0",
         "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.2",
-        "statuses": "~1.3.1",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
         "unpipe": "~1.0.0"
       },
       "engines": {
@@ -12821,9 +13387,6 @@
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "ms": "2.0.0"
       }
@@ -12831,35 +13394,7 @@
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
-    "node_modules/finalhandler/node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/statuses": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
-      "integrity": "sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
     "node_modules/find-cache-dir": {
       "version": "4.0.0",
@@ -12878,16 +13413,19 @@
       }
     },
     "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
       "dependencies": {
-        "locate-path": "^5.0.0",
+        "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/flat": {
@@ -12914,15 +13452,15 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.6",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
       "funding": [
         {
           "type": "individual",
@@ -12939,21 +13477,27 @@
       }
     },
     "node_modules/for-each": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
-      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dev": true,
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "is-callable": "^1.2.7"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/foreground-child": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
-      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "dev": true,
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -12963,18 +13507,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/foreground-child/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/forever-agent": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -12985,12 +13517,13 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
         "mime-types": "^2.1.12"
       },
       "engines": {
@@ -13027,16 +13560,18 @@
       }
     },
     "node_modules/fs-extra": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^3.0.0",
-        "universalify": "^0.1.0"
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/fs-minipass": {
@@ -13072,6 +13607,7 @@
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
       "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -13090,15 +13626,17 @@
       }
     },
     "node_modules/function.prototype.name": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
-      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13132,16 +13670,33 @@
         "node": "6.* || 8.* || >= 10.*"
       }
     },
+    "node_modules/get-east-asian-width": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.3.0.tgz",
+      "integrity": "sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/get-intrinsic": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
-      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
         "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
         "function-bind": "^1.1.2",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "hasown": "^2.0.0"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13150,13 +13705,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "dev": true,
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">= 0.4"
       }
     },
     "node_modules/get-stream": {
@@ -13175,14 +13733,14 @@
       }
     },
     "node_modules/get-symbol-description": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz",
-      "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4"
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -13247,28 +13805,6 @@
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/global-dirs": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
@@ -13337,12 +13873,21 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/globby/node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/gopd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
-      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -13367,26 +13912,30 @@
       "dev": true
     },
     "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
-      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -13395,9 +13944,13 @@
       }
     },
     "node_modules/has-proto": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
-      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "dev": true,
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -13406,9 +13959,9 @@
       }
     },
     "node_modules/has-symbols": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -13420,7 +13973,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
       "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "dev": true,
       "dependencies": {
         "has-symbols": "^1.0.3"
       },
@@ -13468,13 +14020,10 @@
       }
     },
     "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/hpack.js": {
       "version": "2.1.6",
@@ -13509,6 +14058,12 @@
         "util-deprecate": "~1.0.1"
       }
     },
+    "node_modules/hpack.js/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
     "node_modules/hpack.js/node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -13602,9 +14157,9 @@
       }
     },
     "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
-      "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.9.tgz",
+      "integrity": "sha512-n1XsPy3rXVxlqxVioEWdC+0+M+SQw0DpJynwtOPo1X+ZlvdzTLtDBIJJlDQTnwZIFJrZSzSGmIOUdP8tu+SgLw==",
       "dev": true
     },
     "node_modules/http-proxy": {
@@ -13637,7 +14192,6 @@
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
       "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
-      "license": "MIT",
       "dependencies": {
         "@types/http-proxy": "^1.17.8",
         "http-proxy": "^1.18.1",
@@ -13685,10 +14239,21 @@
         "node": ">=14"
       }
     },
+    "node_modules/http-terminator/node_modules/type-fest": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
+      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/https-proxy-agent": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
-      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
       "dependencies": {
         "agent-base": "^7.0.2",
@@ -13707,6 +14272,15 @@
         "node": ">=8.12.0"
       }
     },
+    "node_modules/hyperdyperid": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/hyperdyperid/-/hyperdyperid-1.2.0.tgz",
+      "integrity": "sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.18"
+      }
+    },
     "node_modules/hyphenate-style-name": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz",
@@ -13775,9 +14349,9 @@
       ]
     },
     "node_modules/ignore": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-      "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-6.0.2.tgz",
+      "integrity": "sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -13801,6 +14375,30 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/ignore-walk/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/ignore-walk/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@@ -13820,20 +14418,15 @@
       "integrity": "sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ=="
     },
     "node_modules/immutable": {
-      "version": "3.8.2",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
-      "integrity": "sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.3.tgz",
+      "integrity": "sha512-P8IdPQHq3lA1xVeBRi5VPqUm5HDgKnx0Ru51wZz5mjxHr5n3RWhjIpOFU7ybkUxfB+5IToy+OLaHYDBIWsv+uw==",
+      "dev": true
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -13846,19 +14439,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
       "dev": true,
       "dependencies": {
         "pkg-dir": "^4.2.0",
@@ -13874,6 +14458,58 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/import-local/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/import-local/node_modules/pkg-dir": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
@@ -13927,61 +14563,23 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "node_modules/ini": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz",
-      "integrity": "sha512-AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz",
+      "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==",
       "dev": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/inquirer": {
-      "version": "9.2.15",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-9.2.15.tgz",
-      "integrity": "sha512-vI2w4zl/mDluHt9YEQ/543VTCwPKWiHzKtm9dM2V0NdFcqEexDAjUHzO1oA60HRNaVifGXXM1tRRNluLVHa0Kg==",
-      "dev": true,
-      "dependencies": {
-        "@ljharb/through": "^2.3.12",
-        "ansi-escapes": "^4.3.2",
-        "chalk": "^5.3.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^4.1.0",
-        "external-editor": "^3.1.0",
-        "figures": "^3.2.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "1.0.0",
-        "ora": "^5.4.1",
-        "run-async": "^3.0.0",
-        "rxjs": "^7.8.1",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
-      "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
-      "dev": true,
-      "engines": {
-        "node": "^12.17.0 || ^14.13 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/internal-slot": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
-      "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
       "dev": true,
       "dependencies": {
         "es-errors": "^1.3.0",
-        "hasown": "^2.0.0",
-        "side-channel": "^1.0.4"
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14031,13 +14629,14 @@
       }
     },
     "node_modules/is-array-buffer": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
-      "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==",
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14052,13 +14651,35 @@
       "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
-      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
       "dev": true,
       "dependencies": {
-        "has-bigints": "^1.0.1"
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -14068,6 +14689,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -14076,13 +14698,13 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
-      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14109,9 +14731,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dev": true,
       "dependencies": {
         "hasown": "^2.0.2"
@@ -14124,11 +14746,13 @@
       }
     },
     "node_modules/is-data-view": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz",
-      "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
       "dev": true,
       "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
         "is-typed-array": "^1.1.13"
       },
       "engines": {
@@ -14139,12 +14763,13 @@
       }
     },
     "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14154,15 +14779,15 @@
       }
     },
     "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "dev": true,
       "bin": {
         "is-docker": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -14176,12 +14801,49 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
+      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/is-glob": {
@@ -14200,6 +14862,24 @@
       "resolved": "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz",
       "integrity": "sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g=="
     },
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-installed-globally": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
@@ -14231,10 +14911,10 @@
       "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==",
       "dev": true
     },
-    "node_modules/is-negative-zero": {
+    "node_modules/is-map": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz",
-      "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
@@ -14243,6 +14923,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-network-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
+      "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==",
+      "dev": true,
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -14251,24 +14943,14 @@
         "node": ">=0.12.0"
       }
     },
-    "node_modules/is-number-like": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz",
-      "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "lodash.isfinite": "^3.3.2"
-      }
-    },
     "node_modules/is-number-object": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
-      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14297,14 +14979,28 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14313,13 +15009,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-shared-array-buffer": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz",
-      "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7"
+        "call-bound": "^1.0.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14341,12 +15049,13 @@
       }
     },
     "node_modules/is-string": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
-      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
       "dev": true,
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14356,12 +15065,14 @@
       }
     },
     "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
-      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
       "dev": true,
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14371,12 +15082,12 @@
       }
     },
     "node_modules/is-typed-array": {
-      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz",
-      "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==",
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
       "dependencies": {
-        "which-typed-array": "^1.1.14"
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
         "node": ">= 0.4"
@@ -14403,13 +15114,44 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-weakref": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
-      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -14422,15 +15164,18 @@
       "dev": true
     },
     "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
+      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
       "dev": true,
       "dependencies": {
-        "is-docker": "^2.0.0"
+        "is-inside-container": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/isarray": {
@@ -14452,9 +15197,9 @@
       }
     },
     "node_modules/isbot": {
-      "version": "5.1.17",
-      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.17.tgz",
-      "integrity": "sha512-/wch8pRKZE+aoVhRX/hYPY1C7dMCeeMyhkQLNLNlYAbGQn9bkvMB8fOUXNnk5I0m4vDYbBJ9ciVtkr9zfBJ7qA==",
+      "version": "5.1.23",
+      "resolved": "https://registry.npmjs.org/isbot/-/isbot-5.1.23.tgz",
+      "integrity": "sha512-ie3ehy2iXdkuzaZx32SoKb9b8l9Cm8cqQ1lJjQXnq8GRTrk/Jx7IUDcB4mhlw6H3gWaMqGYoWeV0lPv1P/20Ig==",
       "engines": {
         "node": ">=18"
       }
@@ -14498,28 +15243,19 @@
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
         "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-report": {
@@ -14536,27 +15272,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/istanbul-lib-source-maps": {
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
@@ -14649,16 +15364,13 @@
       }
     },
     "node_modules/jackspeak": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.1.tgz",
-      "integrity": "sha512-U23pQPDnmYybVkYjObcuYMk43VRlMLLqLI+RdZy8s8WV8WsxO9SnqSroKaluuvcNOdCAlauKszDwd+umbot5Mg==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "dev": true,
       "dependencies": {
         "@isaacs/cliui": "^8.0.2"
       },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       },
@@ -14667,9 +15379,9 @@
       }
     },
     "node_modules/jake": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz",
-      "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==",
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
+      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
       "dependencies": {
         "async": "^3.2.3",
         "chalk": "^4.0.2",
@@ -14683,90 +15395,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jake/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jake/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/jake/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jake/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/jake/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jasmine": {
       "version": "3.99.0",
       "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.99.0.tgz",
@@ -14812,15 +15440,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -14837,21 +15456,14 @@
       }
     },
     "node_modules/jiti": {
-      "version": "1.21.6",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
-      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
       "dev": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
     },
-    "node_modules/jquery": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz",
-      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
-      "license": "MIT",
-      "peer": true
-    },
     "node_modules/js-cookie": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz",
@@ -14967,19 +15579,37 @@
         "url": "https://github.com/sponsors/ota-meshi"
       }
     },
+    "node_modules/jsonc-eslint-parser/node_modules/espree": {
+      "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz",
+      "integrity": "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==",
       "dev": true
     },
     "node_modules/jsonfile": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-      "integrity": "sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
-      "optional": true,
-      "peer": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
       "optionalDependencies": {
         "graceful-fs": "^4.1.6"
       }
@@ -14994,9 +15624,9 @@
       ]
     },
     "node_modules/jsonschema": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.4.1.tgz",
-      "integrity": "sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.5.0.tgz",
+      "integrity": "sha512-K+A9hhqbn0f3pJX17Q/7H6yQfD/5OXgdrR5UE12gMXCiN9D5Xq2o5mddV2QEcX/bjla99ASsAAQUyMCCRWAEhw==",
       "engines": {
         "node": "*"
       }
@@ -15194,28 +15824,6 @@
         "url": "https://github.com/sponsors/mattlewis92"
       }
     },
-    "node_modules/karma-coverage-istanbul-reporter/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/karma-coverage-istanbul-reporter/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/karma-jasmine": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.2.tgz",
@@ -15265,6 +15873,65 @@
         "node": ">=4"
       }
     },
+    "node_modules/karma-mocha-reporter/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/karma-mocha-reporter/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/karma-mocha-reporter/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/karma-mocha-reporter/node_modules/log-symbols": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
@@ -15289,6 +15956,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/karma-mocha-reporter/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/karma-source-map-support": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz",
@@ -15298,31 +15977,6 @@
         "source-map-support": "^0.5.5"
       }
     },
-    "node_modules/karma/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/karma/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/karma/node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -15334,78 +15988,6 @@
         "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/karma/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/karma/node_modules/connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/karma/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/karma/node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/karma/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/karma/node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
@@ -15418,24 +16000,6 @@
         "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/karma/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true
-    },
-    "node_modules/karma/node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
-      "dev": true,
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
     "node_modules/karma/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -15445,38 +16009,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/karma/node_modules/statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/karma/node_modules/ua-parser-js": {
-      "version": "0.7.38",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.38.tgz",
-      "integrity": "sha512-fYmIy7fKTSFAhG3fuPlubeGaMoAd6r0rSnfEsO5nEY55i26KSLt9EH7PLQiiqPUhNqYIJvSkTy1oArIcXAbPbA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/faisalman"
-        }
-      ],
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/karma/node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
@@ -15558,9 +16090,9 @@
       }
     },
     "node_modules/launch-editor": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz",
-      "integrity": "sha512-vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz",
+      "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==",
       "dev": true,
       "dependencies": {
         "picocolors": "^1.0.0",
@@ -15603,23 +16135,29 @@
       }
     },
     "node_modules/less-loader": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz",
-      "integrity": "sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==",
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-12.2.0.tgz",
+      "integrity": "sha512-MYUxjSQSBUQmowc0l5nPieOYwMzGPUaTzB6inNW/bdPEG9zOL3eAAD1Qw5ZxSPk7we5dMojHwNODYMV1hq4EVg==",
       "dev": true,
-      "dependencies": {
-        "klona": "^2.0.4"
-      },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
         "less": "^3.5.0 || ^4.0.0",
         "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
     "node_modules/less/node_modules/make-dir": {
@@ -15718,13 +16256,11 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/limiter": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz",
-      "integrity": "sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
     },
     "node_modules/linkify-it": {
       "version": "4.0.1",
@@ -15735,82 +16271,132 @@
       }
     },
     "node_modules/listr2": {
-      "version": "3.14.0",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
-      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
+      "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
       "dev": true,
       "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "colorette": "^2.0.16",
-        "log-update": "^4.0.0",
-        "p-map": "^4.0.0",
-        "rfdc": "^1.3.0",
-        "rxjs": "^7.5.1",
-        "through": "^2.3.8",
-        "wrap-ansi": "^7.0.0"
+        "cli-truncate": "^4.0.0",
+        "colorette": "^2.0.20",
+        "eventemitter3": "^5.0.1",
+        "log-update": "^6.1.0",
+        "rfdc": "^1.4.1",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/listr2/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
       },
-      "peerDependencies": {
-        "enquirer": ">= 2.3.0 < 3"
-      },
-      "peerDependenciesMeta": {
-        "enquirer": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
       }
     },
     "node_modules/listr2/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/listr2/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/listr2/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/listr2/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
       "dev": true
     },
-    "node_modules/listr2/node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+    "node_modules/listr2/node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
+      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
+      "dev": true
+    },
+    "node_modules/listr2/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/listr2/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/listr2/node_modules/wrap-ansi": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
+      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/lmdb": {
+      "version": "3.0.13",
+      "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.13.tgz",
+      "integrity": "sha512-UGe+BbaSUQtAMZobTb4nHvFMrmvuAQKSeaqAX2meTEQjfsbpl5sxdHD8T72OnwD4GU9uwNhYXIVe4QGs8N9Zyw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "msgpackr": "^1.10.2",
+        "node-addon-api": "^6.1.0",
+        "node-gyp-build-optional-packages": "5.2.2",
+        "ordered-binary": "^1.4.1",
+        "weak-lru-cache": "^1.2.2"
+      },
+      "bin": {
+        "download-lmdb-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@lmdb/lmdb-darwin-arm64": "3.0.13",
+        "@lmdb/lmdb-darwin-x64": "3.0.13",
+        "@lmdb/lmdb-linux-arm": "3.0.13",
+        "@lmdb/lmdb-linux-arm64": "3.0.13",
+        "@lmdb/lmdb-linux-x64": "3.0.13",
+        "@lmdb/lmdb-win32-x64": "3.0.13"
+      }
+    },
     "node_modules/loader-runner": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
@@ -15821,24 +16407,27 @@
       }
     },
     "node_modules/loader-utils": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.3.1.tgz",
+      "integrity": "sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==",
       "dev": true,
       "engines": {
         "node": ">= 12.13.0"
       }
     },
     "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "p-locate": "^5.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/lodash": {
@@ -15852,14 +16441,6 @@
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
       "dev": true
     },
-    "node_modules/lodash.isfinite": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz",
-      "integrity": "sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -15888,144 +16469,196 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/log-update": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
+      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
       "dev": true,
       "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "cli-cursor": "^3.1.0",
-        "slice-ansi": "^4.0.0",
-        "wrap-ansi": "^6.2.0"
+        "ansi-escapes": "^7.0.0",
+        "cli-cursor": "^5.0.0",
+        "slice-ansi": "^7.1.0",
+        "strip-ansi": "^7.1.0",
+        "wrap-ansi": "^9.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/log-update/node_modules/ansi-escapes": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
+      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
       "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "environment": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/log-update/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/log-update/node_modules/cli-cursor": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
+      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "restore-cursor": "^5.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/log-update/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/log-update/node_modules/emoji-regex": {
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
       "dev": true
     },
-    "node_modules/log-update/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+    "node_modules/log-update/node_modules/is-fullwidth-code-point": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.0.0.tgz",
+      "integrity": "sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "get-east-asian-width": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/onetime": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
+      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
+      "dev": true,
+      "dependencies": {
+        "mimic-function": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/restore-cursor": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
+      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
+      "dev": true,
+      "dependencies": {
+        "onetime": "^7.0.0",
+        "signal-exit": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/slice-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.0.tgz",
+      "integrity": "sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "is-fullwidth-code-point": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
+    "node_modules/log-update/node_modules/string-width": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^10.3.0",
+        "get-east-asian-width": "^1.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
+      "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^6.2.1",
+        "string-width": "^7.0.0",
+        "strip-ansi": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/log4js": {
       "version": "6.9.1",
       "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz",
@@ -16062,15 +16695,12 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.8",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
-      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+      "version": "0.30.11",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+      "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
+        "@jridgewell/sourcemap-codec": "^1.5.0"
       }
     },
     "node_modules/make-dir": {
@@ -16129,10 +16759,19 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/make-fetch-happen/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/make-fetch-happen/node_modules/cacache": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
-      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
+      "version": "18.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
+      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
       "dev": true,
       "dependencies": {
         "@npmcli/fs": "^3.1.0",
@@ -16165,9 +16804,9 @@
       }
     },
     "node_modules/make-fetch-happen/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -16180,20 +16819,29 @@
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/make-fetch-happen/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
+    "node_modules/make-fetch-happen/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/make-fetch-happen/node_modules/minipass": {
@@ -16217,15 +16865,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/make-fetch-happen/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/make-fetch-happen/node_modules/ssri": {
       "version": "10.0.6",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz",
@@ -16263,9 +16902,9 @@
       }
     },
     "node_modules/manifesto.js": {
-      "version": "4.2.17",
-      "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.17.tgz",
-      "integrity": "sha512-UjctsJ2PkgwGDUQ/ZzvyObXJO/yiFYwiz49xrzkayi9fhrwUVC3Vc0aQyGm723BZTl5nKYJQ8YdEhJRp08xOtA==",
+      "version": "4.2.21",
+      "resolved": "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.21.tgz",
+      "integrity": "sha512-C14J8zMSXlQaQjKR7KpIYEAXWquS2DtdxL8cFj1P2kc/ZJ5nWWmDUrthysVoQlRIzks5HtUNf5bStOwzhzarag==",
       "dependencies": {
         "@edsilv/http-status-codes": "^1.0.3",
         "@iiif/vocabulary": "^1.0.26",
@@ -16303,6 +16942,14 @@
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/md5": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
@@ -16327,15 +16974,22 @@
       }
     },
     "node_modules/memfs": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.17.0.tgz",
+      "integrity": "sha512-4eirfZ7thblFmqFjywlTmuWVSvccHAJbn1r8qQLzmTO11qcqpohOjmY2mFce6x7x7WtskzRqApPD0hv+Oa74jg==",
       "dev": true,
       "dependencies": {
-        "fs-monkey": "^1.0.4"
+        "@jsonjoy.com/json-pack": "^1.0.3",
+        "@jsonjoy.com/util": "^1.3.0",
+        "tree-dump": "^1.0.1",
+        "tslib": "^2.0.0"
       },
       "engines": {
         "node": ">= 4.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
       }
     },
     "node_modules/memoize-one": {
@@ -16409,9 +17063,9 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "version": "1.53.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
+      "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -16427,6 +17081,14 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/mime-types/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
@@ -16436,10 +17098,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/mimic-function": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
+      "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.8.1.tgz",
-      "integrity": "sha512-/1HDlyFRxWIZPI1ZpgqlZ8jMw/1Dp/dl3P0L1jtZ+zVcHqwPhGwaJwKL00WVgfnBy6PWCde9W65or7IIETImuA==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz",
+      "integrity": "sha512-Zs1YsZVfemekSZG+44vBsYTLQORkPMwnlv+aehcxK/NLKC+EGhDB39/YePYYqx/sTk6NnYpuqikhSn7+JIevTA==",
       "dev": true,
       "dependencies": {
         "schema-utils": "^4.0.0",
@@ -16463,18 +17137,14 @@
       "dev": true
     },
     "node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dev": true,
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": "*"
       }
     },
     "node_modules/minimist": {
@@ -16548,16 +17218,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/minipass-json-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz",
-      "integrity": "sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==",
-      "dev": true,
-      "dependencies": {
-        "jsonparse": "^1.3.1",
-        "minipass": "^3.0.0"
-      }
-    },
     "node_modules/minipass-pipeline": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
@@ -16596,11 +17256,11 @@
       }
     },
     "node_modules/mirador": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.3.0.tgz",
-      "integrity": "sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/mirador/-/mirador-3.4.3.tgz",
+      "integrity": "sha512-yHoug0MHy4e9apykbbBhK+4CmbZS94zMxmugw2E2VX6iB0b2PKKY0JfYr/QfXh9P29YnWAbymaXJVpgbHVpTVw==",
       "dependencies": {
-        "@material-ui/core": "^4.11.0",
+        "@material-ui/core": "^4.12.3",
         "@material-ui/icons": "^4.9.1",
         "@material-ui/lab": "^4.0.0-alpha.53",
         "@researchgate/react-intersection-observer": "^1.0.0",
@@ -16617,7 +17277,7 @@
         "lodash": "^4.17.11",
         "manifesto.js": "^4.2.0",
         "normalize-url": "^4.5.0",
-        "openseadragon": "^2.4.2",
+        "openseadragon": "^2.4.2 || ^3.0.0 || 4.0.x || ^4.1.1 || ^5.0.0",
         "prop-types": "^15.6.2",
         "re-reselect": "^4.0.0",
         "react-aria-live": "^2.0.5",
@@ -16680,14 +17340,6 @@
         "react-dom": "16.x"
       }
     },
-    "node_modules/mitt": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz",
-      "integrity": "sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/mkdirp": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
@@ -16749,9 +17401,40 @@
       }
     },
     "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/msgpackr": {
+      "version": "1.11.2",
+      "resolved": "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.2.tgz",
+      "integrity": "sha512-F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==",
+      "dev": true,
+      "optionalDependencies": {
+        "msgpackr-extract": "^3.0.2"
+      }
+    },
+    "node_modules/msgpackr-extract": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-3.0.3.tgz",
+      "integrity": "sha512-P0efT1C9jIdVRefqjzOQ9Xml57zpOXnIuS+csaB4MdZbTdmGDLo8XhzBG1N7aO11gKDDkJvBLULeFTo46wwreA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "dependencies": {
+        "node-gyp-build-optional-packages": "5.2.2"
+      },
+      "bin": {
+        "download-msgpackr-prebuilds": "bin/download-prebuilds.js"
+      },
+      "optionalDependencies": {
+        "@msgpackr-extract/msgpackr-extract-darwin-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-darwin-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-arm64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-linux-x64": "3.0.3",
+        "@msgpackr-extract/msgpackr-extract-win32-x64": "3.0.3"
+      }
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
@@ -16776,9 +17459,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "funding": [
         {
           "type": "github",
@@ -16829,9 +17512,9 @@
       }
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "engines": {
         "node": ">= 0.6"
       }
@@ -16843,30 +17526,30 @@
       "dev": true
     },
     "node_modules/ng-mocks": {
-      "version": "14.13.1",
-      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.1.tgz",
-      "integrity": "sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==",
+      "version": "14.13.2",
+      "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.2.tgz",
+      "integrity": "sha512-ItAB72Pc0uznL1j4TPsFp1wehhitVp7DARkc67aafeIk1FDgwnAZvzJwntMnIp/IWMSbzrEQ6kl3cc5euX1NRA==",
       "dev": true,
       "funding": {
         "url": "https://github.com/sponsors/help-me-mom"
       },
       "peerDependencies": {
-        "@angular/common": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
-        "@angular/core": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
-        "@angular/forms": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18",
-        "@angular/platform-browser": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18"
+        "@angular/common": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
+        "@angular/core": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
+        "@angular/forms": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19",
+        "@angular/platform-browser": "5.0.0-alpha - 5 || 6.0.0-alpha - 6 || 7.0.0-alpha - 7 || 8.0.0-alpha - 8 || 9.0.0-alpha - 9 || 10.0.0-alpha - 10 || 11.0.0-alpha - 11 || 12.0.0-alpha - 12 || 13.0.0-alpha - 13 || 14.0.0-alpha - 14 || 15.0.0-alpha - 15 || 16.0.0-alpha - 16 || 17.0.0-alpha - 17 || 18.0.0-alpha - 18 || 19.0.0-alpha - 19"
       }
     },
     "node_modules/ng2-file-upload": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ng2-file-upload/-/ng2-file-upload-5.0.0.tgz",
-      "integrity": "sha512-M2JaX0unB/30GmQUScfXko2vseaPlU1R5jnhL5cfvOLNw8BBSVJAdOSmcavJzicgTZWCYz7y7Fvpr939bd4eCA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/ng2-file-upload/-/ng2-file-upload-7.0.1.tgz",
+      "integrity": "sha512-qqJRzdRehYn6IQyr49qzW4Z3FYYr2ehq/vcn2K933Xf4kxJwhkzWObzJMEDYzhORoTndt+BYfVBNKmN4wjZkyw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": "^16.0.0",
-        "@angular/core": "^16.0.0"
+        "@angular/common": "^18.0.0",
+        "@angular/core": "^18.0.0"
       }
     },
     "node_modules/ng2-nouislider": {
@@ -16883,15 +17566,15 @@
       }
     },
     "node_modules/ngx-infinite-scroll": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-16.0.0.tgz",
-      "integrity": "sha512-bzyNYd+wVlUUxcopRVr2DAa81eEc8vITtKVvb+c7R1uy8hWPTlxOEXf3L1qA4FMwTEzCQ9b37TXzlJji3qBy+A==",
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-infinite-scroll/-/ngx-infinite-scroll-18.0.0.tgz",
+      "integrity": "sha512-D183TDwpsd9Zl56UmItsl3RzHdN25srAISfg6lc3A8mEKkEgOq0s7ZzRAYcx8DHsAkMgtZqjIPEvMifD3DOB/g==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
       "peerDependencies": {
-        "@angular/common": ">=16.0.0 <17.0.0",
-        "@angular/core": ">=16.0.0 <17.0.0"
+        "@angular/common": ">=18.0.0 <19.0.0",
+        "@angular/core": ">=18.0.0 <19.0.0"
       }
     },
     "node_modules/ngx-mask": {
@@ -16919,10 +17602,22 @@
         "@angular/core": ">=13.0.0"
       }
     },
+    "node_modules/ngx-skeleton-loader": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-skeleton-loader/-/ngx-skeleton-loader-9.0.0.tgz",
+      "integrity": "sha512-aO4/V6oGdZGNcTjasTg/fwzJJYl/ZmNKgCukOEQdUK3GSFOZtB/3GGULMJuZ939hk3Hzqh1OBiLfIM1SqTfhqg==",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=16.0.0",
+        "@angular/core": ">=16.0.0"
+      }
+    },
     "node_modules/ngx-ui-switch": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-14.1.0.tgz",
-      "integrity": "sha512-uGGLppBP1FXjyD+x7f8Pm6I3JQTMmsBqPtwERAX27jSZxDWFp/sewnl75fuDvu75qFofJd/BIOtV4xHxzgZOvw==",
+      "version": "15.0.0",
+      "resolved": "https://registry.npmjs.org/ngx-ui-switch/-/ngx-ui-switch-15.0.0.tgz",
+      "integrity": "sha512-yMfAyIij01zUOeODREX8PyVl1nbfj5gVQW3mRJqihhkFESz+k4vddu6uuxEiyreLCUSDb/e6ZLXvO7ei9WSGcA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -16949,13 +17644,19 @@
         "node-gyp-build": "^4.2.2"
       }
     },
-    "node_modules/node-addon-api": {
+    "node_modules/nice-napi/node_modules/node-addon-api": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz",
       "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==",
       "dev": true,
       "optional": true
     },
+    "node_modules/node-addon-api": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz",
+      "integrity": "sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==",
+      "dev": true
+    },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -16985,9 +17686,9 @@
       }
     },
     "node_modules/node-gyp": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz",
-      "integrity": "sha512-B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz",
+      "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==",
       "dev": true,
       "dependencies": {
         "env-paths": "^2.2.0",
@@ -16996,9 +17697,9 @@
         "graceful-fs": "^4.2.6",
         "make-fetch-happen": "^13.0.0",
         "nopt": "^7.0.0",
-        "proc-log": "^3.0.0",
+        "proc-log": "^4.1.0",
         "semver": "^7.3.5",
-        "tar": "^6.1.2",
+        "tar": "^6.2.1",
         "which": "^4.0.0"
       },
       "bin": {
@@ -17009,9 +17710,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
-      "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz",
+      "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -17020,10 +17721,33 @@
         "node-gyp-build-test": "build-test.js"
       }
     },
+    "node_modules/node-gyp-build-optional-packages": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.2.2.tgz",
+      "integrity": "sha512-s+w+rBWnpTMwSFbaE0UXsRlg7hU4FjekKU4eyAih5T8nJuNZT1nNsskXpxmeqSK9UzkBl6UgRlnKc8hz8IEqOw==",
+      "dev": true,
+      "dependencies": {
+        "detect-libc": "^2.0.1"
+      },
+      "bin": {
+        "node-gyp-build-optional-packages": "bin.js",
+        "node-gyp-build-optional-packages-optional": "optional.js",
+        "node-gyp-build-optional-packages-test": "build-test.js"
+      }
+    },
+    "node_modules/node-gyp/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/node-gyp/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -17036,9 +17760,6 @@
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
@@ -17052,6 +17773,21 @@
         "node": ">=16"
       }
     },
+    "node_modules/node-gyp/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/node-gyp/node_modules/minipass": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
@@ -17077,9 +17813,9 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-      "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g=="
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
     },
     "node_modules/nodemon": {
       "version": "2.0.22",
@@ -17109,16 +17845,6 @@
         "url": "https://opencollective.com/nodemon"
       }
     },
-    "node_modules/nodemon/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
     "node_modules/nodemon/node_modules/debug": {
       "version": "3.2.7",
       "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
@@ -17128,16 +17854,13 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/nodemon/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/nodemon/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
       "engines": {
-        "node": "*"
+        "node": ">=4"
       }
     },
     "node_modules/nodemon/node_modules/semver": {
@@ -17149,6 +17872,18 @@
         "semver": "bin/semver"
       }
     },
+    "node_modules/nodemon/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/nopt": {
       "version": "7.2.1",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz",
@@ -17182,6 +17917,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17277,13 +18013,13 @@
       }
     },
     "node_modules/npm-package-arg": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.1.tgz",
-      "integrity": "sha512-M7s1BD4NxdAvBKUPqqRW957Xwcl/4Zvo8Aj+ANrzvIPzGJZElrH7Z//rSaec2ORcND6FHHLnZeY8qgTpXDMFQQ==",
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz",
+      "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==",
       "dev": true,
       "dependencies": {
         "hosted-git-info": "^7.0.0",
-        "proc-log": "^3.0.0",
+        "proc-log": "^4.0.0",
         "semver": "^7.3.5",
         "validate-npm-package-name": "^5.0.0"
       },
@@ -17304,9 +18040,9 @@
       }
     },
     "node_modules/npm-pick-manifest": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.0.tgz",
-      "integrity": "sha512-VfvRSs/b6n9ol4Qb+bDwNGUXutpy76x6MARw/XssevE0TnctIKcmklJZM5Z7nqs5z5aW+0S63pgCNbpkUNNXBg==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz",
+      "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==",
       "dev": true,
       "dependencies": {
         "npm-install-checks": "^6.0.0",
@@ -17319,16 +18055,16 @@
       }
     },
     "node_modules/npm-registry-fetch": {
-      "version": "16.2.1",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz",
-      "integrity": "sha512-8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==",
+      "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz",
+      "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==",
       "dev": true,
       "dependencies": {
-        "@npmcli/redact": "^1.1.0",
+        "@npmcli/redact": "^2.0.0",
+        "jsonparse": "^1.3.1",
         "make-fetch-happen": "^13.0.0",
         "minipass": "^7.0.2",
         "minipass-fetch": "^3.0.0",
-        "minipass-json-stream": "^1.0.1",
         "minizlib": "^2.1.2",
         "npm-package-arg": "^11.0.0",
         "proc-log": "^4.0.0"
@@ -17346,15 +18082,6 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/npm-registry-fetch/node_modules/proc-log": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
-      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
-      "dev": true,
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
@@ -17387,9 +18114,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
       "engines": {
         "node": ">= 0.4"
       },
@@ -17407,14 +18134,16 @@
       }
     },
     "node_modules/object.assign": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz",
-      "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==",
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
-        "has-symbols": "^1.0.3",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
         "object-keys": "^1.1.1"
       },
       "engines": {
@@ -17457,12 +18186,13 @@
       }
     },
     "node_modules/object.values": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
-      "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
@@ -17523,50 +18253,29 @@
       }
     },
     "node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
+      "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
       "dev": true,
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "default-browser": "^5.2.1",
+        "define-lazy-prop": "^3.0.0",
+        "is-inside-container": "^1.0.0",
+        "is-wsl": "^3.1.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/openseadragon": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-2.4.2.tgz",
-      "integrity": "sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw=="
-    },
-    "node_modules/opn": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
-      "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "is-wsl": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/opn/node_modules/is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-5.0.1.tgz",
+      "integrity": "sha512-a/hjouW9i3UfWxRADVYN2MyRhXMGnE7x9VVL7/4jXCcDLFyO4UM5o4RStYtqa5BfaHw/wMNAaD2WbxQF8f1pJg==",
+      "funding": {
+        "url": "https://opencollective.com/openseadragon"
       }
     },
     "node_modules/optionator": {
@@ -17609,80 +18318,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+    "node_modules/ordered-binary": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz",
+      "integrity": "sha512-oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==",
       "dev": true
     },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/orejime": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/orejime/-/orejime-2.3.0.tgz",
-      "integrity": "sha512-eDUgd5yEF5pCIUHPNXVDKmgH+4k4GEwxU7eexBFeVESba3ZYDHSDq4ULXiF2LnZwxg+H6Qi28o8rGfGxNeOriA==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/orejime/-/orejime-2.3.1.tgz",
+      "integrity": "sha512-LpJCuOG7mvR5fwD3wr+FoHPG+DX2t7+dJ4gBZnWICnNHtOTNuBzne0T+JcK0nW30JjiYULq1vfOaSLU2qmHCPg==",
       "dependencies": {
         "@babel/runtime": "^7.1.2",
         "react-modal": "^3.13.1"
@@ -17706,6 +18351,23 @@
       "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
       "dev": true
     },
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -17730,27 +18392,15 @@
       }
     },
     "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/p-locate/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -17828,38 +18478,37 @@
       }
     },
     "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "dev": true
     },
     "node_modules/pacote": {
-      "version": "17.0.6",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-17.0.6.tgz",
-      "integrity": "sha512-cJKrW21VRE8vVTRskJo78c/RCvwJCn1f4qgfxL4w77SOWrTCRcmfkYHlHtS0gqpgjv3zhXflRtgsrUCX5xwNnQ==",
+      "version": "18.0.6",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz",
+      "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==",
       "dev": true,
       "dependencies": {
         "@npmcli/git": "^5.0.0",
         "@npmcli/installed-package-contents": "^2.0.1",
+        "@npmcli/package-json": "^5.1.0",
         "@npmcli/promise-spawn": "^7.0.0",
-        "@npmcli/run-script": "^7.0.0",
+        "@npmcli/run-script": "^8.0.0",
         "cacache": "^18.0.0",
         "fs-minipass": "^3.0.0",
         "minipass": "^7.0.2",
         "npm-package-arg": "^11.0.0",
         "npm-packlist": "^8.0.0",
         "npm-pick-manifest": "^9.0.0",
-        "npm-registry-fetch": "^16.0.0",
-        "proc-log": "^3.0.0",
+        "npm-registry-fetch": "^17.0.0",
+        "proc-log": "^4.0.0",
         "promise-retry": "^2.0.1",
-        "read-package-json": "^7.0.0",
-        "read-package-json-fast": "^3.0.0",
         "sigstore": "^2.2.0",
         "ssri": "^10.0.0",
         "tar": "^6.1.11"
       },
       "bin": {
-        "pacote": "lib/bin.js"
+        "pacote": "bin/index.js"
       },
       "engines": {
         "node": "^16.14.0 || >=18.0.0"
@@ -17877,10 +18526,19 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/pacote/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/pacote/node_modules/cacache": {
-      "version": "18.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz",
-      "integrity": "sha512-qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==",
+      "version": "18.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz",
+      "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==",
       "dev": true,
       "dependencies": {
         "@npmcli/fs": "^3.1.0",
@@ -17913,9 +18571,9 @@
       }
     },
     "node_modules/pacote/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
       "dependencies": {
         "foreground-child": "^3.1.0",
@@ -17928,20 +18586,29 @@
       "bin": {
         "glob": "dist/esm/bin.mjs"
       },
-      "engines": {
-        "node": ">=18"
-      },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/pacote/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
+    },
+    "node_modules/pacote/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/pacote/node_modules/minipass": {
@@ -18037,12 +18704,6 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
-    "node_modules/parse-json/node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
     "node_modules/parse-node-version": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
@@ -18053,12 +18714,12 @@
       }
     },
     "node_modules/parse5": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
       "devOptional": true,
       "dependencies": {
-        "entities": "^4.4.0"
+        "entities": "^4.5.0"
       },
       "funding": {
         "url": "https://github.com/inikulin/parse5?sponsor=1"
@@ -18148,13 +18809,10 @@
       }
     },
     "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.4.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.0.tgz",
-      "integrity": "sha512-bfJaPTuEiTYBu+ulDaeQ0F+uLmlfFkMgXj4cbwfuMSjgObGMzb55FMMbDvbRU0fAHZ4sLGkz2mKwcMg8Dvm8Ww==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      }
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true
     },
     "node_modules/path-scurry/node_modules/minipass": {
       "version": "7.1.2",
@@ -18166,9 +18824,9 @@
       }
     },
     "node_modules/path-to-regexp": {
-      "version": "0.1.10",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz",
-      "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w=="
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
     },
     "node_modules/path-type": {
       "version": "4.0.0",
@@ -18211,9 +18869,9 @@
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
     "node_modules/picomatch": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.1.tgz",
-      "integrity": "sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+      "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
       "dev": true,
       "engines": {
         "node": ">=12"
@@ -18232,9 +18890,9 @@
       }
     },
     "node_modules/piscina": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.4.0.tgz",
-      "integrity": "sha512-+AQduEJefrOApE4bV7KRmp3N2JnnyErlVqq4P/jmko4FPz9Z877BCccl/iB3FdrWSUkvbGV9Kan/KllJgat3Vg==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/piscina/-/piscina-4.6.1.tgz",
+      "integrity": "sha512-z30AwWGtQE+Apr+2WBZensP2lIvwoaMcOPkQlIEmSGMJNUvaYACylPYrQM6wSdUNJlnDVMSpLv7xTMJqlVshOA==",
       "dev": true,
       "optionalDependencies": {
         "nice-napi": "^1.0.2"
@@ -18326,9 +18984,9 @@
       }
     },
     "node_modules/pkg-dir/node_modules/yocto-queue": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz",
-      "integrity": "sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.0.tgz",
+      "integrity": "sha512-KHBC7z61OJeaMGnF3wqNZj+GGNXOyypZviiKpQeiHirG5Ib1ImwcLBH70rbMSkKfSmUNBsdf2PwaEJtKvgmkNw==",
       "dev": true,
       "engines": {
         "node": ">=12.20"
@@ -18338,57 +18996,23 @@
       }
     },
     "node_modules/popper.js": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
-      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
-      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
-      "license": "MIT",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/popperjs"
-      }
-    },
-    "node_modules/portscanner": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz",
-      "integrity": "sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "async": "^2.6.0",
-        "is-number-like": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.0.0"
-      }
-    },
-    "node_modules/portscanner/node_modules/async": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
-      "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "lodash": "^4.17.14"
-      }
+      "version": "1.16.1-lts",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz",
+      "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
     },
     "node_modules/possible-typed-array-names": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
-      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.47",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-      "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
       "funding": [
         {
           "type": "opencollective",
@@ -18404,8 +19028,8 @@
         }
       ],
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.0",
+        "nanoid": "^3.3.8",
+        "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
       "engines": {
@@ -18431,6 +19055,19 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-attribute-case-insensitive/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-clamp": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz",
@@ -18560,6 +19197,19 @@
         "postcss": "^8.3"
       }
     },
+    "node_modules/postcss-custom-selectors/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-dir-pseudo-class": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz",
@@ -18579,6 +19229,19 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-dir-pseudo-class/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-double-position-gradients": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz",
@@ -18629,6 +19292,19 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/postcss-focus-visible/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-focus-within": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz",
@@ -18644,6 +19320,19 @@
         "postcss": "^8.4"
       }
     },
+    "node_modules/postcss-focus-within/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-font-variant": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz",
@@ -18863,13 +19552,13 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
-      "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
+        "postcss-selector-parser": "^7.0.0",
         "postcss-value-parser": "^4.1.0"
       },
       "engines": {
@@ -18880,12 +19569,12 @@
       }
     },
     "node_modules/postcss-modules-scope": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
-      "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
       "dev": true,
       "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
+        "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
         "node": "^10 || ^12 || >= 14"
@@ -18929,6 +19618,35 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz",
+      "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==",
+      "dev": true,
+      "engines": {
+        "node": "^14 || ^16 || >=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/csstools"
+      },
+      "peerDependencies": {
+        "postcss-selector-parser": "^6.0.10"
+      }
+    },
+    "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-opacity-percentage": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz",
@@ -19084,6 +19802,19 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-replace-overflow-wrap": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz",
@@ -19112,10 +19843,23 @@
         "postcss": "^8.2"
       }
     },
+    "node_modules/postcss-selector-not/node_modules/postcss-selector-parser": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+      "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "dev": true,
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/postcss-selector-parser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz",
-      "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -19153,9 +19897,9 @@
       }
     },
     "node_modules/proc-log": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz",
-      "integrity": "sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz",
+      "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==",
       "dev": true,
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -19254,9 +19998,9 @@
       "dev": true
     },
     "node_modules/pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
+      "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==",
       "dev": true,
       "dependencies": {
         "end-of-stream": "^1.1.0",
@@ -19279,11 +20023,12 @@
       }
     },
     "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "dev": true,
       "dependencies": {
-        "side-channel": "^1.0.6"
+        "side-channel": "^1.1.0"
       },
       "engines": {
         "node": ">=0.6"
@@ -19356,12 +20101,12 @@
       }
     },
     "node_modules/re-resizable": {
-      "version": "6.9.17",
-      "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.17.tgz",
-      "integrity": "sha512-OBqd1BwVXpEJJn/yYROG+CbeqIDBWIp6wathlpB0kzZWWZIY1gPTsgK2yJEui5hOvkCdC2mcexF2V3DZVfLq2g==",
+      "version": "6.11.2",
+      "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.11.2.tgz",
+      "integrity": "sha512-2xI2P3OHs5qw7K0Ud1aLILK6MQxW50TcO+DetD9eIV58j84TqYeHoZcL9H4GXFXXIh7afhH8mv5iUCXII7OW7A==",
       "peerDependencies": {
-        "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0"
+        "react": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/react": {
@@ -19402,6 +20147,7 @@
       "version": "13.1.1",
       "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz",
       "integrity": "sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==",
+      "deprecated": "react-beautiful-dnd is now deprecated. Context and options: https://github.com/atlassian/react-beautiful-dnd/issues/2672",
       "dependencies": {
         "@babel/runtime": "^7.9.2",
         "css-box-model": "^1.2.0",
@@ -19570,21 +20316,18 @@
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
     "node_modules/react-modal": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.1.tgz",
-      "integrity": "sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==",
+      "version": "3.16.3",
+      "resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.16.3.tgz",
+      "integrity": "sha512-yCYRJB5YkeQDQlTt17WGAgFJ7jr2QYcWa1SHqZ3PluDmnKJ/7+tVU+E6uKyZ0nODaeEj+xCpK4LcSnKXLMC0Nw==",
       "dependencies": {
         "exenv": "^1.2.0",
         "prop-types": "^15.7.2",
         "react-lifecycles-compat": "^3.0.0",
         "warning": "^4.0.3"
       },
-      "engines": {
-        "node": ">=8"
-      },
       "peerDependencies": {
-        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18",
-        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18"
+        "react": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19",
+        "react-dom": "^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19"
       }
     },
     "node_modules/react-mosaic-component": {
@@ -19648,11 +20391,11 @@
       }
     },
     "node_modules/react-rnd": {
-      "version": "10.4.11",
-      "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.11.tgz",
-      "integrity": "sha512-XTfNGNcS0ad2vo3to7qNTB0BkFML9k1csIUI0Nlj44M6Uuh7yP/2h8WXiXcV3v3bxxVJck1C9K6FS1LrLH0E0Q==",
+      "version": "10.5.2",
+      "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.5.2.tgz",
+      "integrity": "sha512-0Tm4x7k7pfHf2snewJA8x7Nwgt3LV+58MVEWOVsFjk51eYruFEa6Wy7BNdxt4/lH0wIRsu7Gm3KjSXY2w7YaNw==",
       "dependencies": {
-        "re-resizable": "6.9.17",
+        "re-resizable": "6.11.2",
         "react-draggable": "4.4.6",
         "tslib": "2.6.2"
       },
@@ -19661,6 +20404,11 @@
         "react-dom": ">=16.3.0"
       }
     },
+    "node_modules/react-rnd/node_modules/tslib": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+    },
     "node_modules/react-sizeme": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/react-sizeme/-/react-sizeme-2.6.12.tgz",
@@ -19692,18 +20440,18 @@
       }
     },
     "node_modules/react-virtualized-auto-sizer": {
-      "version": "1.0.24",
-      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.24.tgz",
-      "integrity": "sha512-3kCn7N9NEb3FlvJrSHWGQ4iVl+ydQObq2fHMn12i5wbtm74zHOPhz/i64OL3c1S1vi9i2GXtZqNqUJTQ+BnNfg==",
+      "version": "1.0.25",
+      "resolved": "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.25.tgz",
+      "integrity": "sha512-YHsksEGDfsHbHuaBVDYwJmcktblcHGafz4ZVuYPQYuSHMUGjpwmUCrAOcvMSGMwwk1eFWj1M/1GwYpNPuyhaBg==",
       "peerDependencies": {
-        "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0",
-        "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0"
+        "react": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^15.3.0 || ^16.0.0-alpha || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/react-window": {
-      "version": "1.8.10",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.10.tgz",
-      "integrity": "sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==",
+      "version": "1.8.11",
+      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.11.tgz",
+      "integrity": "sha512-+SRbUVT2scadgFSWx+R1P754xHPEqvcfSfVX10QYg6POOz+WNgkN48pS+BtZNIMGiL1HYrSEiCkwsMS15QogEQ==",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
         "memoize-one": ">=3.1.1 <6"
@@ -19712,8 +20460,8 @@
         "node": ">8.0.0"
       },
       "peerDependencies": {
-        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
+        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
     "node_modules/read-cache": {
@@ -19725,67 +20473,6 @@
         "pify": "^2.3.0"
       }
     },
-    "node_modules/read-package-json": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.1.tgz",
-      "integrity": "sha512-8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==",
-      "deprecated": "This package is no longer supported. Please use @npmcli/package-json instead.",
-      "dev": true,
-      "dependencies": {
-        "glob": "^10.2.2",
-        "json-parse-even-better-errors": "^3.0.0",
-        "normalize-package-data": "^6.0.0",
-        "npm-normalize-package-bin": "^3.0.0"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/read-package-json-fast": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz",
-      "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==",
-      "dev": true,
-      "dependencies": {
-        "json-parse-even-better-errors": "^3.0.0",
-        "npm-normalize-package-bin": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/read-package-json/node_modules/glob": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.3.tgz",
-      "integrity": "sha512-Q38SGlYRpVtDBPSWEylRyctn7uDeTp4NQERTLiCT1FqA9JXPYWqAVmQU6qh4r/zMM5ehxTcbaO8EjhWnvEhmyg==",
-      "dev": true,
-      "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/read-package-json/node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "dev": true,
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
     "node_modules/readable-stream": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
@@ -19804,6 +20491,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -19815,6 +20503,7 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -19872,6 +20561,28 @@
       "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
       "integrity": "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="
     },
+    "node_modules/reflect.getprototypeof": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
+      "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.1",
+        "which-builtin-type": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/regenerate": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
@@ -19905,21 +20616,23 @@
       }
     },
     "node_modules/regex-parser": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.0.tgz",
-      "integrity": "sha512-TVILVSz2jY5D47F4mA4MppkBrafEaiUWJO/TcZHEIuI13AqoZMkK1WMA4Om1YkYbTx+9Ki1/tSUXbceyr9saRg==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/regex-parser/-/regex-parser-2.3.1.tgz",
+      "integrity": "sha512-yXLRqatcCuKtVHsWrNg0JL3l1zGfdXeEvDa0bdu4tCDQw0RpMDZsqbkyRTUnKMR0tXF627V2oEWjBEaEdqTwtQ==",
       "dev": true
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz",
-      "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
+      "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
+        "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
         "es-errors": "^1.3.0",
-        "set-function-name": "^2.0.1"
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "set-function-name": "^2.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -19929,15 +20642,15 @@
       }
     },
     "node_modules/regexpu-core": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.1.1.tgz",
-      "integrity": "sha512-k67Nb9jvwJcJmVpw0jPttR1/zVfnKf8Km0IPatrU/zJ5XeG3+Slx0xLXs9HByJSzXzrlz5EDvN6yLNMDc2qdnw==",
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+      "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
       "dev": true,
       "dependencies": {
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.2.0",
         "regjsgen": "^0.8.0",
-        "regjsparser": "^0.11.0",
+        "regjsparser": "^0.12.0",
         "unicode-match-property-ecmascript": "^2.0.0",
         "unicode-match-property-value-ecmascript": "^2.1.0"
       },
@@ -19952,9 +20665,9 @@
       "dev": true
     },
     "node_modules/regjsparser": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.11.1.tgz",
-      "integrity": "sha512-1DHODs4B8p/mQHU9kr+jv8+wIC9mtG4eBHxWxIq5mhjE3D5oORhCc6deRKzTjs9DcfRFmj9BHSDguZklqCGFWQ==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+      "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
       "dev": true,
       "dependencies": {
         "jsesc": "~3.0.2"
@@ -20049,7 +20762,7 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-from": {
+    "node_modules/resolve-cwd/node_modules/resolve-from": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
@@ -20058,6 +20771,15 @@
         "node": ">=8"
       }
     },
+    "node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/resolve-url-loader": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz",
@@ -20097,66 +20819,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/resp-modifier": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz",
-      "integrity": "sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "debug": "^2.2.0",
-        "minimatch": "^3.0.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/resp-modifier/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/resp-modifier/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/resp-modifier/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/resp-modifier/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -20170,6 +20832,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/restore-cursor/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
+    },
     "node_modules/retry": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
@@ -20180,9 +20848,9 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -20224,12 +20892,12 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.24.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
-      "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
+      "version": "4.22.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.4.tgz",
+      "integrity": "sha512-vD8HJ5raRcWOyymsR6Z3o6+RzfEPCnVLMFJ6vRslO1jt4LO6dUo5Qnpg7y4RkZFM2DMe3WUirkI5c16onjrc6A==",
       "dev": true,
       "dependencies": {
-        "@types/estree": "1.0.6"
+        "@types/estree": "1.0.5"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -20239,22 +20907,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.24.0",
-        "@rollup/rollup-android-arm64": "4.24.0",
-        "@rollup/rollup-darwin-arm64": "4.24.0",
-        "@rollup/rollup-darwin-x64": "4.24.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.24.0",
-        "@rollup/rollup-linux-arm64-musl": "4.24.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.24.0",
-        "@rollup/rollup-linux-x64-gnu": "4.24.0",
-        "@rollup/rollup-linux-x64-musl": "4.24.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.24.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.24.0",
-        "@rollup/rollup-win32-x64-msvc": "4.24.0",
+        "@rollup/rollup-android-arm-eabi": "4.22.4",
+        "@rollup/rollup-android-arm64": "4.22.4",
+        "@rollup/rollup-darwin-arm64": "4.22.4",
+        "@rollup/rollup-darwin-x64": "4.22.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.22.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.22.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.22.4",
+        "@rollup/rollup-linux-arm64-musl": "4.22.4",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.22.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.22.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-gnu": "4.22.4",
+        "@rollup/rollup-linux-x64-musl": "4.22.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.22.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.22.4",
+        "@rollup/rollup-win32-x64-msvc": "4.22.4",
         "fsevents": "~2.3.2"
       }
     },
@@ -20266,13 +20934,16 @@
         "@babel/runtime": "^7.1.2"
       }
     },
-    "node_modules/run-async": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-3.0.0.tgz",
-      "integrity": "sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==",
+    "node_modules/run-applescript": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
+      "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
       "dev": true,
       "engines": {
-        "node": ">=0.12.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/run-parallel": {
@@ -20297,18 +20968,10 @@
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/rx": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
-      "integrity": "sha512-CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/rxjs": {
-      "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
       "dependencies": {
         "tslib": "^2.1.0"
       }
@@ -20331,85 +20994,16 @@
         "rxjs-report-usage": "bin/rxjs-report-usage"
       }
     },
-    "node_modules/rxjs-report-usage/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/rxjs-report-usage/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/rxjs-report-usage/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/rxjs-report-usage/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/rxjs-report-usage/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/rxjs-report-usage/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/safe-array-concat": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz",
-      "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
+      "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "get-intrinsic": "^1.2.4",
-        "has-symbols": "^1.0.3",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "has-symbols": "^1.1.0",
         "isarray": "^2.0.5"
       },
       "engines": {
@@ -20420,19 +21014,49 @@
       }
     },
     "node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
     },
-    "node_modules/safe-regex-test": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz",
-      "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==",
+    "node_modules/safe-push-apply": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
+      "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.6",
         "es-errors": "^1.3.0",
-        "is-regex": "^1.1.4"
+        "isarray": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/safe-regex-test": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
+      "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-regex": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -20442,9 +21066,9 @@
       }
     },
     "node_modules/safe-stable-stringify": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz",
-      "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz",
+      "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==",
       "engines": {
         "node": ">=10"
       }
@@ -20455,13 +21079,13 @@
       "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
     },
     "node_modules/sass": {
-      "version": "1.80.6",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz",
-      "integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==",
+      "version": "1.84.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.84.0.tgz",
+      "integrity": "sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg==",
       "dev": true,
       "dependencies": {
         "chokidar": "^4.0.0",
-        "immutable": "^4.0.0",
+        "immutable": "^5.0.2",
         "source-map-js": ">=0.6.2 <2.0.0"
       },
       "bin": {
@@ -20524,64 +21148,6 @@
         "loader-utils": "^2.0.0"
       }
     },
-    "node_modules/sass-resources-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/sass-resources-loader/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/sass-resources-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/sass-resources-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/sass-resources-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/sass-resources-loader/node_modules/loader-utils": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
@@ -20596,22 +21162,10 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/sass-resources-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/sass/node_modules/chokidar": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.1.tgz",
-      "integrity": "sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
       "dependencies": {
         "readdirp": "^4.0.1"
@@ -20623,19 +21177,13 @@
         "url": "https://paulmillr.com/funding/"
       }
     },
-    "node_modules/sass/node_modules/immutable": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-      "integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
-      "dev": true
-    },
     "node_modules/sass/node_modules/readdirp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.0.2.tgz",
-      "integrity": "sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
+      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
       "dev": true,
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 14.18.0"
       },
       "funding": {
         "type": "individual",
@@ -20660,9 +21208,9 @@
       }
     },
     "node_modules/schema-utils": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz",
+      "integrity": "sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
@@ -20671,13 +21219,30 @@
         "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">= 10.13.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/webpack"
       }
     },
+    "node_modules/schema-utils/node_modules/ajv-formats": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
@@ -20698,12 +21263,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -20716,17 +21278,6 @@
       "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
       "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="
     },
-    "node_modules/semver/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/send": {
       "version": "0.19.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
@@ -20763,6 +21314,14 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
+    "node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/send/node_modules/mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -20774,11 +21333,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/send/node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
@@ -20880,26 +21434,11 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/serve-static/node_modules/encodeurl": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/server-destroy": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz",
-      "integrity": "sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -20927,6 +21466,20 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/set-proto": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
+      "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -20971,23 +21524,77 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz",
-      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.2.tgz",
+      "integrity": "sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
-      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
       "dependencies": {
-        "call-bind": "^1.0.7",
         "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.4",
-        "object-inspect": "^1.13.1"
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -20997,10 +21604,16 @@
       }
     },
     "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
     "node_modules/sigstore": {
       "version": "2.3.1",
@@ -21056,52 +21669,33 @@
       }
     },
     "node_modules/slice-ansi": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
+      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
+        "ansi-styles": "^6.0.0",
+        "is-fullwidth-code-point": "^4.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -21113,9 +21707,9 @@
       }
     },
     "node_modules/socket.io": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.0.tgz",
-      "integrity": "sha512-8U6BEgGjQOfGz3HHTYaC/L1GaxDCJ/KM0XTkJly0EhZ5U/du9uNEZy4ZgYzEzIqlx2CMm25CrCqr1ck899eLNA==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.4",
@@ -21140,21 +21734,21 @@
         "ws": "~8.17.1"
       }
     },
-    "node_modules/socket.io-client": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.0.tgz",
-      "integrity": "sha512-C0jdhD5yQahMws9alf/yvtsMGTaIDBnZ8Rb5HU56svyq0l5LIrGzIDZZD5pHQlmzxLuU91Gz+VpQMKgCTNYtkw==",
+    "node_modules/socket.io-adapter/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dev": true,
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.2",
-        "engine.io-client": "~6.6.1",
-        "socket.io-parser": "~4.2.4"
+        "ms": "^2.1.3"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
     "node_modules/socket.io-parser": {
@@ -21170,6 +21764,40 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/socket.io-parser/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/sockjs": {
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
@@ -21182,9 +21810,9 @@
       }
     },
     "node_modules/socks": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.3.tgz",
-      "integrity": "sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.4.tgz",
+      "integrity": "sha512-D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==",
       "dev": true,
       "dependencies": {
         "ip-address": "^9.0.5",
@@ -21196,12 +21824,12 @@
       }
     },
     "node_modules/socks-proxy-agent": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz",
-      "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==",
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
       "dev": true,
       "dependencies": {
-        "agent-base": "^7.1.1",
+        "agent-base": "^7.1.2",
         "debug": "^4.3.4",
         "socks": "^2.8.3"
       },
@@ -21317,9 +21945,9 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.18",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
-      "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+      "version": "3.0.21",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
+      "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
       "dev": true
     },
     "node_modules/spdy": {
@@ -21409,32 +22037,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/stream-throttle": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz",
-      "integrity": "sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "commander": "^2.2.0",
-        "limiter": "^1.0.5"
-      },
-      "bin": {
-        "throttleproxy": "bin/throttleproxy.js"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
-    "node_modules/stream-throttle/node_modules/commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true,
-      "optional": true,
-      "peer": true
-    },
     "node_modules/streamroller": {
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz",
@@ -21472,6 +22074,15 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/streamroller/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@@ -21481,26 +22092,6 @@
         "safe-buffer": "~5.2.0"
       }
     },
-    "node_modules/string_decoder/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -21529,16 +22120,36 @@
         "node": ">=8"
       }
     },
+    "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width/node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
-      "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==",
+      "version": "1.2.10",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
+      "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
+        "define-data-property": "^1.1.4",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.0",
-        "es-object-atoms": "^1.0.0"
+        "es-abstract": "^1.23.5",
+        "es-object-atoms": "^1.0.0",
+        "has-property-descriptors": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21548,15 +22159,19 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz",
-      "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
+      "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.2",
         "define-properties": "^1.2.1",
         "es-object-atoms": "^1.0.0"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -21633,14 +22248,14 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/supports-preserve-symlinks-flag": {
@@ -21712,9 +22327,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.29.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.1.tgz",
-      "integrity": "sha512-lZQ/fyaIGxsbGxApKmoPTODIzELy3++mXhS5hOqaAWZjQtpq/hFHAc+rm29NND1rYRxRWKcjuARNwULNXa5RtQ==",
+      "version": "5.31.6",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
+      "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -21730,16 +22345,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "version": "5.3.14",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz",
+      "integrity": "sha512-vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.20",
+        "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
-        "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.1",
-        "terser": "^5.26.0"
+        "schema-utils": "^4.3.0",
+        "serialize-javascript": "^6.0.2",
+        "terser": "^5.31.1"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -21763,103 +22378,30 @@
         }
       }
     },
-    "node_modules/terser-webpack-plugin/node_modules/ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
-    "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
-      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.8",
-        "ajv": "^6.12.5",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
-    "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
-      "dev": true,
-      "dependencies": {
-        "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/test-exclude/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
       "dev": true
     },
+    "node_modules/thingies": {
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/thingies/-/thingies-1.21.0.tgz",
+      "integrity": "sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.18"
+      },
+      "peerDependencies": {
+        "tslib": "^2"
+      }
+    },
     "node_modules/throttle-debounce": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz",
@@ -21900,21 +22442,21 @@
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
     "node_modules/tldts": {
-      "version": "6.1.65",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.65.tgz",
-      "integrity": "sha512-xU9gLTfAGsADQ2PcWee6Hg8RFAv0DnjMGVJmDnUmI8a9+nYmapMQix4afwrdaCtT+AqP4MaxEzu7cCrYmBPbzQ==",
+      "version": "6.1.83",
+      "resolved": "https://registry.npmjs.org/tldts/-/tldts-6.1.83.tgz",
+      "integrity": "sha512-FHxxNJJ0WNsEBPHyC1oesQb3rRoxpuho/z2g3zIIAhw1WHJeQsUzK1jYK8TI1/iClaa4fS3Z2TCA9mtxXsENSg==",
       "dev": true,
       "dependencies": {
-        "tldts-core": "^6.1.65"
+        "tldts-core": "^6.1.83"
       },
       "bin": {
         "tldts": "bin/cli.js"
       }
     },
     "node_modules/tldts-core": {
-      "version": "6.1.65",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.65.tgz",
-      "integrity": "sha512-Uq5t0N0Oj4nQSbU8wFN1YYENvMthvwU13MQrMJRspYCGLSAZjAfoBOJki5IQpnBM/WFskxxC/gIOTwaedmHaSg==",
+      "version": "6.1.83",
+      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-6.1.83.tgz",
+      "integrity": "sha512-I2wb9OJc6rXyh9d4aInhSNWChNI+ra6qDnFEGEwe9OoA68lE4Temw29bOkf1Uvwt8VZS079t1BFZdXVBmmB4dw==",
       "dev": true
     },
     "node_modules/tmp": {
@@ -21926,14 +22468,6 @@
         "node": ">=14.14"
       }
     },
-    "node_modules/to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -21968,9 +22502,9 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.0.0.tgz",
-      "integrity": "sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-5.1.2.tgz",
+      "integrity": "sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==",
       "dev": true,
       "dependencies": {
         "tldts": "^6.1.32"
@@ -21984,6 +22518,22 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
     },
+    "node_modules/tree-dump": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz",
+      "integrity": "sha512-dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
     "node_modules/tree-kill": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
@@ -21994,9 +22544,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
-      "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz",
+      "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==",
       "dev": true,
       "engines": {
         "node": ">=16"
@@ -22045,9 +22595,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
@@ -22133,11 +22683,12 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
       "engines": {
-        "node": ">=12.20"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -22156,30 +22707,30 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz",
-      "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
+      "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
-        "is-typed-array": "^1.1.13"
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz",
-      "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
+      "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.14"
       },
       "engines": {
         "node": ">= 0.4"
@@ -22189,17 +22740,18 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz",
-      "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
+      "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
       "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
-        "is-typed-array": "^1.1.13"
+        "gopd": "^1.2.0",
+        "has-proto": "^1.2.0",
+        "is-typed-array": "^1.1.15",
+        "reflect.getprototypeof": "^1.0.9"
       },
       "engines": {
         "node": ">= 0.4"
@@ -22209,17 +22761,17 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz",
-      "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
+      "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-proto": "^1.0.3",
         "is-typed-array": "^1.1.13",
-        "possible-typed-array-names": "^1.0.0"
+        "possible-typed-array-names": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.6"
       },
       "engines": {
         "node": ">= 0.4"
@@ -22268,9 +22820,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "1.0.38",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.38.tgz",
-      "integrity": "sha512-Aq5ppTOfvrCMgAPneW1HfWj66Xi7XL+/mIy996R1/CLS/rcyJQm6QZdsKrUeivDFQ+Oc9Wyuwor8Ze8peEoUoQ==",
+      "version": "0.7.40",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.40.tgz",
+      "integrity": "sha512-us1E3K+3jJppDBa3Tl0L3MOJiGhe1C6P0+nIvQAFYbxlMAx0h81eOwLmU57xgqToduDDPx3y5QsdjPfDu+FgOQ==",
       "dev": true,
       "funding": [
         {
@@ -22286,8 +22838,9 @@
           "url": "https://github.com/sponsors/faisalman"
         }
       ],
-      "optional": true,
-      "peer": true,
+      "bin": {
+        "ua-parser-js": "script/cli.js"
+      },
       "engines": {
         "node": "*"
       }
@@ -22298,15 +22851,18 @@
       "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
     },
     "node_modules/unbox-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
-      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
+      "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
-        "has-symbols": "^1.0.3",
-        "which-boxed-primitive": "^1.0.2"
+        "has-symbols": "^1.1.0",
+        "which-boxed-primitive": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -22318,22 +22874,11 @@
       "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==",
       "dev": true
     },
-    "node_modules/undici": {
-      "version": "6.11.1",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.11.1.tgz",
-      "integrity": "sha512-KyhzaLJnV1qa3BSHdj4AZ2ndqI0QWPxYzaIOio0WzcEJB9gvuysprJSLtpvc2D9mhR9jPDUk7xlJlZbH2KR5iw==",
-      "dev": true,
-      "engines": {
-        "node": ">=18.0"
-      }
-    },
     "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "dev": true,
-      "optional": true,
-      "peer": true
+      "version": "6.20.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
+      "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
+      "dev": true
     },
     "node_modules/unfetch": {
       "version": "4.2.0",
@@ -22380,6 +22925,18 @@
         "node": ">=4"
       }
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz",
+      "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/unique-filename": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
@@ -22399,12 +22956,12 @@
       }
     },
     "node_modules/universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "dev": true,
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">= 10.0.0"
       }
     },
     "node_modules/unpipe": {
@@ -22425,9 +22982,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-      "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
       "funding": [
         {
           "type": "opencollective",
@@ -22443,8 +23000,8 @@
         }
       ],
       "dependencies": {
-        "escalade": "^3.1.2",
-        "picocolors": "^1.0.1"
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -22566,9 +23123,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
-      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz",
+      "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==",
       "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -22596,22 +23153,28 @@
         "defaults": "^1.0.3"
       }
     },
+    "node_modules/weak-lru-cache": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz",
+      "integrity": "sha512-DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==",
+      "dev": true
+    },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
     },
     "node_modules/webpack": {
-      "version": "5.96.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
-      "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
+      "version": "5.97.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.97.1.tgz",
+      "integrity": "sha512-EksG6gFY3L1eFMROS/7Wzgrii5mBAFe4rIr3r2BTfo7bcc+DWwFZ4OJ/miOuHJO/A85HwyI4eQ0F6IKXesO7Fg==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
-        "@webassemblyjs/ast": "^1.12.1",
-        "@webassemblyjs/wasm-edit": "^1.12.1",
-        "@webassemblyjs/wasm-parser": "^1.12.1",
+        "@webassemblyjs/ast": "^1.14.1",
+        "@webassemblyjs/wasm-edit": "^1.14.1",
+        "@webassemblyjs/wasm-parser": "^1.14.1",
         "acorn": "^8.14.0",
         "browserslist": "^4.24.0",
         "chrome-trace-event": "^1.0.2",
@@ -22692,6 +23255,15 @@
         }
       }
     },
+    "node_modules/webpack-cli/node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/webpack-cli/node_modules/commander": {
       "version": "10.0.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
@@ -22702,19 +23274,20 @@
       }
     },
     "node_modules/webpack-dev-middleware": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.2.tgz",
-      "integrity": "sha512-Wu+EHmX326YPYUpQLKmKbTyZZJIB8/n6R09pTmB03kJmnMsVPTo9COzHZFr01txwaCAuZvfBJE4ZCHRcKs5JaQ==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz",
+      "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==",
       "dev": true,
       "dependencies": {
         "colorette": "^2.0.10",
-        "memfs": "^3.4.12",
+        "memfs": "^4.6.0",
         "mime-types": "^2.1.31",
+        "on-finished": "^2.4.1",
         "range-parser": "^1.2.1",
         "schema-utils": "^4.0.0"
       },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 18.12.0"
       },
       "funding": {
         "type": "opencollective",
@@ -22788,13 +23361,13 @@
         }
       }
     },
-    "node_modules/webpack-dev-server/node_modules/connect-history-api-fallback": {
+    "node_modules/webpack-dev-server/node_modules/define-lazy-prop": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "dev": true,
       "engines": {
-        "node": ">=0.8"
+        "node": ">=8"
       }
     },
     "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
@@ -22806,6 +23379,62 @@
         "node": ">= 10"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/memfs": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "dev": true,
+      "dependencies": {
+        "fs-monkey": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dev": true,
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
       "version": "5.3.4",
       "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
@@ -22883,6 +23512,12 @@
         }
       }
     },
+    "node_modules/webpack/node_modules/@types/estree": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "dev": true
+    },
     "node_modules/webpack/node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -22960,20 +23595,6 @@
         "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/webpack/node_modules/watchpack": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-      "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "glob-to-regexp": "^0.4.1",
-        "graceful-fs": "^4.1.2"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/webpack/node_modules/webpack-sources": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
@@ -23030,31 +23651,80 @@
       }
     },
     "node_modules/which-boxed-primitive": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
-      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
+      "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
       "dev": true,
       "dependencies": {
-        "is-bigint": "^1.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
-        "is-symbol": "^1.0.3"
+        "is-bigint": "^1.1.0",
+        "is-boolean-object": "^1.2.1",
+        "is-number-object": "^1.1.1",
+        "is-string": "^1.1.1",
+        "is-symbol": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-builtin-type": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
+      "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "function.prototype.name": "^1.1.6",
+        "has-tostringtag": "^1.0.2",
+        "is-async-function": "^2.0.0",
+        "is-date-object": "^1.1.0",
+        "is-finalizationregistry": "^1.1.0",
+        "is-generator-function": "^1.0.10",
+        "is-regex": "^1.2.1",
+        "is-weakref": "^1.0.2",
+        "isarray": "^2.0.5",
+        "which-boxed-primitive": "^1.1.0",
+        "which-collection": "^1.0.2",
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-collection": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
+      "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
+      "dependencies": {
+        "is-map": "^2.0.3",
+        "is-set": "^2.0.3",
+        "is-weakmap": "^2.0.2",
+        "is-weakset": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz",
-      "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==",
+      "version": "1.1.18",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
+      "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
       "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
         "for-each": "^0.3.3",
-        "gopd": "^1.0.1",
+        "gopd": "^1.2.0",
         "has-tostringtag": "^1.0.2"
       },
       "engines": {
@@ -23111,72 +23781,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi-cjs/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -23212,17 +23816,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/xmlhttprequest-ssl": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.1.tgz",
-      "integrity": "sha512-ptjR8YSJIXoA3Mbv5po7RtSYHO6mZr8s7i5VGmEk7QY2pQWyT1o0N+W1gKbOyJPUCGXGnuw0wqe8f0L6Y0ny7g==",
-      "dev": true,
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -23234,7 +23827,8 @@
     "node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/yaml": {
       "version": "1.10.2",
@@ -23301,6 +23895,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/yoctocolors-cjs": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz",
+      "integrity": "sha512-cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/zone.js": {
       "version": "0.14.10",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.14.10.tgz",
diff --git a/package.json b/package.json
index 206b025da3..c289171423 100644
--- a/package.json
+++ b/package.json
@@ -57,106 +57,103 @@
   "private": true,
   "overrides": {
     "@kolkov/ngx-gallery": {
-      "@angular/animations": "^17.3.11",
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11"
+      "@angular/animations": "^18.2.12",
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12"
     },
     "@ng-bootstrap/ng-bootstrap": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11",
-      "@angular/forms": "^17.3.11",
-      "@angular/localize": "^17.3.11"
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12",
+      "@angular/forms": "^18.2.12",
+      "@angular/localize": "^18.2.12"
     },
     "@ng-dynamic-forms/core": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11",
-      "@angular/forms": "^17.3.11"
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12",
+      "@angular/forms": "^18.2.12"
     },
     "@ng-dynamic-forms/ui-ng-bootstrap": {
-      "ngx-mask": "14.2.4"
-    },
-    "@ngtools/webpack": {
-      "@angular/compiler-cli": "^17.3.11",
-      "typescript": "~5.4.5"
+      "ngx-mask": "14.2.4",
+      "@ng-bootstrap/ng-bootstrap": "^12.0.0",
+      "bootstrap": "^5.3"
     },
     "@nicky-lenaers/ngx-scroll-to": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11"
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12"
     },
     "eslint-plugin-unused-imports": {
       "@typescript-eslint/eslint-plugin": "^7.2.0"
     },
-    "ng2-file-upload": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11"
-    },
     "ngx-infinite-scroll": {
-      "@angular/common": "^17.3.11",
-      "@angular/core": "^17.3.11"
-    }
+      "@angular/common": "^18.2.12",
+      "@angular/core": "^18.2.12"
+    },
+    "notistack": "3.0.1"
   },
   "dependencies": {
-    "@angular/animations": "^17.3.12",
-    "@angular/cdk": "^17.3.10",
-    "@angular/common": "^17.3.12",
-    "@angular/compiler": "^17.3.12",
-    "@angular/core": "^17.3.12",
-    "@angular/forms": "^17.3.12",
-    "@angular/localize": "^17.3.12",
-    "@angular/platform-browser": "^17.3.12",
-    "@angular/platform-browser-dynamic": "^17.3.12",
-    "@angular/platform-server": "^17.3.12",
-    "@angular/router": "^17.3.12",
-    "@angular/ssr": "^17.3.11",
+    "@angular/animations": "^18.2.12",
+    "@angular/cdk": "^18.2.12",
+    "@angular/common": "^18.2.12",
+    "@angular/compiler": "^18.2.12",
+    "@angular/core": "^18.2.12",
+    "@angular/forms": "^18.2.12",
+    "@angular/localize": "^18.2.12",
+    "@angular/platform-browser": "^18.2.12",
+    "@angular/platform-browser-dynamic": "^18.2.12",
+    "@angular/platform-server": "^18.2.12",
+    "@angular/router": "^18.2.12",
+    "@angular/ssr": "^18.2.12",
     "@babel/runtime": "7.26.0",
     "@kolkov/ngx-gallery": "^2.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^11.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^12.0.0",
     "@ng-dynamic-forms/core": "^16.0.0",
     "@ng-dynamic-forms/ui-ng-bootstrap": "^16.0.0",
-    "@ngrx/effects": "^17.1.1",
-    "@ngrx/router-store": "^17.1.1",
-    "@ngrx/store": "^17.1.1",
-    "@ngx-translate/core": "^14.0.0",
+    "@ngrx/effects": "^18.1.1",
+    "@ngrx/operators": "^18.0.0",
+    "@ngrx/router-store": "^18.1.1",
+    "@ngrx/store": "^18.1.1",
+    "@ngx-translate/core": "^16.0.3",
     "@nicky-lenaers/ngx-scroll-to": "^14.0.0",
     "angulartics2": "^12.2.0",
-    "axios": "^1.7.4",
-    "bootstrap": "^4.6.1",
+    "axios": "^1.7.9",
+    "bootstrap": "^5.3",
     "cerialize": "0.1.18",
     "cli-progress": "^3.12.0",
     "colors": "^1.4.0",
     "compression": "^1.7.5",
     "cookie-parser": "1.4.7",
-    "core-js": "^3.38.1",
+    "core-js": "^3.40.0",
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
     "ejs": "^3.1.10",
-    "express": "^4.21.1",
+    "express": "^4.21.2",
     "express-rate-limit": "^5.1.3",
     "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
     "http-proxy-middleware": "^2.0.7",
     "http-terminator": "^3.2.0",
-    "isbot": "^5.1.17",
+    "isbot": "^5.1.22",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
     "json5": "^2.2.3",
-    "jsonschema": "1.4.1",
+    "jsonschema": "1.5.0",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
     "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
-    "mirador": "^3.3.0",
+    "mirador": "^3.4.3",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.16.0",
     "morgan": "^1.10.0",
-    "ng2-file-upload": "5.0.0",
+    "ng2-file-upload": "7.0.1",
     "ng2-nouislider": "^2.0.0",
-    "ngx-infinite-scroll": "^16.0.0",
+    "ngx-infinite-scroll": "^18.0.0",
     "ngx-pagination": "6.0.3",
-    "ngx-ui-switch": "^14.1.0",
+    "ngx-skeleton-loader": "^9.0.0",
+    "ngx-ui-switch": "^15.0.0",
     "nouislider": "^15.7.1",
-    "orejime": "^2.3.0",
+    "orejime": "^2.3.1",
     "pem": "1.14.8",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.0",
@@ -164,29 +161,29 @@
     "zone.js": "~0.14.10"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "~17.0.2",
-    "@angular-devkit/build-angular": "^17.3.11",
-    "@angular-eslint/builder": "^17.5.3",
-    "@angular-eslint/bundled-angular-compiler": "^17.5.3",
-    "@angular-eslint/eslint-plugin": "^17.5.3",
-    "@angular-eslint/eslint-plugin-template": "^17.5.3",
-    "@angular-eslint/schematics": "^17.5.3",
-    "@angular-eslint/template-parser": "^17.5.3",
-    "@angular-eslint/utils": "^17.5.3",
-    "@angular/cli": "^17.3.11",
-    "@angular/compiler-cli": "^17.3.11",
-    "@angular/language-service": "^17.3.12",
+    "@angular-builders/custom-webpack": "~18.0.0",
+    "@angular-devkit/build-angular": "^18.2.12",
+    "@angular-eslint/builder": "^18.4.1",
+    "@angular-eslint/bundled-angular-compiler": "^18.4.1",
+    "@angular-eslint/eslint-plugin": "^18.4.1",
+    "@angular-eslint/eslint-plugin-template": "^18.4.1",
+    "@angular-eslint/schematics": "^18.4.1",
+    "@angular-eslint/template-parser": "^18.4.1",
+    "@angular-eslint/utils": "^18.4.1",
+    "@angular/cli": "^18.2.12",
+    "@angular/compiler-cli": "^18.2.12",
+    "@angular/language-service": "^18.2.12",
     "@cypress/schematic": "^1.5.0",
-    "@fortawesome/fontawesome-free": "^6.6.0",
-    "@ngrx/store-devtools": "^17.1.1",
-    "@ngtools/webpack": "^16.2.16",
+    "@fortawesome/fontawesome-free": "^6.7.2",
+    "@ngrx/store-devtools": "^18.1.1",
+    "@ngtools/webpack": "^18.2.12",
     "@types/deep-freeze": "0.1.5",
     "@types/ejs": "^3.1.2",
     "@types/express": "^4.17.17",
     "@types/grecaptcha": "^3.0.9",
     "@types/jasmine": "~3.6.0",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.15",
     "@types/node": "^14.14.9",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
@@ -196,8 +193,8 @@
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "cypress": "^13.16.0",
-    "cypress-axe": "^1.5.0",
+    "cypress": "^13.17.0",
+    "cypress-axe": "^1.6.0",
     "deep-freeze": "0.0.1",
     "eslint": "^8.39.0",
     "eslint-plugin-deprecation": "^1.4.1",
@@ -206,12 +203,12 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-import-newlines": "^1.3.1",
     "eslint-plugin-jsdoc": "^45.0.0",
-    "eslint-plugin-jsonc": "^2.6.0",
+    "eslint-plugin-jsonc": "^2.19.1",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-rxjs": "^5.0.3",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^3.2.0",
-    "express-static-gzip": "^2.1.8",
+    "express-static-gzip": "^2.2.0",
     "jasmine": "^3.8.0",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
@@ -221,20 +218,20 @@
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "karma-mocha-reporter": "2.2.5",
-    "ng-mocks": "^14.13.1",
+    "ng-mocks": "^14.13.2",
     "ngx-mask": "14.2.4",
     "nodemon": "^2.0.22",
-    "postcss": "^8.4",
+    "postcss": "^8.5",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "rimraf": "^3.0.2",
-    "sass": "~1.80.6",
+    "sass": "~1.84.0",
     "sass-loader": "^12.6.0",
     "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
     "typescript": "~5.4.5",
-    "webpack": "5.96.1",
+    "webpack": "5.97.1",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }
diff --git a/server.ts b/server.ts
index 07a05656d8..52b2823d49 100644
--- a/server.ts
+++ b/server.ts
@@ -20,10 +20,10 @@ import 'reflect-metadata';
 
 /* eslint-disable import/no-namespace */
 import * as morgan from 'morgan';
-import * as express from 'express';
+import express from 'express';
 import * as ejs from 'ejs';
 import * as compression from 'compression';
-import * as expressStaticGzip from 'express-static-gzip';
+import expressStaticGzip from 'express-static-gzip';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';
@@ -81,6 +81,9 @@ let anonymousCache: LRU<string, any>;
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
+// The REST server base URL
+const REST_BASE_URL = environment.rest.ssrBaseUrl || environment.rest.baseUrl;
+
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
 
@@ -156,7 +159,7 @@ export function app() {
    * Proxy the sitemaps
    */
   router.use('/sitemap**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}/sitemaps`,
+    target: `${REST_BASE_URL}/sitemaps`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true,
   }));
@@ -165,7 +168,7 @@ export function app() {
    * Proxy the linksets
    */
   router.use('/signposting**', createProxyMiddleware({
-    target: `${environment.rest.baseUrl}`,
+    target: `${REST_BASE_URL}`,
     pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
     changeOrigin: true,
   }));
@@ -218,7 +221,7 @@ export function app() {
  * The callback function to serve server side angular
  */
 function ngApp(req, res, next) {
-  if (environment.ssr.enabled) {
+  if (environment.ssr.enabled && req.method === 'GET' && (req.path === '/' || environment.ssr.paths.some(pathPrefix => req.path.startsWith(pathPrefix)))) {
     // Render the page to user via SSR (server side rendering)
     serverSideRender(req, res, next);
   } else {
@@ -266,6 +269,11 @@ function serverSideRender(req, res, next, sendToUser: boolean = true) {
     })
     .then((html) => {
       if (hasValue(html)) {
+        // Replace REST URL with UI URL
+        if (environment.ssr.replaceRestUrl && REST_BASE_URL !== environment.rest.baseUrl) {
+          html = html.replace(new RegExp(REST_BASE_URL, 'g'), environment.rest.baseUrl);
+        }
+
         // save server side rendered page to cache (if any are enabled)
         saveToCache(req, html);
         if (sendToUser) {
@@ -623,7 +631,7 @@ function start() {
  * The callback function to serve health check requests
  */
 function healthCheck(req, res) {
-  const baseUrl = `${environment.rest.baseUrl}${environment.actuators.endpointPath}`;
+  const baseUrl = `${REST_BASE_URL}${environment.actuators.endpointPath}`;
   axios.get(baseUrl)
     .then((response) => {
       res.status(response.status).send(response.data);
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
index f96ddf4a23..8c2b37adbd 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
@@ -1,19 +1,13 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'browse'">
   <ngb-panel [id]="'browse'">
-    <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('browse')"
-           data-test="browse">
+    <ng-template ngbPanelTitle>
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle('browse')"
+        data-test="browse">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                [attr.aria-expanded]="acc.isExpanded('browse')"
-                aria-controls="bulk-access-browse-panel-content">
+          [attr.aria-expanded]="acc.isExpanded('browse')"
+          aria-controls="bulk-access-browse-panel-content">
           {{ 'admin.access-control.bulk-access-browse.header' | translate }}
         </button>
-        <div class="text-right d-flex gap-2">
-          <div class="d-flex my-auto">
-            <span *ngIf="acc.isExpanded('browse')" class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!acc.isExpanded('browse')" class="fas fa-chevron-down fa-fw"></span>
-          </div>
-        </div>
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
@@ -22,11 +16,11 @@
           <li [ngbNavItem]="'search'" role="presentation">
             <a ngbNavLink>{{'admin.access-control.bulk-access-browse.search.header' | translate}}</a>
             <ng-template ngbNavContent>
-              <div class="mx-n3">
+              <div class="bulk-access-search">
                 <ds-search [configuration]="'administrativeBulkAccess'"
-                                  [selectable]="true"
-                                  [selectionConfig]="{ repeatable: true, listId: listId }"
-                                  [showThumbnails]="false"></ds-search>
+                  [selectable]="true"
+                  [selectionConfig]="{ repeatable: true, listId: listId }"
+                [showThumbnails]="false"></ds-search>
               </div>
             </ng-template>
           </li>
@@ -42,21 +36,25 @@
                 [showPaginator]="false"
                 (prev)="pagePrev()"
                 (next)="pageNext()">
-                <ul *ngIf="(objectsSelected$|async)?.hasSucceeded" class="list-unstyled ml-4">
-                  <li *ngFor='let object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
-                              currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; let i = index; let last = last '
-                      class="mt-4 mb-4 d-flex"
-                      [attr.data-test]="'list-object' | dsBrowserOnly">
-                    <ds-selectable-list-item-control [index]="i"
-                                                     [object]="object"
-                                                     [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
-                    <ds-listable-object-component-loader [listID]="listId"
-                                                         [index]="i"
-                                                         [object]="object"
-                                                         [showThumbnails]="false"
-                                                         [viewMode]="'list'"></ds-listable-object-component-loader>
-                  </li>
-                </ul>
+                @if ((objectsSelected$|async)?.hasSucceeded) {
+                  <ul class="list-unstyled ms-4">
+                    @for (object of (objectsSelected$|async)?.payload?.page | paginate: { itemsPerPage: (paginationOptions$ | async).pageSize,
+                      currentPage: (paginationOptions$ | async).currentPage, totalItems: (objectsSelected$|async)?.payload?.page.length }; track object; let i = $index; let last = $last) {
+                      <li
+                        class="mt-4 mb-4 d-flex"
+                        [attr.data-test]="'list-object' | dsBrowserOnly">
+                        <ds-selectable-list-item-control [index]="i"
+                          [object]="object"
+                        [selectionConfig]="{ repeatable: true, listId: listId }"></ds-selectable-list-item-control>
+                        <ds-listable-object-component-loader [listID]="listId"
+                          [index]="i"
+                          [object]="object"
+                          [showThumbnails]="false"
+                        [viewMode]="'list'"></ds-listable-object-component-loader>
+                      </li>
+                    }
+                  </ul>
+                }
               </ds-pagination>
             </ng-template>
           </li>
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss
index e69de29bb2..0fb077b979 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss
@@ -0,0 +1,4 @@
+.bulk-access-search {
+    margin-right: calc(var(--bs-gutter-x, 1.5rem) / -2);
+    margin-left: calc(var(--bs-gutter-x, 1.5rem) / -2);
+}
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
index a400742f01..fc7e86ad4c 100644
--- a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -59,11 +55,9 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     NgbAccordionModule,
     TranslateModule,
-    NgIf,
     NgbNavModule,
     ThemedSearchComponent,
     BrowserOnlyPipe,
-    NgForOf,
     NgxPaginationModule,
     SelectableListItemControlComponent,
     ListableObjectComponentLoaderComponent,
diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index c164cc5c31..d22a8bda43 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -7,10 +7,10 @@
   <hr>
 
   <div class="d-flex justify-content-end">
-    <button class="btn btn-outline-primary mr-3" (click)="reset()">
+    <button class="btn btn-outline-primary me-3" (click)="reset()">
       {{ 'access-control-cancel' | translate }}
     </button>
-    <button class="btn btn-primary" [disabled]="!canExport()" (click)="submit()">
+    <button class="btn btn-primary" [dsBtnDisabled]="!canExport()" (click)="submit()">
       {{ 'access-control-execute' | translate }}
     </button>
   </div>
diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts
index bd8e893b59..a1608d27d0 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.ts
+++ b/src/app/access-control/bulk-access/bulk-access.component.ts
@@ -14,6 +14,7 @@ import {
 } from 'rxjs/operators';
 
 import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
 import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
 import { BulkAccessBrowseComponent } from './browse/bulk-access-browse.component';
@@ -27,6 +28,7 @@ import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.com
     TranslateModule,
     BulkAccessSettingsComponent,
     BulkAccessBrowseComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
index c41053874e..0b5c872aff 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
@@ -1,17 +1,11 @@
 <ngb-accordion #acc="ngbAccordion" [activeIds]="'settings'">
   <ngb-panel [id]="'settings'">
-    <ng-template ngbPanelHeader>
+    <ng-template ngbPanelTitle>
       <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle('settings')" data-test="settings">
         <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded('settings')"
                 aria-controls="bulk-access-settings-panel-content">
           {{ 'admin.access-control.bulk-access-settings.header' | translate }}
         </button>
-        <div class="text-right d-flex gap-2">
-          <div class="d-flex my-auto">
-            <span *ngIf="acc.isExpanded('settings')" class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!acc.isExpanded('settings')" class="fas fa-chevron-down fa-fw"></span>
-          </div>
-        </div>
       </div>
     </ng-template>
     <ng-template ngbPanelContent>
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
index 264cefc708..a8c527c755 100644
--- a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   ViewChild,
@@ -16,7 +16,6 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   imports: [
     NgbAccordionModule,
     TranslateModule,
-    NgIf,
     AccessControlFormContainerComponent,
   ],
   standalone: true,
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index b5a26533cf..c054a5dd55 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -5,10 +5,10 @@
         <h1 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h1>
 
         <div>
-          <button class="mr-auto btn btn-success addEPerson-button"
-                  [routerLink]="'create'">
+          <button class="me-auto btn btn-success addEPerson-button"
+            [routerLink]="'create'">
             <i class="fas fa-plus"></i>
-            <span class="d-none d-sm-inline ml-1">{{labelPrefix + 'button.add' | translate}}</span>
+            <span class="d-none d-sm-inline ms-1">{{labelPrefix + 'button.add' | translate}}</span>
           </button>
         </div>
       </div>
@@ -18,77 +18,84 @@
       </h2>
       <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
         <div>
-          <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
+          <select name="scope" id="scope" formControlName="scope" class="form-select" aria-label="Search scope">
             <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
             <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
           </select>
         </div>
-        <div class="flex-grow-1 mr-3 ml-3">
-          <div class="form-group input-group">
+        <div class="flex-grow-1 me-3 ms-3">
+          <div class="mb-3 input-group">
             <input type="text" name="query" id="query" formControlName="query"
-                   class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
-                   [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
+              class="form-control" [attr.aria-label]="labelPrefix + 'search.placeholder' | translate"
+              [placeholder]="(labelPrefix + 'search.placeholder' | translate)">
             <span class="input-group-append">
-                <button type="submit" class="search-button btn btn-primary">
-                  <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
-                </button>
-              </span>
+              <button type="submit" class="search-button btn btn-primary">
+                <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
+              </button>
+            </span>
           </div>
         </div>
         <div>
           <button (click)="clearFormAndResetResult();"
-                  class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}</button>
+          class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}</button>
         </div>
       </form>
 
-      <ds-loading *ngIf="searching$ | async"></ds-loading>
-      <ds-pagination
-        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && (searching$ | async) !== true"
-        [paginationOptions]="config"
-        [collectionSize]="(pageInfoState$ | async)?.totalElements"
-        [hideGear]="true"
-        [hidePagerWhenSinglePage]="true">
-
-        <div class="table-responsive">
-          <table id="epeople" class="table table-striped table-hover table-bordered">
-            <thead>
-            <tr>
-              <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
-              <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
-              <th>{{labelPrefix + 'table.edit' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let epersonDto of (ePeopleDto$ | async)?.page"
-                [ngClass]="{'table-primary' : (activeEPerson$ | async) === epersonDto.eperson}">
-              <td>{{epersonDto.eperson.id}}</td>
-              <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
-              <td>{{epersonDto.eperson.email}}</td>
-              <td>
-                <div class="btn-group edit-field">
-                  <button [routerLink]="getEditEPeoplePage(epersonDto.eperson.id)"
+      @if (searching$ | async) {
+        <ds-loading></ds-loading>
+      }
+      @if ((pageInfoState$ | async)?.totalElements > 0 && (searching$ | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="config"
+          [collectionSize]="(pageInfoState$ | async)?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true">
+          <div class="table-responsive">
+            <table id="epeople" class="table table-striped table-hover table-bordered">
+              <thead>
+                <tr>
+                  <th scope="col">{{labelPrefix + 'table.id' | translate}}</th>
+                  <th scope="col">{{labelPrefix + 'table.name' | translate}}</th>
+                  <th scope="col">{{labelPrefix + 'table.email' | translate}}</th>
+                  <th>{{labelPrefix + 'table.edit' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (epersonDto of (ePeopleDto$ | async)?.page; track epersonDto) {
+                  <tr
+                    [ngClass]="{'table-primary' : (activeEPerson$ | async) === epersonDto.eperson}">
+                    <td>{{epersonDto.eperson.id}}</td>
+                    <td>{{ dsoNameService.getName(epersonDto.eperson) }}</td>
+                    <td>{{epersonDto.eperson.email}}</td>
+                    <td>
+                      <div class="btn-group edit-field">
+                        <button [routerLink]="getEditEPeoplePage(epersonDto.eperson.id)"
                           class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
                           title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                  <button *ngIf="epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
-                          class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
-                          title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
-                    <i class="fas fa-trash-alt fa-fw"></i>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            </tbody>
-          </table>
+                          <i class="fas fa-edit fa-fw"></i>
+                        </button>
+                        @if (epersonDto.ableToDelete) {
+                          <button (click)="deleteEPerson(epersonDto.eperson)"
+                            class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
+                            title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
+                            <i class="fas fa-trash-alt fa-fw"></i>
+                          </button>
+                        }
+                      </div>
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
+
+      @if ((pageInfoState$ | async)?.totalElements === 0) {
+        <div class="alert alert-info w-100 mb-2" role="alert">
+          {{labelPrefix + 'no-items' | translate}}
         </div>
-
-      </ds-pagination>
-
-      <div *ngIf="(pageInfoState$ | async)?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{labelPrefix + 'no-items' | translate}}
-      </div>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
index c636b72d56..cd7441022c 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.spec.ts
@@ -42,6 +42,7 @@ import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { getMockFormBuilderService } from '../../shared/mocks/form-builder-service.mock';
@@ -151,7 +152,7 @@ describe('EPeopleRegistryComponent', () => {
     paginationService = new PaginationServiceStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule, RouterTestingModule.withRoutes([]),
-        TranslateModule.forRoot(), EPeopleRegistryComponent],
+        TranslateModule.forRoot(), EPeopleRegistryComponent, BtnDisabledDirective],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.ts b/src/app/access-control/epeople-registry/epeople-registry.component.ts
index 6b62a13ecf..1aee792aba 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -72,13 +70,11 @@ import { EPersonFormComponent } from './eperson-form/eperson-form.component';
     TranslateModule,
     RouterModule,
     AsyncPipe,
-    NgIf,
     EPersonFormComponent,
     ReactiveFormsModule,
     ThemedLoadingComponent,
     PaginationComponent,
     NgClass,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index ae1046be45..9947d775a2 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -2,97 +2,111 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="activeEPerson$ | async; then editHeader; else createHeader"></div>
-
-      <ng-template #createHeader>
-        <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
-      </ng-template>
-
-      <ng-template #editHeader>
+      @if (activeEPerson$ | async) {
         <h1 class="border-bottom pb-2">{{messagePrefix + '.edit' | translate}}</h1>
-      </ng-template>
+      } @else {
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.create' | translate}}</h1>
+      }
+
+
 
       <ds-form [formId]="formId"
-               [formModel]="formModel"
-               [formGroup]="formGroup"
-               [formLayout]="formLayout"
-               [displayCancel]="false"
-               [submitLabel]="submitLabel"
-               (submitForm)="onSubmit()">
+        [formModel]="formModel"
+        [formGroup]="formGroup"
+        [formLayout]="formLayout"
+        [displayCancel]="false"
+        [submitLabel]="submitLabel"
+        (submitForm)="onSubmit()">
         <div before class="btn-group">
           <button (click)="onCancel()" type="button" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}
           </button>
         </div>
-        <div *ngIf="displayResetPassword" between class="btn-group">
-          <button class="btn btn-primary" [disabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
-            <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
+        @if (displayResetPassword) {
+          <div between class="btn-group">
+            <button class="btn btn-primary" [dsBtnDisabled]="(canReset$ | async) !== true" type="button" (click)="resetPassword()">
+              <i class="fa fa-key"></i> {{'admin.access-control.epeople.actions.reset' | translate}}
+            </button>
+          </div>
+        }
+        @if (canImpersonate$ | async) {
+          <div between class="btn-group ms-1">
+            @if (!isImpersonated) {
+              <button class="btn btn-primary" type="button" (click)="impersonate()">
+                <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
+              </button>
+            }
+            @if (isImpersonated) {
+              <button class="btn btn-primary" type="button" (click)="stopImpersonating()">
+                <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
+              </button>
+            }
+          </div>
+        }
+        @if (canDelete$ | async) {
+          <button after class="btn btn-danger delete-button" type="button" (click)="delete()">
+            <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
           </button>
-        </div>
-        <div *ngIf="canImpersonate$ | async" between class="btn-group">
-          <button *ngIf="!isImpersonated" class="btn btn-primary" type="button" (click)="impersonate()">
-            <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.impersonate' | translate}}
-          </button>
-          <button *ngIf="isImpersonated" class="btn btn-primary" type="button" (click)="stopImpersonating()">
-            <i class="fa fa-user-secret"></i> {{'admin.access-control.epeople.actions.stop-impersonating' | translate}}
-          </button>
-        </div>
-        <button *ngIf="canDelete$ | async" after class="btn btn-danger delete-button" type="button" (click)="delete()">
-          <i class="fas fa-trash"></i> {{'admin.access-control.epeople.actions.delete' | translate}}
-        </button>
+        }
       </ds-form>
 
-      <ds-loading [showMessage]="false" *ngIf="!formGroup"></ds-loading>
+      @if (!formGroup) {
+        <ds-loading [showMessage]="false"></ds-loading>
+      }
 
-      <div *ngIf="activeEPerson$ | async">
-        <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
-
-        <ds-loading [showMessage]="false" *ngIf="groups$ | async | dsHasNoValue"></ds-loading>
-
-        <ds-pagination
-          *ngIf="(groups$ | async)?.payload?.totalElements > 0"
-          [paginationOptions]="config"
-          [collectionSize]="(groups$ | async)?.payload?.totalElements"
-          [hideGear]="true"
-          [hidePagerWhenSinglePage]="true"
-          (pageChange)="onPageChange($event)">
-
-          <div class="table-responsive">
-            <table id="groups" class="table table-striped table-hover table-bordered">
-              <thead>
-              <tr>
-                <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-                <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-                <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr *ngFor="let group of (groups$ | async)?.payload?.page">
-                <td class="align-middle">{{group.id}}</td>
-                <td class="align-middle">
-                  <a (click)="groupsDataService.startEditingNewGroup(group)"
-                     [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
-                    {{ dsoNameService.getName(group) }}
-                  </a>
-                </td>
-                <td class="align-middle">
-                  {{ dsoNameService.getName((group.object | async)?.payload) }}
-                </td>
-              </tr>
-              </tbody>
-            </table>
-          </div>
-
-        </ds-pagination>
-
-        <div *ngIf="(groups$ | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-          <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
-          <div>
-            <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
-                    class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
-          </div>
+      @if (activeEPerson$ | async) {
+        <div>
+          <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
+          @if (groups$ | async | dsHasNoValue) {
+            <ds-loading [showMessage]="false"></ds-loading>
+          }
+          @if ((groups$ | async)?.payload?.totalElements > 0) {
+            <ds-pagination
+              [paginationOptions]="config"
+              [collectionSize]="(groups$ | async)?.payload?.totalElements"
+              [hideGear]="true"
+              [hidePagerWhenSinglePage]="true"
+              (pageChange)="onPageChange($event)">
+              <div class="table-responsive">
+                <table id="groups" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr>
+                      <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+                      <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+                      <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (group of (groups$ | async)?.payload?.page; track group) {
+                      <tr>
+                        <td class="align-middle">{{group.id}}</td>
+                        <td class="align-middle">
+                          <a (click)="groupsDataService.startEditingNewGroup(group)"
+                            [routerLink]="[groupsDataService.getGroupEditPageRouterLink(group)]">
+                            {{ dsoNameService.getName(group) }}
+                          </a>
+                        </td>
+                        <td class="align-middle">
+                          {{ dsoNameService.getName((group.object | async)?.payload) }}
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            </ds-pagination>
+          }
+          @if ((groups$ | async)?.payload?.totalElements === 0) {
+            <div class="alert alert-info w-100 mb-2" role="alert">
+              <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
+              <div>
+                <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
+                class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
+              </div>
+            </div>
+          }
         </div>
-      </div>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
index e61f95d6e5..c5c9407377 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
@@ -43,6 +43,7 @@ import { GroupDataService } from '../../../core/eperson/group-data.service';
 import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -221,7 +222,7 @@ describe('EPersonFormComponent', () => {
     route = new ActivatedRouteStub();
     router = new RouterStub();
     TestBed.configureTestingModule({
-      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
+      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BtnDisabledDirective, BrowserModule,
         RouterModule.forRoot([]),
         TranslateModule.forRoot(),
         EPersonFormComponent,
@@ -516,7 +517,8 @@ describe('EPersonFormComponent', () => {
       // ePersonDataServiceStub.activeEPerson = eperson;
       spyOn(component.epersonService, 'deleteEPerson').and.returnValue(createSuccessfulRemoteDataObject$('No Content', 204));
       const deleteButton = fixture.debugElement.query(By.css('.delete-button'));
-      expect(deleteButton.nativeElement.disabled).toBe(false);
+      expect(deleteButton.nativeElement.getAttribute('aria-disabled')).toBeNull();
+      expect(deleteButton.nativeElement.classList.contains('disabled')).toBeFalse();
       deleteButton.triggerEventHandler('click', null);
       fixture.detectChanges();
       expect(component.epersonService.deleteEPerson).toHaveBeenCalledWith(eperson);
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
index 8aa7f15250..8b5a8817a9 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -65,6 +63,7 @@ import {
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { Registration } from '../../../core/shared/registration.model';
 import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
@@ -83,8 +82,6 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
   templateUrl: './eperson-form.component.html',
   imports: [
     FormComponent,
-    NgIf,
-    NgFor,
     AsyncPipe,
     TranslateModule,
     NgClass,
@@ -92,6 +89,7 @@ import { ValidateEmailNotTaken } from './validators/email-taken.validator';
     PaginationComponent,
     RouterLink,
     HasNoValuePipe,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
@@ -343,7 +341,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         this.groups$ = this.groupsDataService.findListByHref(eperson._links.groups.href, {
           currentPage: 1,
           elementsPerPage: this.config.pageSize,
-        });
+        }, undefined, undefined, followLink('object'));
       }
       this.formGroup.patchValue({
         firstName: eperson != null ? eperson.firstMetadataValue('eperson.firstname') : '',
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.html b/src/app/access-control/group-registry/group-form/group-form.component.html
index 7e8c1ed1b4..060cc5b86d 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.html
+++ b/src/app/access-control/group-registry/group-form/group-form.component.html
@@ -2,13 +2,7 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="activeGroup$ | async; then editHeader; else createHeader"></div>
-
-      <ng-template #createHeader>
-        <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
-      </ng-template>
-
-      <ng-template #editHeader>
+      @if (activeGroup$ | async) {
         <h1 class="border-bottom pb-2">
           <span
             *dsContextHelp="{
@@ -17,47 +11,61 @@
               iconPlacement: 'right',
               tooltipPlacement: ['right', 'bottom']
             }"
-          >
+            >
             {{messagePrefix + '.head.edit' | translate}}
           </span>
         </h1>
-      </ng-template>
+      } @else {
+        <h1 class="border-bottom pb-2">{{messagePrefix + '.head.create' | translate}}</h1>
+      }
 
-      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
-        <ds-alert *ngIf="groupBeingEdited?.permanent" [type]="AlertType.Warning"
-                  [content]="messagePrefix + '.alert.permanent'"></ds-alert>
-        <ng-container *ngIf="(activeGroupLinkedDSO$ | async) as activeGroupLinkedDSO">
-          <ds-alert *ngIf="(canEdit$ | async) !== true" [type]="AlertType.Warning"
-                    [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName(activeGroupLinkedDSO), comcol: activeGroupLinkedDSO.type, comcolEditRolesRoute: (linkedEditRolesRoute$ | async) })">
-          </ds-alert>
-        </ng-container>
-      </ng-container>
+
+
+      @if ((activeGroup$ | async); as groupBeingEdited) {
+        @if (groupBeingEdited?.permanent) {
+          <ds-alert [type]="AlertType.Warning"
+          [content]="messagePrefix + '.alert.permanent'"></ds-alert>
+        }
+        @if ((activeGroupLinkedDSO$ | async); as activeGroupLinkedDSO) {
+          @if ((canEdit$ | async) !== true) {
+            <ds-alert [type]="AlertType.Warning"
+              [content]="(messagePrefix + '.alert.workflowGroup' | translate:{ name: dsoNameService.getName(activeGroupLinkedDSO), comcol: activeGroupLinkedDSO.type, comcolEditRolesRoute: (linkedEditRolesRoute$ | async) })">
+            </ds-alert>
+          }
+        }
+      }
 
       <ds-form [formId]="formId"
-               [formModel]="formModel"
-               [formGroup]="formGroup"
-               [formLayout]="formLayout"
-               [displayCancel]="false"
-               (submitForm)="onSubmit()">
+        [formModel]="formModel"
+        [formGroup]="formGroup"
+        [formLayout]="formLayout"
+        [displayCancel]="false"
+        (submitForm)="onSubmit()">
         <div before class="btn-group">
           <button (click)="onCancel()" type="button"
-                  class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
-        </div>
-        <div after *ngIf="(canEdit$ | async) && !(activeGroup$ | async)?.permanent" class="btn-group">
-          <button (click)="delete()" class="btn btn-danger delete-button" type="button">
-            <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
-          </button>
-        </div>
-      </ds-form>
+            class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{messagePrefix + '.return' | translate}}</button>
+          </div>
+          @if ((canEdit$ | async) && !(activeGroup$ | async)?.permanent) {
+            <div after class="btn-group">
+              <button (click)="delete()" class="btn btn-danger delete-button" type="button">
+                <i class="fa fa-trash"></i> {{ messagePrefix + '.actions.delete' | translate}}
+              </button>
+            </div>
+          }
+        </ds-form>
 
-      <ng-container *ngIf="(activeGroup$ | async) as groupBeingEdited">
-        <div class="mb-5">
-          <ds-members-list *ngIf="groupBeingEdited !== undefined"
-                           [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
-        </div>
-        <ds-subgroups-list *ngIf="groupBeingEdited !== undefined"
-                           [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
-      </ng-container>
+        @if ((activeGroup$ | async); as groupBeingEdited) {
+          <div class="mb-5">
+            @if (groupBeingEdited !== undefined) {
+              <ds-members-list
+              [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
+            }
+          </div>
+          @if (groupBeingEdited !== undefined) {
+            <ds-subgroups-list
+            [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
+          }
+        }
+      </div>
     </div>
   </div>
-</div>
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
index d2ddb3266b..087db617e7 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -92,7 +89,6 @@ import { ValidateGroupExists } from './validators/group-exists.validator';
   imports: [
     FormComponent,
     AlertComponent,
-    NgIf,
     AsyncPipe,
     TranslateModule,
     ContextHelpDirective,
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index 591d80bdd5..44a3775c05 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -3,63 +3,70 @@
 
   <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
 
-  <ds-pagination *ngIf="(ePeopleMembersOfGroup | async)?.totalElements > 0"
-                 [paginationOptions]="config"
-                 [collectionSize]="(ePeopleMembersOfGroup | async)?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
+  @if ((ePeopleMembersOfGroup | async)?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="config"
+      [collectionSize]="(ePeopleMembersOfGroup | async)?.totalElements"
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true">
+      <div class="table-responsive">
+        <table id="ePeopleMembersOfGroup" class="table table-striped table-hover table-bordered">
+          <thead>
+            <tr>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
+              <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (epersonDTO of (ePeopleMembersOfGroup | async)?.page; track epersonDTO) {
+              <tr>
+                <td class="align-middle">{{epersonDTO.eperson.id}}</td>
+                <td class="align-middle">
+                  <a [routerLink]="getEPersonEditRoute(epersonDTO.eperson.id)">
+                    {{ dsoNameService.getName(epersonDTO.eperson) }}
+                  </a>
+                </td>
+                <td class="align-middle">
+                  {{messagePrefix + '.table.email' | translate}}: {{ epersonDTO.eperson.email ? epersonDTO.eperson.email : '-' }}<br/>
+                  {{messagePrefix + '.table.netid' | translate}}: {{ epersonDTO.eperson.netid ? epersonDTO.eperson.netid : '-' }}
+                </td>
+                <td class="align-middle">
+                  <div class="btn-group edit-field">
+                    @if (epersonDTO.ableToDelete) {
+                      <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
+                        [dsBtnDisabled]="actionConfig.remove.disabled"
+                        [ngClass]="['btn btn-sm', actionConfig.remove.css]"
+                        title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
+                        <i [ngClass]="actionConfig.remove.icon"></i>
+                      </button>
+                    }
+                    @if (!epersonDTO.ableToDelete) {
+                      <button
+                        (click)="addMemberToGroup(epersonDTO.eperson)"
+                        [dsBtnDisabled]="actionConfig.add.disabled"
+                        [ngClass]="['btn btn-sm', actionConfig.add.css]"
+                        title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
+                        <i [ngClass]="actionConfig.add.icon"></i>
+                      </button>
+                    }
+                  </div>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 
-    <div class="table-responsive">
-      <table id="ePeopleMembersOfGroup" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
-          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let epersonDTO of (ePeopleMembersOfGroup | async)?.page">
-          <td class="align-middle">{{epersonDTO.eperson.id}}</td>
-          <td class="align-middle">
-            <a [routerLink]="getEPersonEditRoute(epersonDTO.eperson.id)">
-              {{ dsoNameService.getName(epersonDTO.eperson) }}
-            </a>
-          </td>
-          <td class="align-middle">
-            {{messagePrefix + '.table.email' | translate}}: {{ epersonDTO.eperson.email ? epersonDTO.eperson.email : '-' }}<br/>
-            {{messagePrefix + '.table.netid' | translate}}: {{ epersonDTO.eperson.netid ? epersonDTO.eperson.netid : '-' }}
-          </td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
-                      *ngIf="epersonDTO.ableToDelete"
-                      [disabled]="actionConfig.remove.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.remove.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
-                <i [ngClass]="actionConfig.remove.icon"></i>
-              </button>
-              <button *ngIf="!epersonDTO.ableToDelete"
-                      (click)="addMemberToGroup(epersonDTO.eperson)"
-                      [disabled]="actionConfig.add.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.add.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
-                <i [ngClass]="actionConfig.add.icon"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
+  @if ((ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0) {
+    <div class="alert alert-info w-100 mb-2"
+      role="alert">
+      {{messagePrefix + '.no-members-yet' | translate}}
     </div>
-
-  </ds-pagination>
-
-  <div *ngIf="(ePeopleMembersOfGroup | async) === undefined || (ePeopleMembersOfGroup | async)?.totalElements === 0" class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-members-yet' | translate}}
-  </div>
+  }
 
   <h3 id="search" class="border-bottom pb-2">
     <span
@@ -69,77 +76,81 @@
         iconPlacement: 'right',
         tooltipPlacement: ['top', 'right', 'bottom']
       }"
-    >
+      >
       {{messagePrefix + '.search.head' | translate}}
     </span>
   </h3>
 
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-    <div class="flex-grow-1 mr-3">
-      <div class="form-group input-group mr-3">
+    <div class="flex-grow-1 me-3">
+      <div class="form-group input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
-               class="form-control" aria-label="Search input">
+          class="form-control" aria-label="Search input">
         <span class="input-group-append">
-            <button type="submit" class="search-button btn btn-primary">
-              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}</button>
-        </span>
+          <button type="submit" class="search-button btn btn-primary">
+            <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}</button>
+          </span>
+        </div>
       </div>
-    </div>
-    <div>
-      <button (click)="clearFormAndResetResult();"
-              class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
-    </div>
-  </form>
+      <div>
+        <button (click)="clearFormAndResetResult();"
+        class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
+      </div>
+    </form>
 
-  <ds-pagination *ngIf="(ePeopleSearch | async)?.totalElements > 0"
-                 [paginationOptions]="configSearch"
-                 [collectionSize]="(ePeopleSearch | async)?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
+    @if ((ePeopleSearch | async)?.totalElements > 0) {
+      <ds-pagination
+        [paginationOptions]="configSearch"
+        [collectionSize]="(ePeopleSearch | async)?.totalElements"
+        [hideGear]="true"
+        [hidePagerWhenSinglePage]="true">
+        <div class="table-responsive">
+          <table id="epersonsSearch" class="table table-striped table-hover table-bordered">
+            <thead>
+              <tr>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+                <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
+                <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (eperson of (ePeopleSearch | async)?.page; track eperson) {
+                <tr>
+                  <td class="align-middle">{{eperson.id}}</td>
+                  <td class="align-middle">
+                    <a [routerLink]="getEPersonEditRoute(eperson.id)">
+                      {{ dsoNameService.getName(eperson) }}
+                    </a>
+                  </td>
+                  <td class="align-middle">
+                    {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}<br/>
+                    {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }}
+                  </td>
+                  <td class="align-middle">
+                    <div class="btn-group edit-field">
+                      <button (click)="addMemberToGroup(eperson)"
+                        [dsBtnDisabled]="actionConfig.add.disabled"
+                        [ngClass]="['btn btn-sm', actionConfig.add.css]"
+                        title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
+                        <i [ngClass]="actionConfig.add.icon"></i>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              }
+            </tbody>
+          </table>
+        </div>
+      </ds-pagination>
+    }
 
-    <div class="table-responsive">
-      <table id="epersonsSearch" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.identity' | translate}}</th>
-          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let eperson of (ePeopleSearch | async)?.page">
-          <td class="align-middle">{{eperson.id}}</td>
-          <td class="align-middle">
-            <a [routerLink]="getEPersonEditRoute(eperson.id)">
-              {{ dsoNameService.getName(eperson) }}
-            </a>
-          </td>
-          <td class="align-middle">
-            {{messagePrefix + '.table.email' | translate}}: {{ eperson.email ? eperson.email : '-' }}<br/>
-            {{messagePrefix + '.table.netid' | translate}}: {{ eperson.netid ? eperson.netid : '-' }}
-          </td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="addMemberToGroup(eperson)"
-                      [disabled]="actionConfig.add.disabled"
-                      [ngClass]="['btn btn-sm', actionConfig.add.css]"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
-                <i [ngClass]="actionConfig.add.icon"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
+    @if ((ePeopleSearch | async)?.totalElements === 0 && searchDone) {
+      <div
+        class="alert alert-info w-100 mb-2"
+        role="alert">
+        {{messagePrefix + '.no-items' | translate}}
+      </div>
+    }
 
-  </ds-pagination>
-
-  <div *ngIf="(ePeopleSearch | async)?.totalElements === 0 && searchDone"
-       class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-items' | translate}}
-  </div>
-
-</ng-container>
+  </ng-container>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
index 9b123ae447..737e08427b 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -54,6 +52,7 @@ import {
   getFirstCompletedRemoteData,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
@@ -108,11 +107,10 @@ export interface EPersonListActionConfig {
     ContextHelpDirective,
     ReactiveFormsModule,
     PaginationComponent,
-    NgIf,
     AsyncPipe,
     RouterLink,
     NgClass,
-    NgForOf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
index 66404bde0d..d09ab08c42 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
@@ -3,51 +3,56 @@
 
   <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
 
-  <ds-pagination *ngIf="(subGroups$ | async)?.payload?.totalElements > 0"
-                 [paginationOptions]="config"
-                 [collectionSize]="(subGroups$ | async)?.payload?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
-
-    <div class="table-responsive">
-      <table id="subgroupsOfGroup" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-          <th>{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let group of (subGroups$ | async)?.payload?.page">
-          <td class="align-middle">{{group.id}}</td>
-          <td class="align-middle">
-            <a (click)="groupDataService.startEditingNewGroup(group)"
-               [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
-            {{ dsoNameService.getName(group) }}
-          </a>
-          </td>
-          <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload)}}</td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="deleteSubgroupFromGroup(group)"
+  @if ((subGroups$ | async)?.payload?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="config"
+      [collectionSize]="(subGroups$ | async)?.payload?.totalElements"
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true">
+      <div class="table-responsive">
+        <table id="subgroupsOfGroup" class="table table-striped table-hover table-bordered">
+          <thead>
+            <tr>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+              <th>{{messagePrefix + '.table.edit' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (group of (subGroups$ | async)?.payload?.page; track group) {
+              <tr>
+                <td class="align-middle">{{group.id}}</td>
+                <td class="align-middle">
+                  <a (click)="groupDataService.startEditingNewGroup(group)"
+                    [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
+                    {{ dsoNameService.getName(group) }}
+                  </a>
+                </td>
+                <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload)}}</td>
+                <td class="align-middle">
+                  <div class="btn-group edit-field">
+                    <button (click)="deleteSubgroupFromGroup(group)"
                       class="btn btn-outline-danger btn-sm deleteButton"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(group) } }}">
-                <i class="fas fa-trash-alt fa-fw"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </ds-pagination>
+                      <i class="fas fa-trash-alt fa-fw"></i>
+                    </button>
+                  </div>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 
-  <div *ngIf="(subGroups$ | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-subgroups-yet' | translate}}
-  </div>
+  @if ((subGroups$ | async)?.payload?.totalElements === 0) {
+    <div class="alert alert-info w-100 mb-2"
+      role="alert">
+      {{messagePrefix + '.no-subgroups-yet' | translate}}
+    </div>
+  }
 
   <h4 id="search" class="border-bottom pb-2">
     <span *dsContextHelp="{
@@ -56,75 +61,80 @@
             iconPlacement: 'right',
             tooltipPlacement: ['top', 'right', 'bottom']
           }"
-    >
+      >
       {{messagePrefix + '.search.head' | translate}}
     </span>
 
   </h4>
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-    <div class="flex-grow-1 mr-3">
-      <div class="form-group input-group mr-3">
+    <div class="flex-grow-1 me-3">
+      <div class="mb-3 input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
-               class="form-control" aria-label="Search input">
+          class="form-control" aria-label="Search input">
         <span class="input-group-append">
-            <button type="submit" class="search-button btn btn-primary">
-              <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}
-            </button>
+          <button type="submit" class="search-button btn btn-primary">
+            <i class="fas fa-search"></i> {{ messagePrefix + '.search.button' | translate }}
+          </button>
         </span>
 
       </div>
     </div>
     <div>
-      <button (click)="clearFormAndResetResult();" class="btn btn-secondary float-right">
+      <button (click)="clearFormAndResetResult();" class="btn btn-secondary float-end">
         {{messagePrefix + '.button.see-all' | translate}}
       </button>
     </div>
   </form>
 
-  <ds-pagination *ngIf="(searchResults$ | async)?.payload?.totalElements > 0"
-                 [paginationOptions]="configSearch"
-                 [collectionSize]="(searchResults$ | async)?.payload?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true">
-
-    <div class="table-responsive">
-      <table id="groupsSearch" class="table table-striped table-hover table-bordered">
-        <thead>
-        <tr>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
-          <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
-          <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let group of (searchResults$ | async)?.payload?.page">
-          <td class="align-middle">{{group.id}}</td>
-          <td class="align-middle">
-            <a (click)="groupDataService.startEditingNewGroup(group)"
-               [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
-              {{ dsoNameService.getName(group) }}
-            </a>
-          </td>
-          <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload) }}</td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="addSubgroupToGroup(group)"
+  @if ((searchResults$ | async)?.payload?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="configSearch"
+      [collectionSize]="(searchResults$ | async)?.payload?.totalElements"
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true">
+      <div class="table-responsive">
+        <table id="groupsSearch" class="table table-striped table-hover table-bordered">
+          <thead>
+            <tr>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.id' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.name' | translate}}</th>
+              <th scope="col" class="align-middle">{{messagePrefix + '.table.collectionOrCommunity' | translate}}</th>
+              <th class="align-middle">{{messagePrefix + '.table.edit' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (group of (searchResults$ | async)?.payload?.page; track group) {
+              <tr>
+                <td class="align-middle">{{group.id}}</td>
+                <td class="align-middle">
+                  <a (click)="groupDataService.startEditingNewGroup(group)"
+                    [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">
+                    {{ dsoNameService.getName(group) }}
+                  </a>
+                </td>
+                <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload) }}</td>
+                <td class="align-middle">
+                  <div class="btn-group edit-field">
+                    <button (click)="addSubgroupToGroup(group)"
                       class="btn btn-outline-primary btn-sm addButton"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(group) } }}">
-                <i class="fas fa-plus fa-fw"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </ds-pagination>
+                      <i class="fas fa-plus fa-fw"></i>
+                    </button>
+                  </div>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 
-  <div *ngIf="(searchResults$ | async)?.payload?.totalElements === 0 && searchDone" class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-items' | translate}}
-  </div>
+  @if ((searchResults$ | async)?.payload?.totalElements === 0 && searchDone) {
+    <div class="alert alert-info w-100 mb-2"
+      role="alert">
+      {{messagePrefix + '.no-items' | translate}}
+    </div>
+  }
 
 </ng-container>
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
index 95c1b7f249..a42b56d6e2 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -65,12 +61,10 @@ enum SubKey {
   imports: [
     RouterLink,
     AsyncPipe,
-    NgForOf,
     ContextHelpDirective,
     TranslateModule,
     ReactiveFormsModule,
     PaginationComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index c2d998d954..510a156476 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -4,21 +4,21 @@
       <div class="d-flex justify-content-between border-bottom mb-3">
         <h1 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h1>
         <div>
-          <button class="mr-auto btn btn-success"
-                  [routerLink]="'create'">
+          <button class="me-auto btn btn-success"
+            [routerLink]="'create'">
             <i class="fas fa-plus"></i>
-            <span class="d-none d-sm-inline ml-1">{{messagePrefix + 'button.add' | translate}}</span>
+            <span class="d-none d-sm-inline ms-1">{{messagePrefix + 'button.add' | translate}}</span>
           </button>
         </div>
       </div>
 
       <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | translate}}</h2>
       <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
-        <div class="flex-grow-1 mr-3">
-          <div class="form-group input-group">
+        <div class="flex-grow-1 me-3">
+          <div class="mb-3 input-group">
             <input type="text" name="query" id="query" formControlName="query"
-                   class="form-control" [attr.aria-label]="messagePrefix + 'search.placeholder' | translate"
-                   [placeholder]="(messagePrefix + 'search.placeholder' | translate)" >
+              class="form-control" [attr.aria-label]="messagePrefix + 'search.placeholder' | translate"
+              [placeholder]="(messagePrefix + 'search.placeholder' | translate)" >
             <span class="input-group-append">
               <button type="submit" class="search-button btn btn-primary">
                 <i class="fas fa-search"></i> {{ messagePrefix + 'search.button' | translate }}
@@ -33,66 +33,78 @@
         </div>
       </form>
 
-      <ds-loading *ngIf="loading$ | async"></ds-loading>
-      <ds-pagination
-        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && (loading$ | async) !== true"
-        [paginationOptions]="config"
-        [collectionSize]="(pageInfoState$ | async)?.totalElements"
-        [hideGear]="true"
-        [hidePagerWhenSinglePage]="true">
+      @if (loading$ | async) {
+        <ds-loading></ds-loading>
+      }
+      @if ((pageInfoState$ | async)?.totalElements > 0 && (loading$ | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="config"
+          [collectionSize]="(pageInfoState$ | async)?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true">
+          <div  class="table-responsive">
+            <table id="groups" class="table table-striped table-hover table-bordered">
+              <thead>
+                <tr>
+                  <th scope="col">{{messagePrefix + 'table.id' | translate}}</th>
+                  <th scope="col">{{messagePrefix + 'table.name' | translate}}</th>
+                  <th scope="col">{{messagePrefix + 'table.collectionOrCommunity' | translate}}</th>
+                  <th scope="col">{{messagePrefix + 'table.members' | translate}}</th>
+                  <th>{{messagePrefix + 'table.edit' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (groupDto of (groupsDto$ | async)?.page; track groupDto) {
+                  <tr>
+                    <td>{{groupDto.group.id}}</td>
+                    <td>{{ dsoNameService.getName(groupDto.group) }}</td>
+                    <td>{{ dsoNameService.getName((groupDto.group.object | async)?.payload) }}</td>
+                    <td>{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}</td>
+                    <td>
+                      <div class="btn-group edit-field">
+                        @switch (groupDto.ableToEdit) {
+                          @case (true) {
+                            <button
+                              [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
+                              class="btn btn-outline-primary btn-sm btn-edit"
+                              title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: dsoNameService.getName(groupDto.group) } }}"
+                              >
+                              <i class="fas fa-edit fa-fw"></i>
+                            </button>
+                          }
+                          @case (false) {
+                            <button
+                              [dsBtnDisabled]="true"
+                              class="btn btn-outline-primary btn-sm btn-edit"
+                              placement="left"
+                              [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
+                              >
+                              <i class="fas fa-edit fa-fw"></i>
+                            </button>
+                          }
+                        }
+                        @if (!groupDto.group?.permanent && groupDto.ableToDelete) {
+                          <button
+                            (click)="deleteGroup(groupDto)" class="btn btn-outline-danger btn-sm btn-delete"
+                            title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: dsoNameService.getName(groupDto.group) } }}">
+                            <i class="fas fa-trash-alt fa-fw"></i>
+                          </button>
+                        }
+                      </div>
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
 
-        <div  class="table-responsive">
-          <table id="groups" class="table table-striped table-hover table-bordered">
-            <thead>
-            <tr>
-              <th scope="col">{{messagePrefix + 'table.id' | translate}}</th>
-              <th scope="col">{{messagePrefix + 'table.name' | translate}}</th>
-              <th scope="col">{{messagePrefix + 'table.collectionOrCommunity' | translate}}</th>
-              <th scope="col">{{messagePrefix + 'table.members' | translate}}</th>
-              <th>{{messagePrefix + 'table.edit' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let groupDto of (groupsDto$ | async)?.page">
-              <td>{{groupDto.group.id}}</td>
-              <td>{{ dsoNameService.getName(groupDto.group) }}</td>
-              <td>{{ dsoNameService.getName((groupDto.group.object | async)?.payload) }}</td>
-              <td>{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}</td>
-              <td>
-                <div class="btn-group edit-field">
-                  <ng-container [ngSwitch]="groupDto.ableToEdit">
-                    <button *ngSwitchCase="true"
-                      [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
-                      class="btn btn-outline-primary btn-sm btn-edit"
-                      title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: dsoNameService.getName(groupDto.group) } }}"
-                    >
-                      <i class="fas fa-edit fa-fw"></i>
-                    </button>
-                    <button *ngSwitchCase="false"
-                      [disabled]="true"
-                      class="btn btn-outline-primary btn-sm btn-edit"
-                      placement="left"
-                      [ngbTooltip]="'admin.access-control.epeople.table.edit.buttons.edit-disabled' | translate"
-                    >
-                      <i class="fas fa-edit fa-fw"></i>
-                    </button>
-                  </ng-container>
-                  <button *ngIf="!groupDto.group?.permanent && groupDto.ableToDelete"
-                          (click)="deleteGroup(groupDto)" class="btn btn-outline-danger btn-sm btn-delete"
-                          title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: dsoNameService.getName(groupDto.group) } }}">
-                    <i class="fas fa-trash-alt fa-fw"></i>
-                  </button>
-                </div>
-              </td>
-            </tr>
-            </tbody>
-          </table>
+      @if ((pageInfoState$ | async)?.totalElements === 0) {
+        <div class="alert alert-info w-100 mb-2" role="alert">
+          {{messagePrefix + 'no-items' | translate}}
         </div>
-      </ds-pagination>
-
-      <div *ngIf="(pageInfoState$ | async)?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{messagePrefix + 'no-items' | translate}}
-      </div>
+      }
 
     </div>
   </div>
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 43c72843e5..aaea59cead 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -50,6 +50,7 @@ import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   DSONameServiceMock,
   UNDEFINED_NAME,
@@ -208,6 +209,7 @@ describe('GroupsRegistryComponent', () => {
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot(),
         GroupsRegistryComponent,
+        BtnDisabledDirective,
       ],
       providers: [GroupsRegistryComponent,
         { provide: DSONameService, useValue: new DSONameServiceMock() },
@@ -278,7 +280,8 @@ describe('GroupsRegistryComponent', () => {
         const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
         expect(editButtonsFound.length).toEqual(2);
         editButtonsFound.forEach((editButtonFound) => {
-          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+          expect(editButtonFound.nativeElement.getAttribute('aria-disabled')).toBeNull();
+          expect(editButtonFound.nativeElement.classList.contains('disabled')).toBeFalse();
         });
       });
 
@@ -312,7 +315,8 @@ describe('GroupsRegistryComponent', () => {
         const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
         expect(editButtonsFound.length).toEqual(2);
         editButtonsFound.forEach((editButtonFound) => {
-          expect(editButtonFound.nativeElement.disabled).toBeFalse();
+          expect(editButtonFound.nativeElement.getAttribute('aria-disabled')).toBeNull();
+          expect(editButtonFound.nativeElement.classList.contains('disabled')).toBeFalse();
         });
       });
     });
@@ -331,7 +335,8 @@ describe('GroupsRegistryComponent', () => {
         const editButtonsFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(5) button.btn-edit'));
         expect(editButtonsFound.length).toEqual(2);
         editButtonsFound.forEach((editButtonFound) => {
-          expect(editButtonFound.nativeElement.disabled).toBeTrue();
+          expect(editButtonFound.nativeElement.getAttribute('aria-disabled')).toBe('true');
+          expect(editButtonFound.nativeElement.classList.contains('disabled')).toBeTrue();
         });
       });
     });
diff --git a/src/app/access-control/group-registry/groups-registry.component.ts b/src/app/access-control/group-registry/groups-registry.component.ts
index dec3dc955d..d3cf50ad4b 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -1,10 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-  NgSwitch,
-  NgSwitchCase,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -62,6 +56,7 @@ import {
   getRemoteDataPayload,
 } from '../../core/shared/operators';
 import { PageInfo } from '../../core/shared/page-info.model';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { hasValue } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -78,12 +73,9 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     RouterLink,
     ReactiveFormsModule,
     AsyncPipe,
-    NgIf,
     PaginationComponent,
-    NgSwitch,
-    NgSwitchCase,
     NgbTooltipModule,
-    NgForOf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
index c51ee7597c..38c6a1f349 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
@@ -1,14 +1,16 @@
 <div class="container">
   <h1 id="header">{{'admin.batch-import.page.header' | translate}}</h1>
   <p>{{'admin.batch-import.page.help' | translate}}</p>
-  <p *ngIf="dso">
-    selected collection: <b>{{getDspaceObjectName()}}</b>&nbsp;
-    <a href="javascript:void(0)" (click)="removeDspaceObject()">{{'admin.batch-import.page.remove' | translate}}</a>
-  </p>
+  @if (dso) {
+    <p>
+      selected collection: <b>{{getDspaceObjectName()}}</b>&nbsp;
+      <a href="javascript:void(0)" (click)="removeDspaceObject()">{{'admin.batch-import.page.remove' | translate}}</a>
+    </p>
+  }
   <p>
     <button class="btn btn-primary" (click)="this.selectCollection();">{{'admin.metadata-import.page.button.select-collection' | translate}}</button>
   </p>
-  <div class="form-group">
+  <div class="mb-3">
     <div class="form-check">
       <input class="form-check-input" type="checkbox" id="validateOnly" [(ngModel)]="validateOnly">
       <label class="form-check-label" for="validateOnly">
@@ -21,32 +23,35 @@
   </div>
 
   <ui-switch color="#ebebeb"
-             [checkedLabel]="'admin.metadata-import.page.toggle.upload' | translate"
-             [uncheckedLabel]="'admin.metadata-import.page.toggle.url' | translate"
-             [checked]="isUpload"
-             (change)="toggleUpload()" ></ui-switch>
-  <small class="form-text text-muted">
+    [checkedLabel]="'admin.metadata-import.page.toggle.upload' | translate"
+    [uncheckedLabel]="'admin.metadata-import.page.toggle.url' | translate"
+    [checked]="isUpload"
+  (change)="toggleUpload()" ></ui-switch>
+  <small class="form-text text-muted d-block">
     {{'admin.batch-import.page.toggle.help' | translate}}
   </small>
 
 
-  <ds-file-dropzone-no-uploader
-    *ngIf="isUpload"
-    data-test="file-dropzone"
-    (onFileAdded)="setFile($event)"
-    [dropMessageLabel]="'admin.batch-import.page.dropMsg'"
-    [dropMessageLabelReplacement]="'admin.batch-import.page.dropMsgReplace'">
-  </ds-file-dropzone-no-uploader>
+  @if (isUpload) {
+    <ds-file-dropzone-no-uploader
+      data-test="file-dropzone"
+      (onFileAdded)="setFile($event)"
+      [dropMessageLabel]="'admin.batch-import.page.dropMsg'"
+      [dropMessageLabelReplacement]="'admin.batch-import.page.dropMsgReplace'">
+    </ds-file-dropzone-no-uploader>
+  }
 
-  <div class="form-group mt-2" *ngIf="!isUpload">
-    <input class="form-control" type="text" placeholder="{{'admin.metadata-import.page.urlMsg' | translate}}"
-           data-test="file-url-input" [(ngModel)]="fileURL">
-  </div>
+  @if (!isUpload) {
+    <div class="mb-3 mt-2">
+      <input class="form-control" type="text" placeholder="{{'admin.metadata-import.page.urlMsg' | translate}}"
+        data-test="file-url-input" [(ngModel)]="fileURL">
+    </div>
+  }
 
   <div class="space-children-mr">
     <button class="btn btn-secondary" id="backButton"
-            (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
+    (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
     <button class="btn btn-primary" id="proceedButton"
-            (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
+    (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
index 1f54b801c8..d4a578411d 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  Location,
-  NgIf,
-} from '@angular/common';
+import { Location } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
@@ -36,7 +33,6 @@ import { FileDropzoneNoUploaderComponent } from '../../shared/upload/file-dropzo
   selector: 'ds-batch-import-page',
   templateUrl: './batch-import-page.component.html',
   imports: [
-    NgIf,
     TranslateModule,
     FormsModule,
     UiSwitchModule,
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index 73e69737ca..154e69d2c9 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <h1 id="header">{{'admin.metadata-import.page.header' | translate}}</h1>
   <p>{{'admin.metadata-import.page.help' | translate}}</p>
-  <div class="form-group">
+  <div class="mb-3">
     <div class="form-check">
       <input class="form-check-input" type="checkbox" id="validateOnly" [(ngModel)]="validateOnly">
       <label class="form-check-label" for="validateOnly">
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
index cff2757d0d..e07396c5e0 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -4,66 +4,74 @@
       <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translate) : ('ldn-edit-registered-service.title' | translate) }}</h1>
     </div>
     <!-- In the toggle section -->
-    <div class="toggle-switch-container" *ngIf="!isNewService">
-      <label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
-      <div>
-        <input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
-        <div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
-          <div class="slider"></div>
+    @if (!isNewService) {
+      <div class="toggle-switch-container">
+        <label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
+        <div>
+          <input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
+          <div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
+            <div class="slider"></div>
+          </div>
         </div>
       </div>
-    </div>
+    }
     <!-- In the Name section -->
     <div class="mb-5">
       <label for="name" class="font-weight-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
       <input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
-             [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
-             formControlName="name"
-             id="name"
-             name="name"
-             type="text">
-      <div *ngIf="formModel.get('name').invalid && formModel.get('name').touched" class="error-text">
-        {{ 'ldn-new-service.form.error.name' | translate }}
-      </div>
+        [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
+        formControlName="name"
+        id="name"
+        name="name"
+        type="text">
+      @if (formModel.get('name').invalid && formModel.get('name').touched) {
+        <div class="error-text">
+          {{ 'ldn-new-service.form.error.name' | translate }}
+        </div>
+      }
     </div>
 
     <!-- In the description section -->
     <div class="mb-5 mt-5 d-flex flex-column">
       <label for="description" class="font-weight-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
       <textarea [placeholder]="'ldn-new-service.form.placeholder.description' | translate"
-                class="form-control" formControlName="description" id="description" name="description"></textarea>
+      class="form-control" formControlName="description" id="description" name="description"></textarea>
     </div>
 
     <div class="mb-5 mt-5">
       <!-- In the url section -->
       <div class="d-flex align-items-center">
-        <div class="d-flex flex-column w-50 mr-2">
+        <div class="d-flex flex-column w-50 me-2">
           <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
           <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
-                 [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
-                 formControlName="url"
-                 id="url"
-                 name="url"
-                 type="text">
-          <div *ngIf="formModel.get('url').invalid && formModel.get('url').touched" class="error-text">
-            {{ 'ldn-new-service.form.error.url' | translate }}
-          </div>
+            [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
+            formControlName="url"
+            id="url"
+            name="url"
+            type="text">
+          @if (formModel.get('url').invalid && formModel.get('url').touched) {
+            <div class="error-text">
+              {{ 'ldn-new-service.form.error.url' | translate }}
+            </div>
+          }
         </div>
 
         <div class="d-flex flex-column w-50">
           <label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
           <input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
-                 [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
-                 id="score"
-                 name="score"
-                 min="0"
-                 max="1"
-                 step=".01"
-                 class="form-control"
-                 type="number">
-          <div *ngIf="formModel.get('score').invalid && formModel.get('score').touched" class="error-text">
-            {{ 'ldn-new-service.form.error.score' | translate }}
-          </div>
+            [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
+            id="score"
+            name="score"
+            min="0"
+            max="1"
+            step=".01"
+            class="form-control"
+            type="number">
+          @if (formModel.get('score').invalid && formModel.get('score').touched) {
+            <div class="error-text">
+              {{ 'ldn-new-service.form.error.score' | translate }}
+            </div>
+          }
         </div>
       </div>
     </div>
@@ -73,21 +81,23 @@
       <label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
       <div class="d-flex">
         <input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
-               [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control mr-2"
-               formControlName="lowerIp"
-               id="lowerIp"
-               name="lowerIp"
-               type="text">
+          [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
+          formControlName="lowerIp"
+          id="lowerIp"
+          name="lowerIp"
+          type="text">
         <input [class.invalid-field]="formModel.get('upperIp').invalid && formModel.get('upperIp').touched"
-               [placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
-               formControlName="upperIp"
-               id="upperIp"
-               name="upperIp"
-               type="text">
-      </div>
-      <div *ngIf="(formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)" class="error-text">
-        {{ 'ldn-new-service.form.error.ipRange' | translate }}
+          [placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
+          formControlName="upperIp"
+          id="upperIp"
+          name="upperIp"
+          type="text">
       </div>
+      @if ((formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)) {
+        <div class="error-text">
+          {{ 'ldn-new-service.form.error.ipRange' | translate }}
+        </div>
+      }
       <div class="text-muted">
         {{ 'ldn-new-service.form.hint.ipRange' | translate }}
       </div>
@@ -97,19 +107,25 @@
     <div class="mb-5 mt-5">
       <label for="ldnUrl" class="font-weight-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
       <input [class.invalid-field]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
-             [placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
-             formControlName="ldnUrl"
-             id="ldnUrl"
-             name="ldnUrl"
-             type="text">
-      <div *ngIf="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched" >
-        <div *ngIf="formModel.get('ldnUrl').errors['required']" class="error-text">
-          {{ 'ldn-new-service.form.error.ldnurl' | translate }}
+        [placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
+        formControlName="ldnUrl"
+        id="ldnUrl"
+        name="ldnUrl"
+        type="text">
+      @if (formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched) {
+        <div >
+          @if (formModel.get('ldnUrl').errors['required']) {
+            <div class="error-text">
+              {{ 'ldn-new-service.form.error.ldnurl' | translate }}
+            </div>
+          }
+          @if (formModel.get('ldnUrl').errors['ldnUrlAlreadyAssociated']) {
+            <div class="error-text">
+              {{ 'ldn-new-service.form.error.ldnurl.ldnUrlAlreadyAssociated' | translate }}
+            </div>
+          }
         </div>
-        <div *ngIf="formModel.get('ldnUrl').errors['ldnUrlAlreadyAssociated']" class="error-text">
-          {{ 'ldn-new-service.form.error.ldnurl.ldnUrlAlreadyAssociated' | translate }}
-        </div>
-      </div>
+      }
     </div>
 
     <!-- In the usesActorEmailId section -->
@@ -130,206 +146,219 @@
 
 
     <!-- In the Inbound Patterns Labels section -->
-    <div class="row mb-1 mt-5" *ngIf="areControlsInitialized">
-      <div class="col">
-        <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
-      </div>
-      <ng-container *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern">
+    @if (areControlsInitialized) {
+      <div class="row mb-1 mt-5">
         <div class="col">
-          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
+          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
         </div>
-        <div class="col-sm-1">
-          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
+        @if (formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern) {
+          <div class="col">
+            <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
+          </div>
+          <div class="col-sm-1">
+            <label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
+          </div>
+        }
+        <div class="col-sm-2">
         </div>
-      </ng-container>
-      <div class="col-sm-2">
       </div>
-    </div>
+    }
 
     <!-- In the Inbound Patterns section -->
-    <div *ngIf="areControlsInitialized">
-      <div *ngFor="let patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; let i = index"
-           [class.marked-for-deletion]="markedForDeletionInboundPattern.includes(i)"
-           formGroupName="notifyServiceInboundPatterns">
-
-        <ng-container [formGroupName]="i">
-
-
-          <div class="row mb-1 align-items-center">
-            <div class="col">
-              <div #inboundPatternDropdown="ngbDropdown" class="w-80" display="dynamic"
-                   id="additionalInboundPattern{{i}}"
-                   ngbDropdown placement="top-start">
-                <div class="position-relative right-addon" role="combobox"  aria-expanded="false" aria-controls="inboundPatternDropdownButton">
-                  <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
-                     ngbDropdownToggle></i>
-                  <input
-                    (click)="inboundPatternDropdown.open();"
-                    [readonly]="true"
-                    [value]="selectedInboundPatterns"
-                    class="form-control w-80 scrollable-dropdown-input"
-                    formControlName="patternLabel"
-                    id="inboundPatternDropdownButton"
-                    ngbDropdownAnchor
-                    type="text"
-                    [attr.aria-label]="'ldn-service-input-inbound-pattern-dropdown' | translate"
-                  />
-                  <div aria-labelledby="inboundPatternDropdownButton"
-                       class="dropdown-menu dropdown-menu-top w-100 "
-                       ngbDropdownMenu>
-                    <div class="scrollable-menu" role="listbox">
-                      <button (click)="selectInboundPattern(pattern, i); $event.stopPropagation()"
-                              *ngFor="let pattern of inboundPatterns; let internalIndex = index"
+    @if (areControlsInitialized) {
+      <div>
+        @for (patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; track patternGroup; let i = $index) {
+          <div
+            [class.marked-for-deletion]="markedForDeletionInboundPattern.includes(i)"
+            formGroupName="notifyServiceInboundPatterns">
+            <ng-container [formGroupName]="i">
+              <div class="row mb-1 align-items-center">
+                <div class="col">
+                  <div #inboundPatternDropdown="ngbDropdown" class="w-80" display="dynamic"
+                    id="additionalInboundPattern{{i}}"
+                    ngbDropdown placement="top-start">
+                    <div class="position-relative right-addon" role="combobox"  aria-expanded="false" aria-controls="inboundPatternDropdownButton">
+                      <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
+                      ngbDropdownToggle></i>
+                      <input
+                        (click)="inboundPatternDropdown.open();"
+                        [readonly]="true"
+                        [value]="selectedInboundPatterns"
+                        class="form-control w-80 scrollable-dropdown-input"
+                        formControlName="patternLabel"
+                        id="inboundPatternDropdownButton"
+                        ngbDropdownAnchor
+                        type="text"
+                        [attr.aria-label]="'ldn-service-input-inbound-pattern-dropdown' | translate"
+                        />
+                      <div aria-labelledby="inboundPatternDropdownButton"
+                        class="dropdown-menu dropdown-menu-top w-100 "
+                        ngbDropdownMenu>
+                        <div class="scrollable-menu" role="listbox">
+                          @for (pattern of inboundPatterns; track pattern; let internalIndex = $index) {
+                            <button (click)="selectInboundPattern(pattern, i); $event.stopPropagation()"
                               [title]="'ldn-service.form.pattern.' + pattern + '.description' | translate"
                               class="dropdown-item collection-item text-truncate w-100"
                               ngbDropdownItem
                               type="button">
-                        <div>{{ 'ldn-service.form.pattern.' + pattern + '.label' | translate }}</div>
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <div class="col">
-              <ng-container
-                *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern">
-                <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
-                     placement="top-start">
-                  <div class="position-relative right-addon" aria-expanded="false" aria-controls="inboundItemfilterDropdown" role="combobox">
-                    <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
-                       ngbDropdownToggle></i>
-                    <input
-                      [readonly]="true"
-                      class="form-control d-none w-100 scrollable-dropdown-input"
-                      formControlName="constraint"
-                      id="inboundItemfilterDropdown"
-                      ngbDropdownAnchor
-                      type="text"
-                      [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
-                    />
-                    <input
-                      (click)="inboundItemfilterDropdown.open();"
-                      [readonly]="true"
-                      class="form-control w-100 scrollable-dropdown-input"
-                      formControlName="constraintFormatted"
-                      id="inboundItemfilterDropdownPrettified"
-                      ngbDropdownAnchor
-                      type="text"
-                      [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
-                    />
-                    <div aria-labelledby="inboundItemfilterDropdownButton"
-                         class="dropdown-menu scrollable-dropdown-menu w-100 "
-                         ngbDropdownMenu>
-                      <div class="scrollable-menu" role="listbox">
-                        <button (click)="selectInboundItemFilter('', i); $event.stopPropagation()"
-                                class="dropdown-item collection-item text-truncate w-100" ngbDropdownItem type="button">
-                          <span> {{'ldn-service.control-constaint-select-none' | translate}} </span>
-                        </button>
-                        <button (click)="selectInboundItemFilter(constraint.id, i); $event.stopPropagation()"
-                                *ngFor="let constraint of (itemFiltersRD$ | async)?.payload?.page; let internalIndex = index"
-                                class="dropdown-item collection-item text-truncate w-100"
-                                ngbDropdownItem
-                                type="button">
-                          <div>{{ constraint.id + '.label' | translate }}</div>
-                        </button>
+                              <div>{{ 'ldn-service.form.pattern.' + pattern + '.label' | translate }}</div>
+                            </button>
+                          }
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
-              </ng-container>
-            </div>
-
-            <div
-              [style.visibility]="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern ? 'visible' : 'hidden'"
-              class="col-sm-1">
-              <input formControlName="automatic" hidden id="automatic{{i}}" name="automatic{{i}}"
-                     type="checkbox">
-              <div (click)="toggleAutomatic(i)"
-                   [class.checked]="formModel.get('notifyServiceInboundPatterns.' + i + '.automatic').value"
-                   class="toggle-switch">
-                <div class="slider"></div>
-              </div>
-            </div>
-
-
-            <div class="col-sm-2">
-              <div class="btn-group">
-                <button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button"
-                        [title]="'ldn-service-button-mark-inbound-deletion' | translate"
-                        type="button">
-                  <i class="fas fa-trash"></i>
-                </button>
-
-
-                <button (click)="unmarkForInboundPatternDeletion(i)"
-                        *ngIf="markedForDeletionInboundPattern.includes(i)"
+                <div class="col">
+                  @if (formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern) {
+                    <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
+                      placement="top-start">
+                      <div class="position-relative right-addon" aria-expanded="false" aria-controls="inboundItemfilterDropdown" role="combobox">
+                        <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
+                        ngbDropdownToggle></i>
+                        <input
+                          [readonly]="true"
+                          class="form-control d-none w-100 scrollable-dropdown-input"
+                          formControlName="constraint"
+                          id="inboundItemfilterDropdown"
+                          ngbDropdownAnchor
+                          type="text"
+                          [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
+                          />
+                        <input
+                          (click)="inboundItemfilterDropdown.open();"
+                          [readonly]="true"
+                          class="form-control w-100 scrollable-dropdown-input"
+                          formControlName="constraintFormatted"
+                          id="inboundItemfilterDropdownPrettified"
+                          ngbDropdownAnchor
+                          type="text"
+                          [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
+                          />
+                        <div aria-labelledby="inboundItemfilterDropdownButton"
+                          class="dropdown-menu scrollable-dropdown-menu w-100 "
+                          ngbDropdownMenu>
+                          <div class="scrollable-menu" role="listbox">
+                            <button (click)="selectInboundItemFilter('', i); $event.stopPropagation()"
+                              class="dropdown-item collection-item text-truncate w-100" ngbDropdownItem type="button">
+                              <span> {{'ldn-service.control-constaint-select-none' | translate}} </span>
+                            </button>
+                            @for (constraint of (itemFiltersRD$ | async)?.payload?.page; track constraint; let internalIndex = $index) {
+                              <button (click)="selectInboundItemFilter(constraint.id, i); $event.stopPropagation()"
+                                class="dropdown-item collection-item text-truncate w-100"
+                                ngbDropdownItem
+                                type="button">
+                                <div>{{ constraint.id + '.label' | translate }}</div>
+                              </button>
+                            }
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  }
+                </div>
+                <div
+                  [style.visibility]="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern ? 'visible' : 'hidden'"
+                  class="col-sm-1">
+                  <input formControlName="automatic" hidden id="automatic{{i}}" name="automatic{{i}}"
+                    type="checkbox">
+                  <div (click)="toggleAutomatic(i)"
+                    [class.checked]="formModel.get('notifyServiceInboundPatterns.' + i + '.automatic').value"
+                    class="toggle-switch">
+                    <div class="slider"></div>
+                  </div>
+                </div>
+                <div class="col-sm-2">
+                  <div class="btn-group">
+                    <button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button"
+                      [title]="'ldn-service-button-mark-inbound-deletion' | translate"
+                      type="button">
+                      <i class="fas fa-trash"></i>
+                    </button>
+                    @if (markedForDeletionInboundPattern.includes(i)) {
+                      <button (click)="unmarkForInboundPatternDeletion(i)"
                         [title]="'ldn-service-button-unmark-inbound-deletion' | translate"
                         class="btn btn-warning "
                         type="button">
-                  <i class="fas fa-undo"></i>
-                </button>
+                        <i class="fas fa-undo"></i>
+                      </button>
+                    }
+                  </div>
+                </div>
               </div>
-            </div>
+            </ng-container>
           </div>
-        </ng-container>
+        }
       </div>
-    </div>
+    }
 
     <span (click)="addInboundPattern()"
-          class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
+    class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
     <hr>
-    <div class="form-group row">
-      <div class="col text-right space-children-mr">
-        <ng-content select="[before]"></ng-content>
-        <button (click)="resetFormAndLeave()" class="btn btn-outline-secondary" type="button">
-          <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
-        </button>
-        <button class="btn btn-primary" type="submit">
-          <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
-        </button>
+      <div class="form-group row">
+        <div class="col text-right space-children-mr">
+          <ng-content select="[before]"></ng-content>
+          <button (click)="resetFormAndLeave()" class="btn btn-outline-secondary" type="button">
+            <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
+          </button>
+          <button class="btn btn-primary" type="submit">
+            <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
+          </button>
 
+        </div>
       </div>
-    </div>
-  </form>
-</div>
-<ng-template #confirmModal>
+    </form>
+  </div>
+  <ng-template #confirmModal>
     <div class="modal-header">
-      <h4 *ngIf="!isNewService">{{'service.overview.edit.modal' | translate }}</h4>
-      <h4 *ngIf="isNewService">{{'service.overview.create.modal' | translate }}</h4>
+      @if (!isNewService) {
+        <h4>{{'service.overview.edit.modal' | translate }}</h4>
+      }
+      @if (isNewService) {
+        <h4>{{'service.overview.create.modal' | translate }}</h4>
+      }
       <button (click)="closeModal()" aria-label="Close"
-              class="close" type="button">
+        class="close" type="button">
         <span aria-hidden="true">×</span>
       </button>
     </div>
 
     <div class="modal-body">
-      <div *ngIf="!isNewService">
-        {{ 'service.overview.edit.body' | translate }}
-      </div>
-      <span *ngIf="isNewService">
-        {{ 'service.overview.create.body' | translate }}
-      </span>
-    </div>
-      <div class="modal-footer">
-        <div *ngIf="!isNewService">
-          <button (click)="closeModal()" class="btn btn-outline-secondary mr-2"
-                  id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
-          </button>
-          <button *ngIf="!isNewService" (click)="patchService()"
-                  class="btn btn-primary">{{ 'service.detail.update' | translate }}
-          </button>
+      @if (!isNewService) {
+        <div>
+          {{ 'service.overview.edit.body' | translate }}
         </div>
-        <div *ngIf="isNewService">
-          <button (click)="closeModal()" class="btn btn-outline-secondary mr-2 "
-                  id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
+      }
+      @if (isNewService) {
+        <span>
+          {{ 'service.overview.create.body' | translate }}
+        </span>
+      }
+    </div>
+    <div class="modal-footer">
+      @if (!isNewService) {
+        <div>
+          <button (click)="closeModal()" class="btn btn-outline-secondary me-2"
+            id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
+          </button>
+          @if (!isNewService) {
+            <button (click)="patchService()"
+              class="btn btn-primary">{{ 'service.detail.update' | translate }}
+            </button>
+          }
+        </div>
+      }
+      @if (isNewService) {
+        <div>
+          <button (click)="closeModal()" class="btn btn-outline-secondary me-2 "
+            id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
           </button>
           <button (click)="createService()"
-                  class="btn btn-primary">{{ 'service.confirm.create' | translate }}
+            class="btn btn-primary">{{ 'service.confirm.create' | translate }}
           </button>
         </div>
-      </div>
-</ng-template>
+      }
+    </div>
+  </ng-template>
 
 
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
index b5c493da6b..ad3ed35439 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
@@ -5,11 +5,7 @@ import {
   transition,
   trigger,
 } from '@angular/animations';
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -77,9 +73,7 @@ import { notifyPatterns } from '../ldn-services-patterns/ldn-service-coar-patter
   imports: [
     ReactiveFormsModule,
     TranslateModule,
-    NgIf,
     NgbDropdownModule,
-    NgForOf,
     AsyncPipe,
   ],
 })
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
index 1c3dbe91f2..bd156cc0af 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
@@ -4,63 +4,67 @@
   </div>
   <div class="d-flex justify-content-end">
     <button class="btn btn-success" routerLink="/admin/ldn/services/new"><i
-      class="fas fa-plus pr-2"></i>{{ 'process.overview.new' | translate }}</button>
+    class="fas fa-plus pe-2"></i>{{ 'process.overview.new' | translate }}</button>
   </div>
-  <ds-pagination *ngIf="(ldnServicesRD$ | async)?.payload?.totalElements > 0"
-                 [collectionSize]="(ldnServicesRD$ | async)?.payload?.totalElements"
-                 [hideGear]="true"
-                 [hidePagerWhenSinglePage]="true"
-                 [paginationOptions]="pageConfig">
-    <div class="table-responsive">
-      <table class="table table-striped table-hover">
-        <thead>
-        <tr>
-          <th scope="col">{{ 'service.overview.table.name' | translate }}</th>
-          <th scope="col">{{ 'service.overview.table.description' | translate }}</th>
-          <th scope="col">{{ 'service.overview.table.status' | translate }}</th>
-          <th scope="col">{{ 'service.overview.table.actions' | translate }}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let ldnService of (ldnServicesRD$ | async)?.payload?.page">
-          <td class="col-3">{{ ldnService.name }}</td>
-          <td>
-            <ds-truncatable [id]="ldnService.id">
-              <ds-truncatable-part [id]="ldnService.id" [minLines]="2">
-                <div>
-                  {{ ldnService.description }}
-                </div>
-              </ds-truncatable-part>
-            </ds-truncatable>
-          </td>
-          <td>
-                        <span (click)="toggleStatus(ldnService, ldnServicesService)"
-                              [ngClass]="{ 'status-enabled': ldnService.enabled, 'status-disabled': !ldnService.enabled }"
-                              [title]="ldnService.enabled ? ('ldn-service.overview.table.clickToDisable' | translate) : ('ldn-service.overview.table.clickToEnable' | translate)"
-                              class="status-indicator">
-                            {{ ldnService.enabled ? ('ldn-service.overview.table.enabled' | translate) : ('ldn-service.overview.table.disabled' | translate) }}
-                        </span>
-          </td>
-          <td>
-            <div class="btn-group">
-              <button
-                (click)="selectServiceToDelete(ldnService.id)"
-                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
-                class="btn btn-outline-danger">
-                <i class="fas fa-trash"></i>
-              </button>
-              <button [routerLink]="['/admin/ldn/services/edit/', ldnService.id]"
+  @if ((ldnServicesRD$ | async)?.payload?.totalElements > 0) {
+    <ds-pagination
+      [collectionSize]="(ldnServicesRD$ | async)?.payload?.totalElements"
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true"
+      [paginationOptions]="pageConfig">
+      <div class="table-responsive">
+        <table class="table table-striped table-hover">
+          <thead>
+            <tr>
+              <th scope="col">{{ 'service.overview.table.name' | translate }}</th>
+              <th scope="col">{{ 'service.overview.table.description' | translate }}</th>
+              <th scope="col">{{ 'service.overview.table.status' | translate }}</th>
+              <th scope="col">{{ 'service.overview.table.actions' | translate }}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (ldnService of (ldnServicesRD$ | async)?.payload?.page; track ldnService) {
+              <tr>
+                <td class="col-3">{{ ldnService.name }}</td>
+                <td>
+                  <ds-truncatable [id]="ldnService.id">
+                    <ds-truncatable-part [id]="ldnService.id" [minLines]="2">
+                      <div>
+                        {{ ldnService.description }}
+                      </div>
+                    </ds-truncatable-part>
+                  </ds-truncatable>
+                </td>
+                <td>
+                  <span (click)="toggleStatus(ldnService, ldnServicesService)"
+                    [ngClass]="{ 'status-enabled': ldnService.enabled, 'status-disabled': !ldnService.enabled }"
+                    [title]="ldnService.enabled ? ('ldn-service.overview.table.clickToDisable' | translate) : ('ldn-service.overview.table.clickToEnable' | translate)"
+                    class="status-indicator">
+                    {{ ldnService.enabled ? ('ldn-service.overview.table.enabled' | translate) : ('ldn-service.overview.table.disabled' | translate) }}
+                  </span>
+                </td>
+                <td>
+                  <div class="btn-group">
+                    <button
+                      (click)="selectServiceToDelete(ldnService.id)"
+                      [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
+                      class="btn btn-outline-danger">
+                      <i class="fas fa-trash"></i>
+                    </button>
+                    <button [routerLink]="['/admin/ldn/services/edit/', ldnService.id]"
                       [attr.aria-label]="'ldn-service-overview-select-edit' | translate"
                       class="btn btn-outline-dark">
-                <i class="fas fa-edit"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </ds-pagination>
+                      <i class="fas fa-edit"></i>
+                    </button>
+                  </div>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 </div>
 
 <ng-template #deleteModal>
@@ -72,8 +76,8 @@
         <h4>{{'service.overview.delete.header' | translate }}</h4>
       </div>
       <button (click)="closeModal()" aria-label="Close"
-              [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
-              class="close" type="button">
+        [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
+        class="close" type="button">
         <span aria-hidden="true">×</span>
       </button>
     </div>
@@ -84,12 +88,12 @@
       </div>
       <div class="mt-4 text-right">
         <button (click)="closeModal()"
-                [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
-                class="btn btn-outline-secondary mr-2">{{ 'service.detail.delete.cancel' | translate }}</button>
+          [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
+        class="btn btn-outline-secondary me-2">{{ 'service.detail.delete.cancel' | translate }}</button>
         <button (click)="deleteSelected(this.selectedServiceId.toString(), ldnServicesService)"
-                class="btn btn-danger"
-                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
-                id="delete-confirm">{{ 'service.overview.delete' | translate }}
+          class="btn btn-danger"
+          [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
+          id="delete-confirm">{{ 'service.overview.delete' | translate }}
         </button>
       </div>
     </div>
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
index cc2cba4704..59f21bb14a 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -54,8 +52,6 @@ import { LdnService } from '../ldn-services-model/ldn-services.model';
   styleUrls: ['./ldn-services-directory.component.scss'],
   changeDetection: ChangeDetectionStrategy.Default,
   imports: [
-    NgIf,
-    NgFor,
     TranslateModule,
     AsyncPipe,
     PaginationComponent,
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
index 3adb7e857b..0e0183fe84 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -13,11 +13,13 @@
           </li>
           <li class="nav-item">
             <a class="nav-link" [routerLink]="'outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
-        </ul>
-        <div class="mt-2">
-          <ds-admin-notify-metrics *ngIf="(notifyMetricsRows$ | async)?.length" [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
+          </ul>
+          <div class="mt-2">
+            @if ((notifyMetricsRows$ | async)?.length) {
+              <ds-admin-notify-metrics [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
+            }
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
index 5508c18030..4fe93f4c86 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -46,7 +43,6 @@ import {
   imports: [
     AdminNotifyMetricsComponent,
     RouterLink,
-    NgIf,
     TranslateModule,
     AsyncPipe,
   ],
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
index 52d93cbb62..3760dc341d 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -5,12 +5,14 @@
   </button>
 </div>
 <div class="modal-body p-4">
-    <div *ngFor="let key of notifyMessageKeys">
+  @for (key of notifyMessageKeys; track key) {
+    <div>
       <div class="row mb-4">
         <div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
         <div class="col text-right">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
       </div>
     </div>
+  }
 
   <div class="d-flex justify-content-end">
     <button class="btn-primary" (click)="toggleCoarMessage()">
@@ -18,5 +20,7 @@
     </button>
   </div>
 
-  <pre @fadeIn [innerHTML]="notifyMessage.message" class="bg-secondary text-white mt-2 p-2" *ngIf="isCoarMessageVisible"></pre>
+  @if (isCoarMessageVisible) {
+    <pre @fadeIn [innerHTML]="notifyMessage.message" class="bg-secondary text-white mt-2 p-2"></pre>
+  }
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
index 717d24a9fc..1bd5eb9ec7 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -26,9 +23,7 @@ import { AdminNotifyMessage } from '../models/admin-notify-message.model';
   ],
   standalone: true,
   imports: [
-    NgForOf,
     TranslateModule,
-    NgIf,
   ],
 })
 /**
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
index 57ce83934c..ce394175c3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
@@ -3,10 +3,12 @@
     <div class="col-12 col-md-3 text-left h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}</div>
     <div class="col-md-9">
       <div class="h4">
-        <button (click)="resetDefaultConfiguration()" *ngIf="(selectedSearchConfig$ | async) !== defaultConfiguration" class="badge badge-primary mr-1 mb-1">
-          {{ 'admin-notify-logs.' + (selectedSearchConfig$ | async) | translate}}
-          <span> ×</span>
-        </button>
+        @if ((selectedSearchConfig$ | async) !== defaultConfiguration) {
+          <button (click)="resetDefaultConfiguration()" class="badge bg-primary me-1 mb-1">
+            {{ 'admin-notify-logs.' + (selectedSearchConfig$ | async) | translate}}
+            <span> ×</span>
+          </button>
+        }
       </div>
       <ds-search-labels [inPlaceSearch]="true"></ds-search-labels>
     </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
index 2c6164ecda..7aa1e63c56 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -39,7 +36,6 @@ import { ThemedSearchComponent } from '../../../../shared/search/themed-search.c
     ThemedSearchComponent,
     AsyncPipe,
     TranslateModule,
-    NgIf,
   ],
 })
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
index 3257bdd5ba..5c7910284f 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
@@ -1,9 +1,13 @@
-<div class="mb-5" *ngFor="let row of boxesConfig">
-  <div class="mb-2">{{ row.title | translate }}</div>
-  <div class="row justify-content-between">
-    <div class="col-sm" *ngFor="let box of row.boxes">
-      <ds-notification-box (selectedBoxConfig)="navigateToSelectedSearchConfig($event)" [boxConfig]="box"></ds-notification-box>
+@for (row of boxesConfig; track row) {
+  <div class="mb-5">
+    <div class="mb-2">{{ row.title | translate }}</div>
+    <div class="row justify-content-between">
+      @for (box of row.boxes; track box) {
+        <div class="col-sm">
+          <ds-notification-box (selectedBoxConfig)="navigateToSelectedSearchConfig($event)" [boxConfig]="box"></ds-notification-box>
+        </div>
+      }
     </div>
   </div>
-</div>
+}
 
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
index af5345f512..6519826ddf 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -17,7 +17,6 @@ import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
   imports: [
     NotificationBoxComponent,
     TranslateModule,
-    NgForOf,
   ],
 })
 /**
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index af540b094e..5c8360c726 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -11,41 +11,57 @@
       </tr>
     </thead>
     <tbody>
-      <tr *ngFor="let message of (messagesSubject$ | async)">
-        <td class="text-nowrap">
-          <div *ngIf="message.queueLastStartTime">{{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}</div>
-          <div *ngIf="!message.queueLastStartTime">n/a</div>
-        </td>
-        <td>
-          <ds-truncatable [id]="message.id">
-            <ds-truncatable-part [id]="message.id" [minLines]="2">
-              <a *ngIf="message.relatedItem" [routerLink]="'/items/' + (message.context || message.object)">{{ message.relatedItem }}</a>
-            </ds-truncatable-part>
-          </ds-truncatable>
-          <div *ngIf="!message.relatedItem">n/a</div>
-        </td>
-        <td>
-          <div *ngIf="message.ldnService">{{ message.ldnService }}</div>
-          <div *ngIf="!message.ldnService">n/a</div>
-        </td>
-        <td>
-          <div>{{ message.activityStreamType }}</div>
-        </td>
-        <td>
-          <div class="text-nowrap">{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}</div>
-        </td>
-        <td>
-          <div class="d-flex flex-column">
-            <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">{{ 'notify-message-result.detail' | translate }}</button>
-            <button *ngIf="message.queueStatusLabel !== reprocessStatus && validStatusesForReprocess.includes(message.queueStatusLabel)"
-                    (click)="reprocessMessage(message)"
-                    class="btn btn-warning"
-            >
-              {{ 'notify-message-result.reprocess' | translate }}
-            </button>
-          </div>
-        </td>
-      </tr>
+      @for (message of (messagesSubject$ | async); track message) {
+        <tr>
+          <td class="text-nowrap">
+            @if (message.queueLastStartTime) {
+              <div>{{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}</div>
+            }
+            @if (!message.queueLastStartTime) {
+              <div>n/a</div>
+            }
+          </td>
+          <td>
+            <ds-truncatable [id]="message.id">
+              <ds-truncatable-part [id]="message.id" [minLines]="2">
+                @if (message.relatedItem) {
+                  <a [routerLink]="'/items/' + (message.context || message.object)">{{ message.relatedItem }}</a>
+                }
+              </ds-truncatable-part>
+            </ds-truncatable>
+            @if (!message.relatedItem) {
+              <div>n/a</div>
+            }
+          </td>
+          <td>
+            @if (message.ldnService) {
+              <div>{{ message.ldnService }}</div>
+            }
+            @if (!message.ldnService) {
+              <div>n/a</div>
+            }
+          </td>
+          <td>
+            <div>{{ message.activityStreamType }}</div>
+          </td>
+          <td>
+            <div class="text-nowrap">{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}</div>
+          </td>
+          <td>
+            <div class="d-flex flex-column">
+              <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">{{ 'notify-message-result.detail' | translate }}</button>
+              @if (message.queueStatusLabel !== reprocessStatus && validStatusesForReprocess.includes(message.queueStatusLabel)) {
+                <button
+                  (click)="reprocessMessage(message)"
+                  class="btn btn-warning"
+                  >
+                  {{ 'notify-message-result.reprocess' | translate }}
+                </button>
+              }
+            </div>
+          </td>
+        </tr>
+      }
     </tbody>
   </table>
 </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
index f1c8d9ead6..ece05c30bb 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -42,8 +40,6 @@ import { AdminNotifyMessagesService } from '../services/admin-notify-messages.se
   standalone: true,
   imports: [
     TranslateModule,
-    NgForOf,
-    NgIf,
     DatePipe,
     AsyncPipe,
     TruncatableComponent,
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index ccdfd3dfec..c063384389 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -8,51 +8,62 @@
       <p id="create-new" class="mb-2"><a [routerLink]="'add'" class="btn btn-success">{{'admin.registries.bitstream-formats.create.new' | translate}}</a></p>
 
 
-      <ds-pagination
-        *ngIf="(bitstreamFormats$ | async)?.payload?.totalElements > 0"
-        [paginationOptions]="pageConfig"
-        [collectionSize]="(bitstreamFormats$ | async)?.payload?.totalElements"
-        [hideGear]="false"
-        [hidePagerWhenSinglePage]="true">
-        <div class="table-responsive">
-          <table id="formats" class="table table-striped table-hover">
-            <thead>
-            <tr>
-              <th scope="col"><span class="sr-only">{{'admin.registries.bitstream-formats.table.selected' | translate}}</span></th>
-              <th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
-              <th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
-              <th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
-              <th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
-            </tr>
-            </thead>
-            <tbody>
-            <tr *ngFor="let bitstreamFormat of (bitstreamFormats$ | async)?.payload?.page">
-              <td>
-                <label class="mb-0">
-                  <input type="checkbox"
-                         [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"
-                         [checked]="(selectedBitstreamFormatIDs$ | async)?.includes(bitstreamFormat.id)"
-                         (change)="selectBitStreamFormat(bitstreamFormat, $event)"
-                  >
-                  <span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}&#125;</span>
-                </label>
-              </td>
-              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
-              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
-              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.mimetype}} <span *ngIf="bitstreamFormat.internal">({{'admin.registries.bitstream-formats.table.internal' | translate}})</span></a></td>
-              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
-            </tr>
-            </tbody>
-          </table>
+      @if ((bitstreamFormats$ | async)?.payload?.totalElements > 0) {
+        <ds-pagination
+          [paginationOptions]="pageConfig"
+          [collectionSize]="(bitstreamFormats$ | async)?.payload?.totalElements"
+          [hideGear]="false"
+          [hidePagerWhenSinglePage]="true">
+          <div class="table-responsive">
+            <table id="formats" class="table table-striped table-hover">
+              <thead>
+                <tr>
+                  <th scope="col"><span class="sr-only">{{'admin.registries.bitstream-formats.table.selected' | translate}}</span></th>
+                  <th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
+                  <th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
+                  <th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
+                  <th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (bitstreamFormat of (bitstreamFormats$ | async)?.payload?.page; track bitstreamFormat) {
+                  <tr>
+                    <td>
+                      <label class="form-label mb-0">
+                        <input type="checkbox"
+                          [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"
+                          [checked]="(selectedBitstreamFormatIDs$ | async)?.includes(bitstreamFormat.id)"
+                          (change)="selectBitStreamFormat(bitstreamFormat, $event)"
+                          >
+                        <span class="sr-only">{{'admin.registries.bitstream-formats.select' | translate}}&#125;</span>
+                      </label>
+                    </td>
+                    <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
+                    <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
+                    <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.mimetype}} @if (bitstreamFormat.internal) {
+                      <span>({{'admin.registries.bitstream-formats.table.internal' | translate}})</span>
+                    }</a></td>
+                    <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
+      @if ((bitstreamFormats$ | async)?.payload?.totalElements === 0) {
+        <div class="alert alert-info" role="alert">
+          {{'admin.registries.bitstream-formats.no-items' | translate}}
         </div>
-      </ds-pagination>
-      <div *ngIf="(bitstreamFormats$ | async)?.payload?.totalElements === 0" class="alert alert-info" role="alert">
-        {{'admin.registries.bitstream-formats.no-items' | translate}}
-      </div>
+      }
 
       <div>
-        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
-        <button *ngIf="(bitstreamFormats$ | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
+        @if ((bitstreamFormats$ | async)?.payload?.page?.length > 0) {
+          <button class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
+        }
+        @if ((bitstreamFormats$ | async)?.payload?.page?.length > 0) {
+          <button type="submit" class="btn btn-danger float-end" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
+        }
       </div>
     </div>
   </div>
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
index 74869670c5..bc0f76ea17 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -41,12 +37,10 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
   selector: 'ds-bitstream-formats',
   templateUrl: './bitstream-formats.component.html',
   imports: [
-    NgIf,
     AsyncPipe,
     RouterLink,
     TranslateModule,
     PaginationComponent,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
index be6ebf2599..7403623747 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.html
@@ -1,3 +1,5 @@
-<ds-form *ngIf="formModel"
-         [formId]="'comcol-form-id'"
-         [formModel]="formModel" (submitForm)="onSubmit()" (cancel)="onCancel()"></ds-form>
\ No newline at end of file
+@if (formModel) {
+  <ds-form
+    [formId]="'comcol-form-id'"
+  [formModel]="formModel" (submitForm)="onSubmit()" (cancel)="onCancel()"></ds-form>
+}
\ No newline at end of file
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index 37ae0d1dc0..59fa50ee5b 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -35,7 +35,6 @@ import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-p
   templateUrl: './format-form.component.html',
   imports: [
     FormComponent,
-    NgIf,
   ],
   standalone: true,
 })
@@ -64,7 +63,7 @@ export class FormatFormComponent implements OnInit {
    */
   arrayElementLayout: DynamicFormControlLayout = {
     grid: {
-      group: 'form-row',
+      group: 'row',
     },
   };
 
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index 8b3c6fe972..73072b6104 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -1,60 +1,65 @@
 <div class="container">
-    <div class="metadata-registry row">
-        <div class="col-12">
+  <div class="metadata-registry row">
+    <div class="col-12">
 
-            <h1 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h1>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h1>
 
-            <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
+      <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
-            <ds-metadata-schema-form (submitForm)="forceUpdateSchemas()"></ds-metadata-schema-form>
+      <ds-metadata-schema-form (submitForm)="forceUpdateSchemas()"></ds-metadata-schema-form>
 
-            <ds-pagination
-                    *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
-                    [paginationOptions]="config"
-                    [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
-                    [hideGear]="true"
-                    [hidePagerWhenSinglePage]="true">
-
-                <div class="table-responsive">
-                    <table id="metadata-schemas" class="table table-striped table-hover">
-                        <thead>
-                        <tr>
-                            <th scope="col"><span class="sr-only">{{'admin.registries.metadata.schemas.table.selected' | translate}}</span></th>
-                            <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
-                            <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
-                            <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
-                            [ngClass]="{'table-primary' : (activeMetadataSchema$ | async)?.id === schema.id}">
-                            <td>
-                                <label class="mb-0">
-                                    <input type="checkbox"
-                                           [checked]="(selectedMetadataSchemaIDs$ | async)?.includes(schema.id)"
-                                           (change)="selectMetadataSchema(schema, $event)"
-                                    >
-                                    <span class="sr-only">{{(((selectedMetadataSchemaIDs$ | async)?.includes(schema.id)) ? 'admin.registries.metadata.schemas.deselect' : 'admin.registries.metadata.schemas.select') | translate}}</span>
-                                </label>
-                            </td>
-                            <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
-                            <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.namespace}}</a></td>
-                            <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.prefix}}</a></td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-
-            </ds-pagination>
-
-            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-              {{'admin.registries.metadata.schemas.no-items' | translate}}
-            </div>
-
-            <div>
-              <button *ngIf="(metadataSchemas | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
-            </div>
+      @if ((metadataSchemas | async)?.payload?.totalElements > 0) {
+        <ds-pagination
+          [paginationOptions]="config"
+          [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
+          [hideGear]="true"
+          [hidePagerWhenSinglePage]="true">
+          <div class="table-responsive">
+            <table id="metadata-schemas" class="table table-striped table-hover">
+              <thead>
+                <tr>
+                  <th scope="col"><span class="sr-only">{{'admin.registries.metadata.schemas.table.selected' | translate}}</span></th>
+                  <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
+                  <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
+                  <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (schema of (metadataSchemas | async)?.payload?.page; track schema) {
+                  <tr
+                    [ngClass]="{'table-primary' : (activeMetadataSchema$ | async)?.id === schema.id}">
+                    <td>
+                      <label class="form-label mb-0">
+                        <input type="checkbox"
+                          [checked]="(selectedMetadataSchemaIDs$ | async)?.includes(schema.id)"
+                          (change)="selectMetadataSchema(schema, $event)"
+                          >
+                        <span class="sr-only">{{(((selectedMetadataSchemaIDs$ | async)?.includes(schema.id)) ? 'admin.registries.metadata.schemas.deselect' : 'admin.registries.metadata.schemas.select') | translate}}</span>
+                      </label>
+                    </td>
+                    <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
+                    <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.namespace}}</a></td>
+                    <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.prefix}}</a></td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
 
+      @if ((metadataSchemas | async)?.payload?.totalElements === 0) {
+        <div class="alert alert-info w-100 mb-2" role="alert">
+          {{'admin.registries.metadata.schemas.no-items' | translate}}
         </div>
+      }
+
+      <div>
+        @if ((metadataSchemas | async)?.payload?.page?.length > 0) {
+          <button type="submit" class="btn btn-danger float-end" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
+        }
+      </div>
+
     </div>
+  </div>
 </div>
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
index be1239ab95..8e5adeddf7 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -49,8 +47,6 @@ import { MetadataSchemaFormComponent } from './metadata-schema-form/metadata-sch
     TranslateModule,
     AsyncPipe,
     PaginationComponent,
-    NgIf,
-    NgForOf,
     NgClass,
     RouterLink,
   ],
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
index 15cc81d9ca..343e107e01 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -1,18 +1,16 @@
-<div *ngIf="activeMetadataSchema$ | async; then editheader; else createHeader"></div>
+@if (activeMetadataSchema$ | async) {
+  <h2>{{messagePrefix + '.edit' | translate}}</h2>
+} @else {
+  <h2>{{messagePrefix + '.create' | translate}}</h2>
+}
 
-<ng-template #createHeader>
-    <h2>{{messagePrefix + '.create' | translate}}</h2>
-</ng-template>
 
-<ng-template #editheader>
-    <h2>{{messagePrefix + '.edit' | translate}}</h2>
-</ng-template>
 
 <ds-form [formId]="formId"
-         [formModel]="formModel"
-         [formGroup]="formGroup"
-         [formLayout]="formLayout"
-         (cancel)="onCancel()"
-         (submitForm)="onSubmit()">
+  [formModel]="formModel"
+  [formGroup]="formGroup"
+  [formLayout]="formLayout"
+  (cancel)="onCancel()"
+  (submitForm)="onSubmit()">
 
 </ds-form>
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index c58c4bef10..139f711920 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -39,7 +36,6 @@ import { FormComponent } from '../../../../shared/form/form.component';
   selector: 'ds-metadata-schema-form',
   templateUrl: './metadata-schema-form.component.html',
   imports: [
-    NgIf,
     AsyncPipe,
     TranslateModule,
     FormComponent,
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
index 44b6bfb697..c799d87b26 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
@@ -1,18 +1,16 @@
-<div *ngIf="registryService.getActiveMetadataField() | async; then editheader; else createHeader"></div>
+@if (registryService.getActiveMetadataField() | async) {
+  <h2>{{messagePrefix + '.edit' | translate}}</h2>
+} @else {
+  <h2>{{messagePrefix + '.create' | translate}}</h2>
+}
 
-<ng-template #createHeader>
-    <h2>{{messagePrefix + '.create' | translate}}</h2>
-</ng-template>
 
-<ng-template #editheader>
-    <h2>{{messagePrefix + '.edit' | translate}}</h2>
-</ng-template>
 
 <ds-form [formId]="formId"
-         [formModel]="formModel"
-         [formLayout]="formLayout"
-         [formGroup]="formGroup"
-         (cancel)="onCancel()"
-         (submit)="onSubmit()">
+  [formModel]="formModel"
+  [formLayout]="formLayout"
+  [formGroup]="formGroup"
+  (cancel)="onCancel()"
+  (submit)="onSubmit()">
 
 </ds-form>
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index bfadd018ef..63f93961be 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -35,7 +32,6 @@ import { FormComponent } from '../../../../shared/form/form.component';
   selector: 'ds-metadata-field-form',
   templateUrl: './metadata-field-form.component.html',
   imports: [
-    NgIf,
     FormComponent,
     TranslateModule,
     AsyncPipe,
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 288266fb75..438b37d3aa 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -8,52 +8,59 @@
 
       <ds-metadata-field-form
         [metadataSchema]="schema"
-        (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
+      (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
 
       <h2>{{'admin.registries.schema.fields.head' | translate}}</h2>
 
       <ng-container *ngVar="(metadataFields$ | async)?.payload as fields">
-        <ds-pagination
-          *ngIf="fields?.totalElements > 0"
-          [paginationOptions]="config"
-          [collectionSize]="fields?.totalElements"
-          [hideGear]="false"
-          [hidePagerWhenSinglePage]="true">
-          <div class="table-responsive">
-            <table id="metadata-fields" class="table table-striped table-hover">
-              <thead>
-              <tr>
-                <th><span class="sr-only">{{'admin.registries.schema.fields.table.selected' | translate}}</span></th>
-                <th scope="col">{{'admin.registries.schema.fields.table.id' | translate}}</th>
-                <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
-                <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-              <tr *ngFor="let field of fields?.page"
-                  [ngClass]="{'table-primary' : (activeField$ | async)?.id === field.id}">
-                <td *ngVar="(selectedMetadataFieldIDs$ | async)?.includes(field.id) as selected">
-                  <input type="checkbox"
-                         [attr.aria-label]="(selected ? 'admin.registries.schema.fields.deselect' : 'admin.registries.schema.fields.select') | translate"
-                         [checked]="selected"
-                         (change)="selectMetadataField(field, $event)">
-                </td>
-                <td class="selectable-row" (click)="editField(field)">{{field.id}}</td>
-                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}</td>
-                <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
-              </tr>
-              </tbody>
-            </table>
-          </div>
-        </ds-pagination>
+        @if (fields?.totalElements > 0) {
+          <ds-pagination
+            [paginationOptions]="config"
+            [collectionSize]="fields?.totalElements"
+            [hideGear]="false"
+            [hidePagerWhenSinglePage]="true">
+            <div class="table-responsive">
+              <table id="metadata-fields" class="table table-striped table-hover">
+                <thead>
+                  <tr>
+                    <th><span class="sr-only">{{'admin.registries.schema.fields.table.selected' | translate}}</span></th>
+                    <th scope="col">{{'admin.registries.schema.fields.table.id' | translate}}</th>
+                    <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
+                    <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (field of fields?.page; track field) {
+                    <tr
+                      [ngClass]="{'table-primary' : (activeField$ | async)?.id === field.id}">
+                      <td *ngVar="(selectedMetadataFieldIDs$ | async)?.includes(field.id) as selected">
+                        <input type="checkbox"
+                          [attr.aria-label]="(selected ? 'admin.registries.schema.fields.deselect' : 'admin.registries.schema.fields.select') | translate"
+                          [checked]="selected"
+                          (change)="selectMetadataField(field, $event)">
+                      </td>
+                      <td class="selectable-row" (click)="editField(field)">{{field.id}}</td>
+                      <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}{{field.qualifier ? '.' + field.qualifier : ''}}</td>
+                      <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            </div>
+          </ds-pagination>
+        }
 
-        <div *ngIf="fields?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
-          {{'admin.registries.schema.fields.no-items' | translate}}
-        </div>
+        @if (fields?.totalElements === 0) {
+          <div class="alert alert-info w-100 mb-2" role="alert">
+            {{'admin.registries.schema.fields.no-items' | translate}}
+          </div>
+        }
 
         <div>
           <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
-          <button *ngIf="fields?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+          @if (fields?.page?.length > 0) {
+            <button type="submit" class="btn btn-danger float-end" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+          }
         </div>
       </ng-container>
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
index ec5d6b4cb0..52f927073f 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -59,8 +57,6 @@ import { MetadataFieldFormComponent } from './metadata-field-form/metadata-field
     MetadataFieldFormComponent,
     TranslateModule,
     PaginationComponent,
-    NgIf,
-    NgForOf,
     NgClass,
     RouterLink,
   ],
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
index 5199a115a6..c696fa23ba 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
@@ -1,64 +1,72 @@
 <div class="container">
-    <div class="metadata-registry row">
-        <div class="col-12">
+  <div class="metadata-registry row">
+    <div class="col-12">
 
-            <h1 id="header" class="border-bottom pb-2">{{ "admin.reports.collections.head" | translate }}</h1>
+      <h1 id="header" class="border-bottom pb-2">{{ "admin.reports.collections.head" | translate }}</h1>
 
-            <div id="metadatadiv">
-                <ngb-accordion [closeOthers]="true" activeIds="filters" #acc="ngbAccordion">
-                    <ngb-panel id="filters">
-                        <ng-template ngbPanelTitle>
-                          {{ "admin.reports.commons.filters" | translate }}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <div class="container">
-                                <div class="row">
-                                    <span class="col-3"></span>
-                                    <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
-                                </div>
-                                <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
-                                <div class="row">
-                                    <span class="col-3"></span>
-                                    <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
-                                </div>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="collections">
-                        <ng-template ngbPanelTitle>
-                          {{ "admin.reports.collections.collections-report" | translate }}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <table id="table" class="table table-striped">
-                                <thead>
-                                    <tr class="header">
-                                        <th rowspan="2">{{ "admin.reports.collections.community" | translate }}</th>
-                                        <th rowspan="2">{{ "admin.reports.collections.collection" | translate }}</th>
-                                        <th>{{ "admin.reports.collections.nb_items" | translate }}</th>
-                                        <th>{{ "admin.reports.collections.match_all_selected_filters" | translate }}</th>
-                                        <th *ngFor="let filter of results.summary.values | keyvalue">{{ ("admin.reports.commons.filters." + getGroup(filter.key) + "." + filter.key) | translate }}</th>
-                                    </tr>
-                                    <tr class="header">
-                                        <th class="num">{{ results.summary.nbTotalItems }}</th>
-                                        <th class="num">{{ results.summary.allFiltersValue }}</th>
-                                        <th class="num" *ngFor="let filter of results.summary.values | keyvalue">{{ filter.value }}</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr *ngFor="let coll of results.collections">
-                                        <td><a href="/handle/{{ coll.communityHandle }}" rel="noopener noreferrer" target="_blank">{{ coll.communityLabel }}</a></td>
-                                        <td><a href="/handle/{{ coll.handle }}" rel="noopener noreferrer" target="_blank">{{ coll.label }}</a></td>
-                                        <td class="num">{{ coll.nbTotalItems }}</td>
-                                        <td class="num">{{ coll.allFiltersValue }}</td>
-                                        <td class="num" *ngFor="let filter of results.summary.values | keyvalue">{{ coll.values[filter.key] || 0 }}</td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </ng-template>
-                    </ngb-panel>
-                </ngb-accordion>
-            </div>
+      <div id="metadatadiv">
+        <ngb-accordion [closeOthers]="true" activeIds="filters" #acc="ngbAccordion">
+          <ngb-panel id="filters">
+            <ng-template ngbPanelTitle>
+              {{ "admin.reports.commons.filters" | translate }}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <div class="container">
+                <div class="row">
+                  <span class="col-3"></span>
+                  <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                </div>
+                <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
+                <div class="row">
+                  <span class="col-3"></span>
+                  <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                </div>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="collections">
+            <ng-template ngbPanelTitle>
+              {{ "admin.reports.collections.collections-report" | translate }}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <table id="table" class="table table-striped">
+                <thead>
+                  <tr class="header">
+                    <th rowspan="2">{{ "admin.reports.collections.community" | translate }}</th>
+                    <th rowspan="2">{{ "admin.reports.collections.collection" | translate }}</th>
+                    <th>{{ "admin.reports.collections.nb_items" | translate }}</th>
+                    <th>{{ "admin.reports.collections.match_all_selected_filters" | translate }}</th>
+                    @for (filter of results.summary.values | keyvalue; track filter) {
+                      <th>{{ ("admin.reports.commons.filters." + getGroup(filter.key) + "." + filter.key) | translate }}</th>
+                    }
+                  </tr>
+                  <tr class="header">
+                    <th class="num">{{ results.summary.nbTotalItems }}</th>
+                    <th class="num">{{ results.summary.allFiltersValue }}</th>
+                    @for (filter of results.summary.values | keyvalue; track filter) {
+                      <th class="num">{{ filter.value }}</th>
+                    }
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (coll of results.collections; track coll) {
+                    <tr>
+                      <td><a href="/handle/{{ coll.communityHandle }}" rel="noopener noreferrer" target="_blank">{{ coll.communityLabel }}</a></td>
+                      <td><a href="/handle/{{ coll.handle }}" rel="noopener noreferrer" target="_blank">{{ coll.label }}</a></td>
+                      <td class="num">{{ coll.nbTotalItems }}</td>
+                      <td class="num">{{ coll.allFiltersValue }}</td>
+                      @for (filter of results.summary.values | keyvalue; track filter) {
+                        <td class="num">{{ coll.values[filter.key] || 0 }}</td>
+                      }
+                    </tr>
+                  }
+                </tbody>
+              </table>
+            </ng-template>
+          </ngb-panel>
+        </ngb-accordion>
+      </div>
 
-        </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
index dff6445225..ae4df271ae 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
@@ -1,4 +1,8 @@
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
@@ -39,22 +43,21 @@ describe('FiltersComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [
-        NgbAccordionModule,
+      schemas: [NO_ERRORS_SCHEMA],
+      imports: [NgbAccordionModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
             useClass: TranslateLoaderMock,
           },
         }),
-        HttpClientTestingModule,
-        FilteredCollectionsComponent,
-      ],
+        FilteredCollectionsComponent],
       providers: [
         FormBuilder,
         DspaceRestService,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
-      schemas: [NO_ERRORS_SCHEMA],
     });
   }));
 
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
index e1f54bd8d3..85924dd82f 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -1,7 +1,4 @@
-import {
-  KeyValuePipe,
-  NgForOf,
-} from '@angular/common';
+import { KeyValuePipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -37,7 +34,6 @@ import { FilteredCollections } from './filtered-collections.model';
     NgbAccordionModule,
     FiltersComponent,
     KeyValuePipe,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
index b5bc55f6ff..b12a7967c8 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
@@ -1,8 +1,10 @@
 import { Item } from 'src/app/core/shared/item.model';
 
+import { Collection } from '../../../core/shared/collection.model';
+
 export class FilteredItems {
 
-  public items: Item[] = [];
+  public items: FilteredItem[] = [];
   public itemCount: number;
 
   public clear() {
@@ -21,3 +23,8 @@ export class FilteredItems {
   }
 
 }
+
+export interface FilteredItem extends Omit<Item, 'owningCollection'> {
+  index: number;
+  owningCollection?: Collection;
+}
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index 4b6679bdbc..6b67a12769 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -1,175 +1,201 @@
 <div class="container">
-    <div class="metadata-registry row">
-        <div class="col-12">
+  <div class="metadata-registry row">
+    <div class="col-12">
 
-            <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | translate}}</h1>
+      <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | translate}}</h1>
 
-            <div id="querydiv" [formGroup]="queryForm">
-                <ngb-accordion [closeOthers]="true" activeIds="collectionSelector" #acc="ngbAccordion">
-                    <ngb-panel id="collectionSelector">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.items.section.collectionSelector' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
-                                <option *ngFor="let item of collections" [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
-                            </select>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="metadataFieldQueries">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.items.section.metadataFieldQueries' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <fieldset id="predefqueries" class="form-group">
-                                <label>
-                                    {{'admin.reports.items.predefinedQueries' | translate}}
-                                </label>
-                                <select id="predefselect" formControlName="presetQuery" class="form-control" (change)="setPresetQuery()">
-                                    <option *ngFor="let item of presetQueries" [value]="item.id" [selected]="item.isDefault">{{item.label | translate}}</option>
-                                </select>
-                            </fieldset>
-                            <div class="row">&nbsp;</div>
-                            <div id="queries">
-                                <div class="metadata" *ngFor="let pred of queryPredicatesArray().controls; let i = index">
-                                    <div [formGroup]="pred" class="form-group">
-                                        <div class="form-row">
-                                            <div class="col-4">
-                                                <select class="query-tool" formControlName="field" class="form-control">
-                                                    <option *ngFor="let item of metadataFieldsWithAny" [value]="item.id">{{item.name$ | async}}</option>
-                                                </select>
-                                            </div>
-                                            <div class="col-auto">
-                                                <select class="query-tool" formControlName="operator" class="form-control">
-                                                    <option *ngFor="let item of predicates" [value]="item.id">{{item.name$ | async | translate}}</option>
-                                                </select>
-                                            </div>
-                                            <div class="col">
-                                                <input class="form-control" formControlName="value"/>
-                                            </div>
-                                            <div class="col-auto">
-                                                <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
-                                                &nbsp;
-                                                <button class="btn btn-light" [disabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="limitPaginateQueries">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.items.section.limitPaginateQueries' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <div class="row align-items-center">
-                                <label for="limit" class="col-sm-2 col-form-label">{{'admin.reports.items.limit' | translate}}:</label>
-                                <div class="col-6">
-                                    <select id="limit" name="limit" formControlName="pageLimit" class="form-control col-6">
-                                        <option *ngFor="let item of pageLimits" value="{{item.id}}" [selected]="item.isDefault">{{item.name$ | async}}</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="row align-items-center">
-                                <label for="offset" class="col-sm-2 col-form-label">{{'admin.reports.items.offset' | translate}}:</label>
-                                <div class="col-6">
-                                    <input id="offset" name="offset" value="0" class="form-control col-6">
-                                </div>
-                            </div>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="filters">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.commons.filters' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                            <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="additionalData">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.commons.additional-data' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <div id="show-fields">
-                                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-control" formControlName="additionalFields">
-                                    <option *ngFor="let item of metadataFields" [value]="item.id">{{item.name$ | async}}</option>
-                                </select>
-                            </div>
-                            <div class="row">
-                                <span class="col-3"></span>
-                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
-                            </div>
-                        </ng-template>
-                    </ngb-panel>
-                    <ngb-panel id="itemResults">
-                        <ng-template ngbPanelTitle>
-                            {{'admin.reports.collections.item-results' | translate}}
-                        </ng-template>
-                        <ng-template ngbPanelContent>
-                            <table id="table" class="table table-striped">
-                                <thead>
-                                    <tr class="header">
-                                        <th>{{ "admin.reports.items.number" | translate }}</th>
-                                        <th>{{ "admin.reports.items.id" | translate }}</th>
-                                        <th>{{ "admin.reports.items.collection" | translate }}</th>
-                                        <th>{{ "admin.reports.items.handle" | translate }}</th>
-                                        <th>{{ "admin.reports.items.title" | translate }}</th>
-                                        <th *ngFor="let field of queryForm.value['additionalFields']">{{ field }}</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr *ngFor="let item of results$ | async">
-                                        <td class="num">{{ item.index }}</td>
-                                        <td>{{ item.uuid }}</td>
-                                        <td><a *ngIf="item.owningCollection" href="/handle/{{ item.owningCollection.handle }}" rel="noopener noreferrer" target="_blank">{{ item.owningCollection.name }}</a></td>
-                                        <td><a *ngIf="item.handle" href="/handle/{{ item.handle }}" rel="noopener noreferrer" target="_blank">{{ item.handle }}</a></td>
-                                        <td>{{ item.name }}</td>
-                                        <td class="num" *ngFor="let field of queryForm.value['additionalFields']">
-                                            <span *ngFor="let mdvalue of item.metadata[field]">
-                                                {{ mdvalue.value || "" }}
-                                            </span>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                            <div>
-                                {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
-                            </div>
-                            <div>
-                                <button id="prev" class="btn btn-light" (click)="prevPage()" [disabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
-                                <button id="next" class="btn btn-light" (click)="nextPage()" [disabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
-<!--
-                                <button id="export">{{'admin.reports.commons.export' | translate}}</button>
--->
-                            </div>
-                            <table id="itemtable" class="sortable"></table>
-                        </ng-template>
-                    </ngb-panel>
-                </ngb-accordion>
-            </div>
+      <div id="querydiv" [formGroup]="queryForm">
+        <ngb-accordion [closeOthers]="true" activeIds="collectionSelector" #acc="ngbAccordion">
+          <ngb-panel id="collectionSelector">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.items.section.collectionSelector' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
+                @for (item of collections; track item) {
+                  <option [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
+                }
+              </select>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="metadataFieldQueries">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.items.section.metadataFieldQueries' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <fieldset id="predefqueries" class="form-group">
+                <label>
+                  {{'admin.reports.items.predefinedQueries' | translate}}
+                </label>
+                <select id="predefselect" formControlName="presetQuery" class="form-control" (change)="setPresetQuery()">
+                  @for (item of presetQueries; track item.id) {
+                    <option [value]="item.id" [selected]="item.isDefault">{{item.label | translate}}</option>
+                  }
+                </select>
+              </fieldset>
+              <div class="row">&nbsp;</div>
+              <div id="queries">
+                @for (pred of queryPredicatesArray().controls; track pred; let i = $index) {
+                  <div class="metadata">
+                    <div [formGroup]="pred" class="form-group">
+                      <div class="form-row">
+                        <div class="col-4">
+                          <select class="query-tool" formControlName="field" class="form-control">
+                            @for (item of metadataFieldsWithAny; track item) {
+                              <option [value]="item.id">{{item.name$ | async}}</option>
+                            }
+                          </select>
+                        </div>
+                        <div class="col-auto">
+                          <select class="query-tool" formControlName="operator" class="form-control">
+                            @for (item of predicates; track item) {
+                              <option [value]="item.id">{{item.name$ | async | translate}}</option>
+                            }
+                          </select>
+                        </div>
+                        <div class="col">
+                          <input class="form-control" formControlName="value"/>
+                        </div>
+                        <div class="col-auto">
+                          <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
+                          &nbsp;
+                          <button class="btn btn-light" [dsBtnDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                }
+              </div>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="limitPaginateQueries">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.items.section.limitPaginateQueries' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <div class="row align-items-center">
+                <label for="limit" class="col-sm-2 col-form-label">{{'admin.reports.items.limit' | translate}}:</label>
+                <div class="col-6">
+                  <select id="limit" name="limit" formControlName="pageLimit" class="form-control col-6">
+                    @for (item of pageLimits; track item) {
+                      <option value="{{item.id}}" [selected]="item.isDefault">{{item.name$ | async}}</option>
+                    }
+                  </select>
+                </div>
+              </div>
+              <div class="row align-items-center">
+                <label for="offset" class="col-sm-2 col-form-label">{{'admin.reports.items.offset' | translate}}:</label>
+                <div class="col-6">
+                  <input id="offset" name="offset" value="0" class="form-control col-6">
+                </div>
+              </div>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="filters">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.commons.filters' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+              <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="additionalData">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.commons.additional-data' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <div id="show-fields">
+                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-control" formControlName="additionalFields">
+                  @for (item of metadataFields; track item) {
+                    <option [value]="item.id">{{item.name$ | async}}</option>
+                  }
+                </select>
+              </div>
+              <div class="row">
+                <span class="col-3"></span>
+                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+              </div>
+            </ng-template>
+          </ngb-panel>
+          <ngb-panel id="itemResults">
+            <ng-template ngbPanelTitle>
+              {{'admin.reports.collections.item-results' | translate}}
+            </ng-template>
+            <ng-template ngbPanelContent>
+              <table id="table" class="table table-striped">
+                <thead>
+                  <tr class="header">
+                    <th>{{ "admin.reports.items.number" | translate }}</th>
+                    <th>{{ "admin.reports.items.id" | translate }}</th>
+                    <th>{{ "admin.reports.items.collection" | translate }}</th>
+                    <th>{{ "admin.reports.items.handle" | translate }}</th>
+                    <th>{{ "admin.reports.items.title" | translate }}</th>
+                    @for (field of queryForm.value['additionalFields']; track field) {
+                      <th>{{ field }}</th>
+                    }
+                  </tr>
+                </thead>
+                <tbody>
+                  @for (item of results$ | async; track item) {
+                    <tr>
+                      <td class="num">{{ item.index }}</td>
+                      <td>{{ item.uuid }}</td>
+                      <td>@if (item.owningCollection) {
+                        <a href="/handle/{{ item.owningCollection.handle }}" rel="noopener noreferrer" target="_blank">{{ item.owningCollection.name }}</a>
+                      }</td>
+                      <td>@if (item.handle) {
+                        <a href="/handle/{{ item.handle }}" rel="noopener noreferrer" target="_blank">{{ item.handle }}</a>
+                      }</td>
+                      <td>{{ item.name }}</td>
+                      @for (field of queryForm.value['additionalFields']; track field) {
+                        <td class="num">
+                          @for (mdvalue of item.metadata[field]; track mdvalue) {
+                            <span>
+                              {{ mdvalue.value || "" }}
+                            </span>
+                          }
+                        </td>
+                      }
+                    </tr>
+                  }
+                </tbody>
+              </table>
+              <div>
+                {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
+              </div>
+              <div>
+                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsBtnDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
+                <button id="next" class="btn btn-light" (click)="nextPage()" [dsBtnDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
+                <!--
+                <button id="export">{{'admin.reports.commons.export' | translate}}</button>
+                -->
+              </div>
+              <table id="itemtable" class="sortable"></table>
+            </ng-template>
+          </ngb-panel>
+        </ngb-accordion>
+      </div>
 
-        </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
index 4cb93aa9be..7782b0e416 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -38,13 +34,16 @@ import { MetadataField } from 'src/app/core/metadata/metadata-field.model';
 import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.model';
 import { Collection } from 'src/app/core/shared/collection.model';
 import { Community } from 'src/app/core/shared/community.model';
-import { Item } from 'src/app/core/shared/item.model';
 import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operators';
 import { isEmpty } from 'src/app/shared/empty.util';
 import { environment } from 'src/environments/environment';
 
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { FiltersComponent } from '../filters-section/filters-section.component';
-import { FilteredItems } from './filtered-items-model';
+import {
+  FilteredItem,
+  FilteredItems,
+} from './filtered-items-model';
 import { OptionVO } from './option-vo.model';
 import { PresetQuery } from './preset-query.model';
 import { QueryPredicate } from './query-predicate.model';
@@ -61,9 +60,8 @@ import { QueryPredicate } from './query-predicate.model';
     NgbAccordionModule,
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgForOf,
     FiltersComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
@@ -79,7 +77,7 @@ export class FilteredItemsComponent implements OnInit {
   queryForm: FormGroup;
   currentPage = 0;
   results: FilteredItems = new FilteredItems();
-  results$: Observable<Item[]>;
+  results$: Observable<FilteredItem[]>;
   @ViewChild('acc') accordionComponent: NgbAccordion;
 
   constructor(
diff --git a/src/app/admin/admin-reports/filtered-items/option-vo.model.ts b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
index 56334b041f..b26a42a8d8 100644
--- a/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
+++ b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
@@ -9,6 +9,7 @@ export class OptionVO {
   id: string;
   name$: Observable<string>;
   disabled = false;
+  isDefault?: boolean;
 
   static collection(id: string, name: string, disabled: boolean = false): OptionVO {
     const opt = new OptionVO();
diff --git a/src/app/admin/admin-reports/filtered-items/preset-query.model.ts b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
index 213819b70e..9f0fb01ce3 100644
--- a/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
+++ b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
@@ -5,6 +5,7 @@ export class PresetQuery {
   id: string;
   label: string;
   predicates: QueryPredicate[];
+  isDefault?: boolean;
 
   static of(id: string, label: string, predicates: QueryPredicate[]) {
     const query = new PresetQuery();
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.html b/src/app/admin/admin-reports/filters-section/filters-section.component.html
index 1e7856f09c..88e4335506 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.html
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.html
@@ -1,19 +1,23 @@
 <fieldset class="row row-cols-2">
-    <ng-container>
-        <span class="col-12">&nbsp;</span>
-        <span class="col-1">&nbsp;</span>
-        <button id="btnSelectAllFilters" class="btn btn-light mt-1 col-4" (click)="selectAll()">{{"admin.reports.commons.filters.select_all" | translate}}</button>
-        <span class="col-2">&nbsp;</span>
-        <button id="btnDeselectAllFilters" class="btn btn-light mt-1 col-4" (click)="deselectAll()">{{"admin.reports.commons.filters.deselect_all" | translate}}</button>
-        <span class="col-1">&nbsp;</span>
-        <span class="col-12">&nbsp;</span>
-    </ng-container>
+  <ng-container>
+    <span class="col-12">&nbsp;</span>
+    <span class="col-1">&nbsp;</span>
+    <button id="btnSelectAllFilters" class="btn btn-light mt-1 col-4" (click)="selectAll()">{{"admin.reports.commons.filters.select_all" | translate}}</button>
+    <span class="col-2">&nbsp;</span>
+    <button id="btnDeselectAllFilters" class="btn btn-light mt-1 col-4" (click)="deselectAll()">{{"admin.reports.commons.filters.deselect_all" | translate}}</button>
+    <span class="col-1">&nbsp;</span>
+    <span class="col-12">&nbsp;</span>
+  </ng-container>
 </fieldset>
-<fieldset class="row row-cols-2" *ngFor="let group of allFilters()">
+@for (group of allFilters(); track group) {
+  <fieldset class="row row-cols-2">
     <legend>{{group.key | translate}}</legend>
     <ng-container [formGroup]="filtersForm">
-        <div *ngFor="let filter of group.filters" class="col-6">
-            <input type="checkbox" id="flt-{{filter.id}}" value="{{filter.id}}" class="form-check-input col-1 align-baseline" formControlName="{{filter.id}}"><label for="flt-{{filter.id}}" class="col-11 align-middle" title="{{filter.tooltipKey | translate}}">{{filter.key | translate}}</label>
+      @for (filter of group.filters; track filter) {
+        <div class="col-6">
+          <input type="checkbox" id="flt-{{filter.id}}" value="{{filter.id}}" class="form-check-input col-1" formControlName="{{filter.id}}"><label for="flt-{{filter.id}}" class="col-11 align-middle" title="{{filter.tooltipKey | translate}}">{{filter.key | translate}}</label>
         </div>
+      }
     </ng-container>
-</fieldset>
+  </fieldset>
+}
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.scss b/src/app/admin/admin-reports/filters-section/filters-section.component.scss
index e69de29bb2..58d3a12f1b 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.scss
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.scss
@@ -0,0 +1,8 @@
+.col-6 > label.col-11.align-middle {
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+fieldset.row-cols-2 > legend {
+  float: none !important;
+}
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.ts b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
index 85b7932ab4..24bd1103c9 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.ts
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -23,7 +23,6 @@ import { FilterGroup } from './filter-group.model';
   templateUrl: './filters-section.component.html',
   styleUrls: ['./filters-section.component.scss'],
   imports: [
-    NgForOf,
     ReactiveFormsModule,
     TranslateModule,
   ],
diff --git a/src/app/admin/admin-routes.ts b/src/app/admin/admin-routes.ts
index 59529710c9..e5afe09cc7 100644
--- a/src/app/admin/admin-routes.ts
+++ b/src/app/admin/admin-routes.ts
@@ -11,8 +11,8 @@ import {
   REGISTRIES_MODULE_PATH,
   REPORTS_MODULE_PATH,
 } from './admin-routing-paths';
-import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
-import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
+import { ThemedAdminSearchPageComponent } from './admin-search-page/themed-admin-search-page.component';
+import { ThemedAdminWorkflowPageComponent } from './admin-workflow-page/themed-admin-workflow-page.component';
 
 export const ROUTES: Route[] = [
   {
@@ -28,13 +28,13 @@ export const ROUTES: Route[] = [
   {
     path: 'search',
     resolve: { breadcrumb: i18nBreadcrumbResolver },
-    component: AdminSearchPageComponent,
+    component: ThemedAdminSearchPageComponent,
     data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' },
   },
   {
     path: 'workflow',
     resolve: { breadcrumb: i18nBreadcrumbResolver },
-    component: AdminWorkflowPageComponent,
+    component: ThemedAdminWorkflowPageComponent,
     data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' },
   },
   {
diff --git a/src/app/admin/admin-search-page/admin-search-page.component.ts b/src/app/admin/admin-search-page/admin-search-page.component.ts
index 99909b8257..4ae11a9d47 100644
--- a/src/app/admin/admin-search-page/admin-search-page.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-page.component.ts
@@ -4,7 +4,7 @@ import { Context } from '../../core/shared/context.model';
 import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
 
 @Component({
-  selector: 'ds-admin-search-page',
+  selector: 'ds-base-admin-search-page',
   templateUrl: './admin-search-page.component.html',
   styleUrls: ['./admin-search-page.component.scss'],
   standalone: true,
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
index ba4ab15363..5028070c90 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.html
@@ -1,30 +1,52 @@
 <div class="space-children-mr my-1">
   <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary move-link" [routerLink]="[getMoveRoute()]" [title]="'admin.search.item.move' | translate">
-    <i class="fa fa-arrow-circle-right"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
-  </a>
+    <i class="fa fa-arrow-circle-right"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.move" | translate}}</span>
+  }
+</a>
 
-  <a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isDiscoverable" class="btn btn-secondary private-link" [routerLink]="[getPrivateRoute()]" [title]="'admin.search.item.make-private' | translate">
-    <i class="fa fa-eye-slash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
-  </a>
+@if (item && item.isDiscoverable) {
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary private-link" [routerLink]="[getPrivateRoute()]" [title]="'admin.search.item.make-private' | translate">
+    <i class="fa fa-eye-slash"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.make-private" | translate}}</span>
+  }
+</a>
+}
 
-  <a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isDiscoverable" class="btn btn-secondary public-link" [routerLink]="[getPublicRoute()]" [title]="'admin.search.item.make-public' | translate">
-    <i class="fa fa-eye"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
-  </a>
+@if (item && !item.isDiscoverable) {
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary public-link" [routerLink]="[getPublicRoute()]" [title]="'admin.search.item.make-public' | translate">
+    <i class="fa fa-eye"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.make-public" | translate}}</span>
+  }
+</a>
+}
 
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-secondary edit-link" [routerLink]="[getEditRoute()]" [title]="'admin.search.item.edit' | translate">
-    <i class="fa fa-edit"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
-  </a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-secondary edit-link" [routerLink]="[getEditRoute()]" [title]="'admin.search.item.edit' | translate">
+  <i class="fa fa-edit"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{"admin.search.item.edit" | translate}}</span>
+}
+</a>
 
-  <a [ngClass]="{'btn-sm': small}" *ngIf="item && !item.isWithdrawn" class="btn btn-warning t withdraw-link" [routerLink]="[getWithdrawRoute()]" [title]="'admin.search.item.withdraw' | translate">
-    <i class="fa fa-ban"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
-  </a>
+@if (item && !item.isWithdrawn) {
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-warning t withdraw-link" [routerLink]="[getWithdrawRoute()]" [title]="'admin.search.item.withdraw' | translate">
+    <i class="fa fa-ban"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.withdraw" | translate}}</span>
+  }
+</a>
+}
 
-  <a [ngClass]="{'btn-sm': small}" *ngIf="item && item.isWithdrawn" class="btn btn-warning reinstate-link" [routerLink]="[getReinstateRoute()]" [title]="'admin.search.item.reinstate' | translate">
-    <i class="fa fa-undo"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
-  </a>
+@if (item && item.isWithdrawn) {
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-warning reinstate-link" [routerLink]="[getReinstateRoute()]" [title]="'admin.search.item.reinstate' | translate">
+    <i class="fa fa-undo"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.search.item.reinstate" | translate}}</span>
+  }
+</a>
+}
 
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-danger delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.search.item.delete' | translate">
-    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
-  </a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-danger delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.search.item.delete' | translate">
+  <i class="fa fa-trash"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{"admin.search.item.delete" | translate}}</span>
+}
+</a>
 </div>
 
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
index 89d51481d7..681b02ce0e 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -26,7 +23,7 @@ import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
   styleUrls: ['./item-admin-search-result-actions.component.scss'],
   templateUrl: './item-admin-search-result-actions.component.html',
   standalone: true,
-  imports: [NgClass, RouterLink, NgIf, TranslateModule],
+  imports: [NgClass, RouterLink, TranslateModule],
 })
 /**
  * The component for displaying the actions for a list element for an item search result on the admin search page
diff --git a/src/app/admin/admin-search-page/themed-admin-search-page.component.ts b/src/app/admin/admin-search-page/themed-admin-search-page.component.ts
new file mode 100644
index 0000000000..d49c184784
--- /dev/null
+++ b/src/app/admin/admin-search-page/themed-admin-search-page.component.ts
@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { AdminSearchPageComponent } from './admin-search-page.component';
+
+/**
+ * Themed wrapper for {@link AdminSearchPageComponent}
+ */
+@Component({
+  selector: 'ds-admin-search-page',
+  templateUrl: '../../shared/theme-support/themed.component.html',
+  standalone: true,
+  imports: [AdminSearchPageComponent],
+})
+export class ThemedAdminSearchPageComponent extends ThemedComponent<AdminSearchPageComponent> {
+
+  protected getComponentName(): string {
+    return 'AdminSearchPageComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/admin/admin-search-page/admin-search-page.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./admin-search-page.component');
+  }
+
+}
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.html b/src/app/admin/admin-sidebar/admin-sidebar.component.html
index 41376f777e..fc79c58b99 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.html
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.html
@@ -1,64 +1,62 @@
-<nav class="navbar navbar-dark p-0 vh-100"
-     id="admin-sidebar"
-     [attr.aria-label]="'menu.header.nav.description' | translate"
-     [ngClass]="{'expanded': sidebarOpen, 'collapsed': sidebarClosed, 'transitioning': sidebarTransitioning}"
+@if (menuVisible | async) {
+  <nav class="navbar navbar-dark p-0 vh-100"
+    id="admin-sidebar"
+    [attr.aria-label]="'menu.header.nav.description' | translate"
+    [ngClass]="{'expanded': sidebarOpen, 'collapsed': sidebarClosed, 'transitioning': sidebarTransitioning}"
      [@slideSidebar]="{
       value: ((sidebarExpanded | async) !== true ? 'collapsed' : 'expanded'),
       params: { collapsedWidth: (collapsedSidebarWidth$ | async), expandedWidth: (expandedSidebarWidth$ | async) }
      }" (@slideSidebar.done)="finishSlide($event)" (@slideSidebar.start)="startSlide($event)"
-     *ngIf="menuVisible | async"
-     (mouseenter)="handleMouseEnter($event)"
-     (mouseleave)="handleMouseLeave($event)">
-
-  <!-- HEADER -->
-
-  <div class="sidebar-full-width-container" id="sidebar-header-container" aria-hidden="true">
-    <div class="sidebar-section-wrapper">
-      <div class="sidebar-fixed-element-wrapper">
-        <img id="admin-sidebar-logo" src="assets/images/dspace-logo-mini.svg" [alt]="('menu.header.image.logo') | translate" aria-hidden="true">
-      </div>
-      <div class="sidebar-collapsible-element-outer-wrapper">
-        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
-          <h4 class="my-1">{{ 'menu.header.admin' | translate }}</h4>
+    (mouseenter)="handleMouseEnter($event)"
+    (mouseleave)="handleMouseLeave($event)">
+    <!-- HEADER -->
+    <div class="sidebar-full-width-container" id="sidebar-header-container" aria-hidden="true">
+      <div class="sidebar-section-wrapper">
+        <div class="sidebar-fixed-element-wrapper">
+          <img id="admin-sidebar-logo" src="assets/images/dspace-logo-mini.svg" [alt]="('menu.header.image.logo') | translate" aria-hidden="true">
+        </div>
+        <div class="sidebar-collapsible-element-outer-wrapper">
+          <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+            <h4 class="my-1">{{ 'menu.header.admin' | translate }}</h4>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-
-  <!-- ITEMS -->
-
-  <div class="sidebar-full-width-container" id="sidebar-top-level-items-container">
-    <div class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
+    <!-- ITEMS -->
+    <div class="sidebar-full-width-container" id="sidebar-top-level-items-container">
+      <div class="sidebar-full-width-container" id="sidebar-top-level-items" role="menubar"
         [attr.aria-label]="'menu.header.admin.description' |translate">
-      <ng-container *ngFor="let section of (sections | async)">
-        <ng-container
+        @for (section of (sections | async); track section) {
+          <ng-container
           *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-      </ng-container>
+        }
+      </div>
     </div>
-  </div>
-
-  <!-- TOGGLER -->
-
-  <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container">
-    <a class="sidebar-section-wrapper sidebar-full-width-container"
-       id="sidebar-collapse-toggle"
-       [attr.data-test]="'sidebar-collapse-toggle' | dsBrowserOnly"
-       href="javascript:void(0);"
-       (click)="toggle($event)"
-       (keyup.space)="toggle($event)"
-    >
-      <div class="sidebar-fixed-element-wrapper">
-        <i *ngIf="(menuCollapsed | async)" class="fas fa-fw fa-angle-double-right"
-           [title]="'menu.section.icon.pin' | translate"></i>
-                <i *ngIf="(menuCollapsed | async) !== true" class="fas fa-fw fa-angle-double-left"
-           [title]="'menu.section.icon.unpin' | translate"></i>
-      </div>
-      <div class="sidebar-collapsible-element-outer-wrapper">
-        <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
-          {{ ((menuCollapsed | async) ? 'menu.section.pin' : 'menu.section.unpin' ) | translate }}
+    <!-- TOGGLER -->
+    <div class="sidebar-full-width-container" id="sidebar-collapse-toggle-container">
+      <a class="sidebar-section-wrapper sidebar-full-width-container"
+        id="sidebar-collapse-toggle"
+        [attr.data-test]="'sidebar-collapse-toggle' | dsBrowserOnly"
+        href="javascript:void(0);"
+        (click)="toggle($event)"
+        (keyup.space)="toggle($event)"
+        >
+        <div class="sidebar-fixed-element-wrapper">
+          @if ((menuCollapsed | async)) {
+            <i class="fas fa-fw fa-angle-double-right"
+            [title]="'menu.section.icon.pin' | translate"></i>
+          }
+          @if ((menuCollapsed | async) !== true) {
+            <i class="fas fa-fw fa-angle-double-left"
+            [title]="'menu.section.icon.unpin' | translate"></i>
+          }
         </div>
-      </div>
-    </a>
-  </div>
-
-</nav>
+        <div class="sidebar-collapsible-element-outer-wrapper">
+          <div class="sidebar-collapsible-element-inner-wrapper sidebar-item">
+            {{ ((menuCollapsed | async) ? 'menu.section.pin' : 'menu.section.unpin' ) | translate }}
+          </div>
+        </div>
+      </a>
+    </div>
+  </nav>
+}
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index f882a5b2f3..910a384a8b 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -47,7 +45,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
   styleUrls: ['./admin-sidebar.component.scss'],
   animations: [slideSidebar],
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgClass, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgbDropdownModule, NgClass, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AdminSidebarComponent extends MenuComponent implements OnInit {
   /**
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
index d051136921..0450d90a6f 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.html
@@ -4,16 +4,16 @@
      params: {endColor: (sidebarActiveBg$ | async)}
      }">
   <a class="sidebar-section-wrapper"
-     role="menuitem" tabindex="0"
-     aria-haspopup="menu"
-     [attr.aria-controls]="adminMenuSectionId(section.id)"
-     [attr.aria-expanded]="isExpanded$ | async"
-     [attr.aria-label]="('menu.section.toggle.' + section.id) | translate"
-     [class.disabled]="section.model?.disabled"
-     (click)="toggleSection($event)"
-     (keyup.space)="toggleSection($event)"
-     href="javascript:void(0);"
-  >
+    role="menuitem" tabindex="0"
+    aria-haspopup="menu"
+    [attr.aria-controls]="adminMenuSectionId(section.id)"
+    [attr.aria-expanded]="isExpanded$ | async"
+    [attr.aria-label]="('menu.section.toggle.' + section.id) | translate"
+    [class.disabled]="section.model?.disabled"
+    (click)="toggleSection($event)"
+    (keyup.space)="toggleSection($event)"
+    href="javascript:void(0);"
+    >
     <div class="sidebar-fixed-element-wrapper" data-test="sidebar-section-icon" aria-hidden="true">
       <i class="fas fa-{{section.icon}} fa-fw"></i>
     </div>
@@ -21,25 +21,29 @@
       <div class="sidebar-collapsible-element-inner-wrapper sidebar-item toggler-wrapper">
         <span [id]="adminMenuSectionTitleId(section.id)" [attr.data-test]="adminMenuSectionTitleId(section.id) | dsBrowserOnly">
           <ng-container
-            *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
         </span>
         <i class="fas fa-chevron-right fa-xs" aria-hidden="true"
-           [@rotate]="(isExpanded$ | async) ? 'expanded' : 'collapsed'"
+          [@rotate]="(isExpanded$ | async) ? 'expanded' : 'collapsed'"
         ></i>
       </div>
     </div>
   </a>
-  <div class="sidebar-section-wrapper subsection" @slide *ngIf="(isExpanded$ | async)">
-    <div class="sidebar-fixed-element-wrapper"></div>
-    <div class="sidebar-collapsible-element-outer-wrapper">
-      <div class="sidebar-collapsible-element-inner-wrapper">
-        <div class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
-          <div class="sidebar-item" *ngFor="let subSection of (subSections$ | async)">
-            <ng-container
-              *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+  @if ((isExpanded$ | async)) {
+    <div class="sidebar-section-wrapper subsection" @slide>
+      <div class="sidebar-fixed-element-wrapper"></div>
+      <div class="sidebar-collapsible-element-outer-wrapper">
+        <div class="sidebar-collapsible-element-inner-wrapper">
+          <div class="sidebar-sub-level-item-list" role="menu" [id]="adminMenuSectionId(section.id)" [attr.aria-label]="('menu.section.' + section.id) | translate">
+            @for (subSection of (subSections$ | async); track subSection) {
+              <div class="sidebar-item">
+                <ng-container
+                *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+              </div>
+            }
           </div>
         </div>
       </div>
     </div>
-  </div>
+  }
 </div>
diff --git a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
index 9bd90ea7f1..03f9397819 100644
--- a/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
+++ b/src/app/admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -37,7 +35,7 @@ import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sid
   styleUrls: ['./expandable-admin-sidebar-section.component.scss'],
   animations: [rotate, slide, bgColor],
   standalone: true,
-  imports: [NgClass, NgComponentOutlet, NgIf, NgFor, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgClass, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 
 export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionComponent implements OnInit {
@@ -85,7 +83,7 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
     this.sidebarActiveBg$ = this.variableService.getVariable('--ds-admin-sidebar-active-bg');
     this.isSidebarCollapsed$ = this.menuService.isMenuCollapsed(this.menuID);
     this.isSidebarPreviewCollapsed$ = this.menuService.isMenuPreviewCollapsed(this.menuID);
-    this.isExpanded$ = combineLatestObservable([this.active, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
+    this.isExpanded$ = combineLatestObservable([this.active$, this.isSidebarCollapsed$, this.isSidebarPreviewCollapsed$]).pipe(
       map(([active, sidebarCollapsed, sidebarPreviewCollapsed]) => (active && (!sidebarCollapsed || !sidebarPreviewCollapsed))),
     );
   }
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
index 62a66039af..74de483c01 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
@@ -4,11 +4,13 @@ import { Context } from '../../core/shared/context.model';
 import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
 
 @Component({
-  selector: 'ds-admin-workflow-page',
+  selector: 'ds-base-admin-workflow-page',
   templateUrl: './admin-workflow-page.component.html',
   styleUrls: ['./admin-workflow-page.component.scss'],
   standalone: true,
-  imports: [ThemedConfigurationSearchPageComponent],
+  imports: [
+    ThemedConfigurationSearchPageComponent,
+  ],
 })
 
 /**
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
index 7f19ef3c2e..b2ce95bf7c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
@@ -1,8 +1,12 @@
 <div class="space-children-mr">
   <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.workflow.item.delete' | translate">
-    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
-  </a>
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 send-back-link" [routerLink]="[getSendBackRoute()]" [title]="'admin.workflow.item.send-back' | translate">
-    <i class="fa fa-hand-point-left"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.send-back" | translate}}</span>
-  </a>
+    <i class="fa fa-trash"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
+  }
+</a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 send-back-link" [routerLink]="[getSendBackRoute()]" [title]="'admin.workflow.item.send-back' | translate">
+  <i class="fa fa-hand-point-left"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{"admin.workflow.item.send-back" | translate}}</span>
+}
+</a>
 </div>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
index 29e1b65eda..a565c4d9b2 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   Input,
@@ -20,7 +17,7 @@ import {
   styleUrls: ['./workflow-item-admin-workflow-actions.component.scss'],
   templateUrl: './workflow-item-admin-workflow-actions.component.html',
   standalone: true,
-  imports: [NgClass, RouterLink, NgIf, TranslateModule],
+  imports: [NgClass, RouterLink, TranslateModule],
 })
 /**
  * The component for displaying the actions for a list element for a workflow-item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
index 3ad1dce0b8..150411ec40 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
@@ -1,44 +1,47 @@
 <div>
-    <div class="modal-header">{{'supervision-group-selector.header' | translate}}
-        <button type="button" class="close" (click)="close()" aria-label="Close">
-            <span aria-hidden="true">×</span>
-        </button>
+  <div class="modal-header">{{'supervision-group-selector.header' | translate}}
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+    </button>
+  </div>
+  <div class="modal-body">
+    <div class="row">
+      <div class="control-group col-sm-12">
+        <label for="supervisionOrder" class="form-label">{{'supervision-group-selector.select.type-of-order.label' | translate}}</label>
+        <select name="supervisionOrder" id="supervisionOrder" class="form-select"
+          [(ngModel)]="selectedOrderType"
+          attr.aria-label="{{'supervision-group-selector.select.type-of-order.label' | translate}}">
+          <option value="EDITOR">{{'supervision-group-selector.select.type-of-order.option.editor' | translate}}</option>
+          <option value="OBSERVER">{{'supervision-group-selector.select.type-of-order.option.observer' | translate}}</option>
+        </select>
+        @if (isSubmitted && (!selectedOrderType || selectedOrderType === '')) {
+          <ds-error
+          message="{{'supervision-group-selector.select.type-of-order.error' | translate}}"></ds-error>
+        }
+      </div>
     </div>
-    <div class="modal-body">
-        <div class="row">
-            <div class="control-group col-sm-12">
-                <label for="supervisionOrder">{{'supervision-group-selector.select.type-of-order.label' | translate}}</label>
-                <select name="supervisionOrder" id="supervisionOrder" class="form-control"
-                        [(ngModel)]="selectedOrderType"
-                        attr.aria-label="{{'supervision-group-selector.select.type-of-order.label' | translate}}">
-                    <option value="EDITOR">{{'supervision-group-selector.select.type-of-order.option.editor' | translate}}</option>
-                    <option value="OBSERVER">{{'supervision-group-selector.select.type-of-order.option.observer' | translate}}</option>
-                </select>
-                <ds-error *ngIf="isSubmitted && (!selectedOrderType || selectedOrderType === '')"
-                          message="{{'supervision-group-selector.select.type-of-order.error' | translate}}"></ds-error>
-            </div>
-        </div>
-        <div class="row">
-            <div class="control-group col-sm-12">
-                <label for="supervisionGroup">{{'supervision-group-selector.select.group.label' | translate}}</label>
-                <ng-container class="mb-3">
-                    <input id="supervisionGroup" class="form-control" type="text" [value]="selectedGroup ? dsoNameService.getName(selectedGroup) : ''" disabled>
-                    <ds-error *ngIf="isSubmitted && !selectedGroup" message="{{'supervision-group-selector.select.group.error' | translate}}"></ds-error>
-                </ng-container>
-                <ds-eperson-group-list [isListOfEPerson]="false"
-                                       (select)="updateGroupObjectSelected($event)"></ds-eperson-group-list>
-            </div>
-        </div>
-<!--        <div class="d-flex flex-row-reverse m-2">          -->
-        <div class="modal-footer">
-          <button class="btn btn-outline-secondary"
-                  (click)="close()">
-            <i class="fas fa-times"></i> {{"supervision-group-selector.button.cancel" | translate}}
-          </button>
-          <button class="btn btn-primary save"
-                  (click)="save()">
-            <i class="fas fa-save"></i> {{"supervision-group-selector.button.save" | translate}}
-          </button>
-        </div>
+    <div class="row">
+      <div class="control-group col-sm-12">
+        <label for="supervisionGroup" class="form-label">{{'supervision-group-selector.select.group.label' | translate}}</label>
+        <ng-container class="mb-3">
+          <input id="supervisionGroup" class="form-control" type="text" [value]="selectedGroup ? dsoNameService.getName(selectedGroup) : ''" disabled>
+          @if (isSubmitted && !selectedGroup) {
+            <ds-error message="{{'supervision-group-selector.select.group.error' | translate}}"></ds-error>
+          }
+        </ng-container>
+        <ds-eperson-group-list [isListOfEPerson]="false"
+        (select)="updateGroupObjectSelected($event)"></ds-eperson-group-list>
+      </div>
     </div>
+    <!--        <div class="d-flex flex-row-reverse m-2">          -->
+    <div class="modal-footer">
+      <button class="btn btn-outline-secondary"
+        (click)="close()">
+        <i class="fas fa-times"></i> {{"supervision-group-selector.button.cancel" | translate}}
+      </button>
+      <button class="btn btn-primary save"
+        (click)="save()">
+        <i class="fas fa-save"></i> {{"supervision-group-selector.button.save" | translate}}
+      </button>
+    </div>
+  </div>
 </div>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
index 67dcd09b8e..6dea020c59 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -34,7 +34,7 @@ import { ErrorComponent } from '../../../../../../shared/error/error.component';
   styleUrls: ['./supervision-order-group-selector.component.scss'],
   templateUrl: './supervision-order-group-selector.component.html',
   standalone: true,
-  imports: [FormsModule, NgIf, ErrorComponent, EpersonGroupListComponent, TranslateModule],
+  imports: [FormsModule, ErrorComponent, EpersonGroupListComponent, TranslateModule],
 })
 export class SupervisionOrderGroupSelectorComponent {
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
index 84d8c052cd..3d3e912f91 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
@@ -1,15 +1,19 @@
 <ng-container *ngVar="(supervisionOrderEntries$ | async) as supervisionOrders">
-  <div class="item-list-supervision" *ngIf="supervisionOrders?.length > 0">
-    <div>
-      <span>{{'workflow-item.search.result.list.element.supervised-by' | translate}} </span>
+  @if (supervisionOrders?.length > 0) {
+    <div class="item-list-supervision">
+      <div>
+        <span>{{'workflow-item.search.result.list.element.supervised-by' | translate}} </span>
+      </div>
+      <div>
+        @for (supervisionOrder of supervisionOrders; track supervisionOrder) {
+          <a class="badge bg-primary me-1 mb-1 text-capitalize mw-100 text-truncate" data-test="soBadge"
+            [ngbTooltip]="'workflow-item.search.result.list.element.supervised.remove-tooltip' | translate"
+            (click)="$event.preventDefault(); $event.stopImmediatePropagation(); deleteSupervisionOrder(supervisionOrder)" aria-label="Close">
+            {{ dsoNameService.getName(supervisionOrder.group) }}
+            <span aria-hidden="true"> ×</span>
+          </a>
+        }
+      </div>
     </div>
-    <div>
-      <a class="badge badge-primary mr-1 mb-1 text-capitalize mw-100 text-truncate" *ngFor="let supervisionOrder of supervisionOrders" data-test="soBadge"
-         [ngbTooltip]="'workflow-item.search.result.list.element.supervised.remove-tooltip' | translate"
-         (click)="$event.preventDefault(); $event.stopImmediatePropagation(); deleteSupervisionOrder(supervisionOrder)" aria-label="Close">
-        {{ dsoNameService.getName(supervisionOrder.group) }}
-        <span aria-hidden="true"> ×</span>
-      </a>
-    </div>
-  </div>
+  }
 </ng-container>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
index fbd48d4078..ae5e85019c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -42,7 +38,7 @@ export interface SupervisionOrderListEntry {
   templateUrl: './supervision-order-status.component.html',
   styleUrls: ['./supervision-order-status.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, NgFor, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 export class SupervisionOrderStatusComponent implements OnChanges {
 
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
index 2b904a5429..98405fffeb 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
@@ -1,16 +1,22 @@
 <div class="my-1">
   <ds-supervision-order-status [supervisionOrderList]="supervisionOrderList"
-                               (delete)="deleteSupervisionOrder($event)"></ds-supervision-order-status>
+  (delete)="deleteSupervisionOrder($event)"></ds-supervision-order-status>
 </div>
 
 <div class="space-children-mr">
   <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.workflow.item.delete' | translate">
-    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
-  </a>
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 policies-link" [routerLink]="resourcePoliciesPageRoute" [title]="'admin.workflow.item.policies' | translate">
-    <i class="fas fa-edit"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{'admin.workflow.item.policies' | translate}}</span>
-  </a>
-  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 supervision-group-selector" [title]="'admin.workflow.item.supervision' | translate" (click)="openSupervisionModal()">
-    <i class="fas fa-users-cog"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{'admin.workflow.item.supervision' | translate}}</span>
-  </a>
+    <i class="fa fa-trash"></i>@if (!small) {
+    <span class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
+  }
+</a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 policies-link" [routerLink]="resourcePoliciesPageRoute" [title]="'admin.workflow.item.policies' | translate">
+  <i class="fas fa-edit"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{'admin.workflow.item.policies' | translate}}</span>
+}
+</a>
+<a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 supervision-group-selector" [title]="'admin.workflow.item.supervision' | translate" (click)="openSupervisionModal()">
+  <i class="fas fa-users-cog"></i>@if (!small) {
+  <span class="d-none d-sm-inline"> {{'admin.workflow.item.supervision' | translate}}</span>
+}
+</a>
 </div>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
index 2e407f92db..04264b2c8f 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -52,7 +49,7 @@ import {
   styleUrls: ['./workspace-item-admin-workflow-actions.component.scss'],
   templateUrl: './workspace-item-admin-workflow-actions.component.html',
   standalone: true,
-  imports: [SupervisionOrderStatusComponent, NgClass, RouterLink, NgIf, TranslateModule],
+  imports: [SupervisionOrderStatusComponent, NgClass, RouterLink, TranslateModule],
 })
 /**
  * The component for displaying the actions for a list element for a workspace-item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
index c5c2a5331a..38703c3182 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.html
@@ -1,12 +1,14 @@
 <ng-template dsDynamicComponentLoader>
 </ng-template>
-<div #badges class="position-absolute ml-1">
-    <div class="workflow-badge">
-        <span class="badge badge-info">{{ "admin.workflow.item.workflow" | translate }}</span>
-    </div>
+<div #badges class="position-absolute ms-1">
+  <div class="workflow-badge">
+    <span class="badge bg-info">{{ "admin.workflow.item.workflow" | translate }}</span>
+  </div>
 </div>
 <ul #buttons class="list-group list-group-flush">
-    <li class="list-group-item">
-        <ds-workflow-item-admin-workflow-actions-element *ngIf="object" class="d-flex justify-content-between" [wfi]="dso" [small]="true"></ds-workflow-item-admin-workflow-actions-element>
-    </li>
+  <li class="list-group-item">
+    @if (object) {
+      <ds-workflow-item-admin-workflow-actions-element class="d-flex justify-content-between" [wfi]="dso" [small]="true"></ds-workflow-item-admin-workflow-actions-element>
+    }
+  </li>
 </ul>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
index 8ceb4b12bc..8df382a7b3 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   ComponentRef,
@@ -43,7 +43,7 @@ import { WorkflowItemAdminWorkflowActionsComponent } from '../../actions/workflo
   styleUrls: ['./workflow-item-search-result-admin-workflow-grid-element.component.scss'],
   templateUrl: './workflow-item-search-result-admin-workflow-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, WorkflowItemAdminWorkflowActionsComponent, TranslateModule, DynamicComponentLoaderDirective],
+  imports: [WorkflowItemAdminWorkflowActionsComponent, TranslateModule, DynamicComponentLoaderDirective],
 })
 /**
  * The component for displaying a grid element for an workflow item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html
index f78a0a3ca4..3af6264322 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component.html
@@ -1,8 +1,8 @@
 <ng-template dsDynamicComponentLoader>
 </ng-template>
-<div #badges class="position-absolute ml-1">
+<div #badges class="position-absolute ms-1">
     <div class="workflow-badge">
-        <span class="badge badge-info">{{ "admin.workflow.item.workspace" | translate }}</span>
+        <span class="badge bg-info">{{ "admin.workflow.item.workspace" | translate }}</span>
     </div>
 </div>
 <ul #buttons class="list-group list-group-flush">
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
index 192cc751f2..2ecd0a72a1 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.html
@@ -1,10 +1,12 @@
 <div class="workflow-badge">
-    <span class="badge badge-info">{{ "admin.workflow.item.workflow" | translate }}</span>
+  <span class="badge bg-info">{{ "admin.workflow.item.workflow" | translate }}</span>
 </div>
-<ds-listable-object-component-loader *ngIf="item$ | async"
-                                     [object]="item$ | async"
-                                     [viewMode]="viewModes.ListElement"
-                                     [index]="index"
-                                     [linkType]="linkType"
-                                     [listID]="listID"></ds-listable-object-component-loader>
+@if (item$ | async) {
+  <ds-listable-object-component-loader
+    [object]="item$ | async"
+    [viewMode]="viewModes.ListElement"
+    [index]="index"
+    [linkType]="linkType"
+  [listID]="listID"></ds-listable-object-component-loader>
+}
 <ds-workflow-item-admin-workflow-actions-element [wfi]="dso" [small]="false"></ds-workflow-item-admin-workflow-actions-element>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
index 60740fb34b..584e79dccc 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -42,7 +39,7 @@ import { WorkflowItemAdminWorkflowActionsComponent } from '../../actions/workflo
   styleUrls: ['./workflow-item-search-result-admin-workflow-list-element.component.scss'],
   templateUrl: './workflow-item-search-result-admin-workflow-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, WorkflowItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
+  imports: [ListableObjectComponentLoaderComponent, WorkflowItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for a workflow item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
index ed877706c6..32777bfa39 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
@@ -1,13 +1,15 @@
-<span class="badge badge-info">{{ "admin.workflow.item.workspace" | translate }}</span>
-<ds-listable-object-component-loader *ngIf="item$ | async"
-                                     [object]="item$ | async"
-                                     [viewMode]="viewModes.ListElement"
-                                     [index]="index"
-                                     [linkType]="linkType"
-                                     [listID]="listID"></ds-listable-object-component-loader>
+<span class="badge bg-info">{{ "admin.workflow.item.workspace" | translate }}</span>
+@if (item$ | async) {
+  <ds-listable-object-component-loader
+    [object]="item$ | async"
+    [viewMode]="viewModes.ListElement"
+    [index]="index"
+    [linkType]="linkType"
+  [listID]="listID"></ds-listable-object-component-loader>
+}
 
 <ds-workspace-item-admin-workflow-actions-element [small]="false"
-                                                  [supervisionOrderList]="supervisionOrder$ | async"
-                                                  [wsi]="dso"
-                                                  (create)="reloadObject($event)"
-                                                  (delete)="reloadObject($event)"></ds-workspace-item-admin-workflow-actions-element>
+  [supervisionOrderList]="supervisionOrder$ | async"
+  [wsi]="dso"
+  (create)="reloadObject($event)"
+(delete)="reloadObject($event)"></ds-workspace-item-admin-workflow-actions-element>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
index 7cf63a603b..c9b0e6ca67 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -52,7 +49,7 @@ import { WorkspaceItemAdminWorkflowActionsComponent } from '../../actions/worksp
   styleUrls: ['./workspace-item-search-result-admin-workflow-list-element.component.scss'],
   templateUrl: './workspace-item-search-result-admin-workflow-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, WorkspaceItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
+  imports: [ListableObjectComponentLoaderComponent, WorkspaceItemAdminWorkflowActionsComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for a workflow item on the admin workflow search page
diff --git a/src/app/admin/admin-workflow-page/themed-admin-workflow-page.component.ts b/src/app/admin/admin-workflow-page/themed-admin-workflow-page.component.ts
new file mode 100644
index 0000000000..5668b5c7a6
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/themed-admin-workflow-page.component.ts
@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
+
+/**
+ * Themed wrapper for {@link AdminWorkflowPageComponent}
+ */
+@Component({
+  selector: 'ds-admin-workflow-page',
+  templateUrl: '../../shared/theme-support/themed.component.html',
+  standalone: true,
+  imports: [AdminWorkflowPageComponent],
+})
+export class ThemedAdminWorkflowPageComponent extends ThemedComponent<AdminWorkflowPageComponent> {
+
+  protected getComponentName(): string {
+    return 'AdminWorkflowPageComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/admin/admin-workflow-page/admin-workflow-page.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./admin-workflow-page.component');
+  }
+
+}
diff --git a/src/app/app-routes.ts b/src/app/app-routes.ts
index 29a78364b5..37de4e46c7 100644
--- a/src/app/app-routes.ts
+++ b/src/app/app-routes.ts
@@ -63,7 +63,7 @@ export const APP_ROUTES: Route[] = [
         path: 'home',
         loadChildren: () => import('./home-page/home-page-routes')
           .then((m) => m.ROUTES),
-        data: { showBreadcrumbs: false },
+        data: { showBreadcrumbs: false,  enableRSS: true },
         providers: [provideSuggestionNotificationsState()],
         canActivate: [endUserAgreementCurrentUserGuard],
       },
@@ -101,12 +101,14 @@ export const APP_ROUTES: Route[] = [
         path: COMMUNITY_MODULE_PATH,
         loadChildren: () => import('./community-page/community-page-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {
         path: COLLECTION_MODULE_PATH,
         loadChildren: () => import('./collection-page/collection-page-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {
@@ -137,6 +139,7 @@ export const APP_ROUTES: Route[] = [
         path: 'mydspace',
         loadChildren: () => import('./my-dspace-page/my-dspace-page-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         providers: [provideSuggestionNotificationsState()],
         canActivate: [authenticatedGuard, endUserAgreementCurrentUserGuard],
       },
@@ -144,6 +147,7 @@ export const APP_ROUTES: Route[] = [
         path: 'search',
         loadChildren: () => import('./search-page/search-page-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {
@@ -156,6 +160,7 @@ export const APP_ROUTES: Route[] = [
         path: ADMIN_MODULE_PATH,
         loadChildren: () => import('./admin/admin-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         canActivate: [siteAdministratorGuard, endUserAgreementCurrentUserGuard],
       },
       {
@@ -200,6 +205,7 @@ export const APP_ROUTES: Route[] = [
         providers: [provideSubmissionState()],
         loadChildren: () => import('./workflowitems-edit-page/workflowitems-edit-page-routes')
           .then((m) => m.ROUTES),
+        data: { enableRSS: true },
         canActivate: [endUserAgreementCurrentUserGuard],
       },
       {
diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index 61a04c8adb..77b29206cb 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -54,6 +54,7 @@ import {
 } from './app-routes';
 import { BROWSE_BY_DECORATOR_MAP } from './browse-by/browse-by-switcher/browse-by-decorator';
 import { AuthInterceptor } from './core/auth/auth.interceptor';
+import { DspaceRestInterceptor } from './core/dspace-rest/dspace-rest.interceptor';
 import { LocaleInterceptor } from './core/locale/locale.interceptor';
 import { LogInterceptor } from './core/log/log.interceptor';
 import {
@@ -148,6 +149,11 @@ export const commonAppConfig: ApplicationConfig = {
       useClass: LogInterceptor,
       multi: true,
     },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: DspaceRestInterceptor,
+      multi: true,
+    },
     // register the dynamic matcher used by form. MUST be provided by the app module
     ...DYNAMIC_MATCHER_PROVIDERS,
     provideCore(),
diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
index 804bb4f891..b749b3b213 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.html
@@ -1,8 +1,8 @@
 <div class="container">
   <ds-resource-policies [resourceType]="'bitstream'" [resourceUUID]="(dsoRD$ | async)?.payload?.id"></ds-resource-policies>
   <div class="button-row bottom">
-    <div class="text-right">
-      <a [routerLink]="['/bitstreams', (dsoRD$ | async)?.payload?.id, 'edit']" role="button" class="btn btn-outline-secondary mr-1">
+    <div class="text-end">
+      <a [routerLink]="['/bitstreams', (dsoRD$ | async)?.payload?.id, 'edit']" role="button" class="btn btn-outline-secondary me-1">
         <i class="fas fa-arrow-left"></i> {{'bitstream.edit.return' | translate}}
       </a>
     </div>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
index f7d2c60832..acbb38fe27 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
@@ -1,33 +1,41 @@
 <ng-container *ngVar="(bitstreamRD$ | async) as bitstreamRD">
-  <div class="container" *ngVar="(bitstreamFormatsRD$ | async) as formatsRD">
-    <div class="row" *ngIf="bitstreamRD?.hasSucceeded && formatsRD?.hasSucceeded">
-      <div class="col-md-2">
-        <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
-      </div>
-      <div class="col-md-10">
-        <div class="container">
-          <div class="row">
-            <div class="col-12">
-              <h1 class="h2">{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h1>
+  <div class="container">
+    @if (bitstreamRD?.hasSucceeded) {
+      <div class="row">
+        <div class="col-md-2">
+          <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
+        </div>
+        <div class="col-md-10">
+          <div class="container">
+            <div class="row">
+              <div class="col-12">
+                <h1 class="h2">{{dsoNameService.getName(bitstreamRD?.payload)}} <span class="text-muted">({{bitstreamRD?.payload?.sizeBytes | dsFileSize}})</span></h1>
+              </div>
             </div>
           </div>
+          @if (formGroup) {
+            <ds-form [formId]="'edit-bitstream-form-id'"
+              [formGroup]="formGroup"
+              [formModel]="formModel"
+              [formLayout]="formLayout"
+              [submitLabel]="'form.save'"
+              (submitForm)="onSubmit()"
+              (cancel)="onCancel()"
+              (dfChange)="onChange($event)">
+              <div additional class="container py-3">
+                <a [routerLink]="['/bitstreams', bitstreamRD?.payload?.id, 'authorizations']">{{'bitstream.edit.authorizations.link' | translate}}</a>
+              </div>
+            </ds-form>
+          }
         </div>
-        <ds-form *ngIf="formGroup" [formId]="'edit-bitstream-form-id'"
-                  [formGroup]="formGroup"
-                  [formModel]="formModel"
-                  [formLayout]="formLayout"
-                  [submitLabel]="'form.save'"
-                  (submitForm)="onSubmit()"
-                  (cancel)="onCancel()"
-                  (dfChange)="onChange($event)">
-          <div additional class="container py-3">
-            <a [routerLink]="['/bitstreams', bitstreamRD?.payload?.id, 'authorizations']">{{'bitstream.edit.authorizations.link' | translate}}</a>
-          </div>
-        </ds-form>
       </div>
-    </div>
-    <ds-error *ngIf="bitstreamRD?.hasFailed" message="{{'error.bitstream' | translate}}"></ds-error>
-    <ds-loading *ngIf="!bitstreamRD || !formatsRD || bitstreamRD?.isLoading || formatsRD?.isLoading"
-                message="{{'loading.bitstream' | translate}}"></ds-loading>
+    }
+    @if (bitstreamRD?.hasFailed) {
+      <ds-error message="{{'error.bitstream' | translate}}"></ds-error>
+    }
+    @if (!bitstreamRD || bitstreamRD?.isLoading) {
+      <ds-loading
+      message="{{'loading.bitstream' | translate}}"></ds-loading>
+    }
   </div>
 </ng-container>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
index 9243a36491..7da9e040ce 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.spec.ts
@@ -261,7 +261,7 @@ describe('EditBitstreamPageComponent', () => {
       });
 
       it('should select the correct format', () => {
-        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.id);
+        expect(rawForm.formatContainer.selectedFormat).toEqual(selectedFormat.shortDescription);
       });
 
       it('should put the \"New Format\" input on invisible', () => {
@@ -292,7 +292,13 @@ describe('EditBitstreamPageComponent', () => {
 
     describe('when an unknown format is selected', () => {
       beforeEach(() => {
-        comp.updateNewFormatLayout(allFormats[0].id);
+        comp.onChange({
+          model: {
+            id: 'selectedFormat',
+            value: allFormats[0],
+          },
+        });
+        comp.updateNewFormatLayout();
       });
 
       it('should remove the invisible class from the \"New Format\" input', () => {
@@ -394,9 +400,10 @@ describe('EditBitstreamPageComponent', () => {
 
       describe('when selected format has changed', () => {
         beforeEach(() => {
-          comp.formGroup.patchValue({
-            formatContainer: {
-              selectedFormat: allFormats[2].id,
+          comp.onChange({
+            model: {
+              id: 'selectedFormat',
+              value: allFormats[2],
             },
           });
           fixture.detectChanges();
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 36b0816ade..6ad82b2a74 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -21,7 +18,6 @@ import {
   DynamicFormLayout,
   DynamicFormService,
   DynamicInputModel,
-  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
 import {
   TranslateModule,
@@ -39,23 +35,24 @@ import {
   filter,
   map,
   switchMap,
+  take,
   tap,
 } from 'rxjs/operators';
 
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { FindAllDataImpl } from '../../core/data/base/find-all-data';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
-import { PaginatedList } from '../../core/data/paginated-list.model';
 import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
+import { BITSTREAM_FORMAT } from '../../core/shared/bitstream-format.resource-type';
 import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
 import { Bundle } from '../../core/shared/bundle.model';
 import { Item } from '../../core/shared/item.model';
 import { Metadata } from '../../core/shared/metadata.utils';
 import {
-  getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
@@ -72,6 +69,7 @@ import { ErrorComponent } from '../../shared/error/error.component';
 import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import { DsDynamicInputModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DsDynamicTextAreaModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
+import { DynamicScrollableDropdownModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { FormComponent } from '../../shared/form/form.component';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -86,7 +84,6 @@ import { ThemedThumbnailComponent } from '../../thumbnail/themed-thumbnail.compo
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     FormComponent,
-    NgIf,
     VarDirective,
     ThemedThumbnailComponent,
     AsyncPipe,
@@ -109,12 +106,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   bitstreamRD$: Observable<RemoteData<Bitstream>>;
 
-  /**
-   * The formats their remote data observable
-   * Tracks changes and updates the view
-   */
-  bitstreamFormatsRD$: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
-
   /**
    * The UUID of the primary bitstream for this bundle
    */
@@ -130,11 +121,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   originalFormat: BitstreamFormat;
 
-  /**
-   * A list of all available bitstream formats
-   */
-  formats: BitstreamFormat[];
-
   /**
    * @type {string} Key prefix used to generate form messages
    */
@@ -178,7 +164,10 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * Options for fetching all bitstream formats
    */
-  findAllOptions = { elementsPerPage: 9999 };
+  findAllOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
 
   /**
    * The Dynamic Input Model for the file's name
@@ -218,9 +207,22 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   /**
    * The Dynamic Input Model for the selected format
    */
-  selectedFormatModel = new DynamicSelectModel({
+  selectedFormatModel = new DynamicScrollableDropdownModel({
     id: 'selectedFormat',
     name: 'selectedFormat',
+    displayKey: 'shortDescription',
+    repeatable: false,
+    metadataFields: [],
+    submissionId: '',
+    hasSelectableMetadata: false,
+    resourceType: BITSTREAM_FORMAT,
+    formatFunction: (format: BitstreamFormat | string) => {
+      if (format instanceof  BitstreamFormat) {
+        return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription;
+      } else {
+        return format;
+      }
+    },
   });
 
   /**
@@ -249,7 +251,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     group: [this.iiifLabelModel],
   }, {
     grid: {
-      host: 'form-row',
+      host: 'row',
     },
   });
 
@@ -267,7 +269,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     group: [this.iiifTocModel],
   }, {
     grid: {
-      host: 'form-row',
+      host: 'row',
     },
   });
 
@@ -285,7 +287,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     group: [this.iiifWidthModel],
   }, {
     grid: {
-      host: 'form-row',
+      host: 'row',
     },
   });
 
@@ -303,7 +305,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     group: [this.iiifHeightModel],
   }, {
     grid: {
-      host: 'form-row',
+      host: 'row',
     },
   });
 
@@ -326,7 +328,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       ],
     }, {
       grid: {
-        host: 'form-row',
+        host: 'row',
       },
     }),
     new DynamicFormGroupModel({
@@ -438,6 +440,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * @private
    */
   private bundle: Bundle;
+  /**
+   * The currently selected format
+   * @private
+   */
+  private selectedFormat: BitstreamFormat;
 
   constructor(private route: ActivatedRoute,
               private router: Router,
@@ -463,18 +470,12 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.itemId = this.route.snapshot.queryParams.itemId;
     this.entityType = this.route.snapshot.queryParams.entityType;
     this.bitstreamRD$ = this.route.data.pipe(map((data: any) => data.bitstream));
-    this.bitstreamFormatsRD$ = this.bitstreamFormatService.findAll(this.findAllOptions);
 
     const bitstream$ = this.bitstreamRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
     );
 
-    const allFormats$ = this.bitstreamFormatsRD$.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    );
-
     const bundle$ = bitstream$.pipe(
       switchMap((bitstream: Bitstream) => bitstream.bundle),
       getFirstSucceededRemoteDataPayload(),
@@ -490,24 +491,31 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       switchMap((bundle: Bundle) => bundle.item),
       getFirstSucceededRemoteDataPayload(),
     );
+    const format$ = bitstream$.pipe(
+      switchMap(bitstream => bitstream.format),
+      getFirstSucceededRemoteDataPayload(),
+    );
+
     this.subs.push(
       observableCombineLatest(
         bitstream$,
-        allFormats$,
         bundle$,
         primaryBitstream$,
         item$,
-      ).pipe()
-        .subscribe(([bitstream, allFormats, bundle, primaryBitstream, item]) => {
-          this.bitstream = bitstream as Bitstream;
-          this.formats = allFormats.page;
-          this.bundle = bundle;
-          // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
-          // be a success response, but empty
-          this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
-          this.itemId = item.uuid;
-          this.setIiifStatus(this.bitstream);
-        }),
+        format$,
+      ).subscribe(([bitstream, bundle, primaryBitstream, item, format]) => {
+        this.bitstream = bitstream as Bitstream;
+        this.bundle = bundle;
+        this.selectedFormat = format;
+        // hasValue(primaryBitstream) because if there's no primaryBitstream on the bundle it will
+        // be a success response, but empty
+        this.primaryBitstreamUUID = hasValue(primaryBitstream) ? primaryBitstream.uuid : null;
+        this.itemId = item.uuid;
+        this.setIiifStatus(this.bitstream);
+      }),
+      format$.pipe(take(1)).subscribe(
+        (format) => this.originalFormat = format,
+      ),
     );
 
     this.subs.push(
@@ -523,7 +531,6 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   setForm() {
     this.formGroup = this.formService.createFormGroup(this.formModel);
-    this.updateFormatModel();
     this.updateForm(this.bitstream);
     this.updateFieldTranslations();
   }
@@ -542,6 +549,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         description: bitstream.firstMetadataValue('dc.description'),
       },
       formatContainer: {
+        selectedFormat: this.selectedFormat.shortDescription,
         newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined,
       },
     });
@@ -561,36 +569,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
         },
       });
     }
-    this.bitstream.format.pipe(
-      getAllSucceededRemoteDataPayload(),
-    ).subscribe((format: BitstreamFormat) => {
-      this.originalFormat = format;
-      this.formGroup.patchValue({
-        formatContainer: {
-          selectedFormat: format.id,
-        },
-      });
-      this.updateNewFormatLayout(format.id);
-    });
+    this.updateNewFormatLayout();
   }
 
-  /**
-   * Create the list of unknown format IDs an add options to the selectedFormatModel
-   */
-  updateFormatModel() {
-    this.selectedFormatModel.options = this.formats.map((format: BitstreamFormat) =>
-      Object.assign({
-        value: format.id,
-        label: this.isUnknownFormat(format.id) ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription,
-      }));
-  }
 
   /**
    * Update the layout of the "Other Format" input depending on the selected format
    * @param selectedId
    */
-  updateNewFormatLayout(selectedId: string) {
-    if (this.isUnknownFormat(selectedId)) {
+  updateNewFormatLayout() {
+    if (this.isUnknownFormat()) {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout;
     } else {
       this.formLayout.newFormat.grid.host = this.newFormatBaseLayout + ' invisible';
@@ -601,9 +589,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * Is the provided format (id) part of the list of unknown formats?
    * @param id
    */
-  isUnknownFormat(id: string): boolean {
-    const format = this.formats.find((f: BitstreamFormat) => f.id === id);
-    return hasValue(format) && format.supportLevel === BitstreamFormatSupportLevel.Unknown;
+  isUnknownFormat(): boolean {
+    return hasValue(this.selectedFormat) &&  this.selectedFormat.supportLevel === BitstreamFormatSupportLevel.Unknown;
   }
 
   /**
@@ -635,7 +622,8 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onChange(event) {
     const model = event.model;
     if (model.id === this.selectedFormatModel.id) {
-      this.updateNewFormatLayout(model.value);
+      this.selectedFormat = model.value;
+      this.updateNewFormatLayout();
     }
   }
 
@@ -645,8 +633,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   onSubmit() {
     const updatedValues = this.formGroup.getRawValue();
     const updatedBitstream = this.formToBitstream(updatedValues);
-    const selectedFormat = this.formats.find((f: BitstreamFormat) => f.id === updatedValues.formatContainer.selectedFormat);
-    const isNewFormat = selectedFormat.id !== this.originalFormat.id;
+    const isNewFormat = this.selectedFormat.id !== this.originalFormat.id;
     const isPrimary = updatedValues.fileNamePrimaryContainer.primaryBitstream;
     const wasPrimary = this.primaryBitstreamUUID === this.bitstream.uuid;
 
@@ -698,7 +685,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       bundle$ = observableOf(this.bundle);
     }
     if (isNewFormat) {
-      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, selectedFormat).pipe(
+      bitstream$ = this.bitstreamService.updateFormat(this.bitstream, this.selectedFormat).pipe(
         getFirstCompletedRemoteData(),
         map((formatResponse: RemoteData<Bitstream>) => {
           if (hasValue(formatResponse) && formatResponse.hasFailed) {
@@ -856,4 +843,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       .forEach((subscription) => subscription.unsubscribe());
   }
 
+  findAllFormatsServiceFactory() {
+    return () => this.bitstreamFormatService as any as FindAllDataImpl<BitstreamFormat>;
+  }
 }
diff --git a/src/app/breadcrumbs/breadcrumbs.component.html b/src/app/breadcrumbs/breadcrumbs.component.html
index 3bba89622f..cbf9f0c886 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.html
+++ b/src/app/breadcrumbs/breadcrumbs.component.html
@@ -1,20 +1,22 @@
 <ng-container *ngVar="(breadcrumbs$ | async) as breadcrumbs">
-    <nav *ngIf="(showBreadcrumbs$ | async)" aria-label="breadcrumb" class="nav-breadcrumb">
-        <ol class="container breadcrumb my-0">
-            <ng-container
-                    *ngTemplateOutlet="breadcrumbs?.length > 0 ? breadcrumb : activeBreadcrumb; context: {text: 'home.breadcrumbs', url: '/'}"></ng-container>
-            <ng-container *ngFor="let bc of breadcrumbs; let last = last;">
-                <ng-container *ngTemplateOutlet="!last ? breadcrumb : activeBreadcrumb; context: bc"></ng-container>
-            </ng-container>
-        </ol>
+  @if ((showBreadcrumbs$ | async)) {
+    <nav aria-label="breadcrumb" class="nav-breadcrumb">
+      <ol class="container breadcrumb my-0">
+        <ng-container
+        *ngTemplateOutlet="breadcrumbs?.length > 0 ? breadcrumb : activeBreadcrumb; context: {text: 'home.breadcrumbs', url: '/'}"></ng-container>
+        @for (bc of breadcrumbs; track bc; let last = $last) {
+          <ng-container *ngTemplateOutlet="!last ? breadcrumb : activeBreadcrumb; context: bc"></ng-container>
+        }
+      </ol>
     </nav>
+  }
 
-    <ng-template #breadcrumb let-text="text" let-url="url">
-        <li class="breadcrumb-item"><div class="breadcrumb-item-limiter"><a [routerLink]="url" class="text-truncate" [ngbTooltip]="text | translate" placement="bottom" >{{text | translate}}</a></div></li>
-    </ng-template>
+  <ng-template #breadcrumb let-text="text" let-url="url">
+    <li class="breadcrumb-item"><div class="breadcrumb-item-limiter"><a [routerLink]="url" class="text-truncate" [ngbTooltip]="text | translate" placement="bottom" >{{text | translate}}</a></div></li>
+  </ng-template>
 
-    <ng-template #activeBreadcrumb let-text="text">
-        <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><div class="text-truncate">{{text | translate}}</div></div></li>
-    </ng-template>
+  <ng-template #activeBreadcrumb let-text="text">
+    <li class="breadcrumb-item active" aria-current="page"><div class="breadcrumb-item-limiter"><div class="text-truncate">{{text | translate}}</div></div></li>
+  </ng-template>
 </ng-container>
 
diff --git a/src/app/breadcrumbs/breadcrumbs.component.scss b/src/app/breadcrumbs/breadcrumbs.component.scss
index ac9cb42ce5..d938dad1a6 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.scss
+++ b/src/app/breadcrumbs/breadcrumbs.component.scss
@@ -7,6 +7,8 @@
   padding-bottom: calc(var(--ds-content-spacing) / 2);
   padding-top: calc(var(--ds-content-spacing) / 2);
   background-color: var(--ds-breadcrumb-bg);
+  padding-left: calc(var(--bs-spacer) *.75);
+  padding-right: calc(var(--bs-spacer) *.75);
 }
 
 li.breadcrumb-item {
diff --git a/src/app/breadcrumbs/breadcrumbs.component.ts b/src/app/breadcrumbs/breadcrumbs.component.ts
index 9820d672c9..a137a3aaa2 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,7 +1,5 @@
 import {
   AsyncPipe,
-  NgFor,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -22,7 +20,7 @@ import { BreadcrumbsService } from './breadcrumbs.service';
   templateUrl: './breadcrumbs.component.html',
   styleUrls: ['./breadcrumbs.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, NgTemplateOutlet, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgTemplateOutlet, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 export class BreadcrumbsComponent {
 
diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
index edd7cd951a..fad573705c 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
@@ -2,10 +2,13 @@ import { CommonModule } from '@angular/common';
 import {
   ChangeDetectorRef,
   NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import {
@@ -26,6 +29,7 @@ import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-
 import { SortDirection } from '../../core/cache/models/sort-options.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Community } from '../../core/shared/community.model';
 import { Item } from '../../core/shared/item.model';
 import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
@@ -123,6 +127,7 @@ describe('BrowseByDateComponent', () => {
         { provide: ChangeDetectorRef, useValue: mockCdRef },
         { provide: Store, useValue: {} },
         { provide: APP_CONFIG, useValue: environment },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -172,4 +177,33 @@ describe('BrowseByDateComponent', () => {
     //expect(comp.startsWithOptions[0]).toEqual(new Date().getUTCFullYear());
     expect(comp.startsWithOptions[0]).toEqual(1960);
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
+    });
+
+    it('should not call getBrowseItemsFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
index ee33ee533c..3cf4e94de7 100644
--- a/src/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -1,12 +1,13 @@
 import {
   AsyncPipe,
-  NgIf,
+  isPlatformServer,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
   Inject,
   OnInit,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ActivatedRoute,
@@ -17,14 +18,19 @@ import { TranslateModule } from '@ngx-translate/core';
 import {
   combineLatest as observableCombineLatest,
   Observable,
+  of as observableOf,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
 import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
 
 import {
   APP_CONFIG,
   AppConfig,
 } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BrowseService } from '../../core/browse/browse.service';
 import {
@@ -35,13 +41,7 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
 import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { Item } from '../../core/shared/item.model';
-import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
 import { isValidDate } from '../../shared/date.util';
-import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import {
   hasValue,
   isNotEmpty,
@@ -49,11 +49,9 @@ import {
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { StartsWithType } from '../../shared/starts-with/starts-with-type';
-import { VarDirective } from '../../shared/utils/var.directive';
 import {
   BrowseByMetadataComponent,
   browseParamsToOptions,
-  getBrowseSearchOptions,
 } from '../browse-by-metadata/browse-by-metadata.component';
 
 @Component({
@@ -62,15 +60,7 @@ import {
   templateUrl: '../browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
-    NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
@@ -97,24 +87,34 @@ export class BrowseByDateComponent extends BrowseByMetadataComponent implements
     @Inject(APP_CONFIG) public appConfig: AppConfig,
     public dsoNameService: DSONameService,
     protected cdRef: ChangeDetectorRef,
+    @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
+    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService, platformId);
   }
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.ssr.enableBrowseComponent && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
     this.startsWithType = StartsWithType.date;
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.route.data,
-        this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, data, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams, data), scope, currentPage, currentSort];
-        }),
-      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.scope$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
         const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
         this.browseId = params.id || this.defaultBrowseId;
         this.startsWith = +params.startsWith || params.startsWith;
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
index 22e564ac27..ffb7d9feed 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
@@ -1,21 +1,27 @@
-<section class="comcol-page-browse-section">
-  <div class="browse-by-metadata w-100">
-    <ds-browse-by *ngIf="(loading$ | async) !== true" class="col-xs-12 w-100"
+@if ((!ssrRenderingDisabled)) {
+  <section class="comcol-page-browse-section">
+    <div class="browse-by-metadata w-100">
+      @if ((loading$ | async) !== true) {
+        <ds-browse-by class="col-xs-12 w-100"
                          title="{{'browse.title' | translate:{
                            field: 'browse.metadata.' + browseId | translate,
                            startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',
                            value: (value)? '&quot;' + value + '&quot;': ''
                          } }}"
-                         [displayTitle]="displayTitle"
-                         [objects$]="(items$ !== undefined)? items$ : browseEntries$"
-                         [paginationConfig]="(currentPagination$ |async)"
-                         [sortConfig]="(currentSort$ |async)"
-                         [type]="startsWithType"
-                         [startsWithOptions]="startsWithOptions"
-                         (prev)="goPrev()"
-                         (next)="goNext()">
-    </ds-browse-by>
-    <ds-loading *ngIf="loading$ | async"
-                       message="{{'loading.browse-by-page' | translate}}"></ds-loading>
-  </div>
-</section>
+          [displayTitle]="displayTitle"
+          [objects$]="(items$ !== undefined)? items$ : browseEntries$"
+          [paginationConfig]="(currentPagination$ |async)"
+          [sortConfig]="(currentSort$ |async)"
+          [type]="startsWithType"
+          [startsWithOptions]="startsWithOptions"
+          (prev)="goPrev()"
+          (next)="goNext()">
+        </ds-browse-by>
+      }
+      @if (loading$ | async) {
+        <ds-loading
+        message="{{'loading.browse-by-page' | translate}}"></ds-loading>
+      }
+    </div>
+  </section>
+}
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
index b6babc97cf..623f1af8aa 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
@@ -1,8 +1,13 @@
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
+} from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -147,6 +152,7 @@ describe('BrowseByMetadataComponent', () => {
         { provide: ThemeService, useValue: getMockThemeService() },
         { provide: SelectableListService, useValue: {} },
         { provide: HostWindowService, useValue: {} },
+        { provide: PLATFORM_ID, useValue: 'browser' },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -259,6 +265,35 @@ describe('BrowseByMetadataComponent', () => {
       expect(result.fetchThumbnail).toBeTrue();
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.ssrRenderingDisabled = true;
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(null));
+    });
+
+    it('should not call getBrowseEntriesFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseEntriesFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.ssrRenderingDisabled = false;
+      spyOn((comp as any).browseService, 'getBrowseEntriesFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseEntriesFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseEntriesFor).toHaveBeenCalled();
+    }));
+  });
 });
 
 export function toRemoteData(objects: any[]): Observable<RemoteData<PaginatedList<any>>> {
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index 29bc48b1bd..87366d38c6 100644
--- a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,6 +1,6 @@
 import {
   AsyncPipe,
-  NgIf,
+  isPlatformServer,
 } from '@angular/common';
 import {
   Component,
@@ -9,6 +9,8 @@ import {
   OnChanges,
   OnDestroy,
   OnInit,
+  PLATFORM_ID,
+  SimpleChanges,
 } from '@angular/core';
 import {
   ActivatedRoute,
@@ -23,13 +25,17 @@ import {
   of as observableOf,
   Subscription,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
 import { ThemedBrowseByComponent } from 'src/app/shared/browse-by/themed-browse-by.component';
 
 import {
   APP_CONFIG,
   AppConfig,
 } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BrowseService } from '../../core/browse/browse.service';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
@@ -45,12 +51,6 @@ import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Context } from '../../core/shared/context.model';
 import { Item } from '../../core/shared/item.model';
 import { getFirstSucceededRemoteData } from '../../core/shared/operators';
-import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import {
   hasValue,
   isNotEmpty,
@@ -58,7 +58,6 @@ import {
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { StartsWithType } from '../../shared/starts-with/starts-with-type';
-import { VarDirective } from '../../shared/utils/var.directive';
 import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
 
 export const BBM_PAGINATION_ID = 'bbm';
@@ -68,15 +67,7 @@ export const BBM_PAGINATION_ID = 'bbm';
   styleUrls: ['./browse-by-metadata.component.scss'],
   templateUrl: './browse-by-metadata.component.html',
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
-    NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
@@ -111,6 +102,11 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
    */
   @Input() displayTitle = true;
 
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide: boolean;
+
   scope$: BehaviorSubject<string> = new BehaviorSubject(undefined);
 
   /**
@@ -191,6 +187,10 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
    * Observable determining if the loading animation needs to be shown
    */
   loading$ = observableOf(true);
+  /**
+   * Whether this component should be rendered or not in SSR
+   */
+  ssrRenderingDisabled = false;
 
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
@@ -199,6 +199,7 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
                      protected router: Router,
                      @Inject(APP_CONFIG) public appConfig: AppConfig,
                      public dsoNameService: DSONameService,
+                     @Inject(PLATFORM_ID) public platformId: any,
   ) {
     this.fetchThumbnails = this.appConfig.browseBy.showThumbnails;
     this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
@@ -206,21 +207,32 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
       currentPage: 1,
       pageSize: this.appConfig.browseBy.pageSize,
     });
+    this.ssrRenderingDisabled = !this.renderOnServerSide && !environment.ssr.enableBrowseComponent && isPlatformServer(this.platformId);
   }
 
 
   ngOnInit(): void {
-
+    if (this.ssrRenderingDisabled) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('default', SortDirection.ASC);
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.authority === curr.authority && prev.value === curr.value && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
-        }),
-      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.scope$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
         this.browseId = params.id || this.defaultBrowseId;
         this.authority = params.authority;
 
@@ -248,8 +260,10 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
 
   }
 
-  ngOnChanges(): void {
-    this.scope$.next(this.scope);
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasValue(changes.scope)) {
+      this.scope$.next(this.scope);
+    }
   }
 
   /**
@@ -327,7 +341,6 @@ export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
     this.paginationService.clearPagination(this.paginationConfig.id);
   }
 
-
 }
 
 /**
diff --git a/src/app/browse-by/browse-by-page-routes.ts b/src/app/browse-by/browse-by-page-routes.ts
index 9c7e16ab39..3843a50f6e 100644
--- a/src/app/browse-by/browse-by-page-routes.ts
+++ b/src/app/browse-by/browse-by-page-routes.ts
@@ -1,6 +1,5 @@
 import { Route } from '@angular/router';
 
-import { dsoEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 import { browseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
 import { browseByGuard } from './browse-by-guard';
 import { browseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
@@ -11,7 +10,6 @@ export const ROUTES: Route[] = [
     path: '',
     resolve: {
       breadcrumb: browseByDSOBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     children: [
       {
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
index 1a204264d1..670b5a7711 100644
--- a/src/app/browse-by/browse-by-page/browse-by-page.component.ts
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
@@ -23,7 +23,7 @@ import { BrowseBySwitcherComponent } from '../browse-by-switcher/browse-by-switc
 })
 export class BrowseByPageComponent implements OnInit {
 
-  browseByType$: Observable<BrowseByDataType>;
+  browseByType$: Observable<{type: BrowseByDataType }>;
 
   constructor(
     protected route: ActivatedRoute,
@@ -35,7 +35,7 @@ export class BrowseByPageComponent implements OnInit {
    */
   ngOnInit(): void {
     this.browseByType$ = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+      map((data: { browseDefinition: BrowseDefinition }) => ({ type: data.browseDefinition.getRenderType() })),
     );
   }
 
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
index d56671577e..8539365f66 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
@@ -85,7 +85,7 @@ describe('BrowseBySwitcherComponent', () => {
   types.forEach((type: NonHierarchicalBrowseDefinition) => {
     describe(`when switching to a browse-by page for "${type.id}"`, () => {
       beforeEach(async () => {
-        comp.browseByType = type.dataType;
+        comp.browseByType = type as any;
         comp.ngOnChanges({
           browseByType: new SimpleChange(undefined, type.dataType, true),
         });
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
index c1e3dae79f..53be5fa786 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
@@ -24,7 +24,7 @@ export class BrowseBySwitcherComponent extends AbstractComponentLoaderComponent<
 
   @Input() context: Context;
 
-  @Input() browseByType: BrowseByDataType;
+  @Input() browseByType: { type: BrowseByDataType };
 
   @Input() displayTitle: boolean;
 
@@ -43,7 +43,7 @@ export class BrowseBySwitcherComponent extends AbstractComponentLoaderComponent<
   ];
 
   public getComponent(): GenericConstructor<Component> {
-    return getComponentByBrowseByType(this.browseByType, this.context, this.themeService.getThemeName());
+    return getComponentByBrowseByType(this.browseByType.type, this.context, this.themeService.getThemeName());
   }
 
 }
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
index e2c0c52827..f533757d68 100644
--- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
@@ -1,23 +1,25 @@
 <section>
-  <h1 *ngIf="displayTitle">
-    {{ ('browse.title') | translate:{
-    field: 'browse.metadata.' + vocabularyName | translate,
-    startsWith: '',
-    value: '',
-  } }}
-  </h1>
+  @if (displayTitle) {
+    <h1>
+      {{ ('browse.title') | translate:{
+      field: 'browse.metadata.' + vocabularyName | translate,
+      startsWith: '',
+      value: '',
+      } }}
+    </h1>
+  }
   <div class="mb-3">
     <ds-vocabulary-treeview [description]="description"
-                            [vocabularyOptions]=vocabularyOptions
-                            [multiSelect]="true"
-                            [showAdd]="false"
-                            (select)="onSelect($event)"
-                            (deselect)="onDeselect($event)">
+      [vocabularyOptions]=vocabularyOptions
+      [multiSelect]="true"
+      [showAdd]="false"
+      (select)="onSelect($event)"
+      (deselect)="onDeselect($event)">
     </ds-vocabulary-treeview>
   </div>
   <a class="btn btn-primary"
-     [routerLink]="['/search']"
-     [queryParams]="queryParams"
-     [queryParamsHandling]="'merge'">
-    {{ 'browse.taxonomy.button' | translate }}</a>
+    [routerLink]="['/search']"
+    [queryParams]="queryParams"
+    [queryParamsHandling]="'merge'">
+  {{ 'browse.taxonomy.button' | translate }}</a>
 </section>
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
index 2372c7d0c7..4115bc7349 100644
--- a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -52,7 +49,6 @@ import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
     AsyncPipe,
     ComcolPageHeaderComponent,
     ComcolPageLogoComponent,
-    NgIf,
     ThemedComcolPageHandleComponent,
     ThemedComcolPageContentComponent,
     DsoEditMenuComponent,
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
index e2e022391a..1b6d96d3f8 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
@@ -5,7 +5,9 @@ import {
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import {
@@ -23,6 +25,7 @@ import { BrowseService } from '../../core/browse/browse.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
 import { Community } from '../../core/shared/community.model';
 import { Item } from '../../core/shared/item.model';
 import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
@@ -81,6 +84,7 @@ describe('BrowseByTitleComponent', () => {
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({}),
+    queryParams: observableOf({}),
     data: observableOf({ metadata: 'title' }),
   });
 
@@ -127,4 +131,35 @@ describe('BrowseByTitleComponent', () => {
       expect(result.payload.page).toEqual(mockItems);
     });
   });
+
+  describe('when rendered in SSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'server';
+      spyOn((comp as any).browseService, 'getBrowseItemsFor');
+      fixture.detectChanges();
+    });
+
+    it('should not call getBrowseItemsFor on init', (done) => {
+      comp.ngOnInit();
+      expect((comp as any).browseService.getBrowseItemsFor).not.toHaveBeenCalled();
+      comp.loading$.subscribe((res) => {
+        expect(res).toBeFalsy();
+        done();
+      });
+    });
+  });
+
+  describe('when rendered in CSR', () => {
+    beforeEach(() => {
+      comp.platformId = 'browser';
+      fixture.detectChanges();
+      spyOn((comp as any).browseService, 'getBrowseItemsFor').and.returnValue(createSuccessfulRemoteDataObject$(new BrowseEntry()));
+    });
+
+    it('should call getBrowseItemsFor on init', fakeAsync(() => {
+      comp.ngOnInit();
+      tick(100);
+      expect((comp as any).browseService.getBrowseItemsFor).toHaveBeenCalled();
+    }));
+  });
 });
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
index aa5daa3166..2c8f9eeaa1 100644
--- a/src/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -1,6 +1,6 @@
 import {
   AsyncPipe,
-  NgIf,
+  isPlatformServer,
 } from '@angular/common';
 import {
   Component,
@@ -8,27 +8,27 @@ import {
 } from '@angular/core';
 import { Params } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
 
+import { environment } from '../../../environments/environment';
 import {
   SortDirection,
   SortOptions,
 } from '../../core/cache/models/sort-options.model';
 import { ThemedBrowseByComponent } from '../../shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { VarDirective } from '../../shared/utils/var.directive';
 import {
   BrowseByMetadataComponent,
   browseParamsToOptions,
-  getBrowseSearchOptions,
 } from '../browse-by-metadata/browse-by-metadata.component';
 
 @Component({
@@ -37,15 +37,7 @@ import {
   templateUrl: '../browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
-    NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
@@ -57,17 +49,27 @@ import {
 export class BrowseByTitleComponent extends BrowseByMetadataComponent implements OnInit {
 
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.ssr.enableBrowseComponent && isPlatformServer(this.platformId)) {
+      this.loading$ = observableOf(false);
+      return;
+    }
     const sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    // include the thumbnail configuration in browse search options
-    this.updatePage(getBrowseSearchOptions(this.defaultBrowseId, this.paginationConfig, sortConfig, this.fetchThumbnails));
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
+    const routeParams$: Observable<Params> = observableCombineLatest([
+      this.route.params,
+      this.route.queryParams,
+    ]).pipe(
+      map(([params, queryParams]: [Params, Params]) => Object.assign({}, params, queryParams)),
+      distinctUntilChanged((prev: Params, curr: Params) => prev.id === curr.id && prev.startsWith === curr.startsWith),
+    );
     this.subs.push(
-      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
-        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
-          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
-        }),
-      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+      observableCombineLatest([
+        routeParams$,
+        this.scope$,
+        this.currentPagination$,
+        this.currentSort$,
+      ]).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
         this.startsWith = +params.startsWith || params.startsWith;
         this.browseId = params.id || this.defaultBrowseId;
         this.updatePageWithItems(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);
diff --git a/src/app/collection-page/collection-form/collection-form.component.ts b/src/app/collection-page/collection-form/collection-form.component.ts
index 0758435db8..49890c7cb5 100644
--- a/src/app/collection-page/collection-form/collection-form.component.ts
+++ b/src/app/collection-page/collection-form/collection-form.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -64,8 +60,6 @@ import {
     UploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
-    NgIf,
-    NgClass,
     VarDirective,
   ],
 })
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
index f3124720ca..96bea31837 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -19,7 +19,7 @@
                 [dangerConfirm]="true"
                 [hideCollection]="true"
                 (confirm)="mapItems($event, true)"
-                (cancel)="onCancel()"></ds-item-select>
+              (cancel)="onCancel()"></ds-item-select>
             </div>
           </ng-template>
         </li>
@@ -29,30 +29,34 @@
             <div class="row mt-2">
               <div class="col-12 col-lg-6">
                 <ds-search-form id="search-form"
-                                [query]="(searchOptions$ | async)?.query"
-                                [scope]="(searchOptions$ | async)?.scope"
-                                [currentUrl]="'./'"
-                                [inPlaceSearch]="true"
-                                [searchPlaceholder]="'collection.edit.item-mapper.search-form.placeholder' | translate"
-                                (submitSearch)="performedSearch = true">
+                  [query]="(searchOptions$ | async)?.query"
+                  [scope]="(searchOptions$ | async)?.scope"
+                  [currentUrl]="'./'"
+                  [inPlaceSearch]="true"
+                  [searchPlaceholder]="'collection.edit.item-mapper.search-form.placeholder' | translate"
+                  (submitSearch)="performedSearch = true">
                 </ds-search-form>
               </div>
             </div>
 
-            <div *ngIf="performedSearch">
-              <ds-item-select class="mt-2"
-                [key]="'map'"
-                [dsoRD$]="mappedItemsRD$"
-                [paginationOptions]="(searchOptions$ | async)?.pagination"
-                [featureId]="FeatureIds.CanManageMappings"
-                [confirmButton]="'collection.edit.item-mapper.confirm'"
-                [cancelButton]="'collection.edit.item-mapper.cancel'"
-                (confirm)="mapItems($event)"
+            @if (performedSearch) {
+              <div>
+                <ds-item-select class="mt-2"
+                  [key]="'map'"
+                  [dsoRD$]="mappedItemsRD$"
+                  [paginationOptions]="(searchOptions$ | async)?.pagination"
+                  [featureId]="FeatureIds.CanManageMappings"
+                  [confirmButton]="'collection.edit.item-mapper.confirm'"
+                  [cancelButton]="'collection.edit.item-mapper.cancel'"
+                  (confirm)="mapItems($event)"
                 (cancel)="onCancel()"></ds-item-select>
-            </div>
-            <div *ngIf="!performedSearch" class="alert alert-info w-100" role="alert">
-              {{'collection.edit.item-mapper.no-search' | translate}}
-            </div>
+              </div>
+            }
+            @if (!performedSearch) {
+              <div class="alert alert-info w-100" role="alert">
+                {{'collection.edit.item-mapper.no-search' | translate}}
+              </div>
+            }
           </ng-template>
         </li>
       </ul>
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 351a5daf60..4fce1601a9 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -86,7 +83,6 @@ import { followLink } from '../../shared/utils/follow-link-config.model';
     TranslateModule,
     AsyncPipe,
     ItemSelectComponent,
-    NgIf,
     BrowserOnlyPipe,
   ],
   standalone: true,
diff --git a/src/app/collection-page/collection-page-routes.ts b/src/app/collection-page/collection-page-routes.ts
index f2dadc3fbe..e20e3ba8af 100644
--- a/src/app/collection-page/collection-page-routes.ts
+++ b/src/app/collection-page/collection-page-routes.ts
@@ -54,7 +54,6 @@ export const ROUTES: Route[] = [
     resolve: {
       dso: collectionPageResolver,
       breadcrumb: collectionBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     runGuardsAndResolvers: 'always',
     children: [
@@ -83,6 +82,9 @@ export const ROUTES: Route[] = [
       {
         path: '',
         component: ThemedCollectionPageComponent,
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
         children: [
           {
             path: '',
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index 4a3e28c6aa..d38e38dd83 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -1,61 +1,71 @@
 <div class="container">
   <div class="collection-page"
-       *ngVar="(collectionRD$ | async) as collectionRD">
-    <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
-      <div *ngIf="collectionRD?.payload as collection">
-        <ds-view-tracker [object]="collection"></ds-view-tracker>
-        <div class="d-flex flex-row border-bottom mb-4 pb-4">
-          <header class="comcol-header mr-auto">
-            <!-- Collection Name -->
-            <ds-comcol-page-header
-                [name]="dsoNameService.getName(collection)">
-            </ds-comcol-page-header>
-            <!-- Collection logo -->
-            <ds-comcol-page-logo *ngIf="logoRD$"
-                                 [logo]="(logoRD$ | async)?.payload"
-                                 [alternateText]="'collection.logo' | translate">
-            </ds-comcol-page-logo>
-
-            <!-- Handle -->
-            <ds-comcol-page-handle
-                [content]="collection.handle"
-                [title]="'collection.page.handle'">
-            </ds-comcol-page-handle>
-            <!-- Introductory text -->
-            <ds-comcol-page-content
-                [content]="collection.introductoryText"
-                [hasInnerHtml]="true">
-            </ds-comcol-page-content>
-            <!-- News -->
-            <ds-comcol-page-content
-                [content]="collection.sidebarText"
-                [hasInnerHtml]="true"
-                [title]="'collection.page.news'">
-            </ds-comcol-page-content>
-          </header>
-          <ds-dso-edit-menu></ds-dso-edit-menu>
-        </div>
-        <section class="comcol-page-browse-section">
-          <!-- Browse-By Links -->
-          <ds-comcol-page-browse-by
-              [id]="collection.id"
-              [contentType]="collection.type">
-          </ds-comcol-page-browse-by>
-
-          <router-outlet></router-outlet>
-        </section>
-        <footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4">
-          <!-- Copyright -->
-          <ds-comcol-page-content
-              [content]="collection.copyrightText"
-              [hasInnerHtml]="true">
-          </ds-comcol-page-content>
-        </footer>
+    *ngVar="(collectionRD$ | async) as collectionRD">
+    @if (collectionRD?.hasSucceeded) {
+      <div @fadeInOut>
+        @if (collectionRD?.payload; as collection) {
+          <div>
+            <ds-view-tracker [object]="collection"></ds-view-tracker>
+            <div class="d-flex flex-row border-bottom mb-4 pb-4">
+              <header class="comcol-header me-auto">
+                <!-- Collection Name -->
+                <ds-comcol-page-header
+                  [name]="dsoNameService.getName(collection)">
+                </ds-comcol-page-header>
+                <!-- Collection logo -->
+                @if (logoRD$) {
+                  <ds-comcol-page-logo
+                    [logo]="(logoRD$ | async)?.payload"
+                    [alternateText]="'collection.logo' | translate">
+                  </ds-comcol-page-logo>
+                }
+                <!-- Handle -->
+                <ds-comcol-page-handle
+                  [content]="collection.handle"
+                  [title]="'collection.page.handle'">
+                </ds-comcol-page-handle>
+                <!-- Introductory text -->
+                <ds-comcol-page-content
+                  [content]="collection.introductoryText"
+                  [hasInnerHtml]="true">
+                </ds-comcol-page-content>
+                <!-- News -->
+                <ds-comcol-page-content
+                  [content]="collection.sidebarText"
+                  [hasInnerHtml]="true"
+                  [title]="'collection.page.news'">
+                </ds-comcol-page-content>
+              </header>
+              <ds-dso-edit-menu></ds-dso-edit-menu>
+            </div>
+            <section class="comcol-page-browse-section">
+              <!-- Browse-By Links -->
+              <ds-comcol-page-browse-by
+                [id]="collection.id"
+                [contentType]="collection.type">
+              </ds-comcol-page-browse-by>
+              <router-outlet></router-outlet>
+            </section>
+            @if (collection.copyrightText) {
+              <footer class="border-top my-5 pt-4">
+                <!-- Copyright -->
+                <ds-comcol-page-content
+                  [content]="collection.copyrightText"
+                  [hasInnerHtml]="true">
+                </ds-comcol-page-content>
+              </footer>
+            }
+          </div>
+        }
       </div>
-    </div>
-    <ds-error *ngIf="collectionRD?.hasFailed"
-              message="{{'error.collection' | translate}}"></ds-error>
-    <ds-loading *ngIf="collectionRD?.isLoading"
-                       message="{{'loading.collection' | translate}}"></ds-loading>
+    }
+    @if (collectionRD?.hasFailed) {
+      <ds-error
+      message="{{'error.collection' | translate}}"></ds-error>
+    }
+    @if (collectionRD?.isLoading) {
+      <ds-loading
+      message="{{'loading.collection' | translate}}"></ds-loading>
+    }
   </div>
 </div>
diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index 0d240f5328..043d7e6426 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -65,7 +62,6 @@ import { getCollectionPageRoute } from './collection-page-routing-paths';
   imports: [
     ThemedComcolPageContentComponent,
     ErrorComponent,
-    NgIf,
     ThemedLoadingComponent,
     TranslateModule,
     ViewTrackerComponent,
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.html b/src/app/collection-page/create-collection-page/create-collection-page.component.html
index 5c1b7b32a5..63e52925b9 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.html
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.html
@@ -1,15 +1,19 @@
-<div class="container" *ngIf="(isLoading$ | async) === false">
-  <div class="row">
-    <div class="col-12 pb-4">
-      <h1 id="sub-header"
-          class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h1>
+@if ((isLoading$ | async) === false) {
+  <div class="container">
+    <div class="row">
+      <div class="col-12 pb-4">
+        <h1 id="sub-header"
+        class="border-bottom pb-2">{{ 'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h1>
+      </div>
     </div>
+    <ds-collection-form (submitForm)="onSubmit($event)"
+      [isCreation]="true"
+    (back)="navigateToHome()"></ds-collection-form>
   </div>
-  <ds-collection-form (submitForm)="onSubmit($event)"
-                      [isCreation]="true"
-                      (back)="navigateToHome()"></ds-collection-form>
-</div>
+}
 
 <div class="container">
-  <ds-loading *ngIf="isLoading$ | async"></ds-loading>
+  @if (isLoading$ | async) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
index a26bc9d6f8..989d77c15b 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import {
@@ -32,7 +29,6 @@ import { CollectionFormComponent } from '../collection-form/collection-form.comp
     TranslateModule,
     AsyncPipe,
     ThemedLoadingComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index 53c3b45cfa..2147cb85c0 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -1,23 +1,27 @@
 <div class="container">
-    <div class="row">
-        <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
-            <div class="col-12 pb-4">
-                <h1 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h1>
-                <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
-                <div class="form-group row">
-                  <div class="col text-right space-children-mr">
-                    <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
-                      <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
-                    </button>
-                    <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
-                      <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
-                      <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
-                    </button>
-                  </div>
-                </div>
-            </div>
-        </ng-container>
+  <div class="row">
+    <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
+      <div class="col-12 pb-4">
+        <h1 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | translate}}</h1>
+        <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
+        <div class="mb-3 row">
+          <div class="col text-end space-children-mr">
+            <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
+              <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
+            </button>
+            <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
+              @if (processing$ | async) {
+                <span><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
+              }
+              @if ((processing$ | async) !== true) {
+                <span><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
+              }
+            </button>
+          </div>
+        </div>
+      </div>
+    </ng-container>
 
-    </div>
+  </div>
 
 </div>
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index dbb5f8846f..61a6bd3336 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
@@ -15,6 +12,7 @@ import {
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -29,8 +27,8 @@ import { VarDirective } from '../../shared/utils/var.directive';
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
     VarDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
index 4e957cf867..5f7ed57dcd 100644
--- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
@@ -1,7 +1,8 @@
-<ds-access-control-form-container
-  titleMessage="collection-access-control-title"
-  *ngIf="itemRD$ | async as itemRD"
-  [itemRD]="itemRD"
-  [showLimitToSpecificBitstreams]="false">
-</ds-access-control-form-container>
+@if (itemRD$ | async; as itemRD) {
+  <ds-access-control-form-container
+    titleMessage="collection-access-control-title"
+    [itemRD]="itemRD"
+    [showLimitToSpecificBitstreams]="false">
+  </ds-access-control-form-container>
+}
 
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
index 809fdcede8..6d63b69533 100644
--- a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -21,7 +18,6 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./collection-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
index 845c82458a..28c5f21869 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -1,23 +1,29 @@
 <div class="container-fluid mb-2" *ngVar="(itemTemplateRD$ | async) as itemTemplateRD">
   <span class="d-inline-block mb-2">{{ 'collection.edit.template.label' | translate}}</span>
   <div class="button-row space-children-mr">
-    <button *ngIf="!itemTemplateRD?.payload" class="btn btn-success" (click)="addItemTemplate()">
-      <i class="fas fa-plus" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
-    </button>
-    <button *ngIf="itemTemplateRD?.payload" class="btn btn-danger" (click)="deleteItemTemplate()">
-      <i class="fas fa-trash-alt" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.delete-button" | translate}}</span>
-    </button>
-    <button *ngIf="itemTemplateRD?.payload" class="btn btn-primary"
-            [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/itemtemplate'">
-      <i class="fas fa-edit" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.edit-button" | translate}}</span>
-    </button>
+    @if (!itemTemplateRD?.payload) {
+      <button class="btn btn-success" (click)="addItemTemplate()">
+        <i class="fas fa-plus" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
+      </button>
+    }
+    @if (itemTemplateRD?.payload) {
+      <button class="btn btn-danger" (click)="deleteItemTemplate()">
+        <i class="fas fa-trash-alt" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.delete-button" | translate}}</span>
+      </button>
+    }
+    @if (itemTemplateRD?.payload) {
+      <button class="btn btn-primary"
+        [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/itemtemplate'">
+        <i class="fas fa-edit" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.edit-button" | translate}}</span>
+      </button>
+    }
   </div>
 </div>
 <ds-collection-form [dso]="(dsoRD$ | async)?.payload"
-                    [isCreation]="false"
-                    (submitForm)="onSubmit($event)"
-                    (back)="navigateToHomePage()"
-                    (finish)="navigateToHomePage()"></ds-collection-form>
+  [isCreation]="false"
+  (submitForm)="onSubmit($event)"
+  (back)="navigateToHomePage()"
+(finish)="navigateToHomePage()"></ds-collection-form>
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
index df35199755..26f55770c1 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -56,7 +53,6 @@ import { getCollectionItemTemplateRoute } from '../../collection-page-routing-pa
     RouterLink,
     AsyncPipe,
     TranslateModule,
-    NgIf,
     VarDirective,
   ],
   standalone: true,
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
index 9c5020fc7f..9408bd2ab3 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.html
@@ -1,6 +1,9 @@
-<ds-comcol-role
-  *ngFor="let comcolRole of comcolRoles$ | async"
-  [dso]="collection$ | async"
-  [comcolRole]="comcolRole"
->
-</ds-comcol-role>
+<div class="custom-alignment">
+  @for (comcolRole of comcolRoles$ | async; track comcolRole) {
+    <ds-comcol-role
+      [dso]="collection$ | async"
+      [comcolRole]="comcolRole"
+      >
+    </ds-comcol-role>
+  }
+</div>
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
index f402c99caf..bde3d30828 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +28,6 @@ import { hasValue } from '../../../shared/empty.util';
   templateUrl: './collection-roles.component.html',
   imports: [
     ComcolRoleComponent,
-    NgForOf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 7edaadb0a1..147b10ff62 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -1,54 +1,65 @@
 <div *ngVar="(contentSource$ |async) as contentSource">
-    <div class="container-fluid space-children-mr" *ngIf="shouldShow">
-        <h3>{{ 'collection.source.controls.head' | translate }}</h3>
-        <div>
-            <span class="font-weight-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
-            <span>{{contentSource?.harvestStatus}}</span>
-        </div>
-        <div>
-            <span class="font-weight-bold">{{'collection.source.controls.harvest.start' | translate}}</span>
-            <span>{{contentSource?.harvestStartTime ? contentSource?.harvestStartTime : 'collection.source.controls.harvest.no-information'|translate }}</span>
-        </div>
-        <div>
-            <span class="font-weight-bold">{{'collection.source.controls.harvest.last' | translate}}</span>
-            <span>{{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}</span>
-        </div>
-        <div>
-            <span class="font-weight-bold">{{'collection.source.controls.harvest.message' | translate}}</span>
-            <span>{{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}</span>
-        </div>
-
-        <button *ngIf="(testConfigRunning$ |async) !== true" class="btn btn-secondary"
-                [disabled]="!(isEnabled)"
-                (click)="testConfiguration(contentSource)">
-            <span>{{'collection.source.controls.test.submit' | translate}}</span>
+  @if (shouldShow) {
+    <div class="container-fluid space-children-mr">
+      <h3>{{ 'collection.source.controls.head' | translate }}</h3>
+      <div>
+        <span class="fw-bold">{{'collection.source.controls.harvest.status' | translate}}</span>
+        <span>{{contentSource?.harvestStatus}}</span>
+      </div>
+      <div>
+        <span class="fw-bold">{{'collection.source.controls.harvest.start' | translate}}</span>
+        <span>{{contentSource?.harvestStartTime ? contentSource?.harvestStartTime : 'collection.source.controls.harvest.no-information'|translate }}</span>
+      </div>
+      <div>
+        <span class="fw-bold">{{'collection.source.controls.harvest.last' | translate}}</span>
+        <span>{{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}</span>
+      </div>
+      <div>
+        <span class="fw-bold">{{'collection.source.controls.harvest.message' | translate}}</span>
+        <span>{{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}</span>
+      </div>
+      @if ((testConfigRunning$ |async) !== true) {
+        <button class="btn btn-secondary"
+          [dsBtnDisabled]="!(isEnabled)"
+          (click)="testConfiguration(contentSource)">
+          <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
-        <button *ngIf="(testConfigRunning$ |async)" class="btn btn-secondary"
-                [disabled]="true">
-            <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
-            <span>{{'collection.source.controls.test.running' | translate}}</span>
+      }
+      @if ((testConfigRunning$ |async)) {
+        <button class="btn btn-secondary"
+          [dsBtnDisabled]="true">
+          <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
+          <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
-        <button *ngIf="(importRunning$ |async) !== true" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
-                (click)="importNow()">
-            <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
+      }
+      @if ((importRunning$ |async) !== true) {
+        <button class="btn btn-primary"
+          [dsBtnDisabled]="!(isEnabled)"
+          (click)="importNow()">
+          <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
-        <button *ngIf="(importRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
-            <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
-            <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
+      }
+      @if ((importRunning$ |async)) {
+        <button class="btn btn-primary"
+          [dsBtnDisabled]="true">
+          <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
+          <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
-        <button *ngIf="(reImportRunning$ |async) !== true" class="btn btn-primary"
-                [disabled]="!(isEnabled)"
-                (click)="resetAndReimport()">
-            <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
+      }
+      @if ((reImportRunning$ |async) !== true) {
+        <button class="btn btn-primary"
+          [dsBtnDisabled]="!(isEnabled)"
+          (click)="resetAndReimport()">
+          <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
-        <button *ngIf="(reImportRunning$ |async)" class="btn btn-primary"
-                [disabled]="true">
-            <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
-            <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
+      }
+      @if ((reImportRunning$ |async)) {
+        <button class="btn btn-primary"
+          [dsBtnDisabled]="true">
+          <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
+          <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
         </button>
-
-
+      }
     </div>
+  }
 </div>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
index 0caf9b0418..cbe3de1483 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.spec.ts
@@ -22,6 +22,7 @@ import { Collection } from '../../../../core/shared/collection.model';
 import { ContentSource } from '../../../../core/shared/content-source.model';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
 import { Process } from '../../../../process-page/processes/process.model';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
@@ -104,7 +105,7 @@ describe('CollectionSourceControlsComponent', () => {
     requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring', 'setStaleByHrefSubstring']);
 
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule, CollectionSourceControlsComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule, CollectionSourceControlsComponent, VarDirective, BtnDisabledDirective],
       providers: [
         { provide: ScriptDataService, useValue: scriptDataService },
         { provide: ProcessDataService, useValue: processDataService },
@@ -193,9 +194,10 @@ describe('CollectionSourceControlsComponent', () => {
 
       const buttons = fixture.debugElement.queryAll(By.css('button'));
 
-      expect(buttons[0].nativeElement.disabled).toBeTrue();
-      expect(buttons[1].nativeElement.disabled).toBeTrue();
-      expect(buttons[2].nativeElement.disabled).toBeTrue();
+      buttons.forEach(button => {
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
+        expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
+      });
     });
     it('should be enabled when isEnabled is true', () => {
       comp.shouldShow = true;
@@ -205,9 +207,10 @@ describe('CollectionSourceControlsComponent', () => {
 
       const buttons = fixture.debugElement.queryAll(By.css('button'));
 
-      expect(buttons[0].nativeElement.disabled).toBeFalse();
-      expect(buttons[1].nativeElement.disabled).toBeFalse();
-      expect(buttons[2].nativeElement.disabled).toBeFalse();
+      buttons.forEach(button => {
+        expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+        expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+      });
     });
     it('should call the corresponding button when clicked', () => {
       spyOn(comp, 'testConfiguration');
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index fdd65a43c7..1e07978af7 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import {
   Component,
@@ -40,6 +37,7 @@ import {
 } from '../../../../core/shared/operators';
 import { Process } from '../../../../process-page/processes/process.model';
 import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { VarDirective } from '../../../../shared/utils/var.directive';
@@ -54,8 +52,8 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
     VarDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 8f807c1aee..7f392b2f02 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,74 +1,92 @@
 <div class="container-fluid">
-    <div class="d-inline-block float-right space-children-mr">
-        <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                [disabled]="(hasChanges$ | async) !== true"
-                (click)="discard()"><i
-                class="fas fa-times"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-        </button>
-        <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
-                (click)="reinstate()"><i
-                class="fas fa-undo-alt"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-        </button>
-        <button class="btn btn-primary"
-                [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
-                (click)="onSubmit()"><i
-                class="fas fa-save"></i>
-            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-        </button>
-    </div>
-    <h2>{{ 'collection.edit.tabs.source.head' | translate }}</h2>
-    <div *ngIf="contentSource" class="form-check mb-4">
-        <input type="checkbox" class="form-check-input" id="externalSourceCheck"
-               [checked]="(contentSource?.harvestType !== harvestTypeNone)" (change)="changeExternalSource()">
-        <label class="form-check-label"
-               for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
-    </div>
-    <ds-loading *ngIf="!contentSource" [message]="'loading.content-source' | translate"></ds-loading>
-    <h3 *ngIf="contentSource && (contentSource?.harvestType !== harvestTypeNone)">{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
+  <div class="d-inline-block float-end space-children-mr">
+    @if ((isReinstatable$ | async) !== true) {
+      <button class=" btn btn-danger"
+        [dsBtnDisabled]="(hasChanges$ | async) !== true"
+        (click)="discard()"><i
+      class="fas fa-times"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
+    </button>
+  }
+  @if (isReinstatable$ | async) {
+    <button class="btn btn-warning"
+      (click)="reinstate()"><i
+    class="fas fa-undo-alt"></i>
+    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
+  </button>
+}
+<button class="btn btn-primary"
+  [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+  (click)="onSubmit()"><i
+class="fas fa-save"></i>
+<span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
+</button>
+</div>
+<h2>{{ 'collection.edit.tabs.source.head' | translate }}</h2>
+@if (contentSource) {
+  <div class="form-check mb-4">
+    <input type="checkbox" class="form-check-input" id="externalSourceCheck"
+      [checked]="(contentSource?.harvestType !== harvestTypeNone)" (change)="changeExternalSource()">
+    <label class="form-check-label"
+    for="externalSourceCheck">{{ 'collection.edit.tabs.source.external' | translate }}</label>
+  </div>
+}
+@if (!contentSource) {
+  <ds-loading [message]="'loading.content-source' | translate"></ds-loading>
+}
+@if (contentSource && (contentSource?.harvestType !== harvestTypeNone)) {
+  <h3>{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
+}
 </div>
 <div class="row">
-    <ds-form *ngIf="formGroup && contentSource && (contentSource?.harvestType !== harvestTypeNone)"
-             [formId]="'collection-source-form-id'"
-             [formGroup]="formGroup"
-             [formModel]="formModel"
-             [formLayout]="formLayout"
-             [displaySubmit]="false"
-             [displayCancel]="false"
-             (dfChange)="onChange($event)"
-             (submitForm)="onSubmit()"
-             (cancel)="onCancel()"></ds-form>
+  @if (formGroup && contentSource && (contentSource?.harvestType !== harvestTypeNone)) {
+    <ds-form
+      [formId]="'collection-source-form-id'"
+      [formGroup]="formGroup"
+      [formModel]="formModel"
+      [formLayout]="formLayout"
+      [displaySubmit]="false"
+      [displayCancel]="false"
+      (dfChange)="onChange($event)"
+      (submitForm)="onSubmit()"
+    (cancel)="onCancel()"></ds-form>
+  }
 </div>
-<div class="container mt-2" *ngIf="(contentSource?.harvestType !== harvestTypeNone)">
+@if ((contentSource?.harvestType !== harvestTypeNone)) {
+  <div class="container mt-2">
     <div class="row">
-        <div class="col-12">
-            <div class="d-inline-block float-right ml-1 space-children-mr">
-                <button class=" btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-                        [disabled]="(hasChanges$ | async) !== true"
-                        (click)="discard()"><i
-                        class="fas fa-times"></i>
-                    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
-                </button>
-                <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
-                        (click)="reinstate()"><i
-                        class="fas fa-undo-alt"></i>
-                    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
-                </button>
-                <button class="btn btn-primary"
-                        [disabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
-                        (click)="onSubmit()"><i
-                        class="fas fa-save"></i>
-                    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
-                </button>
-            </div>
-        </div>
-    </div>
+      <div class="col-12">
+        <div class="d-inline-block float-end ms-1 space-children-mr">
+          @if ((isReinstatable$ | async) !== true) {
+            <button class=" btn btn-danger"
+              [dsBtnDisabled]="(hasChanges$ | async) !== true"
+              (click)="discard()"><i
+            class="fas fa-times"></i>
+            <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
+          </button>
+        }
+        @if (isReinstatable$ | async) {
+          <button class="btn btn-warning"
+            (click)="reinstate()"><i
+          class="fas fa-undo-alt"></i>
+          <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
+        </button>
+      }
+      <button class="btn btn-primary"
+        [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
+        (click)="onSubmit()"><i
+      class="fas fa-save"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
+    </button>
+  </div>
 </div>
+</div>
+</div>
+}
 <ds-collection-source-controls
-        [isEnabled]="(hasChanges$ | async) !== true"
-        [shouldShow]="contentSource?.harvestType !== harvestTypeNone"
-        [collection]="(collectionRD$ |async)?.payload"
->
+  [isEnabled]="(hasChanges$ | async) !== true"
+  [shouldShow]="contentSource?.harvestType !== harvestTypeNone"
+  [collection]="(collectionRD$ |async)?.payload"
+  >
 </ds-collection-source-controls>
 
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
index 43614e43a6..50b869e636 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   Location,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -56,6 +55,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
 } from '../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -77,10 +77,10 @@ import { CollectionSourceControlsComponent } from './collection-source-controls/
   imports: [
     AsyncPipe,
     TranslateModule,
-    NgIf,
     ThemedLoadingComponent,
     FormComponent,
     CollectionSourceControlsComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.scss b/src/app/collection-page/edit-collection-page/edit-collection-page.component.scss
new file mode 100644
index 0000000000..240d2bb868
--- /dev/null
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.scss
@@ -0,0 +1,9 @@
+:host ::ng-deep #oaiSetContainer {
+  > :first-child {
+    padding-left: 0;
+  }
+
+  > :last-child {
+    padding-right: 0;
+  }
+}
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
index 4508ba7342..03fe92faa8 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -23,13 +21,12 @@ import { getCollectionPageRoute } from '../collection-page-routing-paths';
 @Component({
   selector: 'ds-edit-collection',
   templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html',
+  styleUrls: ['./edit-collection-page.component.scss'],
   imports: [
     RouterLink,
     TranslateModule,
     NgClass,
-    NgForOf,
     RouterOutlet,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index 7f0b2efba2..765d49b7bf 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -1,13 +1,17 @@
 <div class="container" *ngVar="(collectionRD$ | async)?.payload as collection">
   <div class="row">
     <div class="col-12" *ngVar="(itemRD$ | async) as itemRD">
-      <ng-container *ngIf="itemRD?.hasSucceeded">
+      @if (itemRD?.hasSucceeded) {
         <h1 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h1>
         <ds-dso-edit-metadata [updateDataService]="itemTemplateService" [dso]="itemRD?.payload"></ds-dso-edit-metadata>
         <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
-      </ng-container>
-      <ds-loading *ngIf="itemRD?.isLoading" [message]="'collection.edit.template.loading' | translate"></ds-loading>
-      <ds-alert *ngIf="itemRD?.hasFailed" [type]="AlertTypeEnum.Error" [content]="'collection.edit.template.error' | translate"></ds-alert>
+      }
+      @if (itemRD?.isLoading) {
+        <ds-loading [message]="'collection.edit.template.loading' | translate"></ds-loading>
+      }
+      @if (itemRD?.hasFailed) {
+        <ds-alert [type]="AlertTypeEnum.Error" [content]="'collection.edit.template.error' | translate"></ds-alert>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index f7c5dc4b14..eb8b36ec89 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -39,7 +36,6 @@ import { getCollectionEditRoute } from '../collection-page-routing-paths';
     RouterLink,
     AsyncPipe,
     VarDirective,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     AlertComponent,
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index 82238ddd0d..864b5032d5 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -1,18 +1,24 @@
-<ds-loading *ngIf="(dataSource.loading$ | async) && !loadingNode" class="ds-themed-loading"></ds-loading>
+@if ((dataSource.loading$ | async) && !loadingNode) {
+  <ds-loading class="ds-themed-loading"></ds-loading>
+}
 <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl" [trackBy]="trackBy">
   <!-- This is the tree node template for show more node -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: isShowMore" cdkTreeNodePadding
-                 class="example-tree-node show-more-node">
+    class="example-tree-node show-more-node">
     <div class="btn-group">
       <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
         <span class="fa fa-chevron-right"></span>
       </span>
       <div class="align-middle my-auto">
-        <button *ngIf="(dataSource.loading$ | async) !== true" (click)="getNextPage(node)"
-           class="btn btn-outline-primary btn-sm" role="button">
-           <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
-        </button>
-        <ds-loading *ngIf="node===loadingNode && dataSource.loading$ | async" class="ds-themed-loading"></ds-loading>
+        @if ((dataSource.loading$ | async) !== true) {
+          <button (click)="getNextPage(node)"
+            class="btn btn-outline-primary btn-sm" role="button">
+            <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
+          </button>
+        }
+        @if (node===loadingNode && dataSource.loading$ | async) {
+          <ds-loading class="ds-themed-loading"></ds-loading>
+        }
       </div>
     </div>
     <div class="text-muted" cdkTreeNodePadding>
@@ -22,51 +28,61 @@
   </cdk-tree-node>
   <!-- This is the tree node template for expandable nodes (coms and subcoms with children) -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChild" cdkTreeNodePadding
-                 class="example-tree-node expandable-node">
+    class="example-tree-node expandable-node">
     <div class="btn-group">
-      <button *ngIf="hasChild(null, node) | async" type="button" class="btn btn-default" cdkTreeNodeToggle
-              [attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
-              (click)="toggleExpanded(node)"
-              data-test="expand-button">
-        <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
-              aria-hidden="true"></span>
-        <span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
-      </button>
+      @if (hasChild(null, node) | async) {
+        <button type="button" class="btn btn-default btn-transparent" cdkTreeNodeToggle
+          [attr.aria-label]="(node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) }"
+          (click)="toggleExpanded(node)"
+          data-test="expand-button">
+          <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
+          aria-hidden="true"></span>
+          <span class="sr-only">{{ (node.isExpanded ? 'communityList.collapse' : 'communityList.expand') | translate:{ name: dsoNameService.getName(node.payload) } }}</span>
+        </button>
+      }
       <!--Don't render the button when non-expandable otherwise it's still accessible, instead render this placeholder-->
-      <span *ngIf="(hasChild(null, node) | async) !== true" aria-hidden="true" class="btn btn-default invisible">
-        <span class="fa fa-chevron-right"></span>
-      </span>
+      @if ((hasChild(null, node) | async) !== true) {
+        <span aria-hidden="true" class="btn btn-default invisible">
+          <span class="fa fa-chevron-right"></span>
+        </span>
+      }
       <div class="d-flex flex-row">
         <span class="d-flex align-middle my-auto">
           <a [routerLink]="node.route" class="lead">{{ dsoNameService.getName(node.payload) }}</a>
-          <span class="pr-2">&nbsp;</span>
-          <span *ngIf="node.payload.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-top archived-items-lead my-auto">{{node.payload.archivedItemsCount}}</span>
+          <span class="pe-2">&nbsp;</span>
+          @if (node.payload.archivedItemsCount >= 0) {
+            <span class="badge rounded-pill bg-secondary align-top archived-items-lead my-auto ps-2 pe-2">{{node.payload.archivedItemsCount}}</span>
+          }
         </span>
       </div>
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
-        <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <span aria-hidden="true" class="btn btn-default invisible">
-            <span class="fa fa-chevron-right"></span>
-          </span>
-          <ds-truncatable-part [id]="node.id" [minLines]="3">
-            <span>{{node.payload.shortDescription}}</span>
-          </ds-truncatable-part>
-        </div>
+        @if (node.payload.shortDescription) {
+          <div class="d-flex">
+            <span aria-hidden="true" class="btn btn-default invisible">
+              <span class="fa fa-chevron-right"></span>
+            </span>
+            <ds-truncatable-part [id]="node.id" [minLines]="3">
+              <span>{{node.payload.shortDescription}}</span>
+            </ds-truncatable-part>
+          </div>
+        }
       </div>
     </ds-truncatable>
-    <div class="d-flex" *ngIf="node===loadingNode && dataSource.loading$ | async"
-         cdkTreeNodePadding>
-      <span aria-hidden="true" class="btn btn-default invisible">
-        <span class="fa fa-chevron-right"></span>
-      </span>
-      <ds-loading class="ds-themed-loading"></ds-loading>
-    </div>
+    @if (node===loadingNode && dataSource.loading$ | async) {
+      <div class="d-flex"
+        cdkTreeNodePadding>
+        <span aria-hidden="true" class="btn btn-default invisible">
+          <span class="fa fa-chevron-right"></span>
+        </span>
+        <ds-loading class="ds-themed-loading"></ds-loading>
+      </div>
+    }
   </cdk-tree-node>
   <!-- This is the tree node template for leaf nodes (collections and (sub)coms without children) -->
   <cdk-tree-node *cdkTreeNodeDef="let node; when: !(hasChild && isShowMore)" cdkTreeNodePadding
-                 class="example-tree-node childless-node">
+    class="example-tree-node childless-node">
     <div class="btn-group">
       <span aria-hidden="true" class="btn btn-default invisible" cdkTreeNodeToggle>
         <span class="fa fa-chevron-right"></span>
@@ -77,14 +93,16 @@
     </div>
     <ds-truncatable [id]="node.id">
       <div class="text-muted" cdkTreeNodePadding>
-        <div class="d-flex" *ngIf="node.payload.shortDescription">
-          <span aria-hidden="true" class="btn btn-default invisible">
-            <span class="fa fa-chevron-right"></span>
-          </span>
-          <ds-truncatable-part [id]="node.id" [minLines]="3">
-            <span>{{node.payload.shortDescription}}</span>
-          </ds-truncatable-part>
-        </div>
+        @if (node.payload.shortDescription) {
+          <div class="d-flex">
+            <span aria-hidden="true" class="btn btn-default invisible">
+              <span class="fa fa-chevron-right"></span>
+            </span>
+            <ds-truncatable-part [id]="node.id" [minLines]="3">
+              <span>{{node.payload.shortDescription}}</span>
+            </ds-truncatable-part>
+          </div>
+        }
       </div>
     </ds-truncatable>
   </cdk-tree-node>
diff --git a/src/app/community-list-page/community-list/community-list.component.ts b/src/app/community-list-page/community-list/community-list.component.ts
index 5819471d7e..c87fbf5d13 100644
--- a/src/app/community-list-page/community-list/community-list.component.ts
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -5,7 +5,6 @@ import {
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -42,7 +41,7 @@ import { FlatNode } from '../flat-node.model';
   templateUrl: './community-list.component.html',
   styleUrls: ['./community-list.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 export class CommunityListComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts
index d32d9e408f..147f6254ea 100644
--- a/src/app/community-page/community-form/community-form.component.ts
+++ b/src/app/community-page/community-form/community-form.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -49,8 +45,6 @@ import { VarDirective } from '../../shared/utils/var.directive';
     UploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
-    NgIf,
-    NgClass,
     VarDirective,
   ],
 })
diff --git a/src/app/community-page/community-page-routes.ts b/src/app/community-page/community-page-routes.ts
index d9505c53b1..2c8a7942a4 100644
--- a/src/app/community-page/community-page-routes.ts
+++ b/src/app/community-page/community-page-routes.ts
@@ -51,7 +51,6 @@ export const ROUTES: Route[] = [
     resolve: {
       dso: communityPageResolver,
       breadcrumb: communityBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     runGuardsAndResolvers: 'always',
     children: [
@@ -70,6 +69,9 @@ export const ROUTES: Route[] = [
       {
         path: '',
         component: ThemedCommunityPageComponent,
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
         children: [
           {
             path: '',
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index a695e2019a..13e5558d1b 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -1,43 +1,53 @@
 <div class="container" *ngVar="(communityRD$ | async) as communityRD">
-  <div class="community-page" *ngIf="communityRD?.hasSucceeded" @fadeInOut>
-    <div *ngIf="communityRD?.payload; let communityPayload">
-      <ds-view-tracker [object]="communityPayload"></ds-view-tracker>
-      <div class="d-flex flex-row border-bottom mb-4 pb-4">
-        <header class="comcol-header mr-auto">
-          <!-- Community name -->
-          <ds-comcol-page-header [name]="dsoNameService.getName(communityPayload)"></ds-comcol-page-header>
-          <!-- Community logo -->
-          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'community.logo' | translate">
-          </ds-comcol-page-logo>
-          <!-- Handle -->
-          <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
-          </ds-comcol-page-handle>
-          <!-- Introductory text -->
-          <ds-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
-          </ds-comcol-page-content>
-          <!-- News -->
-          <ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
-                                  [title]="'community.page.news'">
-          </ds-comcol-page-content>
-        </header>
-        <ds-dso-edit-menu></ds-dso-edit-menu>
-      </div>
-      <section class="comcol-page-browse-section">
-
-        <!-- Browse-By Links -->
-        <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
-        </ds-comcol-page-browse-by>
-
-        <router-outlet></router-outlet>
-      </section>
-      <footer *ngIf="communityPayload.copyrightText" class="border-top my-5 pt-4">
-        <!-- Copyright -->
-        <ds-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
-        </ds-comcol-page-content>
-      </footer>
+  @if (communityRD?.hasSucceeded) {
+    <div class="community-page" @fadeInOut>
+      @if (communityRD?.payload; as communityPayload) {
+        <div>
+          <ds-view-tracker [object]="communityPayload"></ds-view-tracker>
+          <div class="d-flex flex-row border-bottom mb-4 pb-4">
+            <header class="comcol-header me-auto">
+              <!-- Community name -->
+              <ds-comcol-page-header [name]="dsoNameService.getName(communityPayload)"></ds-comcol-page-header>
+              <!-- Community logo -->
+              @if (logoRD$) {
+                <ds-comcol-page-logo [logo]="(logoRD$ | async)?.payload" [alternateText]="'community.logo' | translate">
+                </ds-comcol-page-logo>
+              }
+              <!-- Handle -->
+              <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
+              </ds-comcol-page-handle>
+              <!-- Introductory text -->
+              <ds-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
+              </ds-comcol-page-content>
+              <!-- News -->
+              <ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
+                [title]="'community.page.news'">
+              </ds-comcol-page-content>
+            </header>
+            <ds-dso-edit-menu></ds-dso-edit-menu>
+          </div>
+          <section class="comcol-page-browse-section">
+            <!-- Browse-By Links -->
+            <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
+            </ds-comcol-page-browse-by>
+            <router-outlet></router-outlet>
+          </section>
+          @if (communityPayload.copyrightText) {
+            <footer class="border-top my-5 pt-4">
+              <!-- Copyright -->
+              <ds-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
+              </ds-comcol-page-content>
+            </footer>
+          }
+        </div>
+      }
     </div>
-  </div>
+  }
 
-  <ds-error *ngIf="communityRD?.hasFailed" message="{{'error.community' | translate}}"></ds-error>
-  <ds-loading *ngIf="communityRD?.isLoading" message="{{'loading.community' | translate}}"></ds-loading>
+  @if (communityRD?.hasFailed) {
+    <ds-error message="{{'error.community' | translate}}"></ds-error>
+  }
+  @if (communityRD?.isLoading) {
+    <ds-loading message="{{'loading.community' | translate}}"></ds-loading>
+  }
 </div>
diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts
index d04ecbee19..c8c947c900 100644
--- a/src/app/community-page/community-page.component.ts
+++ b/src/app/community-page/community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -56,7 +53,6 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com
     ThemedComcolPageContentComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     ThemedCommunityPageSubCommunityListComponent,
     ThemedCollectionPageSubCollectionListComponent,
diff --git a/src/app/community-page/create-community-page/create-community-page.component.html b/src/app/community-page/create-community-page/create-community-page.component.html
index 1d3d6eb871..c07ca9c2e8 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.html
+++ b/src/app/community-page/create-community-page/create-community-page.component.html
@@ -1,18 +1,25 @@
-<div class="container" *ngIf="(isLoading$ | async) === false">
-  <div class="row">
-    <div class="col-12 pb-4">
-      <ng-container *ngVar="(parentRD$ | async)?.payload as parent">
-        <h1 *ngIf="!parent" id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h1>
-        <h1 *ngIf="parent" id="sub-header"
+@if ((isLoading$ | async) === false) {
+  <div class="container">
+    <div class="row">
+      <div class="col-12 pb-4">
+        <ng-container *ngVar="(parentRD$ | async)?.payload as parent">
+          @if (!parent) {
+            <h1 id="header" class="border-bottom p-2">{{ 'community.create.head' | translate }}</h1>
+          } @else {
+            <h1 id="sub-header"
             class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h1>
-      </ng-container>
+          }
+        </ng-container>
+      </div>
     </div>
+    <ds-community-form (submitForm)="onSubmit($event)"
+      [isCreation]="true"
+    (back)="navigateToHome()"></ds-community-form>
   </div>
-  <ds-community-form (submitForm)="onSubmit($event)"
-                     [isCreation]="true"
-                     (back)="navigateToHome()"></ds-community-form>
-</div>
+}
 
 <div class="container">
-  <ds-loading *ngIf="isLoading$ | async"></ds-loading>
+  @if (isLoading$ | async) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/community-page/create-community-page/create-community-page.component.ts b/src/app/community-page/create-community-page/create-community-page.component.ts
index 082f6c4f0b..7c0c26ffcd 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.ts
+++ b/src/app/community-page/create-community-page/create-community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import {
@@ -31,7 +28,6 @@ import { CommunityFormComponent } from '../community-form/community-form.compone
     CommunityFormComponent,
     TranslateModule,
     VarDirective,
-    NgIf,
     AsyncPipe,
     ThemedLoadingComponent,
   ],
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index b241a7027c..3403cc45db 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -1,22 +1,26 @@
 <div class="container">
-    <div class="row">
-        <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
-            <div class="col-12 pb-4">
-                <h1 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h1>
-                <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
-                <div class="form-group row">
-                    <div class="col text-right space-children-mr">
-                        <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [disabled]="(processing$ | async)">
-                            <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
-                        </button>
-                        <button class="btn btn-danger" (click)="onConfirm(dso)" [disabled]="(processing$ | async)">
-                            <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
-                            <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </ng-container>
-    </div>
+  <div class="row">
+    <ng-container *ngVar="(dsoRD$ | async)?.payload as dso">
+      <div class="col-12 pb-4">
+        <h1 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translate}}</h1>
+        <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
+        <div class="mb-3 row">
+          <div class="col text-end space-children-mr">
+            <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
+              <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
+            </button>
+            <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
+              @if (processing$ | async) {
+                <span><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
+              }
+              @if ((processing$ | async) !== true) {
+                <span><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
+              }
+            </button>
+          </div>
+        </div>
+      </div>
+    </ng-container>
+  </div>
 
 </div>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index f35e2d6bd2..4799cd2db8 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   ActivatedRoute,
@@ -15,6 +12,7 @@ import {
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { Community } from '../../core/shared/community.model';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -30,7 +28,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     TranslateModule,
     AsyncPipe,
     VarDirective,
-    NgIf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
index b4f2123b86..5f7d1d8fc4 100644
--- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
@@ -1,6 +1,7 @@
-<ds-access-control-form-container
-  titleMessage="community-access-control-title"
-  *ngIf="itemRD$ | async as itemRD"
-  [itemRD]="itemRD"
-  [showLimitToSpecificBitstreams]="false">
-</ds-access-control-form-container>
+@if (itemRD$ | async; as itemRD) {
+  <ds-access-control-form-container
+    titleMessage="community-access-control-title"
+    [itemRD]="itemRD"
+    [showLimitToSpecificBitstreams]="false">
+  </ds-access-control-form-container>
+}
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
index a0e094e21d..cc632c0e94 100644
--- a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -21,7 +18,6 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./community-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.html b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
index 37a70ff403..86e5b113fd 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.html
@@ -1,6 +1,9 @@
-<ds-comcol-role
-  *ngFor="let comcolRole of comcolRoles$ | async"
-  [dso]="community$ | async"
-  [comcolRole]="comcolRole"
->
-</ds-comcol-role>
+<div class="custom-alignment">
+  @for (comcolRole of comcolRoles$ | async; track comcolRole) {
+    <ds-comcol-role
+      [dso]="community$ | async"
+      [comcolRole]="comcolRole"
+      >
+    </ds-comcol-role>
+  }
+</div>
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
index 2e85cbe4c3..69234e07c3 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +28,6 @@ import { ComcolRoleComponent } from '../../../shared/comcol/comcol-forms/edit-co
   imports: [
     ComcolRoleComponent,
     AsyncPipe,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts
index 194976c3a8..77300023be 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.component.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -28,9 +26,7 @@ import { getCommunityPageRoute } from '../community-page-routing-paths';
     RouterLink,
     TranslateModule,
     NgClass,
-    NgForOf,
     RouterOutlet,
-    NgIf,
     AsyncPipe,
   ],
 })
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
index 59d7b3bb5e..825399c23b 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
@@ -1,13 +1,19 @@
 <ng-container *ngVar="(subCollectionsRDObs | async) as subCollectionsRD">
-  <div *ngIf="subCollectionsRD?.hasSucceeded && subCollectionsRD?.payload.totalElements > 0" @fadeIn>
-    <h3>{{'community.sub-collection-list.head' | translate}}</h3>
-    <ds-viewable-collection
-      [config]="config"
-      [sortConfig]="sortConfig"
-      [objects]="subCollectionsRD"
-      [hideGear]="false">
-    </ds-viewable-collection>
-  </div>
-  <ds-error *ngIf="subCollectionsRD?.hasFailed" message="{{'error.sub-collections' | translate}}"></ds-error>
-  <ds-loading *ngIf="subCollectionsRD?.isLoading" message="{{'loading.sub-collections' | translate}}"></ds-loading>
+  @if (subCollectionsRD?.hasSucceeded && subCollectionsRD?.payload.totalElements > 0) {
+    <div @fadeIn>
+      <h3>{{'community.sub-collection-list.head' | translate}}</h3>
+      <ds-viewable-collection
+        [config]="config"
+        [sortConfig]="sortConfig"
+        [objects]="subCollectionsRD"
+        [hideGear]="false">
+      </ds-viewable-collection>
+    </div>
+  }
+  @if (subCollectionsRD?.hasFailed) {
+    <ds-error message="{{'error.sub-collections' | translate}}"></ds-error>
+  }
+  @if (subCollectionsRD?.isLoading) {
+    <ds-loading message="{{'loading.sub-collections' | translate}}"></ds-loading>
+  }
 </ng-container>
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
index 1e8ff1d46c..1d12860628 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -44,7 +41,6 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     ObjectCollectionComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
     VarDirective,
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
index a811014bcc..151737573e 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
@@ -1,8 +1,8 @@
-<ng-container *ngIf="(community$ | async) as community">
+@if ((community$ | async); as community) {
   <ds-community-page-sub-community-list
-      [community]="community">
+    [community]="community">
   </ds-community-page-sub-community-list>
   <ds-community-page-sub-collection-list
-      [community]="community">
+    [community]="community">
   </ds-community-page-sub-collection-list>
-</ng-container>
+}
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
index 7aed3be076..ea21c66b54 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -26,7 +23,6 @@ import { ThemedCommunityPageSubCommunityListComponent } from './sub-community-li
     ThemedCommunityPageSubCommunityListComponent,
     ThemedCollectionPageSubCollectionListComponent,
     AsyncPipe,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
index 7f9840f6b7..7c3d23b809 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
@@ -1,13 +1,19 @@
 <ng-container *ngVar="(subCommunitiesRDObs | async) as subCommunitiesRD">
-  <div *ngIf="subCommunitiesRD?.hasSucceeded && subCommunitiesRD?.payload.totalElements > 0" @fadeIn>
-    <h3>{{'community.sub-community-list.head' | translate}}</h3>
-    <ds-viewable-collection
-      [config]="config"
-      [sortConfig]="sortConfig"
-      [objects]="subCommunitiesRD"
-      [hideGear]="false">
-    </ds-viewable-collection>
-  </div>
-  <ds-error *ngIf="subCommunitiesRD?.hasFailed" message="{{'error.sub-communities' | translate}}"></ds-error>
-  <ds-loading *ngIf="subCommunitiesRD?.isLoading" message="{{'loading.sub-communities' | translate}}"></ds-loading>
+  @if (subCommunitiesRD?.hasSucceeded && subCommunitiesRD?.payload.totalElements > 0) {
+    <div @fadeIn>
+      <h3>{{'community.sub-community-list.head' | translate}}</h3>
+      <ds-viewable-collection
+        [config]="config"
+        [sortConfig]="sortConfig"
+        [objects]="subCommunitiesRD"
+        [hideGear]="false">
+      </ds-viewable-collection>
+    </div>
+  }
+  @if (subCommunitiesRD?.hasFailed) {
+    <ds-error message="{{'error.sub-communities' | translate}}"></ds-error>
+  }
+  @if (subCommunitiesRD?.isLoading) {
+    <ds-loading message="{{'loading.sub-communities' | translate}}"></ds-loading>
+  }
 </ng-container>
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
index 36bd9919bb..972ba3d7fb 100644
--- a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -43,7 +40,6 @@ import { VarDirective } from '../../../../shared/utils/var.directive';
     ErrorComponent,
     ThemedLoadingComponent,
     VarDirective,
-    NgIf,
     ObjectCollectionComponent,
     AsyncPipe,
     TranslateModule,
diff --git a/src/app/core/auth/auth.interceptor.spec.ts b/src/app/core/auth/auth.interceptor.spec.ts
index d824df472a..b137b2713c 100644
--- a/src/app/core/auth/auth.interceptor.spec.ts
+++ b/src/app/core/auth/auth.interceptor.spec.ts
@@ -1,7 +1,11 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
@@ -28,7 +32,7 @@ describe(`AuthInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [],
       providers: [
         DspaceRestService,
         { provide: AuthService, useValue: authServiceStub },
@@ -39,6 +43,8 @@ describe(`AuthInterceptor`, () => {
           multi: true,
         },
         { provide: Store, useValue: store },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index 84d4c53210..d011d27059 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -129,12 +129,24 @@ export class AuthInterceptor implements HttpInterceptor {
    */
   private sortAuthMethods(authMethodModels: AuthMethod[]): AuthMethod[] {
     const sortedAuthMethodModels: AuthMethod[] = [];
+    let passwordAuthFound = false;
+    let ldapAuthFound = false;
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType === AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);
+        passwordAuthFound = true;
+      }
+      if (method.authMethodType === AuthMethodType.Ldap) {
+        ldapAuthFound = true;
       }
     });
 
+    // Using password authentication method to provide UI for LDAP authentication even if password auth is not present in server
+    if (ldapAuthFound && !(passwordAuthFound)) {
+      sortedAuthMethodModels.push(new AuthMethod(AuthMethodType.Password,0));
+    }
+
     authMethodModels.forEach((method) => {
       if (method.authMethodType !== AuthMethodType.Password) {
         sortedAuthMethodModels.push(method);
diff --git a/src/app/core/auth/models/auth.method-type.ts b/src/app/core/auth/models/auth.method-type.ts
index 594d6d8b39..87871f433e 100644
--- a/src/app/core/auth/models/auth.method-type.ts
+++ b/src/app/core/auth/models/auth.method-type.ts
@@ -5,5 +5,6 @@ export enum AuthMethodType {
   Ip = 'ip',
   X509 = 'x509',
   Oidc = 'oidc',
-  Orcid = 'orcid'
+  Orcid = 'orcid',
+  Saml = 'saml'
 }
diff --git a/src/app/core/auth/models/auth.method.ts b/src/app/core/auth/models/auth.method.ts
index b84e7a308a..5ff5532cea 100644
--- a/src/app/core/auth/models/auth.method.ts
+++ b/src/app/core/auth/models/auth.method.ts
@@ -40,6 +40,11 @@ export class AuthMethod {
         this.location = location;
         break;
       }
+      case 'saml': {
+        this.authMethodType = AuthMethodType.Saml;
+        this.location = location;
+        break;
+      }
 
       default: {
         break;
diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts
index d987891388..122945ab6a 100644
--- a/src/app/core/cache/builders/link.service.spec.ts
+++ b/src/app/core/cache/builders/link.service.spec.ts
@@ -31,10 +31,12 @@ class TestModel implements HALResource {
     self: HALLink;
     predecessor: HALLink;
     successor: HALLink;
+    standardLinkName: HALLink;
   };
 
   predecessor?: TestModel;
   successor?: TestModel;
+  renamedProperty?: TestModel;
 }
 
 const mockDataServiceMap: any = new Map([
@@ -66,6 +68,24 @@ describe('LinkService', () => {
     testDataService = new TestDataService();
     spyOn(testDataService, 'findListByHref').and.callThrough();
     spyOn(testDataService, 'findByHref').and.callThrough();
+
+    const linksDefinitions = new Map();
+    linksDefinitions.set('predecessor', {
+      resourceType: TEST_MODEL,
+      linkName: 'predecessor',
+      propertyName: 'predecessor',
+    });
+    linksDefinitions.set('successor', {
+      resourceType: TEST_MODEL,
+      linkName: 'successor',
+      propertyName: 'successor',
+    });
+    linksDefinitions.set('standardLinkName', {
+      resourceType: TEST_MODEL,
+      linkName: 'standardLinkName',
+      propertyName: 'renamedProperty',
+    });
+
     TestBed.configureTestingModule({
       providers: [
         LinkService,
@@ -87,18 +107,7 @@ describe('LinkService', () => {
         },
         {
           provide: LINK_DEFINITION_MAP_FACTORY,
-          useValue: jasmine.createSpy('getLinkDefinitions').and.returnValue([
-            {
-              resourceType: TEST_MODEL,
-              linkName: 'predecessor',
-              propertyName: 'predecessor',
-            },
-            {
-              resourceType: TEST_MODEL,
-              linkName: 'successor',
-              propertyName: 'successor',
-            },
-          ]),
+          useValue: jasmine.createSpy('getLinkDefinitions').and.returnValue(linksDefinitions),
         },
       ],
     });
@@ -117,6 +126,15 @@ describe('LinkService', () => {
         });
       });
     });
+    describe(`when the propertyName is different than linkName`, () => {
+      beforeEach(() => {
+        result = service.resolveLink(testModel, followLink('standardLinkName', {}));
+      });
+      it('link should be assign to custom property', () => {
+        expect(result.renamedProperty).toBeDefined();
+        expect(result.standardLinkName).toBeUndefined();
+      });
+    });
     describe(`when the linkdefinition concerns a list`, () => {
       beforeEach(() => {
         ((service as any).getLinkDefinition as jasmine.Spy).and.returnValue({
diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts
index 6265e89d53..df3ccf1c87 100644
--- a/src/app/core/cache/builders/link.service.ts
+++ b/src/app/core/cache/builders/link.service.ts
@@ -112,7 +112,16 @@ export class LinkService {
    * @param linkToFollow the {@link FollowLinkConfig} to resolve
    */
   public resolveLink<T extends HALResource>(model, linkToFollow: FollowLinkConfig<T>): T {
-    model[linkToFollow.name] = this.resolveLinkWithoutAttaching(model, linkToFollow);
+    const linkDefinitions = this.getLinkDefinitions(model.constructor as GenericConstructor<T>);
+    const linkDef = linkDefinitions.get(linkToFollow.name);
+
+    if (isNotEmpty(linkDef)) {
+      // If link exist in definition we can resolve it and  use a real property name
+      model[linkDef.propertyName] = this.resolveLinkWithoutAttaching(model, linkToFollow);
+    } else {
+      // For some links we don't have a definition, so we use the link name as property name
+      model[linkToFollow.name] = this.resolveLinkWithoutAttaching(model, linkToFollow);
+    }
     return model;
   }
 
diff --git a/src/app/core/cache/object-cache.reducer.spec.ts b/src/app/core/cache/object-cache.reducer.spec.ts
index 7dda02a0f5..105ee93733 100644
--- a/src/app/core/cache/object-cache.reducer.spec.ts
+++ b/src/app/core/cache/object-cache.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 import { Operation } from 'fast-json-patch';
 
 import { Item } from '../shared/item.model';
diff --git a/src/app/core/cache/server-sync-buffer.reducer.spec.ts b/src/app/core/cache/server-sync-buffer.reducer.spec.ts
index d986581ce2..e954b5d7c0 100644
--- a/src/app/core/cache/server-sync-buffer.reducer.spec.ts
+++ b/src/app/core/cache/server-sync-buffer.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { RestRequestMethod } from '../data/rest-request-method';
 import { RemoveFromObjectCacheAction } from './object-cache.actions';
diff --git a/src/app/core/config/models/config-submission-section.model.ts b/src/app/core/config/models/config-submission-section.model.ts
index feb4fc9cb0..13e19544dc 100644
--- a/src/app/core/config/models/config-submission-section.model.ts
+++ b/src/app/core/config/models/config-submission-section.model.ts
@@ -4,20 +4,16 @@ import {
   inheritSerialization,
 } from 'cerialize';
 
+import {
+  SectionScope,
+  SectionVisibility,
+} from '../../../submission/objects/section-visibility.model';
 import { SectionsType } from '../../../submission/sections/sections-type';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { HALLink } from '../../shared/hal-link.model';
 import { ConfigObject } from './config.model';
 import { SUBMISSION_SECTION_TYPE } from './config-type';
 
-/**
- * An interface that define section visibility and its properties.
- */
-export interface SubmissionSectionVisibility {
-  main: any;
-  other: any;
-}
-
 @typedObject
 @inheritSerialization(ConfigObject)
 export class SubmissionSectionModel extends ConfigObject {
@@ -35,6 +31,12 @@ export class SubmissionSectionModel extends ConfigObject {
   @autoserialize
   mandatory: boolean;
 
+  /**
+   * The submission scope for this section
+   */
+  @autoserialize
+  scope: SectionScope;
+
   /**
    * A string representing the kind of section object
    */
@@ -42,10 +44,10 @@ export class SubmissionSectionModel extends ConfigObject {
   sectionType: SectionsType;
 
   /**
-   * The [SubmissionSectionVisibility] object for this section
+   * The [SectionVisibility] object for this section
    */
   @autoserialize
-  visibility: SubmissionSectionVisibility;
+  visibility: SectionVisibility;
 
   /**
    * The {@link HALLink}s for this SubmissionSectionModel
diff --git a/src/app/core/data/base/base-data.service.spec.ts b/src/app/core/data/base/base-data.service.spec.ts
index 3f44ad5e5a..6f32395667 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -5,6 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
+// eslint-disable-next-line max-classes-per-file
 import {
   fakeAsync,
   tick,
@@ -26,12 +27,20 @@ import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-ser
 import { ObjectCacheServiceStub } from '../../../shared/testing/object-cache-service.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { BITSTREAM } from '../../shared/bitstream.resource-type';
+import { COLLECTION } from '../../shared/collection.resource-type';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
 import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
 import { RemoteData } from '../remote-data';
 import { RequestService } from '../request.service';
 import { RequestEntryState } from '../request-entry-state.model';
@@ -56,6 +65,25 @@ class TestService extends BaseDataService<any> {
   }
 }
 
+@typedObject
+class BaseData {
+  static type = new ResourceType('test');
+
+  foo: string;
+
+  _links: {
+    followLink1: HALLink;
+    followLink2: HALLink[];
+    self: HALLink;
+  };
+
+  @link(COLLECTION)
+  followLink1: Observable<any>;
+
+  @link(BITSTREAM, true, 'followLink2')
+  followLink2CustomVariableName: Observable<PaginatedList<any>>;
+}
+
 describe('BaseDataService', () => {
   let service: TestService;
   let requestService;
@@ -65,8 +93,9 @@ describe('BaseDataService', () => {
   let selfLink;
   let linksToFollow;
   let testScheduler;
-  let remoteDataMocks: { [responseType: string]: RemoteData<any> };
-  let remoteDataPageMocks: { [responseType: string]: RemoteData<any> };
+  let remoteDataTimestamp: number;
+  let remoteDataMocks: { [responseType: string]: RemoteData<BaseData> };
+  let remoteDataPageMocks: { [responseType: string]: RemoteData<PaginatedList<BaseData>> };
 
   function initTestService(): TestService {
     requestService = getMockRequestService();
@@ -85,12 +114,14 @@ describe('BaseDataService', () => {
       expect(actual).toEqual(expected);
     });
 
-    const timeStamp = new Date().getTime();
+    // The response's lastUpdated equals the time of 60 seconds after the test started, ensuring they are not perceived
+    // as cached values.
+    remoteDataTimestamp = new Date().getTime() + 60 * 1000;
     const msToLive = 15 * 60 * 1000;
-    const payload = {
+    const payload: BaseData = Object.assign(new BaseData(), {
       foo: 'bar',
-      followLink1: {},
-      followLink2: {},
+      followLink1: observableOf({}),
+      followLink2CustomVariableName: observableOf(createPaginatedList()),
       _links: {
         self: Object.assign(new HALLink(), {
           href: 'self-test-link',
@@ -107,27 +138,27 @@ describe('BaseDataService', () => {
           }),
         ],
       },
-    };
+    });
     const statusCodeSuccess = 200;
     const statusCodeError = 404;
     const errorMessage = 'not found';
     remoteDataMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+      RequestPending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+      Success: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Success, undefined, payload, statusCodeSuccess),
+      SuccessStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.SuccessStale, undefined, payload, statusCodeSuccess),
+      Error: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
     };
     remoteDataPageMocks = {
-      RequestPending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
-      ResponsePending: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
-      ResponsePendingStale: new RemoteData(undefined, msToLive, timeStamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
-      Success: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Success, undefined, createPaginatedList([payload]), statusCodeSuccess),
-      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, createPaginatedList([payload]), statusCodeSuccess),
-      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
-      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+      RequestPending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.RequestPending, undefined, undefined, undefined),
+      ResponsePending: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePending, undefined, undefined, undefined),
+      ResponsePendingStale: new RemoteData(undefined, msToLive, remoteDataTimestamp, RequestEntryState.ResponsePendingStale, undefined, undefined, undefined),
+      Success: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Success, undefined, createPaginatedList([payload]), statusCodeSuccess),
+      SuccessStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.SuccessStale, undefined, createPaginatedList([payload]), statusCodeSuccess),
+      Error: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(remoteDataTimestamp, msToLive, remoteDataTimestamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
     };
 
     return new TestService(
@@ -361,11 +392,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
+        // Old cached value from 1 minute before the test started
+        const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataPageMocks.Success, {
+          timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+          lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+        } as RemoteData<any>);
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataMocks.RequestPending,
             c: remoteDataMocks.ResponsePending,
             d: remoteDataMocks.Success,
@@ -383,6 +418,22 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b', {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataMocks.Success,
+            b: remoteDataMocks.SuccessStale,
+          };
+
+          expectObservable(service.findByHref(selfLink, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d-e-f-g', {
@@ -411,17 +462,12 @@ describe('BaseDataService', () => {
     it('should link all the followLinks of a cached object by calling addDependency', () => {
       spyOn(objectCache, 'addDependency').and.callThrough();
       testScheduler.run(({ cold, expectObservable, flush }) => {
-        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d', {
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a', {
           a: remoteDataMocks.Success,
-          b: remoteDataMocks.RequestPending,
-          c: remoteDataMocks.ResponsePending,
-          d: remoteDataMocks.Success,
         }));
-        const expected = '--b-c-d';
+        const expected = 'a';
         const values = {
-          b: remoteDataMocks.RequestPending,
-          c: remoteDataMocks.ResponsePending,
-          d: remoteDataMocks.Success,
+          a: remoteDataMocks.Success,
         };
 
         expectObservable(service.findByHref(selfLink, false, false, ...linksToFollow)).toBe(expected, values);
@@ -570,11 +616,15 @@ describe('BaseDataService', () => {
         spyOn(service as any, 'reRequestStaleRemoteData').and.callFake(() => (source) => source);
       });
 
-
-      it(`should not emit a cached completed RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
+      it('should not emit a cached completed RemoteData', () => {
         testScheduler.run(({ cold, expectObservable }) => {
+          // Old cached value from 1 minute before the test started
+          const oldCachedSucceededData: RemoteData<any> = Object.assign({}, remoteDataPageMocks.Success, {
+            timeCompleted: remoteDataTimestamp - 2 * 60 * 1000,
+            lastUpdated: remoteDataTimestamp - 2 * 60 * 1000,
+          } as RemoteData<any>);
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataPageMocks.Success,
+            a: oldCachedSucceededData,
             b: remoteDataPageMocks.RequestPending,
             c: remoteDataPageMocks.ResponsePending,
             d: remoteDataPageMocks.Success,
@@ -592,6 +642,22 @@ describe('BaseDataService', () => {
         });
       });
 
+      it('should emit the first completed RemoteData since the request was made', () => {
+        testScheduler.run(({ cold, expectObservable }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b', {
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.SuccessStale,
+          }));
+          const expected = 'a-b';
+          const values = {
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.SuccessStale,
+          };
+
+          expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
+        });
+      });
+
       it(`should not emit a cached stale RemoteData, but only start emitting after the state first changes to RequestPending`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e-f-g', {
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index d09ee21ee0..da36461240 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -11,6 +11,7 @@ import {
   from as observableFrom,
   Observable,
   of as observableOf,
+  shareReplay,
 } from 'rxjs';
 import {
   map,
@@ -28,11 +29,16 @@ import {
   isNotEmptyOperator,
 } from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import {
+  getLinkDefinition,
+  LinkDefinition,
+} from '../../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { CacheableObject } from '../../cache/cacheable-object.model';
 import { RequestParam } from '../../cache/models/request-param.model';
 import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { HALLink } from '../../shared/hal-link.model';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
@@ -283,8 +289,13 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       isNotEmptyOperator(),
       take(1),
       map((href: string) => this.buildHrefFromFindOptions(href, {}, [], ...linksToFollow)),
+      shareReplay({
+        bufferSize: 1,
+        refCount: true,
+      }),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     const response$: Observable<RemoteData<T>> = this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
@@ -292,7 +303,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
+      skipWhile((rd: RemoteData<T>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
@@ -300,9 +311,10 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // Ensure all followLinks from the cached object are automatically invalidated when invalidating the cached object
       tap((remoteDataObject: RemoteData<T>) => {
         if (hasValue(remoteDataObject?.payload?._links)) {
-          for (const followLinkName of Object.keys(remoteDataObject.payload._links)) {
-            // only add the followLinks if they are embedded
-            if (hasValue(remoteDataObject.payload[followLinkName]) && followLinkName !== 'self') {
+          for (const followLinkName of Object.keys(remoteDataObject.payload._links) as (keyof typeof remoteDataObject.payload._links)[]) {
+            // only add the followLinks if they are embedded, and we get only links from the linkMap with the correct name
+            const linkDefinition: LinkDefinition<T> = getLinkDefinition(remoteDataObject.payload.constructor as GenericConstructor<T>, followLinkName);
+            if (linkDefinition?.propertyName && hasValue(remoteDataObject.payload[linkDefinition.propertyName]) && followLinkName !== 'self') {
               // followLink can be either an individual HALLink or a HALLink[]
               const followLinksList: HALLink[] = [].concat(remoteDataObject.payload._links[followLinkName]);
               for (const individualFollowLink of followLinksList) {
@@ -336,8 +348,13 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       isNotEmptyOperator(),
       take(1),
       map((href: string) => this.buildHrefFromFindOptions(href, options, [], ...linksToFollow)),
+      shareReplay({
+        bufferSize: 1,
+        refCount: true,
+      }),
     );
 
+    const startTime: number = new Date().getTime();
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
     const response$: Observable<RemoteData<PaginatedList<T>>> = this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
@@ -345,7 +362,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       // call it isn't immediately returned, but we wait until the remote data for the new request
       // is created. If useCachedVersionIfAvailable is false it also ensures you don't get a
       // cached completed object
-      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.hasCompleted)),
+      skipWhile((rd: RemoteData<PaginatedList<T>>) => rd.isStale || (!useCachedVersionIfAvailable && rd.lastUpdated < startTime)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findListByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
@@ -355,9 +372,10 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
         if (hasValue(remoteDataObject?.payload?.page)) {
           for (const object of remoteDataObject.payload.page) {
             if (hasValue(object?._links)) {
-              for (const followLinkName of Object.keys(object._links)) {
-                // only add the followLinks if they are embedded
-                if (hasValue(object[followLinkName]) && followLinkName !== 'self') {
+              for (const followLinkName of Object.keys(object._links) as (keyof typeof object._links)[]) {
+                // only add the followLinks if they are embedded, and we get only links from the linkMap with the correct name
+                const linkDefinition: LinkDefinition<PaginatedList<T>> = getLinkDefinition(object.constructor as GenericConstructor<PaginatedList<T>>, followLinkName);
+                if (linkDefinition?.propertyName && followLinkName !== 'self' && hasValue(object[linkDefinition.propertyName])) {
                   // followLink can be either an individual HALLink or a HALLink[]
                   const followLinksList: HALLink[] = [].concat(object._links[followLinkName]);
                   for (const individualFollowLink of followLinksList) {
diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index 91b5132ce0..6aa75065d4 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -16,6 +16,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
@@ -176,4 +177,30 @@ describe('BitstreamDataService', () => {
       expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream2-self');
     });
   });
+
+  describe('findByItemHandle', () => {
+    it('should encode the filename correctly in the search parameters', () => {
+      const handle = '123456789/1234';
+      const sequenceId = '5';
+      const filename = 'file with spaces.pdf';
+      const searchParams = [
+        new RequestParam('handle', handle),
+        new RequestParam('sequenceId', sequenceId),
+        new RequestParam('filename', filename),
+      ];
+      const linksToFollow: FollowLinkConfig<Bitstream>[] = [];
+
+      spyOn(service as any, 'getSearchByHref').and.callThrough();
+
+      service.getSearchByHref('byItemHandle', { searchParams }, ...linksToFollow).subscribe((href) => {
+        expect(service.getSearchByHref).toHaveBeenCalledWith(
+          'byItemHandle',
+          { searchParams },
+          ...linksToFollow,
+        );
+
+        expect(href).toBe(`${url}/bitstreams/search/byItemHandle?handle=123456789%2F1234&sequenceId=5&filename=file%20with%20spaces.pdf`);
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index b8776d2530..9455a456fa 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -241,11 +241,12 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
    *                                    no valid cached version. Defaults to true
    * @param reRequestOnStale            Whether or not the request should automatically be re-
    *                                    requested after the response becomes stale
+   * @param options                     the {@link FindListOptions} for the request
    * @return {Observable<Bitstream | null>}
    *    Return an observable that contains primary bitstream information or null
    */
-  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<Bitstream | null> {
-    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, followLink('primaryBitstream')).pipe(
+  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions): Observable<Bitstream | null> {
+    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, options, followLink('primaryBitstream')).pipe(
       getFirstCompletedRemoteData(),
       switchMap((rd: RemoteData<Bundle>) => {
         if (!rd.hasSucceeded) {
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 5d552c9bf0..79f877fadd 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -78,10 +78,14 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
    *                                    requested after the response becomes stale
    * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
    *                                    {@link HALLink}s should be automatically resolved
+   * @param options                     the {@link FindListOptions} for the request
    */
   // TODO should be implemented rest side
-  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
-    return this.findAllByItem(item, { elementsPerPage: 9999 }, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
+  findByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<Bundle>[]): Observable<RemoteData<Bundle>> {
+    //Since we filter by bundleName where the pagination options are not indicated we need to load all the possible bundles.
+    // This is a workaround, in substitution of the previously recursive call with expand
+    const paginationOptions = options ?? { elementsPerPage: 9999 };
+    return this.findAllByItem(item, paginationOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
       map((rd: RemoteData<PaginatedList<Bundle>>) => {
         if (hasValue(rd.payload) && hasValue(rd.payload.page)) {
           const matchingBundle = rd.payload.page.find((bundle: Bundle) =>
diff --git a/src/app/core/data/object-updates/object-updates.reducer.spec.ts b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
index 1f2a15769b..9572767854 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { Relationship } from '../../shared/item-relationships/relationship.model';
 import { FieldChangeType } from './field-change-type.model';
diff --git a/src/app/core/data/object-updates/object-updates.service.stub.ts b/src/app/core/data/object-updates/object-updates.service.stub.ts
new file mode 100644
index 0000000000..c41728a338
--- /dev/null
+++ b/src/app/core/data/object-updates/object-updates.service.stub.ts
@@ -0,0 +1,28 @@
+export class ObjectUpdatesServiceStub {
+
+  initialize = jasmine.createSpy('initialize');
+  saveFieldUpdate = jasmine.createSpy('saveFieldUpdate');
+  getObjectEntry = jasmine.createSpy('getObjectEntry');
+  getFieldState = jasmine.createSpy('getFieldState');
+  getFieldUpdates = jasmine.createSpy('getFieldUpdates');
+  getFieldUpdatesExclusive = jasmine.createSpy('getFieldUpdatesExclusive');
+  isValid = jasmine.createSpy('isValid');
+  isValidPage = jasmine.createSpy('isValidPage');
+  saveAddFieldUpdate = jasmine.createSpy('saveAddFieldUpdate');
+  saveRemoveFieldUpdate = jasmine.createSpy('saveRemoveFieldUpdate');
+  saveChangeFieldUpdate = jasmine.createSpy('saveChangeFieldUpdate');
+  isSelectedVirtualMetadata = jasmine.createSpy('isSelectedVirtualMetadata');
+  setSelectedVirtualMetadata = jasmine.createSpy('setSelectedVirtualMetadata');
+  setEditableFieldUpdate = jasmine.createSpy('setEditableFieldUpdate');
+  setValidFieldUpdate = jasmine.createSpy('setValidFieldUpdate');
+  discardFieldUpdates = jasmine.createSpy('discardFieldUpdates');
+  discardAllFieldUpdates = jasmine.createSpy('discardAllFieldUpdates');
+  reinstateFieldUpdates = jasmine.createSpy('reinstateFieldUpdates');
+  removeSingleFieldUpdate = jasmine.createSpy('removeSingleFieldUpdate');
+  getUpdateFields = jasmine.createSpy('getUpdateFields');
+  hasUpdates = jasmine.createSpy('hasUpdates');
+  isReinstatable = jasmine.createSpy('isReinstatable');
+  getLastModified = jasmine.createSpy('getLastModified');
+  createPatch = jasmine.createSpy('getPatch');
+
+}
diff --git a/src/app/core/data/request.reducer.spec.ts b/src/app/core/data/request.reducer.spec.ts
index 40e17a49dd..d39f8fe644 100644
--- a/src/app/core/data/request.reducer.spec.ts
+++ b/src/app/core/data/request.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   RequestConfigureAction,
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
new file mode 100644
index 0000000000..4a47ffe9fd
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.spec.ts
@@ -0,0 +1,194 @@
+import {
+  HTTP_INTERCEPTORS,
+  HttpClient,
+} from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { PLATFORM_ID } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { DspaceRestInterceptor } from './dspace-rest.interceptor';
+import { DspaceRestService } from './dspace-rest.service';
+
+describe('DspaceRestInterceptor', () => {
+  let httpMock: HttpTestingController;
+  let httpClient: HttpClient;
+  const appConfig: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+    },
+  };
+  const appConfigWithSSR: Partial<AppConfig> = {
+    rest: {
+      ssl: false,
+      host: 'localhost',
+      port: 8080,
+      nameSpace: '/server',
+      baseUrl: 'http://api.example.com/server',
+      ssrBaseUrl: 'http://ssr.example.com/server',
+    },
+  };
+
+  describe('When SSR base URL is not set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfig },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+
+  describe('When SSR base URL is set ', () => {
+    describe('and it\'s in the browser', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'browser' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should not modify the request', () => {
+        const url = 'http://api.example.com/server/items';
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(url);
+        expect(req.request.url).toBe(url);
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+
+    describe('and it\'s in SSR mode', () => {
+      beforeEach(() => {
+        TestBed.configureTestingModule({
+          imports: [HttpClientTestingModule],
+          providers: [
+            DspaceRestService,
+            {
+              provide: HTTP_INTERCEPTORS,
+              useClass: DspaceRestInterceptor,
+              multi: true,
+            },
+            { provide: APP_CONFIG, useValue: appConfigWithSSR },
+            { provide: PLATFORM_ID, useValue: 'server' },
+          ],
+        });
+
+        httpMock = TestBed.inject(HttpTestingController);
+        httpClient = TestBed.inject(HttpClient);
+      });
+
+      it('should replace the base URL', () => {
+        const url = 'http://api.example.com/server/items';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items');
+        req.flush({});
+        httpMock.verify();
+      });
+
+      it('should not replace any query param containing the base URL', () => {
+        const url = 'http://api.example.com/server/items?url=http://api.example.com/server/item/1';
+        const ssrBaseUrl = appConfigWithSSR.rest.ssrBaseUrl;
+
+        httpClient.get(url).subscribe((response) => {
+          expect(response).toBeTruthy();
+        });
+
+        const req = httpMock.expectOne(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        expect(req.request.url).toBe(ssrBaseUrl + '/items?url=http://api.example.com/server/item/1');
+        req.flush({});
+        httpMock.verify();
+      });
+    });
+  });
+});
diff --git a/src/app/core/dspace-rest/dspace-rest.interceptor.ts b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
new file mode 100644
index 0000000000..efd2c12b5d
--- /dev/null
+++ b/src/app/core/dspace-rest/dspace-rest.interceptor.ts
@@ -0,0 +1,52 @@
+import { isPlatformBrowser } from '@angular/common';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import {
+  Inject,
+  Injectable,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { isEmpty } from '../../shared/empty.util';
+
+@Injectable()
+/**
+ * This Interceptor is used to use the configured base URL for the request made during SSR execution
+ */
+export class DspaceRestInterceptor implements HttpInterceptor {
+
+  /**
+   * Contains the configured application base URL
+   * @protected
+   */
+  protected baseUrl: string;
+  protected ssrBaseUrl: string;
+
+  constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(PLATFORM_ID) private platformId: string,
+  ) {
+    this.baseUrl = this.appConfig.rest.baseUrl;
+    this.ssrBaseUrl = this.appConfig.rest.ssrBaseUrl;
+  }
+
+  intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
+    if (isPlatformBrowser(this.platformId) || isEmpty(this.ssrBaseUrl) || this.baseUrl === this.ssrBaseUrl) {
+      return next.handle(request);
+    }
+
+    // Different SSR Base URL specified so replace it in the current request url
+    const url = request.url.replace(this.baseUrl, this.ssrBaseUrl);
+    const newRequest: HttpRequest<any> = request.clone({ url });
+    return next.handle(newRequest);
+  }
+}
diff --git a/src/app/core/dspace-rest/dspace-rest.service.spec.ts b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
index 4dd856b48e..04f44fc942 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.spec.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
@@ -1,10 +1,12 @@
 import {
   HttpErrorResponse,
   HttpHeaders,
+  provideHttpClient,
+  withInterceptorsFromDi,
 } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import {
   inject,
@@ -33,8 +35,12 @@ describe('DspaceRestService', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
-      providers: [DspaceRestService],
+      imports: [],
+      providers: [
+        DspaceRestService,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ],
     });
 
     dspaceRestService = TestBed.inject(DspaceRestService);
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
index 82fb36ce66..aa45ee5ee3 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
@@ -1,7 +1,11 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
@@ -21,7 +25,7 @@ describe('ForwardClientIpInterceptor', () => {
     clientIp = '1.2.3.4';
 
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [],
       providers: [
         DspaceRestService,
         {
@@ -30,6 +34,8 @@ describe('ForwardClientIpInterceptor', () => {
           multi: true,
         },
         { provide: REQUEST, useValue: { get: () => undefined, connection: { remoteAddress: clientIp } } },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 
diff --git a/src/app/core/index/index.reducer.spec.ts b/src/app/core/index/index.reducer.spec.ts
index a5d46a05f6..5f876f6167 100644
--- a/src/app/core/index/index.reducer.spec.ts
+++ b/src/app/core/index/index.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   AddToIndexAction,
diff --git a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
index 6d513120dc..ca25240ac6 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   CommitPatchOperationsAction,
diff --git a/src/app/core/locale/locale.interceptor.spec.ts b/src/app/core/locale/locale.interceptor.spec.ts
index 4725820a6b..4731e109e5 100644
--- a/src/app/core/locale/locale.interceptor.spec.ts
+++ b/src/app/core/locale/locale.interceptor.spec.ts
@@ -1,7 +1,11 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
@@ -25,7 +29,7 @@ describe(`LocaleInterceptor`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [],
       providers: [
         DspaceRestService,
         {
@@ -34,6 +38,8 @@ describe(`LocaleInterceptor`, () => {
           multi: true,
         },
         { provide: LocaleService, useValue: mockLocaleService },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 
diff --git a/src/app/core/log/log.interceptor.spec.ts b/src/app/core/log/log.interceptor.spec.ts
index 7a3c11fccc..021526f2e1 100644
--- a/src/app/core/log/log.interceptor.spec.ts
+++ b/src/app/core/log/log.interceptor.spec.ts
@@ -1,7 +1,11 @@
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HTTP_INTERCEPTORS,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
@@ -39,10 +43,7 @@ describe('LogInterceptor', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [
-        HttpClientTestingModule,
-        StoreModule.forRoot(appReducers, storeModuleConfig),
-      ],
+      imports: [StoreModule.forRoot(appReducers, storeModuleConfig)],
       providers: [
         DspaceRestService,
         // LogInterceptor,
@@ -55,6 +56,8 @@ describe('LogInterceptor', () => {
         { provide: Router, useValue: router },
         { provide: CorrelationIdService, useClass: CorrelationIdService },
         { provide: UUIDService, useClass: UUIDService },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 
diff --git a/src/app/core/metadata/head-tag.service.ts b/src/app/core/metadata/head-tag.service.ts
index 270e5fde72..d52efb8fa1 100644
--- a/src/app/core/metadata/head-tag.service.ts
+++ b/src/app/core/metadata/head-tag.service.ts
@@ -50,6 +50,7 @@ import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core-state.model';
 import { BundleDataService } from '../data/bundle-data.service';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { FindListOptions } from '../data/find-list-options.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { RootDataService } from '../data/root-data.service';
@@ -185,6 +186,7 @@ export class HeadTagService {
     this.setCitationKeywordsTag();
 
     this.setCitationAbstractUrlTag();
+    this.setCitationDoiTag();
     this.setCitationPdfUrlTag();
     this.setCitationPublisherTag();
 
@@ -197,7 +199,6 @@ export class HeadTagService {
     // this.setCitationIssueTag();
     // this.setCitationFirstPageTag();
     // this.setCitationLastPageTag();
-    // this.setCitationDOITag();
     // this.setCitationPMIDTag();
 
     // this.setCitationFullTextTag();
@@ -318,6 +319,18 @@ export class HeadTagService {
     }
   }
 
+  /**
+   * Add <meta name="citation_doi" ... >  to the <head>
+   */
+  protected setCitationDoiTag(): void {
+    if (this.currentObject.value instanceof Item) {
+      const doi = this.getMetaTagValue('dc.identifier.doi');
+      if (hasValue(doi)) {
+        this.addMetaTag('citation_doi', doi);
+      }
+    }
+  }
+
   /**
    * Add <meta name="citation_pdf_url" ... >  to the <head>
    */
@@ -331,6 +344,7 @@ export class HeadTagService {
         'ORIGINAL',
         true,
         true,
+        new FindListOptions(),
         followLink('primaryBitstream'),
         followLink('bitstreams', {
           findListOptions: {
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 1aacb76295..dcc355edd0 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -27,7 +27,7 @@ export class MetadataService {
    * Returns undefined otherwise.
    */
   public virtualValue(metadataValue: MetadataValue | undefined): string {
-    if (this.isVirtual) {
+    if (this.isVirtual(metadataValue)) {
       return metadataValue.authority.substring(metadataValue.authority.indexOf(VIRTUAL_METADATA_PREFIX) + VIRTUAL_METADATA_PREFIX.length);
     } else {
       return undefined;
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
index e015dd01d9..e2a00f2e75 100644
--- a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
+++ b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
@@ -88,6 +88,15 @@ export interface SourceQualityAssuranceEventMessageObject {
    */
   pidHref: string;
 
+  /**
+   * Possible link to a page
+   */
+  href?: string;
+
+  /**
+   * The service Id
+   */
+  serviceId?: string;
 }
 
 /**
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index 9bac2af51d..b0f6009e98 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -44,7 +44,7 @@ import { RegistryService } from './registry.service';
 @Component({
   template: '',
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class DummyComponent {
 }
diff --git a/src/app/core/services/server-hard-redirect.service.spec.ts b/src/app/core/services/server-hard-redirect.service.spec.ts
index 27777ed7ba..a904a8e66c 100644
--- a/src/app/core/services/server-hard-redirect.service.spec.ts
+++ b/src/app/core/services/server-hard-redirect.service.spec.ts
@@ -1,5 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 
+import { environment } from '../../../environments/environment.test';
 import { ServerHardRedirectService } from './server-hard-redirect.service';
 
 describe('ServerHardRedirectService', () => {
@@ -7,7 +8,7 @@ describe('ServerHardRedirectService', () => {
   const mockRequest = jasmine.createSpyObj(['get']);
   const mockResponse = jasmine.createSpyObj(['redirect', 'end']);
 
-  const service: ServerHardRedirectService = new ServerHardRedirectService(mockRequest, mockResponse);
+  let service: ServerHardRedirectService = new ServerHardRedirectService(environment, mockRequest, mockResponse);
   const origin = 'https://test-host.com:4000';
 
   beforeEach(() => {
@@ -68,4 +69,23 @@ describe('ServerHardRedirectService', () => {
     });
   });
 
+  describe('when SSR base url is set', () => {
+    const redirect = 'https://private-url:4000/server/api/bitstreams/uuid';
+    const replacedUrl = 'https://public-url/server/api/bitstreams/uuid';
+    const environmentWithSSRUrl: any = { ...environment, ...{ ...environment.rest, rest: {
+      ssrBaseUrl: 'https://private-url:4000/server',
+      baseUrl: 'https://public-url/server',
+    } } };
+    service = new ServerHardRedirectService(environmentWithSSRUrl, mockRequest, mockResponse);
+
+    beforeEach(() => {
+      service.redirect(redirect);
+    });
+
+    it('should perform a 302 redirect', () => {
+      expect(mockResponse.redirect).toHaveBeenCalledWith(302, replacedUrl);
+      expect(mockResponse.end).toHaveBeenCalled();
+    });
+  });
+
 });
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
index e1ded1568c..1592d9bf1c 100644
--- a/src/app/core/services/server-hard-redirect.service.ts
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -7,10 +7,15 @@ import {
   Response,
 } from 'express';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import {
   REQUEST,
   RESPONSE,
 } from '../../../express.tokens';
+import { isNotEmpty } from '../../shared/empty.util';
 import { HardRedirectService } from './hard-redirect.service';
 
 /**
@@ -20,6 +25,7 @@ import { HardRedirectService } from './hard-redirect.service';
 export class ServerHardRedirectService extends HardRedirectService {
 
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     @Inject(REQUEST) protected req: Request,
     @Inject(RESPONSE) protected res: Response,
   ) {
@@ -35,17 +41,22 @@ export class ServerHardRedirectService extends HardRedirectService {
    *    optional HTTP status code to use for redirect (default = 302, which is a temporary redirect)
    */
   redirect(url: string, statusCode?: number) {
-
     if (url === this.req.url) {
       return;
     }
 
+    let redirectUrl = url;
+    // If redirect url contains SSR base url then replace with public base url
+    if (isNotEmpty(this.appConfig.rest.ssrBaseUrl) && this.appConfig.rest.baseUrl !== this.appConfig.rest.ssrBaseUrl) {
+      redirectUrl = url.replace(this.appConfig.rest.ssrBaseUrl, this.appConfig.rest.baseUrl);
+    }
+
     if (this.res.finished) {
       const req: any = this.req;
       req._r_count = (req._r_count || 0) + 1;
 
       console.warn('Attempted to redirect on a finished response. From',
-        this.req.url, 'to', url);
+        this.req.url, 'to', redirectUrl);
 
       if (req._r_count > 10) {
         console.error('Detected a redirection loop. killing the nodejs process');
@@ -59,9 +70,9 @@ export class ServerHardRedirectService extends HardRedirectService {
         status = 302;
       }
 
-      console.log(`Redirecting from ${this.req.url} to ${url} with ${status}`);
+      console.info(`Redirecting from ${this.req.url} to ${redirectUrl} with ${status}`);
 
-      this.res.redirect(status, url);
+      this.res.redirect(status, redirectUrl);
       this.res.end();
       // I haven't found a way to correctly stop Angular rendering.
       // So we just let it end its work, though we have already closed
diff --git a/src/app/core/shared/browse-definition.model.ts b/src/app/core/shared/browse-definition.model.ts
index 6de81727fa..5fe5d02ecb 100644
--- a/src/app/core/shared/browse-definition.model.ts
+++ b/src/app/core/shared/browse-definition.model.ts
@@ -1,4 +1,7 @@
-import { autoserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+} from 'cerialize';
 
 import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
 import { CacheableObject } from '../cache/cacheable-object.model';
@@ -11,6 +14,9 @@ export abstract class BrowseDefinition extends CacheableObject {
   @autoserialize
   id: string;
 
+  @autoserializeAs('metadata')
+  metadataKeys: string[];
+
   /**
    * Get the render type of the BrowseDefinition model
    */
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index dcebf5794c..566dba01b4 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -29,6 +29,9 @@ export enum Context {
   SideBarSearchModal = 'sideBarSearchModal',
   SideBarSearchModalCurrent = 'sideBarSearchModalCurrent',
 
+  ScopeSelectorModal = 'scopeSelectorModal',
+  ScopeSelectorModalCurrent = 'scopeSelectorModalCurrent',
+
   /** The MyDSpace* Context values below are used for badge display in MyDSpace. */
   MyDSpaceArchived = 'mydspaceArchived',
   MyDSpaceWorkspace = 'mydspaceWorkspace',
diff --git a/src/app/core/shared/hierarchical-browse-definition.model.ts b/src/app/core/shared/hierarchical-browse-definition.model.ts
index e7c06a5372..eb606b7bbe 100644
--- a/src/app/core/shared/hierarchical-browse-definition.model.ts
+++ b/src/app/core/shared/hierarchical-browse-definition.model.ts
@@ -1,6 +1,5 @@
 import {
   autoserialize,
-  autoserializeAs,
   deserialize,
   inheritSerialization,
 } from 'cerialize';
@@ -33,9 +32,6 @@ export class HierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserialize
   vocabulary: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   get self(): string {
     return this._links.self.href;
   }
diff --git a/src/app/core/shared/non-hierarchical-browse-definition.ts b/src/app/core/shared/non-hierarchical-browse-definition.ts
index 7f8c6d0e5f..07083f7a8a 100644
--- a/src/app/core/shared/non-hierarchical-browse-definition.ts
+++ b/src/app/core/shared/non-hierarchical-browse-definition.ts
@@ -21,9 +21,6 @@ export abstract class NonHierarchicalBrowseDefinition extends BrowseDefinition {
   @autoserializeAs('order')
   defaultSortOrder: string;
 
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
   @autoserialize
   dataType: BrowseByDataType;
 }
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
index 64b305ff64..403def3d32 100644
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -40,7 +40,7 @@ import anything = jasmine.anything;
 @Component({
   template: '',
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class DummyComponent {
 }
diff --git a/src/app/core/xsrf/browser-xsrf.service.spec.ts b/src/app/core/xsrf/browser-xsrf.service.spec.ts
index aba3edd330..9c67819741 100644
--- a/src/app/core/xsrf/browser-xsrf.service.spec.ts
+++ b/src/app/core/xsrf/browser-xsrf.service.spec.ts
@@ -1,7 +1,11 @@
-import { HttpClient } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
+  HttpClient,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
@@ -17,8 +21,12 @@ describe(`BrowserXSRFService`, () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [ HttpClientTestingModule ],
-      providers: [ BrowserXSRFService ],
+      imports: [],
+      providers: [
+        BrowserXSRFService,
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
+      ],
     });
     httpClient = TestBed.inject(HttpClient);
     httpTestingController = TestBed.inject(HttpTestingController);
diff --git a/src/app/core/xsrf/xsrf.interceptor.spec.ts b/src/app/core/xsrf/xsrf.interceptor.spec.ts
index 1668407e04..54afdc9b9c 100644
--- a/src/app/core/xsrf/xsrf.interceptor.spec.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.spec.ts
@@ -2,10 +2,12 @@ import {
   HTTP_INTERCEPTORS,
   HttpHeaders,
   HttpXsrfTokenExtractor,
+  provideHttpClient,
+  withInterceptorsFromDi,
 } from '@angular/common/http';
 import {
-  HttpClientTestingModule,
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 
@@ -20,7 +22,7 @@ import { XsrfInterceptor } from './xsrf.interceptor';
 describe(`XsrfInterceptor`, () => {
   let service: DspaceRestService;
   let httpMock: HttpTestingController;
-  let cookieService: CookieService;
+  let cookieService: CookieServiceMock;
 
   // mock XSRF token
   const testToken = 'test-token';
@@ -33,45 +35,52 @@ describe(`XsrfInterceptor`, () => {
   const mockStatusCode = 200;
   const mockStatusText = 'SUCCESS';
 
+  const testUrl = 'https://rest.com/server/api/core/items';
+
   beforeEach(() => {
+    const tokenExtractor = new HttpXsrfTokenExtractorMock(testToken);
+    cookieService = new CookieServiceMock();
+    const interceptor = new XsrfInterceptor(tokenExtractor,cookieService as any);
+
     TestBed.configureTestingModule({
-      imports: [HttpClientTestingModule],
+      imports: [],
       providers: [
         DspaceRestService,
         {
           provide: HTTP_INTERCEPTORS,
-          useClass: XsrfInterceptor,
+          useValue: interceptor,
           multi: true,
         },
-        { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock(testToken) },
-        { provide: CookieService, useValue: new CookieServiceMock() },
+        { provide: HttpXsrfTokenExtractor, useValue: tokenExtractor },
+        { provide: CookieService, useValue: cookieService },
+        provideHttpClient(withInterceptorsFromDi()),
+        provideHttpClientTesting(),
       ],
     });
 
     service = TestBed.get(DspaceRestService);
     httpMock = TestBed.get(HttpTestingController);
-    cookieService = TestBed.get(CookieService);
   });
 
   it('should change withCredentials to true at all times', (done) => {
-    service.request(RestRequestMethod.POST, 'server/api/core/items', 'test', { withCredentials: false }).subscribe((response) => {
+    service.request(RestRequestMethod.POST, testUrl, 'test', { withCredentials: false }).subscribe((response) => {
       expect(response).toBeTruthy();
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
     expect(httpRequest.request.withCredentials).toBeTrue();
 
     httpRequest.flush(mockPayload, { status: mockStatusCode, statusText: mockStatusText });
   });
 
   it('should add an X-XSRF-TOKEN header when we are sending an HTTP POST request', (done) => {
-    service.request(RestRequestMethod.POST, 'server/api/core/items', 'test').subscribe((response) => {
+    service.request(RestRequestMethod.POST, testUrl, 'test').subscribe((response) => {
       expect(response).toBeTruthy();
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     expect(httpRequest.request.headers.has('X-XSRF-TOKEN')).toBeTrue();
     expect(httpRequest.request.withCredentials).toBeTrue();
@@ -83,12 +92,12 @@ describe(`XsrfInterceptor`, () => {
   });
 
   it('should NOT add an X-XSRF-TOKEN header when we are sending an HTTP GET request', (done) => {
-    service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe((response) => {
+    service.request(RestRequestMethod.GET, testUrl).subscribe((response) => {
       expect(response).toBeTruthy();
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     expect(httpRequest.request.headers.has('X-XSRF-TOKEN')).toBeFalse();
     expect(httpRequest.request.withCredentials).toBeTrue();
@@ -115,7 +124,7 @@ describe(`XsrfInterceptor`, () => {
     // Create a mock XSRF token to be returned in response within DSPACE-XSRF-TOKEN header
     const mockNewXSRFToken = '123456789abcdefg';
 
-    service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe((response) => {
+    service.request(RestRequestMethod.GET, testUrl).subscribe((response) => {
       expect(response).toBeTruthy();
 
       // ensure mock data (added in below flush() call) is returned.
@@ -135,7 +144,7 @@ describe(`XsrfInterceptor`, () => {
       done();
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     // Flush & create mock response (including sending back a new XSRF token in header)
     httpRequest.flush(mockPayload, {
@@ -153,7 +162,7 @@ describe(`XsrfInterceptor`, () => {
     const mockErrorText = 'Forbidden';
     const mockErrorMessage = 'CSRF token mismatch';
 
-    service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe({
+    service.request(RestRequestMethod.GET, testUrl).subscribe({
       error: (error: unknown) => {
         expect(error).toBeTruthy();
         expect(error instanceof RequestError).toBeTrue();
@@ -170,7 +179,7 @@ describe(`XsrfInterceptor`, () => {
       },
     });
 
-    const httpRequest = httpMock.expectOne('server/api/core/items');
+    const httpRequest = httpMock.expectOne(testUrl);
 
     // Flush & create mock error response (including sending back a new XSRF token in header)
     httpRequest.flush(mockErrorMessage, {
diff --git a/src/app/curation-form/curation-form.component.html b/src/app/curation-form/curation-form.component.html
index c940494016..b312a75dd7 100644
--- a/src/app/curation-form/curation-form.component.html
+++ b/src/app/curation-form/curation-form.component.html
@@ -1,20 +1,24 @@
 <form [formGroup]="form" (ngSubmit)="submit()">
-    <div class="form-group">
-        <div class="row mb-2">
-            <div class="col-12 col-sm-6">
-                <label class="font-weight-bold" for="task">{{'curation.form.task-select.label' |translate }}</label>
-                <select id="task" formControlName="task" class="form-control">
-                    <option *ngFor="let task of tasks" [value]="task">
-                        {{ 'curation-task.task.' + task + '.label' | translate }}
-                    </option>
-                </select>
-            </div>
-            <div *ngIf="!hasHandleValue()" class="col-12 col-sm-6">
-                <label class="font-weight-bold" for="handle">{{'curation.form.handle.label' |translate }}</label>
-                <input id="handle" class="form-control" formControlName="handle">
-                <small class="text-muted">{{'curation.form.handle.hint' |translate }}</small>
-            </div>
+  <div class="mb-3">
+    <div class="row mb-2">
+      <div class="col-12 col-sm-6">
+        <label class="fw-bold form-label" for="task">{{'curation.form.task-select.label' |translate }}</label>
+        <select id="task" formControlName="task" class="form-select">
+          @for (task of tasks; track task) {
+            <option [value]="task">
+              {{ 'curation-task.task.' + task + '.label' | translate }}
+            </option>
+          }
+        </select>
+      </div>
+      @if (!hasHandleValue()) {
+        <div class="col-12 col-sm-6">
+          <label class="fw-bold form-label" for="handle">{{'curation.form.handle.label' |translate }}</label>
+          <input id="handle" class="form-control" formControlName="handle">
+          <small class="text-muted">{{'curation.form.handle.hint' |translate }}</small>
         </div>
-        <button class="btn btn-default btn-primary" type="submit">{{'curation.form.submit' |translate }}</button>
+      }
     </div>
+    <button class="btn btn-default btn-primary" type="submit">{{'curation.form.submit' |translate }}</button>
+  </div>
 </form>
diff --git a/src/app/curation-form/curation-form.component.ts b/src/app/curation-form/curation-form.component.ts
index 8e1c1b26c8..3a69a09466 100644
--- a/src/app/curation-form/curation-form.component.ts
+++ b/src/app/curation-form/curation-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -53,7 +50,7 @@ export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
   selector: 'ds-curation-form',
   templateUrl: './curation-form.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgFor, NgIf, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, TranslateModule],
 })
 export class CurationFormComponent implements OnDestroy, OnInit {
 
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
index aee9fb980c..d1ec80376e 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
@@ -1,16 +1,18 @@
 <div class="flex-grow-1 ds-drop-list h-100" [class.disabled]="(draggingMdField$ | async) && (draggingMdField$ | async) !== mdField" cdkDropList (cdkDropListDropped)="drop($event)" role="table">
   <ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
-  <ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index" role="presentation"
-                              [dso]="dso"
-                              [mdValue]="mdValue"
-                              [mdField]="mdField"
-                              [dsoType]="dsoType"
-                              [saving$]="saving$"
-                              [isOnlyValue]="form.fields[mdField].length === 1"
-                              (edit)="mdValue.editing = true"
-                              (confirm)="mdValue.confirmChanges($event); form.resetReinstatable(); valueSaved.emit()"
-                              (remove)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()"
-                              (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()"
-                              (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)">
-  </ds-dso-edit-metadata-value>
+  @for (mdValue of form.fields[mdField]; track mdValue; let idx = $index) {
+    <ds-dso-edit-metadata-value role="presentation"
+      [dso]="dso"
+      [mdValue]="mdValue"
+      [mdField]="mdField"
+      [dsoType]="dsoType"
+      [saving$]="saving$"
+      [isOnlyValue]="form.fields[mdField].length === 1"
+      (edit)="mdValue.editing = true"
+      (confirm)="mdValue.confirmChanges($event); form.resetReinstatable(); valueSaved.emit()"
+      (remove)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()"
+      (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()"
+      (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)">
+    </ds-dso-edit-metadata-value>
+  }
 </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
index a96b77be62..003ce13ad3 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
@@ -3,10 +3,7 @@ import {
   CdkDropList,
   moveItemInArray,
 } from '@angular/cdk/drag-drop';
-import {
-  AsyncPipe,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -32,7 +29,7 @@ import { DsoEditMetadataValueHeadersComponent } from '../dso-edit-metadata-value
   styleUrls: ['./dso-edit-metadata-field-values.component.scss'],
   templateUrl: './dso-edit-metadata-field-values.component.html',
   standalone: true,
-  imports: [CdkDropList, DsoEditMetadataValueHeadersComponent, NgFor, DsoEditMetadataValueComponent, AsyncPipe],
+  imports: [CdkDropList, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, AsyncPipe],
 })
 /**
  * Component displaying table rows for each value for a certain metadata field within a form
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
index 29b93f3150..d83bacecb2 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
@@ -24,26 +24,26 @@
   }
 
   &.ds-warning {
-    background-color: var(--ds-warning-bg);
+    background-color: var(--ds-warning-bg-subtle);
 
     .ds-flex-cell {
-      border: 1px solid var(--bs-warning);
+      border: 1px solid var(--bs-warning-border-subtle);
     }
   }
 
   &.ds-danger {
-    background-color: var(--ds-danger-bg);
+    background-color: var(--ds-danger-bg-subtle);
 
     .ds-flex-cell {
-      border: 1px solid var(--bs-danger);
+      border: 1px solid var(--bs-danger-border-subtle);
     }
   }
 
   &.ds-success {
-    background-color: var(--ds-success-bg);
+    background-color: var(--ds-success-bg-subtle);
 
     .ds-flex-cell {
-      border: 1px solid var(--bs-success);
+      border: 1px solid var(--bs-success-border-subtle);
     }
   }
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index 25b82b9b43..fb765583b5 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -1,101 +1,135 @@
 <div class="d-flex flex-row ds-value-row" *ngVar="metadataService.isVirtual(mdValue.newValue) as isVirtual" role="row"
-     cdkDrag (cdkDragStarted)="dragging.emit(true)" (cdkDragEnded)="dragging.emit(false)"
-     [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
+  cdkDrag (cdkDragStarted)="dragging.emit(true)" (cdkDragEnded)="dragging.emit(false)"
+  [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
   <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex flex-column" *ngVar="(mdRepresentation$ | async) as mdRepresentation" role="cell">
-    <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing && !mdRepresentation">{{ mdValue.newValue.value }}</div>
-    <textarea class="form-control" rows="5" *ngIf="mdValue.editing && !mdRepresentation && (isAuthorityControlled() | async) !== true" [(ngModel)]="mdValue.newValue.value"
-              [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
-              [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
-    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
-                                    [bindId]="mdField"
-                                    [group]="group"
-                                    [model]="getModel()"
-                                    (change)="onChangeAuthorityField($event)">
-    </ds-dynamic-scrollable-dropdown>
-    <ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
-                      [group]="group"
-                      [model]="getModel()"
-                      (change)="onChangeAuthorityField($event)">
-    </ds-dynamic-onebox>
-    <div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
-      <span class="badge badge-light border" >
-        <i dsAuthorityConfidenceState
-           class="fas fa-fw p-0"
-           aria-hidden="true"
-           [authorityValue]="mdValue.newValue"
-           [iconMode]="true"
-        ></i>
-        {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
-      </span>
-    </div>
-    <div class="mt-2" *ngIf=" mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)">
-      <div class="btn-group w-75">
-        <i dsAuthorityConfidenceState
-          class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
-          aria-hidden="true"
-          [authorityValue]="mdValue.newValue.confidence"
-          [iconMode]="true"
-      ></i>
-        <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
-              [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
-              (change)="onChangeAuthorityKey()" />
-        <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
-                [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
-                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
-                (click)="onChangeEditingAuthorityStatus(true)">
-          <i class="fas fa-lock fa-fw"></i>
-        </button>
-        <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="editingAuthority"
-                [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
-                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
-                (click)="onChangeEditingAuthorityStatus(false)">
-          <i class="fas fa-lock-open fa-fw"></i>
-        </button>
+    @if (!mdValue.editing && !mdRepresentation) {
+      <div class="dont-break-out preserve-line-breaks">{{ mdValue.newValue.value }}</div>
+    }
+    @if (mdValue.editing && !mdRepresentation && ((isAuthorityControlled() | async) !== true || (enabledFreeTextEditing && (isSuggesterVocabulary() | async) !== true))) {
+      <textarea class="form-control" rows="5" [(ngModel)]="mdValue.newValue.value"
+        [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
+      [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
+    }
+    @if (mdValue.editing && (isScrollableVocabulary() | async) && !enabledFreeTextEditing) {
+      <ds-dynamic-scrollable-dropdown
+        [bindId]="mdField"
+        [group]="group"
+        [model]="getModel()"
+        (change)="onChangeAuthorityField($event)">
+      </ds-dynamic-scrollable-dropdown>
+    }
+    @if (mdValue.editing && (((isHierarchicalVocabulary() | async)  && !enabledFreeTextEditing) || (isSuggesterVocabulary() | async))) {
+      <ds-dynamic-onebox
+        [group]="group"
+        [model]="getModel()"
+        (change)="onChangeAuthorityField($event)">
+      </ds-dynamic-onebox>
+    }
+    @if (mdValue.editing && ((isScrollableVocabulary() | async) || (isHierarchicalVocabulary() | async))) {
+      <button class="btn btn-secondary mt-2"
+        [title]="enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing' | translate"
+        (click)="toggleFreeTextEdition()">
+        <i class="fas fa-fw" [ngClass]="enabledFreeTextEditing ? 'fa-lock' : 'fa-unlock'"></i>
+        {{ (enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing') | translate }}
+      </button>
+    }
+    @if (!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE) {
+      <div>
+        <span class="badge bg-light border" >
+          <i dsAuthorityConfidenceState
+            class="fas fa-fw p-0"
+            aria-hidden="true"
+            [authorityValue]="mdValue.newValue"
+            [iconMode]="true"
+          ></i>
+          {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
+        </span>
       </div>
-    </div>
-    <div class="d-flex" *ngIf="mdRepresentation">
-      <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
-      <ds-type-badge [object]="mdRepresentation"></ds-type-badge>
-    </div>
+    }
+    @if ( mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)) {
+      <div class="mt-2">
+        <div class="btn-group w-75">
+          <i dsAuthorityConfidenceState
+            class="fas fa-fw p-0 me-1 mt-auto mb-auto"
+            aria-hidden="true"
+            [authorityValue]="mdValue.newValue.confidence"
+            [iconMode]="true"
+          ></i>
+          <input class="form-control form-outline" data-test="authority-input" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
+            [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
+            (change)="onChangeAuthorityKey()" />
+          @if (!editingAuthority) {
+            <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn"
+              [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
+              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
+              (click)="onChangeEditingAuthorityStatus(true)">
+              <i class="fas fa-lock fa-fw"></i>
+            </button>
+          }
+          @if (editingAuthority) {
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn"
+              [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
+              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
+              (click)="onChangeEditingAuthorityStatus(false)">
+              <i class="fas fa-lock-open fa-fw"></i>
+            </button>
+          }
+        </div>
+      </div>
+    }
+    @if (mdRepresentation) {
+      <div class="d-flex">
+        <a class="me-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
+        <ds-type-badge [object]="mdRepresentation"></ds-type-badge>
+      </div>
+    }
   </div>
   <div class="ds-flex-cell ds-lang-cell" role="cell">
-    <div class="dont-break-out preserve-line-breaks" *ngIf="!mdValue.editing">{{ mdValue.newValue.language }}</div>
-    <input class="form-control" type="text" *ngIf="mdValue.editing" [(ngModel)]="mdValue.newValue.language"
-           [attr.aria-label]="(dsoType + '.edit.metadata.edit.language') | translate"
-           [dsDebounce]="300" (onDebounce)="confirm.emit(false)" />
+    @if (!mdValue.editing) {
+      <div class="dont-break-out preserve-line-breaks">{{ mdValue.newValue.language }}</div>
+    }
+    @if (mdValue.editing) {
+      <input class="form-control" type="text" [(ngModel)]="mdValue.newValue.language"
+        [attr.aria-label]="(dsoType + '.edit.metadata.edit.language') | translate"
+        [dsDebounce]="300" (onDebounce)="confirm.emit(false)" />
+    }
   </div>
   <div class="text-center ds-flex-cell ds-edit-cell" role="cell">
     <div class="btn-group">
       <div class="edit-field">
         <div class="btn-group edit-buttons" [ngbTooltip]="isVirtual ? (dsoType + '.edit.metadata.edit.buttons.virtual' | translate) : null">
-          <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn" *ngIf="!mdValue.editing"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
-                  [disabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
-            <i class="fas fa-edit fa-fw"></i>
-          </button>
-          <button class="btn btn-outline-success btn-sm ng-star-inserted" data-test="metadata-confirm-btn" *ngIf="mdValue.editing"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
-                  [disabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
-            <i class="fas fa-check fa-fw"></i>
-          </button>
+          @if (!mdValue.editing) {
+            <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn"
+              [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
+              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
+              [dsBtnDisabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || (saving$ | async)" (click)="edit.emit()">
+              <i class="fas fa-edit fa-fw"></i>
+            </button>
+          }
+          @if (mdValue.editing) {
+            <button class="btn btn-outline-success btn-sm ng-star-inserted" data-test="metadata-confirm-btn"
+              [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
+              ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
+              [dsBtnDisabled]="isVirtual || (saving$ | async)" (click)="confirm.emit(true)">
+              <i class="fas fa-check fa-fw"></i>
+            </button>
+          }
           <button class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
-                  [disabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
+            [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
+            ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
+            [dsBtnDisabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || (saving$ | async)" (click)="remove.emit()">
             <i class="fas fa-trash-alt fa-fw"></i>
           </button>
           <button class="btn btn-outline-warning btn-sm" data-test="metadata-undo-btn"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
-                  [disabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
+            [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
+            ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
+            [dsBtnDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || (saving$ | async)" (click)="undo.emit()">
             <i class="fas fa-undo-alt fa-fw"></i>
           </button>
           <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn" *ngVar="(isOnlyValue || (saving$ | async)) as disabled"
-                  cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [disabled]="disabled"
-                  [title]="dsoType + '.edit.metadata.edit.buttons.drag' | translate"
-                  ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}">
+            cdkDragHandle [cdkDragHandleDisabled]="disabled" [ngClass]="{'disabled': disabled}" [dsBtnDisabled]="disabled"
+            [title]="dsoType + '.edit.metadata.edit.buttons.drag' | translate"
+            ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.drag' | translate }}">
             <i class="fas fa-grip-vertical fa-fw"></i>
           </button>
         </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
index e555191300..b57e6005b7 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
@@ -14,3 +14,6 @@
 .cdk-drag-placeholder {
   opacity: 0;
 }
+.badge.bg-light {
+  color: var(--bs-gray-900);
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
index e96959c1d1..196a13ec4a 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
@@ -34,6 +34,7 @@ import {
   VIRTUAL_METADATA_PREFIX,
 } from '../../../core/shared/metadata.models';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import { DsDynamicScrollableDropdownComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
 import { ThemedTypeBadgeComponent } from '../../../shared/object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -188,6 +189,7 @@ describe('DsoEditMetadataValueComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataValueComponent,
         VarDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
@@ -524,7 +526,14 @@ describe('DsoEditMetadataValueComponent', () => {
         });
 
         it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
-          expect(btn.nativeElement.disabled).toBe(disabled);
+          if (disabled) {
+            expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
+          } else {
+            // Can be null or false, depending on if button was ever disabled so just check not true
+            expect(btn.nativeElement.getAttribute('aria-disabled')).not.toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeFalse();
+          }
         });
       } else {
         it('should not exist', () => {
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
index 11bbcfd9d5..e718080eb6 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -5,7 +5,6 @@ import {
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -67,6 +66,7 @@ import {
 import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model';
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { DsDynamicOneboxComponent } from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
 import {
@@ -94,7 +94,7 @@ import {
   styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
   templateUrl: './dso-edit-metadata-value.component.html',
   standalone: true,
-  imports: [VarDirective, CdkDrag, NgClass, NgIf, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective],
+  imports: [VarDirective, CdkDrag, NgClass, FormsModule, DebounceDirective, RouterLink, ThemedTypeBadgeComponent, NgbTooltipModule, CdkDragHandle, AsyncPipe, TranslateModule, DsDynamicScrollableDropdownComponent, DsDynamicOneboxComponent, AuthorityConfidenceStateDirective, BtnDisabledDirective],
 })
 /**
  * Component displaying a single editable row for a metadata value
@@ -191,6 +191,12 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
    */
   public editingAuthority = false;
 
+
+  /**
+   * Whether or not the free-text editing is enabled when scrollable dropdown or hierarchical vocabulary is used
+   */
+  public enabledFreeTextEditing = false;
+
   /**
    * Field group used by authority field
    * @type {UntypedFormGroup}
@@ -438,15 +444,23 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
    * Process the change of authority field value updating the authority key and confidence as necessary
    */
   onChangeAuthorityField(event): void {
-    this.mdValue.newValue.value = event.value;
-    if (event.authority) {
-      this.mdValue.newValue.authority = event.authority;
-      this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+    if (event) {
+      this.mdValue.newValue.value = event.value;
+      if (event.authority) {
+        this.mdValue.newValue.authority = event.authority;
+        this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+      } else {
+        this.mdValue.newValue.authority = null;
+        this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+      }
+      this.confirm.emit(false);
     } else {
+      // The event is undefined when the user clears the selection in scrollable dropdown
+      this.mdValue.newValue.value = '';
       this.mdValue.newValue.authority = null;
       this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+      this.confirm.emit(false);
     }
-    this.confirm.emit(false);
   }
 
   /**
@@ -480,4 +494,17 @@ export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
     }
   }
 
+  /**
+   * Toggles the free-text ediitng mode
+   */
+  toggleFreeTextEdition() {
+    if (this.enabledFreeTextEditing) {
+      if (this.getModel().value !== this.mdValue.newValue.value) {
+        // Reload the model to adapt it to the new possible value modified during free text editing
+        this.initAuthorityProperties();
+      }
+    }
+    this.enabledFreeTextEditing = !this.enabledFreeTextEditing;
+  }
+
 }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index f8b193f4a0..e8dfce3a7b 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,102 +1,120 @@
-<div class="item-metadata" *ngIf="form">
-  <div class="button-row top d-flex my-2 space-children-mr ml-gap">
-    <button class="mr-auto btn btn-success" id="dso-add-btn" [disabled]="form.newValue || (saving$ | async)"
-            [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
-            [title]="dsoType + '.edit.metadata.add-button' | translate"
-            (click)="add()"><i class="fas fa-plus" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
-    </button>
-    <button class="btn btn-warning ml-1" id="dso-reinstate-btn" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
+@if (form) {
+  <div class="item-metadata">
+    <div class="button-row top d-flex my-2 space-children-mr ms-gap">
+      <button class="me-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
+        [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
+        [title]="dsoType + '.edit.metadata.add-button' | translate"
+        (click)="add()"><i class="fas fa-plus" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
+      </button>
+      @if (isReinstatable) {
+        <button class="btn btn-warning ms-1" id="dso-reinstate-btn" [dsBtnDisabled]="(saving$ | async)"
+          [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
+          [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
+          (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></i>
+          <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
+        </button>
+      }
+      <button class="btn btn-primary ms-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+        [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
+        [title]="dsoType + '.edit.metadata.save-button' | translate"
+        (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
+      </button>
+      @if (!isReinstatable) {
+        <button class="btn btn-danger ms-1" id="dso-discard-btn"
+          [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
+          [title]="dsoType + '.edit.metadata.discard-button' | translate"
+          [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+          (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
+          <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
+        </button>
+      }
+    </div>
+    <div role="table" [attr.aria-label]="'item.edit.head' | translate">
+      <ds-dso-edit-metadata-headers [dsoType]="dsoType"></ds-dso-edit-metadata-headers>
+      @if (form.newValue) {
+        <div class="d-flex flex-row ds-field-row" role="row">
+          <div class="lbl-cell ds-success" role="rowheader">
+            <ds-metadata-field-selector [dsoType]="dsoType"
+              [(mdField)]="newMdField"
+              [autofocus]="true">
+            </ds-metadata-field-selector>
+          </div>
+          <div class="flex-grow-1 ds-drop-list" role="cell">
+            <div role="table">
+              <ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
+              <ds-dso-edit-metadata-value [dso]="dso"
+                [mdValue]="form.newValue"
+                [dsoType]="dsoType"
+                [saving$]="savingOrLoadingFieldValidation$"
+                [isOnlyValue]="true"
+                [mdField]="newMdField"
+                (confirm)="confirmNewValue($event)"
+                (remove)="form.newValue = undefined"
+                (undo)="form.newValue = undefined">
+              </ds-dso-edit-metadata-value>
+            </div>
+          </div>
+        </div>
+      }
+      @for (mdField of form.fieldKeys; track mdField) {
+        <div class="d-flex flex-row ds-field-row" role="row">
+          <div class="lbl-cell" role="rowheader">
+            <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
+            @if (form.hasOrderChanges(mdField)) {
+              <div class="btn btn-warning reset-order-button mt-2 w-100"
+                (click)="form.resetOrder(mdField); onValueSaved()">
+                {{ dsoType + '.edit.metadata.reset-order-button' | translate }}
+              </div>
+            }
+          </div>
+          <ds-dso-edit-metadata-field-values class="flex-grow-1" role="cell"
+            [dso]="dso"
+            [form]="form"
+            [dsoType]="dsoType"
+            [saving$]="saving$"
+            [draggingMdField$]="draggingMdField$"
+            [mdField]="mdField"
+            (valueSaved)="onValueSaved()">
+          </ds-dso-edit-metadata-field-values>
+        </div>
+      }
+    </div>
+    @if (isEmpty && !form.newValue) {
+      <div>
+        <ds-alert [content]="dsoType + '.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
+      </div>
+    }
+    <div class="button-row bottom d-inline-block w-100">
+      <div class="mt-2 float-end space-children-mr ms-gap">
+        @if (isReinstatable) {
+          <button class="btn btn-warning" [dsBtnDisabled]="(saving$ | async)"
             [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
             [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
-            (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
-    </button>
-    <button class="btn btn-primary ml-1" id="dso-save-btn" [disabled]="!hasChanges || (saving$ | async)"
-            [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
-            [title]="dsoType + '.edit.metadata.save-button' | translate"
-            (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
-    </button>
-    <button class="btn btn-danger ml-1" id="dso-discard-btn" *ngIf="!isReinstatable"
+            (click)="reinstate()">
+            <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
+          </button>
+        }
+        <button class="btn btn-primary" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+          [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
+          [title]="dsoType + '.edit.metadata.save-button' | translate"
+          (click)="submit()">
+          <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
+        </button>
+        @if (!isReinstatable) {
+          <button class="btn btn-danger"
             [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
             [title]="dsoType + '.edit.metadata.discard-button' | translate"
-            [disabled]="!hasChanges || (saving$ | async)"
-            (click)="discard()"><i class="fas fa-times" aria-hidden="true"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.discard-button' | translate }}</span>
-    </button>
-  </div>
-
-  <div role="table" [attr.aria-label]="'item.edit.head' | translate">
-    <ds-dso-edit-metadata-headers [dsoType]="dsoType"></ds-dso-edit-metadata-headers>
-    <div class="d-flex flex-row ds-field-row" role="row" *ngIf="form.newValue">
-      <div class="lbl-cell ds-success" role="rowheader">
-        <ds-metadata-field-selector [dsoType]="dsoType"
-                                    [(mdField)]="newMdField"
-                                    [autofocus]="true">
-        </ds-metadata-field-selector>
-      </div>
-      <div class="flex-grow-1 ds-drop-list" role="cell">
-        <div role="table">
-          <ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
-          <ds-dso-edit-metadata-value [dso]="dso"
-                                      [mdValue]="form.newValue"
-                                      [dsoType]="dsoType"
-                                      [saving$]="savingOrLoadingFieldValidation$"
-                                      [isOnlyValue]="true"
-                                      [mdField]="newMdField"
-                                      (confirm)="confirmNewValue($event)"
-                                      (remove)="form.newValue = undefined"
-                                      (undo)="form.newValue = undefined">
-          </ds-dso-edit-metadata-value>
-        </div>
+            [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+            (click)="discard()">
+            <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
+          </button>
+        }
       </div>
     </div>
-    <div class="d-flex flex-row ds-field-row" role="row" *ngFor="let mdField of form.fieldKeys">
-      <div class="lbl-cell" role="rowheader">
-        <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
-        <div class="btn btn-warning reset-order-button mt-2 w-100" *ngIf="form.hasOrderChanges(mdField)"
-             (click)="form.resetOrder(mdField); onValueSaved()">
-          {{ dsoType + '.edit.metadata.reset-order-button' | translate }}
-        </div>
-      </div>
-      <ds-dso-edit-metadata-field-values class="flex-grow-1" role="cell"
-                                         [dso]="dso"
-                                         [form]="form"
-                                         [dsoType]="dsoType"
-                                         [saving$]="saving$"
-                                         [draggingMdField$]="draggingMdField$"
-                                         [mdField]="mdField"
-                                         (valueSaved)="onValueSaved()">
-      </ds-dso-edit-metadata-field-values>
-    </div>
   </div>
-
-  <div *ngIf="isEmpty && !form.newValue">
-    <ds-alert [content]="dsoType + '.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
-  </div>
-  <div class="button-row bottom d-inline-block w-100">
-    <div class="mt-2 float-right space-children-mr ml-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable" [disabled]="(saving$ | async)"
-              [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
-              [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
-              (click)="reinstate()">
-        <i class="fas fa-undo-alt" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
-      </button>
-      <button class="btn btn-primary" [disabled]="!hasChanges || (saving$ | async)"
-              [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
-              [title]="dsoType + '.edit.metadata.save-button' | translate"
-              (click)="submit()">
-        <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
-      </button>
-      <button class="btn btn-danger" *ngIf="!isReinstatable"
-              [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
-              [title]="dsoType + '.edit.metadata.discard-button' | translate"
-              [disabled]="!hasChanges || (saving$ | async)"
-              (click)="discard()">
-        <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
-      </button>
-    </div>
-  </div>
-</div>
-<ds-loading *ngIf="!form"></ds-loading>
+}
+@if (!form) {
+  <ds-loading></ds-loading>
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
index 32e57e003d..cbe2c18792 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
@@ -22,6 +22,7 @@ import { Item } from '../../core/shared/item.model';
 import { ITEM } from '../../core/shared/item.resource-type';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { AlertComponent } from '../../shared/alert/alert.component';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TestDataService } from '../../shared/testing/test-data-service.mock';
@@ -94,6 +95,7 @@ describe('DsoEditMetadataComponent', () => {
         RouterTestingModule.withRoutes([]),
         DsoEditMetadataComponent,
         VarDirective,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: APP_DATA_SERVICES_MAP, useValue: mockDataServiceMap },
@@ -216,7 +218,13 @@ describe('DsoEditMetadataComponent', () => {
         });
 
         it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
-          expect(btn.nativeElement.disabled).toBe(disabled);
+          if (disabled) {
+            expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeTrue();
+          } else {
+            expect(btn.nativeElement.getAttribute('aria-disabled')).not.toBe('true');
+            expect(btn.nativeElement.classList.contains('disabled')).toBeFalse();
+          }
         });
       } else {
         it('should not exist', () => {
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index 234a8539c4..31d44928e9 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -47,6 +43,7 @@ import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -66,7 +63,7 @@ import { MetadataFieldSelectorComponent } from './metadata-field-selector/metada
   styleUrls: ['./dso-edit-metadata.component.scss'],
   templateUrl: './dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component showing a table of all metadata on a DSpaceObject and options to modify them
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
index 3f5af76051..20cf35aabc 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
@@ -1,19 +1,42 @@
 <div class="w-100 position-relative">
   <input type="text" #mdFieldInput
-         class="form-control" [ngClass]="{ 'is-invalid': showInvalid }"
-         [attr.aria-label]="(dsoType + '.edit.metadata.metadatafield') | translate"
-         [value]="mdField"
-         [formControl]="input"
-         (focusin)="query$.next(mdField)"
-         (dsClickOutside)="query$.next(null)"
-         (click)="$event.stopPropagation();" />
-  <div class="invalid-feedback show-feedback" *ngIf="showInvalid">{{ dsoType + '.edit.metadata.metadatafield.invalid' | translate }}</div>
-  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
-    <div class="dropdown-list">
-      <div *ngFor="let mdFieldOption of (mdFieldOptions$ | async)">
-        <button class="d-block dropdown-item" (click)="select(mdFieldOption)">
-          <span [innerHTML]="mdFieldOption"></span>
-        </button>
+    class="form-control" [ngClass]="{ 'is-invalid': showInvalid }"
+    [attr.aria-label]="(dsoType + '.edit.metadata.metadatafield') | translate"
+    [value]="mdField"
+    [formControl]="input"
+    (focusin)="query$.next(mdField)"
+    (dsClickOutside)="query$.next(null)"
+    (click)="$event.stopPropagation();"
+    (keyup)="this.selectedValueLoading = false"
+    />
+  @if (showInvalid) {
+    <div class="invalid-feedback show-feedback">{{ dsoType + '.edit.metadata.metadatafield.invalid' | translate }}</div>
+  }
+  <div id="scrollable-metadata-field-selector" class="dropdown-menu scrollable-menu" [ngClass]="{'show': (mdFieldOptions$ | async)?.length > 0}">
+    <div  class="dropdown-list">
+      <div
+        infiniteScroll
+        [infiniteScrollDistance]="1"
+        [infiniteScrollThrottle]="0"
+        [infiniteScrollContainer]="'#scrollable-metadata-field-selector'"
+        [fromRoot]="true"
+        (scrolled)="onScrollDown()">
+        @if (mdFieldOptions$ | async) {
+          @for (listEntry of (mdFieldOptions$ | async); track listEntry) {
+            <button
+              class="d-block dropdown-item"
+              dsHoverClass="ds-hover"
+              (click)="select(listEntry)" #listEntryElement>
+              <span [innerHTML]="listEntry"></span>
+            </button>
+          }
+        }
+        @if (loading) {
+          <button
+            class="list-group-item list-group-item-action border-0 list-entry">
+            <ds-loading [showMessage]="false"></ds-loading>
+          </button>
+        }
       </div>
     </div>
   </div>
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
index e69de29bb2..e4c20f130d 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
@@ -0,0 +1,5 @@
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dso-selector-list-max-height);
+  overflow: scroll;
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
index 3342cec154..198a6f102d 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
@@ -39,7 +39,8 @@ describe('MetadataFieldSelectorComponent', () => {
     metadataSchema = Object.assign(new MetadataSchema(), {
       id: 0,
       prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/',
+      namespace: 'https://schema.org/CreativeWork',
+      field: '.',
     });
     metadataFields = [
       Object.assign(new MetadataField(), {
@@ -78,10 +79,10 @@ describe('MetadataFieldSelectorComponent', () => {
   });
 
   describe('when a query is entered', () => {
-    const query = 'test query';
+    const query = 'dc.d';
 
     beforeEach(() => {
-      component.showInvalid = true;
+      component.showInvalid = false;
       component.query$.next(query);
     });
 
@@ -90,7 +91,7 @@ describe('MetadataFieldSelectorComponent', () => {
     });
 
     it('should query the registry service for metadata fields and include the schema', () => {
-      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema'));
+      expect(registryService.queryMetadataFields).toHaveBeenCalledWith(query, { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC), currentPage: 1 }, true, false, followLink('schema'));
     });
   });
 
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
index 87dfe2200c..65bd8bfa7b 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   AfterViewInit,
@@ -24,16 +22,18 @@ import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
   BehaviorSubject,
+  combineLatest as observableCombineLatest,
   Observable,
   of,
   Subscription,
 } from 'rxjs';
 import {
   debounceTime,
-  distinctUntilChanged,
   map,
+  startWith,
   switchMap,
   take,
   tap,
@@ -50,6 +50,7 @@ import {
   metadataFieldsToString,
 } from '../../../core/shared/operators';
 import { hasValue } from '../../../shared/empty.util';
+import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { ClickOutsideDirective } from '../../../shared/utils/click-outside.directive';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -59,7 +60,7 @@ import { followLink } from '../../../shared/utils/follow-link-config.model';
   styleUrls: ['./metadata-field-selector.component.scss'],
   templateUrl: './metadata-field-selector.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, NgIf, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, NgClass, ReactiveFormsModule, ClickOutsideDirective, AsyncPipe, TranslateModule, ThemedLoadingComponent, InfiniteScrollModule],
 })
 /**
  * Component displaying a searchable input for metadata-fields
@@ -96,7 +97,7 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * List of available metadata field options to choose from, dependent on the current query the user entered
    * Shows up in a dropdown below the input
    */
-  mdFieldOptions$: Observable<string[]>;
+  mdFieldOptions$: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
 
   /**
    * FormControl for the input
@@ -131,6 +132,30 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    */
   subs: Subscription[] = [];
 
+
+  /**
+   * The current page to load
+   * Dynamically goes up as the user scrolls down until it reaches the last page possible
+   */
+  currentPage$ = new BehaviorSubject(1);
+
+  /**
+   * Whether or not the list contains a next page to load
+   * This allows us to avoid next pages from trying to load when there are none
+   */
+  hasNextPage = false;
+
+  /**
+   * Whether or not new results are currently loading
+   */
+  loading = false;
+
+  /**
+   * Default page option for this feature
+   */
+  pageOptions = { elementsPerPage: 20, sort: new SortOptions('fieldName', SortDirection.ASC) };
+
+
   constructor(protected registryService: RegistryService,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService) {
@@ -141,32 +166,33 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
    * Update the mdFieldOptions$ depending on the query$ fired by querying the server
    */
   ngOnInit(): void {
+    this.subs.push(this.input.valueChanges.pipe(
+      debounceTime(this.debounceTime),
+      startWith(''),
+    ).subscribe((valueChange) => {
+      this.currentPage$.next(1);
+      if (!this.selectedValueLoading) {
+        this.query$.next(valueChange);
+      }
+      this.mdField = valueChange;
+      this.mdFieldChange.emit(this.mdField);
+    }));
     this.subs.push(
-      this.input.valueChanges.pipe(
-        debounceTime(this.debounceTime),
-      ).subscribe((valueChange) => {
-        if (!this.selectedValueLoading) {
-          this.query$.next(valueChange);
-        }
-        this.selectedValueLoading = false;
-        this.mdField = valueChange;
-        this.mdFieldChange.emit(this.mdField);
-      }),
-    );
-    this.mdFieldOptions$ = this.query$.pipe(
-      distinctUntilChanged(),
-      switchMap((query: string) => {
-        this.showInvalid = false;
-        if (query !== null) {
-          return this.registryService.queryMetadataFields(query, { elementsPerPage: 10, sort: new SortOptions('fieldName', SortDirection.ASC) }, true, false, followLink('schema')).pipe(
-            getAllSucceededRemoteData(),
-            metadataFieldsToString(),
-          );
-        } else {
-          return [[]];
-        }
-      }),
-    );
+      observableCombineLatest(
+        this.query$,
+        this.currentPage$,
+      )
+        .pipe(
+          switchMap(([query, page]: [string, number]) => {
+            this.loading = true;
+            if (page === 1) {
+              this.mdFieldOptions$.next([]);
+            }
+            return this.search(query as string, page as number);
+          }),
+        ).subscribe((rd ) => {
+          if (!this.selectedValueLoading) {this.updateList(rd);}
+        }));
   }
 
   /**
@@ -210,6 +236,41 @@ export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterV
     this.input.setValue(mdFieldOption);
   }
 
+
+  /**
+   * When the user reaches the bottom of the page (or almost) and there's a next page available, increase the current page
+   */
+  onScrollDown() {
+    if (this.hasNextPage && !this.loading) {
+      this.currentPage$.next(this.currentPage$.value + 1);
+    }
+  }
+
+  /**
+   * @Description It update the mdFieldOptions$ according the query result page
+   * */
+  updateList(list: string[]) {
+    this.loading = false;
+    this.hasNextPage = list.length > 0;
+    const currentEntries = this.mdFieldOptions$.getValue();
+    this.mdFieldOptions$.next([...currentEntries, ...list]);
+    this.selectedValueLoading = false;
+  }
+  /**
+   * Perform a search for the current query and page
+   * @param query Query to search objects for
+   * @param page  Page to retrieve
+   * @param useCache Whether or not to use the cache
+   */
+  search(query: string, page: number, useCache: boolean = true)  {
+    return this.registryService.queryMetadataFields(query,{
+      elementsPerPage: this.pageOptions.elementsPerPage, sort: this.pageOptions.sort,
+      currentPage: page }, useCache, false, followLink('schema'))
+      .pipe(
+        getAllSucceededRemoteData(),
+        metadataFieldsToString(),
+      );
+  }
   /**
    * Unsubscribe from any open subscriptions
    */
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
index bca1a1b3b3..786e3b5466 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.html
@@ -1,44 +1,56 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-            <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
-            </div>
-        </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('creativework.datePublished')"
-         class="item-date card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('journal.title')" class="item-journal-title card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('journal.title')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('creativework.datePublished')) {
+        <p
+          class="item-date card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('journal.title')) {
+        <p class="item-journal-title card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('journal.title')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
index ce56496198..61c1e5d80e 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './journal-issue-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
index 3b14a1d8b0..22903638d3 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.html
@@ -1,44 +1,56 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-                <div>
-                    <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                    </ds-thumbnail>
-                </div>
-            </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('creativework.datePublished')"
-         class="item-date card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('dc.description')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('creativework.datePublished')) {
+        <p
+          class="item-date card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('dc.description')) {
+        <p class="item-description card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('dc.description')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
index 4fcc8ade5d..001c06186d 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './journal-volume-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
index 20084f21ba..18a5ffc5cc 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.html
@@ -1,48 +1,62 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-            <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
-            </div>
-        </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('creativework.editor')"
-         class="item-publisher card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span class="item-editor">{{firstMetadataValue('creativework.editor')}}</span>
-          <span *ngIf="dso.hasMetadata('creativework.publisher')" class="item-publisher">
-            <span>, </span>
-            {{firstMetadataValue('creativework.publisher')}}
-          </span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('dc.description')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('creativework.editor')) {
+        <p
+          class="item-publisher card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span class="item-editor">{{firstMetadataValue('creativework.editor')}}</span>
+            @if (dso.hasMetadata('creativework.publisher')) {
+              <span class="item-publisher">
+                <span>, </span>
+                {{firstMetadataValue('creativework.publisher')}}
+              </span>
+            }
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('dc.description')) {
+        <p class="item-description card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('dc.description')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
index 38a7cf3210..72fb8dadb4 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './journal-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
index 59d2ea4dc9..1807147bdb 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.html
@@ -1,42 +1,68 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </a>
-      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></span>
+      }
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                  class="item-list-journal-issues">
-                    <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
-                <span *ngIf="dso.allMetadata(['publicationissue.issueNumber']).length > 0"
-                      class="item-list-journal-issue-numbers">
-                    <span *ngFor="let value of allMetadataValues(['publicationissue.issueNumber']); let last=last;">
-                        <span> - </span><span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
-                </span>
-            </span>
-        </ds-truncatable-part>
-  </span>
-    </ds-truncatable>
-  </div>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          @if (dso.allMetadata(['publicationvolume.volumeNumber']).length > 0) {
+            <span
+              class="item-list-journal-issues">
+              @for (value of allMetadataValues(['publicationvolume.volumeNumber']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"></span>@if (!last) {
+                  <span>; </span>
+                }
+              </span>
+            }
+            @if (dso.allMetadata(['publicationissue.issueNumber']).length > 0) {
+              <span
+                class="item-list-journal-issue-numbers">
+                @for (value of allMetadataValues(['publicationissue.issueNumber']); track value; let first = $first; let last = $last) {
+                  <span>
+                    @if (first) {
+                      <span> - </span>
+                      }<span [innerHTML]="value"></span>@if (!last) {
+                      <span>; </span>
+                    }
+                  </span>
+                }
+              </span>
+            }
+          </span>
+        }
+      </ds-truncatable-part>
+    </span>
+  </ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index f3f8d79809..7ce5ac9df1 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -21,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./journal-issue-search-result-list-element.component.scss'],
   templateUrl: './journal-issue-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
index 4a6ffb412d..a153592638 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.html
@@ -1,42 +1,66 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </a>
-      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></span>
+      }
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['journal.title']).length > 0"
-                  class="item-list-journal-volumes">
-                    <span *ngFor="let value of allMetadataValues(['journal.title']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          @if (dso.allMetadata(['journal.title']).length > 0) {
+            <span
+              class="item-list-journal-volumes">
+              @for (value of allMetadataValues(['journal.title']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"></span>@if (!last) {
+                  <span>; </span>
+                }
+              </span>
+            }
+          </span>
+        }
+        @if (dso.allMetadata(['publicationvolume.volumeNumber']).length > 0) {
+          <span
+            class="item-list-journal-volume-identifiers">
+            @for (value of allMetadataValues(['publicationvolume.volumeNumber']); track value; let last = $last) {
+              <span>
+                <span> (</span><span [innerHTML]="value"></span><span>)</span>@if (!last) {
+                <span>;</span>
+              }
             </span>
-            <span *ngIf="dso.allMetadata(['publicationvolume.volumeNumber']).length > 0"
-                  class="item-list-journal-volume-identifiers">
-                    <span *ngFor="let value of allMetadataValues(['publicationvolume.volumeNumber']); let last=last;">
-                        <span> (</span><span [innerHTML]="value"><span [innerHTML]="value"></span></span><span>)</span>
-                    </span>
-            </span>
-        </ds-truncatable-part>
+          }
+        </span>
+      }
+    </ds-truncatable-part>
   </span>
-    </ds-truncatable>
-  </div>
+</ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index 4aee64c4f5..f01c859fdd 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -21,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./journal-volume-search-result-list-element.component.scss'],
   templateUrl: './journal-volume-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
index bd119493d3..c74b01934a 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.html
@@ -1,34 +1,52 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </a>
-      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="lead item-list-title dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></span>
+      }
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['creativeworkseries.issn']).length > 0"
-                  class="item-list-journals">
-                    <span *ngFor="let value of allMetadataValues(['creativeworkseries.issn']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
-            </span>
-        </ds-truncatable-part>
-  </span>
-    </ds-truncatable>
-  </div>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          @if (dso.allMetadata(['creativeworkseries.issn']).length > 0) {
+            <span
+              class="item-list-journals">
+              @for (value of allMetadataValues(['creativeworkseries.issn']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"></span>@if (!last) {
+                  <span>; </span>
+                }
+              </span>
+            }
+          </span>
+        }
+      </ds-truncatable-part>
+    </span>
+  </ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index 8ef14120e0..f589e2ffc5 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -21,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./journal-search-result-list-element.component.scss'],
   templateUrl: './journal-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
index de698eed1a..919d712c32 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -17,11 +16,13 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-journal-issue-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalIssue" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
index 8e6b2f0a9b..d9ec174b16 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -17,11 +16,13 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-journal-volume-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalVolume" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
index c1cfd1755d..2c17494f87 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -17,11 +16,13 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
 
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-journal-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Journal" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
index e3dec92c52..a693891ae6 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
@@ -1,6 +1,8 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index ca6bb56e79..ed52174054 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +20,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./journal-issue.component.scss'],
   templateUrl: './journal-issue.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index de1ee4a27d..13c8e12939 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -1,6 +1,8 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index fab0e105be..81764dd3ee 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +20,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./journal-volume.component.scss'],
   templateUrl: './journal-volume.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index 7041158923..ddd15b5573 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -1,6 +1,8 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
@@ -38,7 +40,7 @@
       </a>
     </div>
   </div>
-  <div class="mt-5 w-100">
+  <div class="mt-5 w-100 px-0">
     <ds-tabbed-related-entities-search  [item]="object"
                                         [relationTypes]="[{
                                           label: 'isJournalOfPublication',
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index 179355d869..7e3dc40c1e 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -24,7 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./journal.component.scss'],
   templateUrl: './journal.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
index 56c518a09c..2836fbfbe1 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.html
@@ -1,50 +1,64 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-            <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
-            </div>
-        </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('organization.foundingDate')"
-         class="item-date card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('organization.foundingDate')"></span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('organization.address.addressCountry')"
-         class="item-location card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span
+      @if (dso.hasMetadata('organization.foundingDate')) {
+        <p
+          class="item-date card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span [innerHTML]="firstMetadataValue('organization.foundingDate')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('organization.address.addressCountry')) {
+        <p
+          class="item-location card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span
             class="item-country">{{firstMetadataValue('organization.address.addressCountry')}}</span>
-          <span *ngIf="dso.hasMetadata('organization.address.addressLocality')" class="item-city">
-            <span>, </span>
-            {{firstMetadataValue('organization.address.addressLocality')}}
-          </span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+            @if (dso.hasMetadata('organization.address.addressLocality')) {
+              <span class="item-city">
+                <span>, </span>
+                {{firstMetadataValue('organization.address.addressLocality')}}
+              </span>
+            }
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
index 6b4dd0e21d..ae681a3129 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './org-unit-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
index 7b444d261c..f3613a8637 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.html
@@ -1,43 +1,55 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-            <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
-            </div>
-        </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('person.email')" class="item-email card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('person.email')"></span>
-        </ds-truncatable-part>
-      </p>
-      <p *ngIf="dso.hasMetadata('person.jobTitle')" class="item-jobtitle card-text">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('person.jobTitle')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('person.email')) {
+        <p class="item-email card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            <span [innerHTML]="firstMetadataValue('person.email')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (dso.hasMetadata('person.jobTitle')) {
+        <p class="item-jobtitle card-text">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('person.jobTitle')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
index dc9b1f8f47..aaa0434c02 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './person-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Person
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
index 2181a4eb07..0c266c09dc 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.html
@@ -1,38 +1,48 @@
 <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
   <ds-truncatable [id]="dso.id">
-    <div class="position-absolute ml-1">
+    <div class="position-absolute ms-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType !== linkTypes.None"
-       [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-       class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-      <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
-      </div>
-    </span>
+    @if (linkType !== linkTypes.None) {
+      <a
+        [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+        [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="card-img-top full-width">
+        <div>
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+          </ds-thumbnail>
+        </div>
+      </span>
+    }
     <div class="card-body">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('dc.description')"></span>
-        </ds-truncatable-part>
-      </p>
-      <div *ngIf="linkType !== linkTypes.None" class="text-center">
-        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-           class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-      </div>
+      @if (dso.hasMetadata('dc.description')) {
+        <p class="item-description card-text text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="3">
+            <span [innerHTML]="firstMetadataValue('dc.description')"></span>
+          </ds-truncatable-part>
+        </p>
+      }
+      @if (linkType !== linkTypes.None) {
+        <div class="text-center">
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+            [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+          class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        </div>
+      }
     </div>
   </ds-truncatable>
   <ng-content></ng-content>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
index 0ba8ce6f75..77f67f5756 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +19,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   templateUrl: './project-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [TruncatableComponent, NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [TruncatableComponent, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Project
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
index 91b694c072..6c6218dc43 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.html
@@ -1,40 +1,54 @@
 <div class="row">
-    <div *ngIf="showThumbnails" class="col-3 col-md-2">
-        <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-           [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-           [routerLink]="[itemPageRoute]" class="dont-break-out">
-            <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                                 [defaultImage]="'assets/images/orgunit-placeholder.svg'"
-                                 [alt]="'thumbnail.orgunit.alt'"
-                                 [placeholder]="'thumbnail.orgunit.placeholder'">
-            </ds-thumbnail>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+            [alt]="'thumbnail.orgunit.alt'"
+            [placeholder]="'thumbnail.orgunit.placeholder'">
+          </ds-thumbnail>
         </a>
-        <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-            <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                          [defaultImage]="'assets/images/orgunit-placeholder.svg'"
-                          [alt]="'thumbnail.orgunit.alt'"
-                          [placeholder]="'thumbnail.orgunit.placeholder'">
-            </ds-thumbnail>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+            [alt]="'thumbnail.orgunit.alt'"
+            [placeholder]="'thumbnail.orgunit.placeholder'">
+          </ds-thumbnail>
         </span>
+      }
     </div>
-    <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-        <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-        <ds-truncatable [id]="dso.id">
-            <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-               [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-               [routerLink]="[itemPageRoute]" class="lead"
-               [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></a>
-            <span *ngIf="linkType === linkTypes.None"
-                  class="lead"
-                  [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></span>
-            <span class="text-muted">
-      <span *ngIf="dso.allMetadata(['dc.description']).length > 0"
+  }
+  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
+    <ds-truncatable [id]="dso.id">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead"
+        [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead"
+        [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></span>
+      }
+      <span class="text-muted">
+        @if (dso.allMetadata(['dc.description']).length > 0) {
+          <span
             class="item-list-org-unit-description">
             <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
-                    [innerHTML]="firstMetadataValue('dc.description')"></span>
-            </ds-truncatable-part>
-      </span>
-  </span>
-        </ds-truncatable>
-    </div>
+            [innerHTML]="firstMetadataValue('dc.description')"></span>
+          </ds-truncatable-part>
+        </span>
+      }
+    </span>
+  </ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index 9fb88d0eac..47cbefd4f5 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -21,7 +20,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./org-unit-search-result-list-element.component.scss'],
   templateUrl: './org-unit-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for an item search result of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
index cc7905e719..b625212240 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.html
@@ -1,42 +1,58 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                           [defaultImage]="'assets/images/person-placeholder.svg'"
-                           [alt]="'thumbnail.person.alt'"
-                           [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                    [defaultImage]="'assets/images/person-placeholder.svg'"
-                    [alt]="'thumbnail.person.alt'"
-                    [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/person-placeholder.svg'"
+            [alt]="'thumbnail.person.alt'"
+            [placeholder]="'thumbnail.person.placeholder'">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/person-placeholder.svg'"
+            [alt]="'thumbnail.person.alt'"
+            [placeholder]="'thumbnail.person.placeholder'">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9 col-md-10' : 'col-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead"
-         [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead"
-            [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></span>
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead"
+        [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead"
+        [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></span>
+      }
       <span class="text-muted">
-    <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
-                  class="item-list-job-title">
-                    <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                        <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                    </span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          @if (dso.allMetadata(['person.jobTitle']).length > 0) {
+            <span
+              class="item-list-job-title">
+              @for (value of allMetadataValues(['person.jobTitle']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                </span>
+              }
             </span>
+          }
         </ds-truncatable-part>
-  </span>
+      </span>
     </ds-truncatable>
   </div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index 86ead8b825..870d3222b5 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -32,7 +30,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./person-search-result-list-element.component.scss'],
   templateUrl: './person-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a list element for an item search result of the type Person
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
index 34d5588c2d..294f3d909c 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.html
@@ -1,42 +1,54 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                           [defaultImage]="'assets/images/project-placeholder.svg'"
-                           [alt]="'thumbnail.project.alt'"
-                           [placeholder]="'thumbnail.project.placeholder'">
-      </ds-thumbnail>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                    [defaultImage]="'assets/images/project-placeholder.svg'"
-                    [alt]="'thumbnail.project.alt'"
-                    [placeholder]="'thumbnail.project.placeholder'">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/project-placeholder.svg'"
+            [alt]="'thumbnail.project.alt'"
+            [placeholder]="'thumbnail.project.placeholder'">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/project-placeholder.svg'"
+            [alt]="'thumbnail.project.alt'"
+            [placeholder]="'thumbnail.project.placeholder'">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-truncatable [id]="dso.id">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-         [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None"
-            class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context"></ds-badges>
+      }
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span
+          class="lead item-list-title dont-break-out"
+        [innerHTML]="dsoTitle"></span>
+      }
       <!--<span class="text-muted">-->
       <!--<ds-truncatable-part [id]="dso.id" [minLines]="1">-->
       <!--<span *ngIf="dso.allMetadata(['project.identifier.status']).length > 0"-->
       <!--class="item-list-status">-->
       <!--<span *ngFor="let value of allMetadataValues(['project.identifier.status']); let last=last;">-->
-      <!--<span [innerHTML]="value"><span [innerHTML]="value"></span></span>-->
-      <!--</span>-->
-      <!--</span>-->
-      <!--</ds-truncatable-part>-->
-      <!--</span>-->
-    </ds-truncatable>
-  </div>
+      <!--<span [innerHTML]="value"></span><span *ngIf="!last">; </span>-->
+    <!--</span>-->
+  <!--</span>-->
+<!--</ds-truncatable-part>-->
+<!--</span>-->
+</ds-truncatable>
+</div>
 </div>
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index 825f7be387..dd8f6acb44 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -19,7 +18,7 @@ import { ThemedThumbnailComponent } from '../../../../../thumbnail/themed-thumbn
   styleUrls: ['./project-search-result-list-element.component.scss'],
   templateUrl: './project-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, TruncatableComponent, ThemedBadgesComponent, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, TruncatableComponent, ThemedBadgesComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Project
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
index 2789c1eb26..9d41175ecd 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -16,11 +15,13 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-org-unit-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "OrgUnit" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
index 618211b94a..5a115f74de 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -23,11 +22,13 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-person-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Person" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
index 25dc73a731..3002f3b283 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -16,11 +15,13 @@ import { TruncatablePartComponent } from '../../../../../shared/truncatable/trun
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-project-sidebar-search-list-element',
   templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Project" within the context of
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index 21acce9f09..36ec0e48c0 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -1,6 +1,8 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
@@ -8,10 +10,10 @@
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="object?.thumbnail | async"
-                    [defaultImage]="'assets/images/orgunit-placeholder.svg'"
-                    [alt]="'thumbnail.orgunit.alt'"
-                    [placeholder]="'thumbnail.orgunit.placeholder'"
-      >
+        [defaultImage]="'assets/images/orgunit-placeholder.svg'"
+        [alt]="'thumbnail.orgunit.alt'"
+        [placeholder]="'thumbnail.orgunit.placeholder'"
+        >
       </ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
@@ -42,7 +44,7 @@
       [item]="object"
       [label]="'orgunit.page.ror'"
       [urlRegex]="'(.*)ror.org'"
-    >
+      >
     </ds-item-page-img-field>
     <ds-related-items
       [parentItem]="object"
@@ -59,7 +61,7 @@
       </a>
     </div>
   </div>
-  <div class="mt-5 w-100">
+  <div class="mt-5 w-100 px-0">
     <ds-tabbed-related-entities-search  [item]="object"
                                         [relationTypes]="[{
                                           label: 'isOrgUnitOfPerson',
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
index a5d101c5d0..41e798fb6f 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -25,7 +22,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./org-unit.component.scss'],
   templateUrl: './org-unit.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule, ItemPageImgFieldComponent],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule, ItemPageImgFieldComponent],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.html b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
index fb93da4265..efeec4bc04 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -1,6 +1,8 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
-  <ds-item-page-title-field class="mr-auto" [item]="object">
+  <ds-item-page-title-field class="me-auto" [item]="object">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
@@ -8,9 +10,9 @@
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
       <ds-thumbnail [thumbnail]="object?.thumbnail | async"
-                    [defaultImage]="'assets/images/person-placeholder.svg'"
-                    [alt]="'thumbnail.person.alt'"
-                    [placeholder]="'thumbnail.person.placeholder'">
+        [defaultImage]="'assets/images/person-placeholder.svg'"
+        [alt]="'thumbnail.person.alt'"
+        [placeholder]="'thumbnail.person.placeholder'">
       </ds-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
@@ -55,7 +57,7 @@
       </a>
     </div>
   </div>
-  <div class="mt-5 w-100">
+  <div class="mt-5 w-100 px-0">
     <ds-tabbed-related-entities-search  [item]="object"
                                         [relationTypes]="[{
                                           label: 'isAuthorOfPublication',
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
index 56cb2b3fa9..4071d9a709 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -24,7 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./person.component.scss'],
   templateUrl: './person.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Person
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.html b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
index 340650506b..86c49a7608 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.html
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.html
@@ -1,6 +1,8 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
@@ -15,56 +17,56 @@
       </ds-thumbnail>
     </ds-metadata-field-wrapper>
     <!--<ds-generic-item-page-field [item]="object"-->
-      <!--[fields]="['project.identifier.status']"-->
-      <!--[label]="'project.page.status'">-->
-    <!--</ds-generic-item-page-field>-->
-    <ds-metadata-representation-list
-      [parentItem]="object"
-      [itemType]="'OrgUnit'"
-      [metadataFields]="['project.contributor.other']"
-      [label]="'project.page.contributor' | translate">
-    </ds-metadata-representation-list>
-    <ds-generic-item-page-field [item]="object"
-      [fields]="['project.identifier.funder']"
-      [label]="'project.page.funder'">
-    </ds-generic-item-page-field>
-    <ds-generic-item-page-field [item]="object"
-      [fields]="['dc.identifier']"
-      [label]="'project.page.id'">
-    </ds-generic-item-page-field>
-    <!--<ds-generic-item-page-field [item]="object"-->
-      <!--[fields]="['project.identifier.expectedcompletion']"-->
-      <!--[label]="'project.page.expectedcompletion'">-->
-    <!--</ds-generic-item-page-field>-->
-  </div>
-  <div class="col-xs-12 col-md-7">
-    <ds-related-items
-      [parentItem]="object"
-      [relationType]="'isPersonOfProject'"
-      [label]="'relationships.isPersonOf' | translate">
-    </ds-related-items>
-    <ds-related-items
-      [parentItem]="object"
-      [relationType]="'isPublicationOfProject'"
-      [label]="'relationships.isPublicationOf' | translate">
-    </ds-related-items>
-    <ds-related-items
-      [parentItem]="object"
-      [relationType]="'isOrgUnitOfProject'"
-      [label]="'relationships.isOrgUnitOf' | translate">
-    </ds-related-items>
-    <ds-generic-item-page-field [item]="object"
-      [fields]="['dc.description']"
-      [label]="'project.page.description'">
-    </ds-generic-item-page-field>
-    <ds-generic-item-page-field [item]="object"
-      [fields]="['dc.subject']"
-      [label]="'project.page.keyword'">
-    </ds-generic-item-page-field>
-    <div>
-      <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
-        {{"item.page.link.full" | translate}}
-      </a>
-    </div>
+    <!--[fields]="['project.identifier.status']"-->
+    <!--[label]="'project.page.status'">-->
+  <!--</ds-generic-item-page-field>-->
+  <ds-metadata-representation-list
+    [parentItem]="object"
+    [itemType]="'OrgUnit'"
+    [metadataFields]="['project.contributor.other']"
+    [label]="'project.page.contributor' | translate">
+  </ds-metadata-representation-list>
+  <ds-generic-item-page-field [item]="object"
+    [fields]="['project.identifier.funder']"
+    [label]="'project.page.funder'">
+  </ds-generic-item-page-field>
+  <ds-generic-item-page-field [item]="object"
+    [fields]="['dc.identifier']"
+    [label]="'project.page.id'">
+  </ds-generic-item-page-field>
+  <!--<ds-generic-item-page-field [item]="object"-->
+  <!--[fields]="['project.identifier.expectedcompletion']"-->
+  <!--[label]="'project.page.expectedcompletion'">-->
+<!--</ds-generic-item-page-field>-->
+</div>
+<div class="col-xs-12 col-md-7">
+  <ds-related-items
+    [parentItem]="object"
+    [relationType]="'isPersonOfProject'"
+    [label]="'relationships.isPersonOf' | translate">
+  </ds-related-items>
+  <ds-related-items
+    [parentItem]="object"
+    [relationType]="'isPublicationOfProject'"
+    [label]="'relationships.isPublicationOf' | translate">
+  </ds-related-items>
+  <ds-related-items
+    [parentItem]="object"
+    [relationType]="'isOrgUnitOfProject'"
+    [label]="'relationships.isOrgUnitOf' | translate">
+  </ds-related-items>
+  <ds-generic-item-page-field [item]="object"
+    [fields]="['dc.description']"
+    [label]="'project.page.description'">
+  </ds-generic-item-page-field>
+  <ds-generic-item-page-field [item]="object"
+    [fields]="['dc.subject']"
+    [label]="'project.page.keyword'">
+  </ds-generic-item-page-field>
+  <div>
+    <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']">
+      {{"item.page.link.full" | translate}}
+    </a>
   </div>
 </div>
+</div>
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
index b654f5e17c..d5d33919a9 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -24,7 +21,7 @@ import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail
   styleUrls: ['./project.component.scss'],
   templateUrl: './project.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Project
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index 6f56056781..edb3aa7834 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -1,15 +1,27 @@
 <ng-template #descTemplate>
   <span class="text-muted">
-      <span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
-            class="item-list-job-title">
-              <span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
-                  <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-              </span>
-      </span>
-  </span>
+    @if (mdRepresentation.allMetadata(['person.jobTitle']).length > 0) {
+      <span
+        class="item-list-job-title">
+        @for (value of mdRepresentation.allMetadataValues(['person.jobTitle']); track value; let last = $last) {
+          <span>
+            <span [innerHTML]="value"></span>@if (!last) {
+            <span>; </span>
+          }
+        </span>
+      }
+    </span>
+  }
+</span>
 </ng-template>
 <ds-truncatable [id]="mdRepresentation.id">
   <a [routerLink]="[itemPageRoute]"
-     [innerHTML]="mdRepresentation.getValue()"
-     [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
+    [innerHTML]="mdRepresentation.getValue()"
+  [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
+  @if (mdRepresentation.firstMetadata('person.identifier.orcid')) {
+    <ds-orcid-badge-and-tooltip class="ml-1"
+      [orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
+      [authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
+    </ds-orcid-badge-and-tooltip>
+  }
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
index 48957a6cbd..82e5f54ebb 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
@@ -1,19 +1,17 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 
 import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+import { OrcidBadgeAndTooltipComponent } from '../../../../shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component';
 import { TruncatableComponent } from '../../../../shared/truncatable/truncatable.component';
 
 @Component({
   selector: 'ds-person-item-metadata-list-element',
   templateUrl: './person-item-metadata-list-element.component.html',
   standalone: true,
-  imports: [NgIf, NgFor, TruncatableComponent, RouterLink, NgbTooltipModule],
+  imports: [TruncatableComponent, RouterLink, NgbTooltipModule, OrcidBadgeAndTooltipComponent],
 })
 /**
  * The component for displaying an item of the type Person as a metadata field
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
index 9d4a3566ad..78c86ae639 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
@@ -1,4 +1,6 @@
 <div class="d-inline-block">
   <div>{{object.display}}</div>
-  <div *ngIf="uri"><a target="_blank" [href]="uri.value">{{uri.value}}</a></div>
+  @if (uri) {
+    <div><a target="_blank" [href]="uri.value">{{uri.value}}</a></div>
+  }
 </div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
index d7c5b8aafd..c9eea61118 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   OnInit,
@@ -19,7 +19,7 @@ import { AbstractListableElementComponent } from '../../../../../shared/object-c
   styleUrls: ['./external-source-entry-list-submission-element.component.scss'],
   templateUrl: './external-source-entry-list-submission-element.component.html',
   standalone: true,
-  imports: [NgIf],
+  imports: [],
 })
 /**
  * The component for displaying a list element of an external source entry
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
index e264958738..90ec0261e2 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -1,22 +1,32 @@
 <div class="d-flex">
-<!--    <div class="person-thumbnail pr-2">-->
-<!--        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-themed-thumbnail>-->
+  <!--    <div class="person-thumbnail pe-2">-->
+  <!--        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-themed-thumbnail>-->
 <!--    </div>-->
-    <div class="flex-grow-1">
-        <ds-org-unit-input-suggestions *ngIf="useNameVariants" [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)"
-                                       (submitSuggestion)="selectCustom($event)"></ds-org-unit-input-suggestions>
+<div class="flex-grow-1">
+  @if (useNameVariants) {
+    <ds-org-unit-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)"
+    (submitSuggestion)="selectCustom($event)"></ds-org-unit-input-suggestions>
+  }
 
-      <div *ngIf="!useNameVariants" class="lead" [innerHTML]="dsoTitle"></div>
+  @if (!useNameVariants) {
+    <div class="lead" [innerHTML]="dsoTitle"></div>
+  }
 
-        <span class="text-muted">
-        <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
-              class="item-list-address-locality">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
-        </span>
-        <span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
-              class="item-list-address-country">
-                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span></span>
-        </span>
-        </span>
-    </div>
+  <span class="text-muted">
+    @if (dso.allMetadata('organization.address.addressLocality').length > 0) {
+      <span
+        class="item-list-address-locality">
+        <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span>@if (dso.allMetadata('organization.address.addressCountry').length > 0) {
+        <span>, </span>
+      }
+    </span>
+  }
+  @if (dso.allMetadata('organization.address.addressCountry').length > 0) {
+    <span
+      class="item-list-address-country">
+      <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span>
+    </span>
+  }
+</span>
+</div>
 </div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
index b2e62fcb37..e08f917fe9 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -33,11 +33,11 @@ import { OrgUnitInputSuggestionsComponent } from './org-unit-suggestions/org-uni
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
-  selector: 'ds-person-search-result-list-submission-element',
+  selector: 'ds-org-unit-search-result-list-submission-element',
   styleUrls: ['./org-unit-search-result-list-submission-element.component.scss'],
   templateUrl: './org-unit-search-result-list-submission-element.component.html',
   standalone: true,
-  imports: [NgIf, OrgUnitInputSuggestionsComponent, FormsModule],
+  imports: [OrgUnitInputSuggestionsComponent, FormsModule],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
index 58f39b8d0b..45a4dc9bb3 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
@@ -1,26 +1,28 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
-    <input #inputField type="text" [(ngModel)]="value" [name]="name"
-           class="form-control suggestion_input"
-           (focus)="open()"
-           (click)="open()"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <button class="sr-only" type="submit">
-        {{'search.filters.search.submit' | translate}}
-    </button>
-    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
-        <div class="dropdown-list">
-            <div *ngFor="let suggestionOption of suggestions">
-                <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
-                    <span [innerHTML]="suggestionOption"></span>
-                </a>
-            </div>
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  <input #inputField type="text" [(ngModel)]="value" [name]="name"
+    class="form-control suggestion_input"
+    (focus)="open()"
+    (click)="open()"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+            <span [innerHTML]="suggestionOption"></span>
+          </a>
         </div>
+      }
     </div>
+  </div>
 </form>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
index 073a7aacce..6896da5783 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -33,7 +32,7 @@ import { DebounceDirective } from '../../../../../../shared/utils/debounce.direc
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
index 66db99a6af..cc6e09ab7f 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -1,36 +1,48 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
-       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                    [defaultImage]="'assets/images/person-placeholder.svg'"
-                    [alt]="'thumbnail.person.alt'"
-                    [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-      <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
-                    [defaultImage]="'assets/images/person-placeholder.svg'"
-                    [alt]="'thumbnail.person.alt'"
-                    [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+          [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/person-placeholder.svg'"
+            [alt]="'thumbnail.person.alt'"
+            [placeholder]="'thumbnail.person.placeholder'">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
+            [defaultImage]="'assets/images/person-placeholder.svg'"
+            [alt]="'thumbnail.person.alt'"
+            [placeholder]="'thumbnail.person.placeholder'">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <div class="d-flex">
       <div class="flex-grow-1">
         <ds-person-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName"
-                                     (clickSuggestion)="select($event)"
-                                     (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
+          (clickSuggestion)="select($event)"
+        (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
         <span class="text-muted">
-        <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
+          @if (dso.allMetadata(['person.jobTitle']).length > 0) {
+            <span
               class="item-list-job-title">
-                <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
-                    <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
-                </span>
-        </span>
-    </span>
-      </div>
+              @for (value of allMetadataValues(['person.jobTitle']); track value; let last = $last) {
+                <span>
+                  <span [innerHTML]="value"></span>@if (!last) {
+                  <span>; </span>
+                }
+              </span>
+            }
+          </span>
+        }
+      </span>
     </div>
   </div>
 </div>
+</div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
index 1145fb78e3..f5973408f6 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -39,7 +37,7 @@ import { PersonInputSuggestionsComponent } from './person-suggestions/person-inp
   styleUrls: ['./person-search-result-list-submission-element.component.scss'],
   templateUrl: './person-search-result-list-submission-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedThumbnailComponent, NgClass, PersonInputSuggestionsComponent, FormsModule, NgFor, AsyncPipe],
+  imports: [ThemedThumbnailComponent, NgClass, PersonInputSuggestionsComponent, FormsModule, AsyncPipe],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
index 53260ceaa3..e2bdaab5a4 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
@@ -1,27 +1,29 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(inputField.value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
-    <input #inputField type="text" [ngModel]="value" [name]="name"
-           class="form-control suggestion_input"
-           (focus)="open()"
-           (blur)="onSubmit(inputField.value)"
-           (click)="open()"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <button class="sr-only" type="submit">
-        {{'search.filters.search.submit' | translate}}
-    </button>
-    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
-        <div class="dropdown-list">
-            <div *ngFor="let suggestionOption of suggestions">
-                <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
-                    <span [innerHTML]="suggestionOption"></span>
-                </a>
-            </div>
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  <input #inputField type="text" [ngModel]="value" [name]="name"
+    class="form-control suggestion_input"
+    (focus)="open()"
+    (blur)="onSubmit(inputField.value)"
+    (click)="open()"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+            <span [innerHTML]="suggestionOption"></span>
+          </a>
         </div>
+      }
     </div>
+  </div>
 </form>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
index 0058789811..b5645ff3f1 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -33,7 +32,7 @@ import { DebounceDirective } from '../../../../../../shared/utils/debounce.direc
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html
index 13ae884ccb..2129aec11a 100644
--- a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html
@@ -1,7 +1,6 @@
 <div class="modal-header">
     <h4 class="modal-title">New name variant</h4>
-    <button type="button" class="close" aria-label="Close" (click)="modal.dismiss('Cross click')">
-        <span aria-hidden="true">&times;</span>
+    <button type="button" class="btn-close" aria-label="Close" (click)="modal.dismiss('Cross click')">
     </button>
 </div>
 <div class="modal-body">
diff --git a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
index ef20ec3a5c..e63e920784 100644
--- a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
@@ -43,7 +43,7 @@ describe('NameVariantModalComponent', () => {
   });
 
   it('when close button is clicked, dismiss should be called on the modal', () => {
-    debugElement.query(By.css('button.close')).triggerEventHandler('click', {});
+    debugElement.query(By.css('button.btn-close')).triggerEventHandler('click', {});
     expect(modal.dismiss).toHaveBeenCalled();
   });
 
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 4841674852..bd18fc2a37 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -1,55 +1,51 @@
-<footer class="text-lg-start">
-  <div *ngIf="showTopFooter" class="top-footer">
-    <!-- Grid container -->
-    <div class=" container p-4">
-      <!--Grid row-->
-      <div class="row">
-
-        <!--Grid column-->
-        <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
-          <h5 class="text-uppercase">Footer Content</h5>
-
-          <ul class="list-unstyled mb-0">
-            <li>
-              <a routerLink="./" class="">Lorem ipsum</a>
-            </li>
-            <li>
-              <a routerLink="./" class="">Ut facilisis</a>
-            </li>
-            <li>
-              <a routerLink="./" class="">Aenean sit</a>
-            </li>
-          </ul>
+<footer>
+  @if (showTopFooter) {
+    <div class="top-footer">
+      <!-- Grid container -->
+      <div class=" container p-4">
+        <!--Grid row-->
+        <div class="row">
+          <!--Grid column-->
+          <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
+            <h5 class="text-uppercase">Footer Content</h5>
+            <ul class="list-unstyled mb-0">
+              <li>
+                <a routerLink="./" class="">Lorem ipsum</a>
+              </li>
+              <li>
+                <a routerLink="./" class="">Ut facilisis</a>
+              </li>
+              <li>
+                <a routerLink="./" class="">Aenean sit</a>
+              </li>
+            </ul>
+          </div>
+          <!--Grid column-->
+          <!--Grid column-->
+          <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
+            <h5 class="text-uppercase">Footer Content</h5>
+            <ul class="list-unstyled mb-0">
+              <li>
+                <a routerLink="./" class="">Suspendisse potenti</a>
+              </li>
+            </ul>
+          </div>
+          <!--Grid column-->
+          <!--Grid column-->
+          <div class="col-lg-4 col-md-12 mb-4 mb-md-0">
+            <h5 class="text-uppercase">Footer Content</h5>
+            <p>
+              Lorem ipsum dolor sit amet consectetur, adipisicing elit. Iste atque ea quis
+              molestias. Fugiat pariatur maxime quis culpa corporis vitae repudiandae aliquam
+              voluptatem veniam, est atque cumque eum delectus sint!
+            </p>
+          </div>
+          <!--Grid column-->
         </div>
-        <!--Grid column-->
-
-        <!--Grid column-->
-        <div class="col-lg-4 col-md-6 mb-4 mb-lg-0">
-          <h5 class="text-uppercase">Footer Content</h5>
-
-          <ul class="list-unstyled mb-0">
-            <li>
-              <a routerLink="./" class="">Suspendisse potenti</a>
-            </li>
-          </ul>
-        </div>
-        <!--Grid column-->
-
-        <!--Grid column-->
-        <div class="col-lg-4 col-md-12 mb-4 mb-md-0">
-          <h5 class="text-uppercase">Footer Content</h5>
-
-          <p>
-            Lorem ipsum dolor sit amet consectetur, adipisicing elit. Iste atque ea quis
-            molestias. Fugiat pariatur maxime quis culpa corporis vitae repudiandae aliquam
-            voluptatem veniam, est atque cumque eum delectus sint!
-          </p>
-        </div>
-        <!--Grid column-->
+        <!--Grid row-->
       </div>
-      <!--Grid row-->
     </div>
-  </div>
+  }
   <!-- Grid container -->
 
   <!-- Copyright -->
@@ -57,10 +53,10 @@
     <div class="content-container">
       <p class="m-0">
         <a class="text-white"
-           href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
+        href="http://www.dspace.org/">{{ 'footer.link.dspace' | translate}}</a>
         {{ 'footer.copyright' | translate:{year: dateObj | date:'y'} }}
         <a class="text-white"
-           href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
+        href="https://www.lyrasis.org/">{{ 'footer.link.lyrasis' | translate}}</a>
       </p>
       <ul class="footer-info list-unstyled d-flex justify-content-center mb-0">
         <li>
@@ -68,26 +64,34 @@
             {{ 'footer.link.cookies' | translate}}
           </button>
         </li>
-        <li *ngIf="showPrivacyPolicy">
-          <a class="btn text-white"
-             routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
-        </li>
-        <li *ngIf="showEndUserAgreement">
-          <a class="btn text-white"
-             routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
-        </li>
-        <li *ngIf="showSendFeedback$ | async">
-          <a class="btn text-white"
-             routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
-        </li>
+        @if (showPrivacyPolicy) {
+          <li>
+            <a class="btn text-white"
+            routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
+          </li>
+        }
+        @if (showEndUserAgreement) {
+          <li>
+            <a class="btn text-white"
+            routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
+          </li>
+        }
+        @if (showSendFeedback$ | async) {
+          <li>
+            <a class="btn text-white"
+            routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
+          </li>
+        }
       </ul>
     </div>
-    <div *ngIf="coarLdnEnabled$ | async" class="notify-enabled text-white">
-      <a class="coar-notify-support-route" routerLink="info/coar-notify-support">
-        <img class="n-coar" src="assets/images/n-coar.svg" [attr.alt]="'menu.header.image.logo' | translate" />
-        {{ 'footer.link.coar-notify-support' | translate }}
-      </a>
-    </div>
+    @if (coarLdnEnabled$ | async) {
+      <div class="notify-enabled text-white">
+        <a class="coar-notify-support-route" routerLink="info/coar-notify-support">
+          <img class="n-coar" src="assets/images/n-coar.svg" [attr.alt]="'menu.header.image.logo' | translate" />
+          {{ 'footer.link.coar-notify-support' | translate }}
+        </a>
+      </div>
+    }
   </div>
   <!-- Copyright -->
 </footer>
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 5f86137b44..7b6c6ae239 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -68,6 +68,10 @@
         }
       }
     }
+
+    .btn {
+      box-shadow: none;
+    }
   }
 }
 
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index 6a6e5e94d7..c691203c02 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -31,7 +30,7 @@ import { hasValue } from '../shared/empty.util';
   styleUrls: ['footer.component.scss'],
   templateUrl: 'footer.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, DatePipe, TranslateModule],
+  imports: [RouterLink, AsyncPipe, DatePipe, TranslateModule],
 })
 export class FooterComponent implements OnInit {
   dateObj: number = Date.now();
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 189d0bee40..59ce7311f8 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -1,36 +1,35 @@
-<div class="container" *ngIf="(registration$ |async)">
+@if ((registration$ |async)) {
+  <div class="container">
     <h1 class="mb-4">{{'forgot-password.form.head' | translate}}</h1>
     <div class="card mb-4">
-        <div class="card-header">{{'forgot-password.form.identification.header' | translate}}</div>
-        <div class="card-body">
-            <div class="row">
-                <div class="col-12">
-                    <span class="font-weight-bold">{{'forgot-password.form.identification.email' | translate}} </span>
-                    <span [attr.data-test]="'email' | dsBrowserOnly">{{(registration$ |async).email}}</span>
-                </div>
-            </div>
+      <div class="card-header">{{'forgot-password.form.identification.header' | translate}}</div>
+      <div class="card-body">
+        <div class="row">
+          <div class="col-12">
+            <span class="fw-bold form-label">{{'forgot-password.form.identification.email' | translate}} </span>
+            <span [attr.data-test]="'email' | dsBrowserOnly">{{(registration$ |async).email}}</span>
+          </div>
         </div>
+      </div>
     </div>
-
     <div class="card mb-4">
-        <div class="card-header">{{'forgot-password.form.card.security' | translate}}</div>
-        <div class="card-body">
-
-            <ds-profile-page-security-form
-                    [passwordCanBeEmpty]="false"
-                    [FORM_PREFIX]="'forgot-password.form.'"
-                    (isInvalid)="setInValid($event)"
-                    (passwordValue)="setPasswordValue($event)"
-            ></ds-profile-page-security-form>
-        </div>
+      <div class="card-header">{{'forgot-password.form.card.security' | translate}}</div>
+      <div class="card-body">
+        <ds-profile-page-security-form
+          [passwordCanBeEmpty]="false"
+          [FORM_PREFIX]="'forgot-password.form.'"
+          (isInvalid)="setInValid($event)"
+          (passwordValue)="setPasswordValue($event)"
+        ></ds-profile-page-security-form>
+      </div>
     </div>
-
     <div class="row">
-        <div class="col-12">
-            <button
-                    [disabled]="isInValid"
-                    class="btn btn-default btn-primary"
-                    (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
-        </div>
+      <div class="col-12">
+        <button
+          [dsBtnDisabled]="isInValid"
+          class="btn btn-default btn-primary"
+        (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
+      </div>
     </div>
-</div>
+  </div>
+}
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 7b2b1beedd..37d964084a 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -29,6 +26,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
 
@@ -41,7 +39,7 @@ import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
     BrowserOnlyPipe,
     ProfilePageSecurityFormComponent,
     AsyncPipe,
-    NgIf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.html b/src/app/header/context-help-toggle/context-help-toggle.component.html
index 6f04326d56..f815312739 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.html
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.html
@@ -1,10 +1,12 @@
-<div *ngIf="buttonVisible$ | async">
-  <a href="javascript:void(0);"
-     role="menuitem"
-     (click)="onClick()"
-     [attr.aria-label]="'nav.context-help-toggle' | translate"
-     [title]="'nav.context-help-toggle' | translate"
-  >
-    <i class="fas fa-lg fa-fw fa-question-circle ds-context-help-toggle"></i>
-  </a>
-</div>
+@if (buttonVisible$ | async) {
+  <div>
+    <a href="javascript:void(0);"
+      role="menuitem"
+      (click)="onClick()"
+      [attr.aria-label]="'nav.context-help-toggle' | translate"
+      [title]="'nav.context-help-toggle' | translate"
+      >
+      <i class="fas fa-lg fa-fw fa-question-circle ds-context-help-toggle"></i>
+    </a>
+  </div>
+}
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
index d538ce520b..33dfccc5ad 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -56,11 +56,9 @@ describe('ContextHelpToggleComponent', () => {
     });
 
     it('clicking the button should toggle context help icon visibility', fakeAsync(() => {
-      fixture.whenStable().then(() => {
-        fixture.debugElement.query(By.css('a')).nativeElement.click();
-        tick();
-        expect(contextHelpService.toggleIcons).toHaveBeenCalled();
-      });
+      fixture.debugElement.query(By.css('a')).nativeElement.click();
+      tick();
+      expect(contextHelpService.toggleIcons).toHaveBeenCalled();
     }));
   });
 
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.ts b/src/app/header/context-help-toggle/context-help-toggle.component.ts
index 8ef0d107e0..84eeb4013b 100644
--- a/src/app/header/context-help-toggle/context-help-toggle.component.ts
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -25,7 +22,7 @@ import { ContextHelpService } from '../../shared/context-help.service';
   templateUrl: './context-help-toggle.component.html',
   styleUrls: ['./context-help-toggle.component.scss'],
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class ContextHelpToggleComponent implements OnInit {
   buttonVisible$: Observable<boolean>;
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index e59086134a..67a4a96c23 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -11,13 +11,15 @@
         <ds-context-help-toggle></ds-context-help-toggle>
         <ds-auth-nav-menu></ds-auth-nav-menu>
         <ds-impersonate-navbar></ds-impersonate-navbar>
-        <div *ngIf="isMobile$ | async" class="pl-2">
-          <button class="navbar-toggler px-0" type="button" (click)="toggleNavbar()"
-                  aria-controls="collapsingNav"
-                  aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
-            <span class="fas fa-bars fa-fw toggler-icon" aria-hidden="true"></span>
-          </button>
-        </div>
+        @if (isMobile$ | async) {
+          <div class="ps-2">
+            <button class="navbar-toggler px-0" type="button" (click)="toggleNavbar()"
+              aria-controls="collapsingNav"
+              aria-expanded="false" [attr.aria-label]="'nav.toggle' | translate">
+              <span class="fas fa-bars fa-fw toggler-icon" aria-hidden="true"></span>
+            </button>
+          </div>
+        }
       </nav>
     </div>
   </div>
diff --git a/src/app/header/header.component.ts b/src/app/header/header.component.ts
index 25e3b55766..48fad0b56b 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +28,7 @@ import { ContextHelpToggleComponent } from './context-help-toggle/context-help-t
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
   standalone: true,
-  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe, NgIf],
+  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe],
 })
 export class HeaderComponent implements OnInit {
   /**
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.html b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
index 84cba4d92f..f15d8f17b1 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.html
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.html
@@ -1,27 +1,35 @@
-<div *ngFor="let entry of healthInfoComponent | dsObjNgFor" data-test="collapse">
-  <div *ngIf="entry && !isPlainProperty(entry.value)" class="mb-3 border-bottom">
-    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
-      <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              [attr.aria-controls]="'health-info-component-' + entry.key + '-content'">
-        {{ entry.key | titlecase }}
-      </button>
-      <div class="d-flex my-auto">
-        <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-        <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
-      </div>
-    </div>
-    <div #collapse="ngbCollapse" [id]="'health-info-component-' + entry.key + '-content'" [ngbCollapse]="isCollapsed">
-      <div class="card border-0">
-        <div class="card-body">
-          <ds-health-info-component [healthInfoComponent]="entry.value"
-                                    [healthInfoComponentName]="entry.key"
-                                    [isNested]="true"
-                                    data-test="info-component"></ds-health-info-component>
+@for (entry of healthInfoComponent | dsObjNgFor; track entry) {
+  <div data-test="collapse">
+    @if (entry && !isPlainProperty(entry.value)) {
+      <div class="mb-3 border-bottom">
+        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
+          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
+            [attr.aria-controls]="'health-info-component-' + entry.key + '-content'">
+            {{ entry.key | titlecase }}
+          </button>
+          <div class="d-flex my-auto">
+            @if (collapse.collapsed) {
+              <span class="fas fa-chevron-down"></span>
+            }
+            @if (!collapse.collapsed) {
+              <span class="fas fa-chevron-up"></span>
+            }
+          </div>
+        </div>
+        <div #collapse="ngbCollapse" [id]="'health-info-component-' + entry.key + '-content'" [ngbCollapse]="isCollapsed">
+          <div class="card border-0">
+            <div class="card-body">
+              <ds-health-info-component [healthInfoComponent]="entry.value"
+                [healthInfoComponentName]="entry.key"
+                [isNested]="true"
+              data-test="info-component"></ds-health-info-component>
+            </div>
+          </div>
         </div>
       </div>
-    </div>
+    }
+    @if (entry && isPlainProperty(entry.value)) {
+      <p data-test="property"> <span class="fw-bold">{{ getPropertyLabel(entry.key) | titlecase }}</span> : {{entry.value}}</p>
+    }
   </div>
-  <ng-container *ngIf="entry && isPlainProperty(entry.value)">
-    <p data-test="property"> <span class="font-weight-bold">{{ getPropertyLabel(entry.key) | titlecase }}</span> : {{entry.value}}</p>
-  </ng-container>
-</div>
+}
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
index 5c65586327..531efe6059 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -21,7 +17,7 @@ import { HealthInfoComponent } from '../../models/health-component.model';
   templateUrl: './health-info-component.component.html',
   styleUrls: ['./health-info-component.component.scss'],
   standalone: true,
-  imports: [NgFor, NgIf, NgbCollapseModule, TitleCasePipe, ObjNgFor],
+  imports: [NgbCollapseModule, TitleCasePipe, ObjNgFor],
 })
 export class HealthInfoComponentComponent extends HealthComponentComponent {
 
diff --git a/src/app/health-page/health-info/health-info.component.html b/src/app/health-page/health-info/health-info.component.html
index b590695b0b..432570cef0 100644
--- a/src/app/health-page/health-info/health-info.component.html
+++ b/src/app/health-page/health-info/health-info.component.html
@@ -1,26 +1,24 @@
-<ng-container *ngIf="healthInfoResponse">
+@if (healthInfoResponse) {
   <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
-    <ngb-panel [id]="entry.key" *ngFor="let entry of healthInfoResponse | dsObjNgFor">
-      <ng-template ngbPanelHeader>
-        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="info-component">
-          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
-                  [attr.aria-controls]="'health-info-' + entry.key + '-content'">
-            {{ getPanelLabel(entry.key) | titlecase }}
-          </button>
-          <div class="text-right d-flex gap-2">
-            <ds-health-status [status]="entry.value?.status"></ds-health-status>
-            <div class="d-flex my-auto">
-              <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
-              <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
+    @for (entry of healthInfoResponse | dsObjNgFor; track entry) {
+      <ngb-panel [id]="entry.key">
+        <ng-template ngbPanelTitle>
+          <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle(entry.key)" data-test="info-component">
+            <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+              [attr.aria-controls]="'health-info-' + entry.key + '-content'">
+              {{ getPanelLabel(entry.key) | titlecase }}
+            </button>
+            <div class="text-end d-flex gap-2">
+              <ds-health-status class="me-2" [status]="entry.value?.status"></ds-health-status>
             </div>
           </div>
-        </div>
-      </ng-template>
-      <ng-template ngbPanelContent>
-        <ds-health-info-component [healthInfoComponentName]="entry.key" [healthInfoComponent]="entry.value"
-                                  [id]="'health-info-' + entry.key + '-content'">
-        </ds-health-info-component>
-      </ng-template>
-    </ngb-panel>
+        </ng-template>
+        <ng-template ngbPanelContent>
+          <ds-health-info-component [healthInfoComponentName]="entry.key" [healthInfoComponent]="entry.value"
+            [id]="'health-info-' + entry.key + '-content'">
+          </ds-health-info-component>
+        </ng-template>
+      </ngb-panel>
+    }
   </ngb-accordion>
-</ng-container>
+}
diff --git a/src/app/health-page/health-info/health-info.component.ts b/src/app/health-page/health-info/health-info.component.ts
index fe795104e8..3e6f7714ff 100644
--- a/src/app/health-page/health-info/health-info.component.ts
+++ b/src/app/health-page/health-info/health-info.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -28,7 +24,7 @@ import { HealthInfoComponentComponent } from './health-info-component/health-inf
   templateUrl: './health-info.component.html',
   styleUrls: ['./health-info.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbAccordionModule, NgFor, HealthStatusComponent, HealthInfoComponentComponent, TitleCasePipe, ObjNgFor],
+  imports: [NgbAccordionModule, HealthStatusComponent, HealthInfoComponentComponent, TitleCasePipe, ObjNgFor],
 })
 export class HealthInfoComponent implements OnInit  {
 
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 797ca0bc6e..10e34b392a 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -1,27 +1,33 @@
-<div class="container" *ngIf="(healthResponseInitialised | async) && (healthInfoResponseInitialised | async)">
-  <h1>{{'health-page.heading' | translate}}</h1>
-  <div *ngIf="(healthResponse | async) && (healthInfoResponse | async)">
-    <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
-      <li [ngbNavItem]="'status'" role="presentation">
-        <a data-test="health-page.status-tab" ngbNavLink>{{'health-page.status-tab' | translate}}</a>
-        <ng-template ngbNavContent>
-          <div id="status">
-            <ds-health-panel [healthResponse]="(healthResponse | async)"></ds-health-panel>
-          </div>
-        </ng-template>
-      </li>
-      <li [ngbNavItem]="'info'" role="presentation">
-        <a data-test="health-page.info-tab" ngbNavLink>{{'health-page.info-tab' | translate}}</a>
-        <ng-template ngbNavContent>
-          <div id="info">
-            <ds-health-info [healthInfoResponse]="(healthInfoResponse | async)"></ds-health-info>
-          </div>
-        </ng-template>
-      </li>
-    </ul>
-    <div [ngbNavOutlet]="nav" class="mt-2"></div>
+@if ((healthResponseInitialised | async) && (healthInfoResponseInitialised | async)) {
+  <div class="container">
+    <h1>{{'health-page.heading' | translate}}</h1>
+    @if ((healthResponse | async) && (healthInfoResponse | async)) {
+      <div>
+        <ul ngbNav #nav="ngbNav" [activeId]="'status'" class="nav-tabs">
+          <li [ngbNavItem]="'status'" role="presentation">
+            <a data-test="health-page.status-tab" ngbNavLink>{{'health-page.status-tab' | translate}}</a>
+            <ng-template ngbNavContent>
+              <div id="status">
+                <ds-health-panel [healthResponse]="(healthResponse | async)"></ds-health-panel>
+              </div>
+            </ng-template>
+          </li>
+          <li [ngbNavItem]="'info'" role="presentation">
+            <a data-test="health-page.info-tab" ngbNavLink>{{'health-page.info-tab' | translate}}</a>
+            <ng-template ngbNavContent>
+              <div id="info">
+                <ds-health-info [healthInfoResponse]="(healthInfoResponse | async)"></ds-health-info>
+              </div>
+            </ng-template>
+          </li>
+        </ul>
+        <div [ngbNavOutlet]="nav" class="mt-2"></div>
+      </div>
+    }
+    @if ((healthResponse | async) === null || (healthInfoResponse | async) === null) {
+      <ds-alert [type]="AlertType.Error" [content]="'health-page.error.msg'"></ds-alert>
+    }
   </div>
-  <ds-alert *ngIf="(healthResponse | async) === null || (healthInfoResponse | async) === null" [type]="AlertType.Error" [content]="'health-page.error.msg'"></ds-alert>
-</div>
+}
 
 
diff --git a/src/app/health-page/health-page.component.ts b/src/app/health-page/health-page.component.ts
index 778e63ed50..d1c322bff2 100644
--- a/src/app/health-page/health-page.component.ts
+++ b/src/app/health-page/health-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -26,7 +23,7 @@ import {
   templateUrl: './health-page.component.html',
   styleUrls: ['./health-page.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbNavModule, HealthPanelComponent, HealthInfoComponent, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [NgbNavModule, HealthPanelComponent, HealthInfoComponent, AlertComponent, AsyncPipe, TranslateModule],
 })
 export class HealthPageComponent implements OnInit {
 
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.html b/src/app/health-page/health-panel/health-component/health-component.component.html
index f962e66052..37dedd7b98 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.html
+++ b/src/app/health-page/health-panel/health-component/health-component.component.html
@@ -1,30 +1,38 @@
-<ng-container *ngIf="healthComponent?.components">
-  <div *ngFor="let entry of healthComponent?.components | dsObjNgFor" class="mb-3 border-bottom" data-test="collapse">
-    <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
-      <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
-              [attr.aria-controls]="'health-component-' + entry.key + 'content'">
-        {{ entry.key | titlecase }}
-      </button>
-      <div class="d-flex my-auto">
-        <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-        <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
+@if (healthComponent?.components) {
+  @for (entry of healthComponent?.components | dsObjNgFor; track entry) {
+    <div class="mb-3 border-bottom" data-test="collapse">
+      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="collapse.toggle()">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="!collapse.collapsed"
+          [attr.aria-controls]="'health-component-' + entry.key + 'content'">
+          {{ entry.key | titlecase }}
+        </button>
+        <div class="d-flex my-auto">
+          @if (collapse.collapsed) {
+            <span class="fas fa-chevron-down"></span>
+          }
+          @if (!collapse.collapsed) {
+            <span class="fas fa-chevron-up"></span>
+          }
+        </div>
       </div>
-    </div>
-    <div #collapse="ngbCollapse" [id]="'health-component-' + entry.key + 'content'" [ngbCollapse]="isCollapsed">
-      <div class="card border-0">
-        <div class="card-body">
-          <ds-health-component [healthComponent]="entry.value"
-                               [healthComponentName]="entry.key"></ds-health-component>
+      <div #collapse="ngbCollapse" [id]="'health-component-' + entry.key + 'content'" [ngbCollapse]="isCollapsed">
+        <div class="card border-0">
+          <div class="card-body">
+            <ds-health-component [healthComponent]="entry.value"
+            [healthComponentName]="entry.key"></ds-health-component>
+          </div>
         </div>
       </div>
     </div>
-  </div>
-</ng-container>
-<ng-container *ngIf="healthComponent?.details">
-  <div *ngFor="let item of healthComponent?.details | dsObjNgFor" data-test="details">
-    <p data-test="property"><span class="font-weight-bold">{{ getPropertyLabel(item.key) | titlecase }}</span> : {{item.value}}</p>
-  </div>
-</ng-container>
-<ng-container *ngIf="!healthComponent?.details && !healthComponent?.components">
+  }
+}
+@if (healthComponent?.details) {
+  @for (item of healthComponent?.details | dsObjNgFor; track item) {
+    <div data-test="details">
+      <p data-test="property"><span class="fw-bold">{{ getPropertyLabel(item.key) | titlecase }}</span> : {{item.value}}</p>
+    </div>
+  }
+}
+@if (!healthComponent?.details && !healthComponent?.components) {
   <ds-alert [content]="'health-page.section.no-issues'" [type]="AlertTypeEnum.Info"></ds-alert>
-</ng-container>
+}
diff --git a/src/app/health-page/health-panel/health-component/health-component.component.ts b/src/app/health-page/health-panel/health-component/health-component.component.ts
index 769f5b545b..a7ec69d06f 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.ts
+++ b/src/app/health-page/health-panel/health-component/health-component.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -27,7 +23,7 @@ import { HealthComponent } from '../../models/health-component.model';
   templateUrl: './health-component.component.html',
   styleUrls: ['./health-component.component.scss'],
   standalone: true,
-  imports: [NgIf, NgFor, NgbCollapseModule, AlertComponent, TitleCasePipe, ObjNgFor],
+  imports: [NgbCollapseModule, AlertComponent, TitleCasePipe, ObjNgFor],
 })
 export class HealthComponentComponent {
 
diff --git a/src/app/health-page/health-panel/health-panel.component.html b/src/app/health-page/health-panel/health-panel.component.html
index ec2a27ce40..50caff35dd 100644
--- a/src/app/health-page/health-panel/health-panel.component.html
+++ b/src/app/health-page/health-panel/health-panel.component.html
@@ -3,26 +3,24 @@
   <ds-health-status [status]="healthResponse.status" class="d-inline-flex"></ds-health-status>
 </p>
 <ngb-accordion #acc="ngbAccordion" [activeIds]="activeId">
-  <ngb-panel [id]="entry.key" *ngFor="let entry of healthResponse.components | dsObjNgFor">
-    <ng-template ngbPanelHeader>
-      <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" ngbPanelToggle (click)="acc.toggle(entry.key)" data-test="component">
-        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
-                [attr.aria-controls]="'health-panel-' + entry.key + '-content'">
-          {{ getPanelLabel(entry.key) | titlecase }}
-        </button>
-        <div class="text-right d-flex gap-2">
-          <ds-health-status [status]="entry.value?.status"></ds-health-status>
-          <div class="d-flex my-auto">
-            <span *ngIf="acc.isExpanded(entry.key)" class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!acc.isExpanded(entry.key)" class="fas fa-chevron-down fa-fw"></span>
+  @for (entry of healthResponse.components | dsObjNgFor; track entry) {
+    <ngb-panel [id]="entry.key">
+      <ng-template ngbPanelTitle>
+        <div class="w-100 d-flex gap-3 justify-content-between collapse-toggle" (click)="acc.toggle(entry.key)" data-test="component">
+          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()" [attr.aria-expanded]="acc.isExpanded(entry.key)"
+            [attr.aria-controls]="'health-panel-' + entry.key + '-content'">
+            {{ getPanelLabel(entry.key) | titlecase }}
+          </button>
+          <div class="text-end d-flex gap-2">
+            <ds-health-status class="me-2" [status]="entry.value?.status"></ds-health-status>
           </div>
         </div>
-      </div>
-    </ng-template>
-    <ng-template ngbPanelContent>
-      <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"
-                           [id]="'health-panel-' + entry.key + '-content'" role="presentation">
-      </ds-health-component>
-    </ng-template>
-  </ngb-panel>
+      </ng-template>
+      <ng-template ngbPanelContent>
+        <ds-health-component [healthComponent]="entry.value" [healthComponentName]="entry.key"
+          [id]="'health-panel-' + entry.key + '-content'" role="presentation">
+        </ds-health-component>
+      </ng-template>
+    </ngb-panel>
+  }
 </ngb-accordion>
diff --git a/src/app/health-page/health-panel/health-panel.component.ts b/src/app/health-page/health-panel/health-panel.component.ts
index 3d72f6b6b7..d1b233df64 100644
--- a/src/app/health-page/health-panel/health-panel.component.ts
+++ b/src/app/health-page/health-panel/health-panel.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -27,7 +23,7 @@ import { HealthStatusComponent } from './health-status/health-status.component';
   templateUrl: './health-panel.component.html',
   styleUrls: ['./health-panel.component.scss'],
   standalone: true,
-  imports: [HealthStatusComponent, NgbAccordionModule, NgFor, NgIf, HealthComponentComponent, TitleCasePipe, ObjNgFor, TranslateModule],
+  imports: [HealthStatusComponent, NgbAccordionModule, HealthComponentComponent, TitleCasePipe, ObjNgFor, TranslateModule],
 })
 export class HealthPanelComponent implements OnInit {
 
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.html b/src/app/health-page/health-panel/health-status/health-status.component.html
index e8710a0760..6e6a8ea190 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.html
+++ b/src/app/health-page/health-panel/health-status/health-status.component.html
@@ -1,12 +1,18 @@
-<ng-container [ngSwitch]="status">
-  <i *ngSwitchCase="HealthStatus.UP"
-     class="fa fa-check-circle text-success my-auto"
-     ngbTooltip="{{'health-page.status.ok.info' | translate}}" container="body" ></i>
-  <i *ngSwitchCase="HealthStatus.UP_WITH_ISSUES"
-     class="fa fa-exclamation-triangle text-warning my-auto"
-     ngbTooltip="{{'health-page.status.warning.info' | translate}}" container="body"></i>
-  <i *ngSwitchCase="HealthStatus.DOWN"
-     class="fa fa-times-circle text-danger my-auto"
-     ngbTooltip="{{'health-page.status.error.info' | translate}}" container="body"></i>
 
-</ng-container>
+@switch (status) {
+  @case (HealthStatus.UP) {
+    <i
+      class="fa fa-check-circle text-success ms-2 mt-1"
+    ngbTooltip="{{'health-page.status.ok.info' | translate}}" container="body" ></i>
+  }
+  @case (HealthStatus.UP_WITH_ISSUES) {
+    <i
+      class="fa fa-exclamation-triangle text-warning ms-2 mt-1"
+    ngbTooltip="{{'health-page.status.warning.info' | translate}}" container="body"></i>
+  }
+  @case (HealthStatus.DOWN) {
+    <i
+      class="fa fa-times-circle text-danger ms-2 mt-1"
+    ngbTooltip="{{'health-page.status.error.info' | translate}}" container="body"></i>
+  }
+}
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.ts b/src/app/health-page/health-panel/health-status/health-status.component.ts
index 1a1c15bf0b..050dd2c621 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.ts
+++ b/src/app/health-page/health-panel/health-status/health-status.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgSwitch,
-  NgSwitchCase,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -19,7 +16,7 @@ import { HealthStatus } from '../../models/health-component.model';
   templateUrl: './health-status.component.html',
   styleUrls: ['./health-status.component.scss'],
   standalone: true,
-  imports: [NgSwitch, NgSwitchCase, NgbTooltipModule, TranslateModule],
+  imports: [NgbTooltipModule, TranslateModule],
 })
 export class HealthStatusComponent {
   /**
diff --git a/src/app/home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html
index 9bb2e9857a..972c8cc293 100644
--- a/src/app/home-page/home-news/home-news.component.html
+++ b/src/app/home-page/home-news/home-news.component.html
@@ -1,8 +1,8 @@
-<div class="jumbotron jumbotron-fluid mt-ncs">
+<div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-0 mb-4">
   <div class="container">
     <div class="d-flex flex-wrap">
       <div>
-        <h1 class="display-3">DSpace 9</h1>
+        <h1 class="display-2">DSpace 9</h1>
         <p class="lead">DSpace is the world leading open source repository platform that enables organisations to:</p>
       </div>
     </div>
diff --git a/src/app/home-page/home-news/home-news.component.scss b/src/app/home-page/home-news/home-news.component.scss
index 911a2fafc5..0306555522 100644
--- a/src/app/home-page/home-news/home-news.component.scss
+++ b/src/app/home-page/home-news/home-news.component.scss
@@ -13,7 +13,7 @@
 a {
   color: var(--ds-home-news-link-color);
 
-  @include hover {
+  &:hover {
     color: var(--ds-home-news-link-hover-color);
   }
 }
diff --git a/src/app/home-page/home-page.component.html b/src/app/home-page/home-page.component.html
index ad48fb328c..43f7977bf2 100644
--- a/src/app/home-page/home-page.component.html
+++ b/src/app/home-page/home-page.component.html
@@ -1,25 +1,31 @@
 <ds-home-coar></ds-home-coar>
 <ds-home-news></ds-home-news>
-<ds-configuration-search-page *ngIf="showDiscoverFilters"
-                              [sideBarWidth]="3"
-                              [showViewModes]="false"
-                              [searchEnabled]="false"
-                              [inPlaceSearch]="false"
-                              [showScopeSelector]="false">
-  <ng-container searchContentTop *ngTemplateOutlet="homeContent"></ng-container>
-</ds-configuration-search-page>
-<div *ngIf="!showDiscoverFilters" class="container">
-  <ng-container *ngTemplateOutlet="homeContent"></ng-container>
-</div>
+@if (showDiscoverFilters) {
+  <ds-configuration-search-page
+    [sideBarWidth]="3"
+    [showViewModes]="false"
+    [searchEnabled]="false"
+    [inPlaceSearch]="false"
+    [showScopeSelector]="false">
+    <ng-container searchContentTop *ngTemplateOutlet="homeContent"></ng-container>
+  </ds-configuration-search-page>
+}
+@if (!showDiscoverFilters) {
+  <div class="container">
+    <ng-container *ngTemplateOutlet="homeContent"></ng-container>
+  </div>
+}
 <ds-suggestions-popup></ds-suggestions-popup>
 
 <ng-template #homeContent>
-  <ng-container *ngIf="(site$ | async) as site">
+  @if ((site$ | async); as site) {
     <ds-view-tracker [object]="site"></ds-view-tracker>
-  </ng-container>
+  }
   <ds-search-form [inPlaceSearch]="false"
-                         [searchPlaceholder]="'home.search-form.placeholder' | translate">
+    [searchPlaceholder]="'home.search-form.placeholder' | translate">
   </ds-search-form>
   <ds-top-level-community-list></ds-top-level-community-list>
-  <ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list>
+  @if (recentSubmissionspageSize>0) {
+    <ds-recent-item-list></ds-recent-item-list>
+  }
 </ng-template>
diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts
index c954e90402..33a8216a8a 100644
--- a/src/app/home-page/home-page.component.ts
+++ b/src/app/home-page/home-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -34,7 +33,7 @@ import { ThemedTopLevelCommunityListComponent } from './top-level-community-list
   styleUrls: ['./home-page.component.scss'],
   templateUrl: './home-page.component.html',
   standalone: true,
-  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
+  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
 })
 export class HomePageComponent implements OnInit {
 
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html
index 82262be1b3..4d77e5027e 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.html
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.html
@@ -1,14 +1,22 @@
 <ng-container *ngVar="(itemRD$ | async) as itemRD">
-        <div class="mt-4" [ngClass]="placeholderFontClass" *ngIf="itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0" @fadeIn>
-                <div class="d-flex flex-row border-bottom mb-4 pb-4"></div>
-                <h2> {{'home.recent-submissions.head' | translate}}</h2>
-                <div class="my-4" *ngFor="let item of itemRD?.payload?.page">
-                        <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
-                        </ds-listable-object-component-loader>
-                </div>
-                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
+  @if (itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0) {
+    <div class="mt-4" [ngClass]="placeholderFontClass" @fadeIn>
+      <div class="d-flex flex-row border-bottom mb-4 pb-4"></div>
+      <h2> {{'home.recent-submissions.head' | translate}}</h2>
+      @for (item of itemRD?.payload?.page; track item) {
+        <div class="my-4">
+          <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
+          </ds-listable-object-component-loader>
         </div>
-        <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error>
-        <ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}">
-        </ds-loading>
+      }
+      <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-start ng-tns-c290-40"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
+    </div>
+  }
+  @if (itemRD?.hasFailed) {
+    <ds-error message="{{'error.recent-submissions' | translate}}"></ds-error>
+  }
+  @if (!itemRD || itemRD.isLoading) {
+    <ds-loading message="{{'loading.recent-submissions' | translate}}">
+    </ds-loading>
+  }
 </ng-container>
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.ts b/src/app/home-page/recent-item-list/recent-item-list.component.ts
index c7383dd883..b336cf7e9b 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   isPlatformBrowser,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -61,7 +59,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
     fadeInOut,
   ],
   standalone: true,
-  imports: [VarDirective, NgIf, NgClass, NgFor, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgClass, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class RecentItemListComponent implements OnInit, OnDestroy {
   itemRD$: Observable<RemoteData<PaginatedList<Item>>>;
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
index 2a4325428f..00446d658a 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.html
@@ -1,15 +1,21 @@
 <ng-container *ngVar="(communitiesRD$ | async) as communitiesRD">
-  <div *ngIf="communitiesRD?.hasSucceeded ">
-    <h2>
-      {{'home.top-level-communities.head' | translate}}
-    </h2>
-  <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
-  <ds-viewable-collection
-    [config]="config"
-    [sortConfig]="sortConfig"
-    [objects]="communitiesRD$ | async"
-    [hideGear]="true">
-  </ds-viewable-collection>
-</div>
-<ds-error *ngIf="communitiesRD?.hasFailed " message="{{'error.top-level-communities' | translate}}"></ds-error>
-<ds-loading *ngIf="communitiesRD?.isLoading " message="{{'loading.top-level-communities' | translate}}"></ds-loading></ng-container>
+  @if (communitiesRD?.hasSucceeded ) {
+    <div>
+      <h2>
+        {{'home.top-level-communities.head' | translate}}
+      </h2>
+      <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
+      <ds-viewable-collection
+        [config]="config"
+        [sortConfig]="sortConfig"
+        [objects]="communitiesRD$ | async"
+        [hideGear]="true">
+      </ds-viewable-collection>
+    </div>
+  }
+  @if (communitiesRD?.hasFailed ) {
+    <ds-error message="{{'error.top-level-communities' | translate}}"></ds-error>
+  }
+  @if (communitiesRD?.isLoading ) {
+    <ds-loading message="{{'loading.top-level-communities' | translate}}"></ds-loading>
+  }</ng-container>
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
index c562d38ff2..4af7bcc483 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -48,7 +45,7 @@ import { VarDirective } from '../../shared/utils/var.directive';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [fadeInOut],
   standalone: true,
-  imports: [VarDirective, NgIf, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 
 export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.html b/src/app/info/end-user-agreement/end-user-agreement.component.html
index 2ab0005c69..23b728e09d 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.html
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.html
@@ -2,12 +2,12 @@
   <ds-end-user-agreement-content></ds-end-user-agreement-content>
 
   <form class="form-user-agreement-accept mt-4" (ngSubmit)="submit()" novalidate>
-    <input class="ml-1 mr-2" type="checkbox" id="user-agreement-accept" [(ngModel)]="accepted" [ngModelOptions]="{standalone: true}">
+    <input class="ms-1 me-2" type="checkbox" id="user-agreement-accept" [(ngModel)]="accepted" [ngModelOptions]="{standalone: true}">
     <label class="col-form-label-lg" for="user-agreement-accept">{{ 'info.end-user-agreement.accept' | translate }}</label>
 
     <div class="d-flex mt-4">
-      <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary mr-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
-      <button id="button-save" type="submit" class="btn btn-primary" [disabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
+      <button id="button-cancel" type="button" (click)="cancel()" class="btn btn-outline-secondary me-auto">{{ 'info.end-user-agreement.buttons.cancel' | translate }}</button>
+      <button id="button-save" type="submit" class="btn btn-primary" [dsBtnDisabled]="!accepted">{{ 'info.end-user-agreement.buttons.save' | translate }}</button>
     </div>
   </form>
 </div>
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
index fbb5ebc49b..88cb46e377 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.spec.ts
@@ -16,6 +16,7 @@ import { of as observableOf } from 'rxjs';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { EndUserAgreementComponent } from './end-user-agreement.component';
@@ -57,7 +58,7 @@ describe('EndUserAgreementComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), EndUserAgreementComponent],
+      imports: [TranslateModule.forRoot(), EndUserAgreementComponent, BtnDisabledDirective],
       providers: [
         { provide: EndUserAgreementService, useValue: endUserAgreementService },
         { provide: NotificationsService, useValue: notificationsService },
@@ -95,7 +96,8 @@ describe('EndUserAgreementComponent', () => {
 
     it('should disable the save button', () => {
       const button = fixture.debugElement.query(By.css('#button-save')).nativeElement;
-      expect(button.disabled).toBeTruthy();
+      expect(button.getAttribute('aria-disabled')).toBe('true');
+      expect(button.classList.contains('disabled')).toBeTrue();
     });
   });
 
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts
index 5c10c02432..e9835945f5 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -23,6 +23,7 @@ import { AppState } from '../../app.reducer';
 import { LogOutAction } from '../../core/auth/auth.actions';
 import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { EndUserAgreementContentComponent } from './end-user-agreement-content/end-user-agreement-content.component';
@@ -32,7 +33,7 @@ import { EndUserAgreementContentComponent } from './end-user-agreement-content/e
   templateUrl: './end-user-agreement.component.html',
   styleUrls: ['./end-user-agreement.component.scss'],
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component displaying the End User Agreement and an option to accept it
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.html b/src/app/info/feedback/feedback-form/feedback-form.component.html
index a3437d1f0e..a1ee88df3b 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.html
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.html
@@ -5,43 +5,53 @@
     <form [formGroup]="feedbackForm" (ngSubmit)="createFeedback()" class="col p-0">
       <div class="row mt-3">
         <div class="control-group col-sm-12">
-          <label class="control-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
+            <label class="control-label form-label" for="email">{{ 'info.feedback.email-label' | translate }}&nbsp;</label>
           <input id="email" class="form-control" name="email" type="text" value="" formControlName="email" autofocus="autofocus" title="{{ 'info.feedback.email_help' | translate }}">
           <small class="text-muted">{{ 'info.feedback.email_help' | translate }}</small>
         </div>
       </div>
 
-      <div *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)" class="row">
-        <div class="col-sm-12 alert">
-          <ds-error *ngIf="feedbackForm.controls.email.errors?.required" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
-          <ds-error *ngIf="feedbackForm.controls.email.errors?.pattern" message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+      @if (feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)) {
+        <div class="row">
+          <div class="col-sm-12 alert">
+            @if (feedbackForm.controls.email.errors?.required) {
+              <ds-error message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+            }
+            @if (feedbackForm.controls.email.errors?.pattern) {
+              <ds-error message="{{'info.feedback.error.email.required' | translate}}"></ds-error>
+            }
+          </div>
         </div>
-      </div>
+      }
 
       <div class="row mt-3">
         <div class="control-group col-sm-12">
-          <label class="control-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
+            <label class="control-label form-label" for="comments">{{ 'info.feedback.comments' | translate }}:&nbsp;</label>
           <textarea id="comments" formControlName="message" class="form-control" name="message" cols="20" rows="5"> </textarea>
         </div>
       </div>
 
-      <div *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)" class="row">
-        <div class="col-sm-12 alert">
-          <ds-error *ngIf="feedbackForm.controls.message.errors?.required" message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
+      @if (feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)) {
+        <div class="row">
+          <div class="col-sm-12 alert">
+            @if (feedbackForm.controls.message.errors?.required) {
+              <ds-error message="{{'info.feedback.error.message.required' | translate}}"></ds-error>
+            }
+          </div>
         </div>
-      </div>
+      }
 
       <div class="row mt-3">
         <div class="control-group col-sm-12">
-          <label class="control-label" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
+            <label class="control-label form-labe" for="page">{{ 'info.feedback.page-label' | translate }}&nbsp;</label>
           <input id="page" readonly class="form-control" name="page" type="text" value="" formControlName="page" autofocus="autofocus" title="{{ 'info.feedback.page_help' | translate }}">
           <small class="text-muted">{{ 'info.feedback.page_help' | translate }}</small>
         </div>
       </div>
 
       <div class="row mt-3">
-        <div class="control-group col-sm-12 text-right">
-          <button [disabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
+        <div class="control-group col-sm-12 text-end">
+          <button [dsBtnDisabled]="!feedbackForm.valid" class="btn btn-primary" name="submit" type="submit">{{ 'info.feedback.send' | translate }}</button>
         </div>
       </div>
     </form>
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
index 4329c923c4..56275ad5a3 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.spec.ts
@@ -18,6 +18,7 @@ import { FeedbackDataService } from '../../../core/feedback/feedback-data.servic
 import { Feedback } from '../../../core/feedback/models/feedback.model';
 import { RouteService } from '../../../core/services/route.service';
 import { NativeWindowService } from '../../../core/services/window.service';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
 import { RouterMock } from '../../../shared/mocks/router.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -45,7 +46,7 @@ describe('FeedbackFormComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), FeedbackFormComponent],
+      imports: [TranslateModule.forRoot(), FeedbackFormComponent, BtnDisabledDirective],
       providers: [
         { provide: RouteService, useValue: routeServiceStub },
         { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
@@ -79,7 +80,8 @@ describe('FeedbackFormComponent', () => {
   });
 
   it('should have disabled button', () => {
-    expect(de.query(By.css('button')).nativeElement.disabled).toBeTrue();
+    expect(de.query(By.css('button')).nativeElement.getAttribute('aria-disabled')).toBe('true');
+    expect(de.query(By.css('button')).nativeElement.classList.contains('disabled')).toBeTrue();
   });
 
   describe('when message is inserted', () => {
@@ -90,7 +92,8 @@ describe('FeedbackFormComponent', () => {
     });
 
     it('should not have disabled button', () => {
-      expect(de.query(By.css('button')).nativeElement.disabled).toBeFalse();
+      expect(de.query(By.css('button')).nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(de.query(By.css('button')).nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('on submit should call createFeedback of feedbackDataServiceStub service', () => {
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index 59be526f17..fd7bb09eb8 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -30,6 +30,7 @@ import {
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ErrorComponent } from '../../../shared/error/error.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
@@ -38,7 +39,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
   templateUrl: './feedback-form.component.html',
   styleUrls: ['./feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, ErrorComponent, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component displaying the contents of the Feedback Statement
diff --git a/src/app/item-page/alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
index b964327e39..cb69f873bb 100644
--- a/src/app/item-page/alerts/item-alerts.component.html
+++ b/src/app/item-page/alerts/item-alerts.component.html
@@ -1,16 +1,22 @@
 <div>
-    <div *ngIf="item && !item.isDiscoverable" class="private-warning">
-        <ds-alert [type]="AlertTypeEnum.Warning" [content]="'item.alerts.private' | translate"></ds-alert>
+  @if (item && !item.isDiscoverable) {
+    <div class="private-warning">
+      <ds-alert [type]="AlertTypeEnum.Warning" [content]="'item.alerts.private' | translate"></ds-alert>
     </div>
-    <div *ngIf="item && item.isWithdrawn" class="withdrawn-warning">
-        <ds-alert [type]="AlertTypeEnum.Warning">
-            <div class="d-flex justify-content-between flex-wrap">
-                <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
-                <div class="gap-2 d-flex">
-                  <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
-                  <a *ngIf="showReinstateButton$ | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
-                </div>
-            </div>
-        </ds-alert>
+  }
+  @if (item && item.isWithdrawn) {
+    <div class="withdrawn-warning">
+      <ds-alert [type]="AlertTypeEnum.Warning">
+        <div class="d-flex justify-content-between flex-wrap">
+          <span class="align-self-center">{{'item.alerts.withdrawn' | translate}}</span>
+          <div class="gap-2 d-flex">
+            <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
+            @if (showReinstateButton$ | async) {
+              <a class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
+            }
+          </div>
+        </div>
+      </ds-alert>
     </div>
+  }
 </div>
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
index bcf940e69d..3dbe0f2562 100644
--- a/src/app/item-page/alerts/item-alerts.component.ts
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -37,7 +34,6 @@ import {
   styleUrls: ['./item-alerts.component.scss'],
   imports: [
     AlertComponent,
-    NgIf,
     TranslateModule,
     RouterLink,
     AsyncPipe,
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index 3c08c2fb65..4e40883602 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -1,87 +1,101 @@
 <div class="container">
-    <h1 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h1>
-    <div *ngIf="canDownload$|async" class="alert alert-success">
-        <span>{{'bitstream-request-a-copy.alert.canDownload1' | translate}}</span>
-        <a [routerLink]="getBitstreamLink()">{{'bitstream-request-a-copy.alert.canDownload2'| translate}}</a>
+  <h1 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h1>
+  @if (canDownload$|async) {
+    <div class="alert alert-success">
+      <span>{{'bitstream-request-a-copy.alert.canDownload1' | translate}}</span>
+      <a [routerLink]="getBitstreamLink()">{{'bitstream-request-a-copy.alert.canDownload2'| translate}}</a>
     </div>
-    <div>
-        <p>{{'bitstream-request-a-copy.intro' | translate}} <a [routerLink]="getItemPath()">{{itemName}}</a></p>
-        <p *ngIf="bitstream !== undefined && allfiles.value === 'false'">{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}</p>
-        <p *ngIf="allfiles.value === 'true'">{{'bitstream-request-a-copy.intro.bitstream.all' | translate}}</p>
-    </div>
-    <form [class]="'ng-invalid'" [formGroup]="requestCopyForm" (ngSubmit)="onSubmit()">
+  }
+  <div>
+    <p>{{'bitstream-request-a-copy.intro' | translate}} <a [routerLink]="getItemPath()">{{itemName}}</a></p>
+    @if (bitstream !== undefined && allfiles.value === 'false') {
+      <p>{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}</p>
+    }
+    @if (allfiles.value === 'true') {
+      <p>{{'bitstream-request-a-copy.intro.bitstream.all' | translate}}</p>
+    }
+  </div>
+  <form [class]="'ng-invalid'" [formGroup]="requestCopyForm" (ngSubmit)="onSubmit()">
 
-        <div class="form-group">
-            <div class="row mb-4">
-                <div class="col-12">
-                    <label for="name">{{'bitstream-request-a-copy.name.label' | translate}}</label>
-                    <input [className]="(name.invalid) && (name.dirty || name.touched) ? 'form-control is-invalid' :'form-control'"
-                           type="text" id="name" formControlName="name"/>
-                    <div *ngIf="name.invalid && (name.dirty || name.touched)"
-                         class="invalid-feedback show-feedback">
-                    <span *ngIf="name.errors && name.errors.required">
-                        {{ 'bitstream-request-a-copy.name.error' | translate }}
-                    </span>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-4">
-                <div class="col-12">
-                    <label
-                            for="email">{{'bitstream-request-a-copy.email.label' | translate}}</label>
-                    <input
-                            [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
-                            id="email" formControlName="email">
-                    <div *ngIf="email.invalid && (email.dirty || email.touched)"
-                         class="invalid-feedback show-feedback">
-                    <span *ngIf="email.errors">
-                        {{ 'bitstream-request-a-copy.email.error' | translate }}
-                    </span>
-                    </div>
-                    <small class="text-muted ds-hint">{{'bitstream-request-a-copy.email.hint' |translate}}</small>
-                </div>
-            </div>
-            <div class="row mb-4">
-                <div class="col-12">
-                    <div>{{'bitstream-request-a-copy.allfiles.label' |translate}}</div>
-                    <div class="ml-4">
-                        <input [className]="'form-check-input'" type="radio"
-                               id="allfiles-true" formControlName="allfiles" value="true">
-                        <label class="form-check-label"
-                               for="allfiles-true">{{'bitstream-request-a-copy.files-all-true.label' | translate}}</label>
-                    </div>
-                    <div class="ml-4">
-                        <input [className]="'form-check-input'" type="radio"
-                               id="allfiles-false" formControlName="allfiles" value="false" [attr.disabled]="bitstream === undefined ? true : null ">
-                        <label class="form-check-label"
-                               for="allfiles-false">{{'bitstream-request-a-copy.files-all-false.label' | translate}}</label>
-                    </div>
-                </div>
-            </div>
-            <div class="row mb-4">
-                <div class="col-12">
-                    <label
-                            for="message">{{'bitstream-request-a-copy.message.label' | translate}}</label>
-                    <textarea rows="5"
-                              [className]="'form-control'"
-                              id="message" formControlName="message"></textarea>
-                </div>
+    <div class="mb-3">
+      <div class="row mb-4">
+        <div class="col-12">
+          <label for="name" class="form-label">{{'bitstream-request-a-copy.name.label' | translate}}</label>
+          <input [className]="(name.invalid) && (name.dirty || name.touched) ? 'form-control is-invalid' :'form-control'"
+            type="text" id="name" formControlName="name"/>
+          @if (name.invalid && (name.dirty || name.touched)) {
+            <div
+              class="invalid-feedback show-feedback">
+              @if (name.errors && name.errors.required) {
+                <span>
+                  {{ 'bitstream-request-a-copy.name.error' | translate }}
+                </span>
+              }
             </div>
+          }
         </div>
-    </form>
+      </div>
+      <div class="row mb-4">
+        <div class="col-12">
+          <label
+          for="email" class="form-label">{{'bitstream-request-a-copy.email.label' | translate}}</label>
+          <input
+            [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
+            id="email" formControlName="email">
+          @if (email.invalid && (email.dirty || email.touched)) {
+            <div
+              class="invalid-feedback show-feedback">
+              @if (email.errors) {
+                <span>
+                  {{ 'bitstream-request-a-copy.email.error' | translate }}
+                </span>
+              }
+            </div>
+          }
+          <small class="text-muted ds-hint">{{'bitstream-request-a-copy.email.hint' |translate}}</small>
+        </div>
+      </div>
+      <div class="row mb-4">
+        <div class="col-12">
+          <div>{{'bitstream-request-a-copy.allfiles.label' |translate}}</div>
+          <div class="ms-4 form-check">
+            <input [className]="'form-check-input'" type="radio"
+              id="allfiles-true" formControlName="allfiles" value="true">
+            <label class="form-check-label"
+            for="allfiles-true">{{'bitstream-request-a-copy.files-all-true.label' | translate}}</label>
+          </div>
+          <div class="ms-4">
+            <input [className]="'form-check-input'" type="radio"
+              id="allfiles-false" formControlName="allfiles" value="false" [attr.disabled]="bitstream === undefined ? true : null ">
+            <label class="form-check-label"
+            for="allfiles-false">{{'bitstream-request-a-copy.files-all-false.label' | translate}}</label>
+          </div>
+        </div>
+      </div>
+      <div class="row mb-4">
+        <div class="col-12">
+          <label
+          for="message" class="form-label">{{'bitstream-request-a-copy.message.label' | translate}}</label>
+          <textarea rows="5"
+            [className]="'form-control'"
+          id="message" formControlName="message"></textarea>
+        </div>
+      </div>
+    </div>
+  </form>
 
-    <hr>
+  <hr>
     <div class="row">
-        <div class="col-12 text-right">
+      <div class="col-12 text-end">
 
-            <a (click)="navigateBack()" role="button" class="btn btn-outline-secondary mr-1">
-                <i class="fas fa-arrow-left"></i> {{'bitstream-request-a-copy.return' | translate}}
-            </a>
+        <a (click)="navigateBack()" role="button" class="btn btn-outline-secondary me-1">
+          <i class="fas fa-arrow-left"></i> {{'bitstream-request-a-copy.return' | translate}}
+        </a>
 
-            <button
-                    [disabled]="requestCopyForm.invalid"
-                    class="btn btn-default btn-primary"
-                    (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
-        </div>
+        <button
+          [dsBtnDisabled]="requestCopyForm.invalid"
+          class="btn btn-default btn-primary"
+        (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
+      </div>
     </div>
-</div>
+  </div>
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index bd12d3675e..dfbcef4111 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   Location,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -55,6 +54,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -70,7 +70,7 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     RouterLink,
     AsyncPipe,
     ReactiveFormsModule,
-    NgIf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
index 530471135c..a0f25a9d3c 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
@@ -1,41 +1,47 @@
 <div class="container">
-  <ng-container *ngIf="bundles">
+  @if (bundles) {
     <div class="row">
       <div class="col-12 mb-2">
         <h1>{{'item.bitstreams.upload.title' | translate}}</h1>
         <ng-container *ngVar="(itemRD$ | async)?.payload as item">
-          <div *ngIf="item">
-            <span class="font-weight-bold">{{'item.bitstreams.upload.item' | translate}}</span>
-            <span>{{ dsoNameService.getName(item) }}</span>
-          </div>
+          @if (item) {
+            <div>
+              <span class="fw-bold">{{'item.bitstreams.upload.item' | translate}}</span>
+              <span>{{ dsoNameService.getName(item) }}</span>
+            </div>
+          }
         </ng-container>
       </div>
       <div class="col-12">
-        <label class="font-weight-bold">{{'item.bitstreams.upload.bundle' | translate}}</label>
+        <label class="fw-bold form-label">{{'item.bitstreams.upload.bundle' | translate}}</label>
         <ds-dso-input-suggestions #f id="search-form"
-                                  [suggestions]="bundles"
-                                  [placeholder]="'item.bitstreams.upload.bundle.placeholder' | translate"
-                                  [action]="getCurrentUrl()"
-                                  [name]="'bundle-select'"
-                                  [debounceTime]="50"
-                                  [(ngModel)]="selectedBundleName"
-                                  (typeSuggestion)="bundleNameChange()"
-                                  (clickSuggestion)="onClick($event)"
-                                  (click)="f.open()"
-                                  ngDefaultControl>
+          [suggestions]="bundles"
+          [placeholder]="'item.bitstreams.upload.bundle.placeholder' | translate"
+          [action]="getCurrentUrl()"
+          [name]="'bundle-select'"
+          [debounceTime]="50"
+          [(ngModel)]="selectedBundleName"
+          (typeSuggestion)="bundleNameChange()"
+          (clickSuggestion)="onClick($event)"
+          (click)="f.open()"
+          ngDefaultControl>
         </ds-dso-input-suggestions>
-        <button *ngIf="!selectedBundleId && selectedBundleName?.length > 0" class="btn btn-success mr-2" (click)="createBundle()">
-          <i class="fa fa-plus"></i> {{ 'item.bitstreams.upload.bundle.new' | translate }}
-        </button>
-        <ds-uploader  class="w-100" *ngIf="selectedBundleId"
-                      [dropMsg]="'item.bitstreams.upload.drop-message'"
-                      [dropOverDocumentMsg]="'item.bitstreams.upload.drop-message'"
-                      [enableDragOverDocument]="true"
-                      [uploadFilesOptions]="uploadFilesOptions"
-                      (onCompleteItem)="onCompleteItem($event)"
-                      (onUploadError)="onUploadError()"></ds-uploader>
+        @if (!selectedBundleId && selectedBundleName?.length > 0) {
+          <button class="btn btn-success me-2" (click)="createBundle()">
+            <i class="fa fa-plus"></i> {{ 'item.bitstreams.upload.bundle.new' | translate }}
+          </button>
+        }
+        @if (selectedBundleId) {
+          <ds-uploader  class="w-100"
+            [dropMsg]="'item.bitstreams.upload.drop-message'"
+            [dropOverDocumentMsg]="'item.bitstreams.upload.drop-message'"
+            [enableDragOverDocument]="true"
+            [uploadFilesOptions]="uploadFilesOptions"
+            (onCompleteItem)="onCompleteItem($event)"
+          (onUploadError)="onUploadError()"></ds-uploader>
+        }
         <button class="btn btn-outline-secondary" (click)="onCancel()">{{'item.bitstreams.upload.cancel' | translate}}</button>
       </div>
     </div>
-  </ng-container>
+  }
 </div>
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
index e8b216aa52..00d0a9a420 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -62,7 +59,6 @@ import { getEntityEditRoute } from '../../item-page-routing-paths';
     TranslateModule,
     AsyncPipe,
     VarDirective,
-    NgIf,
     DsoInputSuggestionsComponent,
     FormsModule,
     UploaderComponent,
diff --git a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
index 1e963a5cca..254c44ad46 100644
--- a/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
+++ b/src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
@@ -16,9 +16,9 @@ import {
   Subscription,
 } from 'rxjs';
 import {
-  first,
   map,
   switchMap,
+  take,
   tap,
 } from 'rxjs/operators';
 
@@ -102,7 +102,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
     super.ngOnInit();
 
     this.discardTimeOut = environment.item.edit.undoTimeout;
-    this.hasChanges().pipe(first()).subscribe((hasChanges) => {
+    this.hasChanges().pipe(take(1)).subscribe((hasChanges) => {
       if (!hasChanges) {
         this.initializeOriginalFields();
       } else {
@@ -187,7 +187,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
    */
   private checkLastModified() {
     const currentVersion = this.item.lastModified;
-    this.objectUpdatesService.getLastModified(this.url).pipe(first()).subscribe(
+    this.objectUpdatesService.getLastModified(this.url).pipe(take(1)).subscribe(
       (updateVersion: Date) => {
         if (updateVersion.getDate() !== currentVersion.getDate()) {
           this.notificationsService.warning(this.getNotificationTitle('outdated'), this.getNotificationContent('outdated'));
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index cac114ef28..0d3907c431 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -1,38 +1,46 @@
 <div class="container">
-    <div class="row">
-        <div class="col-12">
-            <h1 class="border-bottom">{{'item.edit.head' | translate}}</h1>
-            <div class="pt-2">
-              <ul *ngIf="pages.length > 0" class="nav nav-tabs justify-content-start" role="tablist">
-                    <li *ngFor="let page of pages" class="nav-item" role="presentation">
-                        <a *ngIf="(page.enabled | async)"
-                           [attr.aria-selected]="page.page === currentPage"
-                           class="nav-link"
-                           [ngClass]="{'active' : page.page === currentPage}"
-                           [routerLink]="['./' + page.page]"
-                           [attr.data-test]="page.page"
-                           role="tab">
-                            {{'item.edit.tabs.' + page.page + '.head' | translate}}
-                        </a>
-                        <span [ngbTooltip]="'item.edit.tabs.disabled.tooltip' | translate">
-                            <button *ngIf="(page.enabled | async) !== true"
-                                 class="nav-link disabled">
-                                {{'item.edit.tabs.' + page.page + '.head' | translate}}
-                            </button>
-                        </span>
-                    </li>
-                </ul>
-                <div class="tab-pane active">
-                    <div class="mb-4">
-                        <router-outlet></router-outlet>
-                    </div>
-                    <div class="button-row bottom">
-                      <div class="text-right">
-                        <a [routerLink]="getItemPage((itemRD$ | async)?.payload)" role="button" class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{'item.edit.return' | translate}}</a>
-                      </div>
-                    </div>
-                </div>
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom">{{'item.edit.head' | translate}}</h1>
+      <div class="pt-2">
+        @if (pages.length > 0) {
+          <ul class="nav nav-tabs justify-content-start" role="tablist">
+            @for (page of pages; track page) {
+              <li class="nav-item" role="presentation">
+                @if ((page.enabled | async)) {
+                  <a
+                    [attr.aria-selected]="page.page === currentPage"
+                    class="nav-link"
+                    [ngClass]="{'active' : page.page === currentPage}"
+                    [routerLink]="['./' + page.page]"
+                    [attr.data-test]="page.page"
+                    role="tab">
+                    {{'item.edit.tabs.' + page.page + '.head' | translate}}
+                  </a>
+                }
+                <span [ngbTooltip]="'item.edit.tabs.disabled.tooltip' | translate">
+                  @if ((page.enabled | async) !== true) {
+                    <button
+                      class="nav-link disabled">
+                      {{'item.edit.tabs.' + page.page + '.head' | translate}}
+                    </button>
+                  }
+                </span>
+              </li>
+            }
+          </ul>
+        }
+        <div class="tab-pane active">
+          <div class="mb-4">
+            <router-outlet></router-outlet>
+          </div>
+          <div class="button-row bottom">
+            <div class="text-end">
+              <a [routerLink]="getItemPage((itemRD$ | async)?.payload)" role="button" class="btn btn-outline-secondary"><i class="fas fa-arrow-left"></i> {{'item.edit.return' | translate}}</a>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts
index cd3e1ff215..64a32968e5 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -48,8 +46,6 @@ import { getItemPageRoute } from '../item-page-routing-paths';
   imports: [
     TranslateModule,
     NgClass,
-    NgIf,
-    NgForOf,
     AsyncPipe,
     NgbTooltipModule,
     RouterLink,
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
index 782e24fa2d..1e862c344d 100644
--- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
@@ -1,6 +1,7 @@
-<ds-access-control-form-container
-  titleMessage="item-access-control-title"
-  *ngIf="itemRD$ | async as itemRD"
-  [itemRD]="itemRD"
-  [showLimitToSpecificBitstreams]="true">
-</ds-access-control-form-container>
+@if (itemRD$ | async; as itemRD) {
+  <ds-access-control-form-container
+    titleMessage="item-access-control-title"
+    [itemRD]="itemRD"
+    [showLimitToSpecificBitstreams]="true">
+  </ds-access-control-form-container>
+}
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
index 1a2fc7292b..926afad490 100644
--- a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -21,7 +18,6 @@ import { AccessControlFormContainerComponent } from '../../../shared/access-cont
   styleUrls: ['./item-access-control.component.scss'],
   imports: [
     AccessControlFormContainerComponent,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
index 7f121081f2..4aca189e16 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
@@ -3,10 +3,10 @@
   <ds-resource-policies [resourceType]="'item'" [resourceName]="(getItemName() | async)"
     [resourceUUID]="(getItemUUID() | async)">
   </ds-resource-policies>
-  <ng-container *ngFor="let bundle of (bundles$ | async); trackById">
+  @for (bundle of (bundles$ | async); track bundle) {
     <ds-resource-policies [resourceType]="'bundle'" [resourceUUID]="bundle.id" [resourceName]="bundle.name">
     </ds-resource-policies>
-    <ng-container *ngIf="(bundleBitstreamsMap.get(bundle.id)?.bitstreams | async)?.length > 0">
+    @if ((bundleBitstreamsMap.get(bundle.id)?.bitstreams | async)?.length > 0) {
       <div class="card auth-bitstream-container">
         <div class="card-header">
           <button type="button" class="btn btn-outline-primary" (click)="collapseArea(bundle.id)"
@@ -15,19 +15,22 @@
           </button>
         </div>
         <div class="card-body" [id]="bundle.id" [ngbCollapse]="bundleBitstreamsMap.get(bundle.id).isCollapsed">
-          <ng-container
-            *ngFor="let bitstream of (bundleBitstreamsMap.get(bundle.id).bitstreams | async); trackById">
+          @for (bitstream of (bundleBitstreamsMap.get(bundle.id).bitstreams | async); track bitstream) {
             <ds-resource-policies [resourceType]="'bitstream'" [resourceUUID]="bitstream.id"
-              [resourceName]="bitstream.name"></ds-resource-policies>
-          </ng-container>
-          <div class="row justify-content-center" *ngIf="!bundleBitstreamsMap.get(bundle.id).allBitstreamsLoaded">
-            <button type="button" class="btn btn-link" (click)="onBitstreamsLoad(bundle)">{{ 'collection.edit.item.authorizations.load-more-button' | translate }}</button>
-          </div>
+            [resourceName]="bitstream.name"></ds-resource-policies>
+          }
+          @if (!bundleBitstreamsMap.get(bundle.id).allBitstreamsLoaded) {
+            <div class="row justify-content-center">
+              <button type="button" class="btn btn-link" (click)="onBitstreamsLoad(bundle)">{{ 'collection.edit.item.authorizations.load-more-button' | translate }}</button>
+            </div>
+          }
         </div>
       </div>
-    </ng-container>
-  </ng-container>
-  <div class="row justify-content-center" *ngIf="!allBundlesLoaded">
-    <button type="button" class="btn btn-link" (click)="onBundleLoad()">{{ 'collection.edit.item.authorizations.load-bundle-button' | translate }}</button>
-  </div>
+    }
+  }
+  @if (!allBundlesLoaded) {
+    <div class="row justify-content-center">
+      <button type="button" class="btn btn-link" (click)="onBundleLoad()">{{ 'collection.edit.item.authorizations.load-bundle-button' | translate }}</button>
+    </div>
+  }
 </div>
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index 30d1fce2bc..6e700fd48e 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -65,10 +61,8 @@ interface BundleBitstreamsMapEntry {
     ResourcePoliciesComponent,
     NgbCollapseModule,
     TranslateModule,
-    NgForOf,
     NgForTrackByIdDirective,
     AsyncPipe,
-    NgIf,
     AlertComponent,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 88d984c19f..15d713bdaf 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -1,76 +1,97 @@
 <div class="item-bitstreams" *ngVar="(bundles$ | async) as bundles">
-  <div class="button-row top d-flex mt-2 space-children-mr">
-    <button class="mr-auto btn btn-success"
-            [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
-            [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
-            class="fas fa-upload"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
-    </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
-            [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
-            (click)="reinstate()"><i
-            class="fas fa-undo-alt"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
-    </button>
-    <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
-            [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
-            (click)="submit()"><i
-            class="fas fa-save"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
-    </button>
-    <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-            [disabled]="(hasChanges$ | async) !== true || submitting"
-            (click)="discard()"><i
-            class="fas fa-times"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
-    </button>
+  <div class="mt-2" id="reorder-description">
+    <ds-alert [content]="'item.edit.bitstreams.info-alert'" [type]="AlertType.Info"></ds-alert>
   </div>
 
-  <div *ngIf="item && bundles?.length > 0" class="container table-bordered mt-4">
-    <div class="row header-row font-weight-bold">
-      <div class="{{columnSizes.columns[0].buildClasses()}} row-element">
-        <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
-        {{'item.edit.bitstreams.headers.name' | translate}}
+  <div class="button-row top d-flex mt-2 space-children-mr">
+    <button class="me-auto btn btn-success"
+      [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
+      [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
+    class="fas fa-upload"></i>
+    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
+  </button>
+  @if (isReinstatable$ | async) {
+    <button class="btn btn-warning"
+      [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
+      (click)="reinstate()"><i
+    class="fas fa-undo-alt"></i>
+    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
+  </button>
+}
+<button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+  [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
+  (click)="submit()"><i
+class="fas fa-save"></i>
+<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
+</button>
+@if ((isReinstatable$ | async) !== true) {
+  <button class="btn btn-danger"
+    [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+    [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+    (click)="discard()"><i
+  class="fas fa-times"></i>
+  <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
+</button>
+}
+</div>
+
+@if (item && bundles?.length > 0) {
+  <div class="mt-4 table-border scrollable-table" [ngClass]="{'disabled-overlay': (isProcessingMoveRequest | async)}">
+    @for (bundle of bundles; track bundle; let isFirst = $first) {
+      <ds-item-edit-bitstream-bundle
+        [bundle]="bundle"
+        [item]="item"
+        [columnSizes]="columnSizes"
+        [isFirstTable]="isFirst"
+        aria-describedby="reorder-description">
+      </ds-item-edit-bitstream-bundle>
+    }
+    @if (showLoadMoreLink$ | async) {
+      <div class="d-flex justify-content-center">
+        <button class="btn btn-link my-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</button>
       </div>
-      <div class="{{columnSizes.columns[1].buildClasses()}} row-element">{{'item.edit.bitstreams.headers.description' | translate}}</div>
-      <div class="{{columnSizes.columns[2].buildClasses()}} text-center row-element">{{'item.edit.bitstreams.headers.format' | translate}}</div>
-      <div class="{{columnSizes.columns[3].buildClasses()}} text-center row-element">{{'item.edit.bitstreams.headers.actions' | translate}}</div>
-    </div>
-    <ds-item-edit-bitstream-bundle *ngFor="let bundle of bundles"
-                                   [bundle]="bundle"
-                                   [item]="item"
-                                   [columnSizes]="columnSizes"
-                                   (dropObject)="dropBitstream(bundle, $event)">
-    </ds-item-edit-bitstream-bundle>
+    }
   </div>
-  <div *ngIf="bundles?.length === 0"
-       class="alert alert-info w-100 d-inline-block mt-4" role="alert">
+}
+@if (bundles?.length === 0) {
+  <div
+    class="alert alert-info w-100 d-inline-block mt-4" role="alert">
     {{'item.edit.bitstreams.empty' | translate}}
   </div>
-  <ds-loading *ngIf="!bundles" message="{{'loading.bitstreams' | translate}}"></ds-loading>
+}
+@if (!bundles) {
+  <ds-loading message="{{'loading.bitstreams' | translate}}"></ds-loading>
+}
 
-  <div class="button-row bottom">
-    <div class="mt-4 float-right space-children-mr ml-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable$ | async"
-              [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
-              (click)="reinstate()"><i
-        class="fas fa-undo-alt"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
-      </button>
-      <button class="btn btn-primary" [disabled]="(hasChanges$ | async) !== true || submitting"
-              [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
-              (click)="submit()"><i
-        class="fas fa-save"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
-      </button>
-      <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-              [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-              [disabled]="(hasChanges$ | async) !== true || submitting"
-              (click)="discard()"><i
-        class="fas fa-times"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
-      </button>
-    </div>
-  </div>
+<div class="button-row bottom">
+  <div class="mt-4 float-end space-children-mr ms-gap">
+    @if (isReinstatable$ | async) {
+      <button class="btn btn-warning"
+        [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
+        (click)="reinstate()"><i
+      class="fas fa-undo-alt"></i>
+      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
+    </button>
+  }
+  <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+    [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
+    (click)="submit()"><i
+  class="fas fa-save"></i>
+  <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
+</button>
+@if ((isReinstatable$ | async) !== true) {
+  <button class="btn btn-danger"
+    [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+    [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+    (click)="discard()"><i
+  class="fas fa-times"></i>
+  <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
+</button>
+}
 </div>
+</div>
+</div>
+
+@if (isProcessingMoveRequest | async) {
+  <ds-loading class="loading-overlay"></ds-loading>
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
index 7de575b785..7fd1f4b31e 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.scss
@@ -1,23 +1,4 @@
-.header-row {
-  color: var(--bs-table-dark-color);
-  background-color: var(--bs-table-dark-bg);
-  border-color: var(--bs-table-dark-border-color);
-}
-
-.bundle-row {
-  color: var(--bs-table-head-color);
-  background-color: var(--bs-table-head-bg);
-  border-color: var(--bs-table-border-color);
-}
-
-.row-element {
-  padding: 12px;
-  padding: 0.75em;
-  border-bottom: var(--bs-table-border-width) solid var(--bs-table-border-color);
-}
-
 .drag-handle {
-  visibility: hidden;
   &:hover {
     cursor: move;
   }
@@ -27,10 +8,6 @@
   cursor: move;
 }
 
-:host ::ng-deep .bitstream-row:hover .drag-handle, :host ::ng-deep .bitstream-row-drag-handle:focus .drag-handle {
-  visibility: visible !important;
-}
-
 .cdk-drag-preview {
   margin-left: 0;
   box-sizing: border-box;
@@ -54,3 +31,25 @@
 :host ::ng-deep .larger-tooltip .tooltip-inner {
   max-width: 500px;
 }
+
+.table-border {
+  border: 1px solid #dee2e6;
+}
+
+:host ::ng-deep .pagination {
+  padding-top: 0.5rem;
+}
+
+.scrollable-table {
+  overflow-x: auto;
+}
+
+.disabled-overlay {
+  opacity: 0.6;
+}
+
+.loading-overlay {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
index 6fcb2fab84..874107e6de 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.spec.ts
@@ -7,6 +7,7 @@ import {
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import {
   ActivatedRoute,
   Router,
@@ -15,7 +16,6 @@ import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { RestResponse } from '../../../core/cache/response.models';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
@@ -44,8 +44,12 @@ import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { ObjectValuesPipe } from '../../../shared/utils/object-values-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { ItemBitstreamsComponent } from './item-bitstreams.component';
+import { ItemBitstreamsService } from './item-bitstreams.service';
+import {
+  getItemBitstreamsServiceStub,
+  ItemBitstreamsServiceStub,
+} from './item-bitstreams.service.stub';
 import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
-import { ItemEditBitstreamDragHandleComponent } from './item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
 
 let comp: ItemBitstreamsComponent;
 let fixture: ComponentFixture<ItemBitstreamsComponent>;
@@ -97,6 +101,7 @@ let objectCache: ObjectCacheService;
 let requestService: RequestService;
 let searchConfig: SearchConfigurationService;
 let bundleService: BundleDataService;
+let itemBitstreamsService: ItemBitstreamsServiceStub;
 
 describe('ItemBitstreamsComponent', () => {
   beforeEach(waitForAsync(() => {
@@ -165,11 +170,19 @@ describe('ItemBitstreamsComponent', () => {
       url: url,
     });
     bundleService = jasmine.createSpyObj('bundleService', {
-      patch: observableOf(new RestResponse(true, 200, 'OK')),
+      patch: createSuccessfulRemoteDataObject$({}),
     });
 
+    itemBitstreamsService = getItemBitstreamsServiceStub();
+
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), ItemBitstreamsComponent, ObjectValuesPipe, VarDirective],
+      imports: [
+        TranslateModule.forRoot(),
+        ItemBitstreamsComponent,
+        ObjectValuesPipe,
+        VarDirective,
+        BrowserAnimationsModule,
+      ],
       providers: [
         { provide: ItemDataService, useValue: itemService },
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
@@ -181,6 +194,7 @@ describe('ItemBitstreamsComponent', () => {
         { provide: RequestService, useValue: requestService },
         { provide: SearchConfigurationService, useValue: searchConfig },
         { provide: BundleDataService, useValue: bundleService },
+        { provide: ItemBitstreamsService, useValue: itemBitstreamsService },
         ChangeDetectorRef,
       ], schemas: [
         NO_ERRORS_SCHEMA,
@@ -189,7 +203,6 @@ describe('ItemBitstreamsComponent', () => {
       .overrideComponent(ItemBitstreamsComponent, {
         remove: {
           imports: [ItemEditBitstreamBundleComponent,
-            ItemEditBitstreamDragHandleComponent,
             ThemedLoadingComponent],
         },
       })
@@ -209,28 +222,8 @@ describe('ItemBitstreamsComponent', () => {
       comp.submit();
     });
 
-    it('should call removeMultiple on the bitstreamService for the marked field', () => {
-      expect(bitstreamService.removeMultiple).toHaveBeenCalledWith([bitstream2]);
-    });
-
-    it('should not call removeMultiple on the bitstreamService for the unmarked field', () => {
-      expect(bitstreamService.removeMultiple).not.toHaveBeenCalledWith([bitstream1]);
-    });
-  });
-
-  describe('when dropBitstream is called', () => {
-    beforeEach((done) => {
-      comp.dropBitstream(bundle, {
-        fromIndex: 0,
-        toIndex: 50,
-        finish: () => {
-          done();
-        },
-      });
-    });
-
-    it('should send out a patch for the move operation', () => {
-      expect(bundleService.patch).toHaveBeenCalled();
+    it('should call removeMarkedBitstreams on the itemBitstreamsService', () => {
+      expect(itemBitstreamsService.removeMarkedBitstreams).toHaveBeenCalled();
     });
   });
 
@@ -247,4 +240,114 @@ describe('ItemBitstreamsComponent', () => {
       expect(objectUpdatesService.reinstateFieldUpdates).toHaveBeenCalledWith(bundle.self);
     });
   });
+
+  describe('moveUp', () => {
+    it('should move the selected bitstream up', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveUp(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamUp).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveUp(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamUp).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('moveDown', () => {
+    it('should move the selected bitstream down', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveDown(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamDown).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.moveDown(event);
+
+      expect(itemBitstreamsService.moveSelectedBitstreamDown).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('cancelSelection', () => {
+    it('should cancel the selection', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.cancelSelection(event);
+
+      expect(itemBitstreamsService.cancelSelection).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        preventDefault: () => {/* Intentionally empty */},
+      } as KeyboardEvent;
+      comp.cancelSelection(event);
+
+      expect(itemBitstreamsService.cancelSelection).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('clearSelection', () => {
+    it('should clear the selection', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        target: document.createElement('BODY'),
+        preventDefault: () => {/* Intentionally empty */},
+      } as unknown as KeyboardEvent;
+      comp.clearSelection(event);
+
+      expect(itemBitstreamsService.clearSelection).toHaveBeenCalled();
+    });
+
+    it('should not do anything if no bitstream is selected', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(false);
+
+      const event = {
+        target: document.createElement('BODY'),
+        preventDefault: () => {/* Intentionally empty */},
+      } as unknown as KeyboardEvent;
+      comp.clearSelection(event);
+
+      expect(itemBitstreamsService.clearSelection).not.toHaveBeenCalled();
+    });
+
+    it('should not do anything if the event target is not \'BODY\'', () => {
+      itemBitstreamsService.hasSelectedBitstream.and.returnValue(true);
+
+      const event = {
+        target: document.createElement('NOT-BODY'),
+        preventDefault: () => {/* Intentionally empty */},
+      } as unknown as KeyboardEvent;
+      comp.clearSelection(event);
+
+      expect(itemBitstreamsService.clearSelection).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 685ad006e0..ea56a4274a 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,11 +1,11 @@
 import {
   AsyncPipe,
-  NgForOf,
-  NgIf,
+  CommonModule,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
+  HostListener,
   NgZone,
   OnDestroy,
 } from '@angular/core';
@@ -20,65 +20,65 @@ import {
 } from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
 import {
+  BehaviorSubject,
   combineLatest,
   Observable,
   Subscription,
-  zip as observableZip,
 } from 'rxjs';
 import {
   filter,
   map,
   switchMap,
   take,
+  tap,
 } from 'rxjs/operators';
+import { AlertComponent } from 'src/app/shared/alert/alert.component';
+import { AlertType } from 'src/app/shared/alert/alert-type';
 
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { BundleDataService } from '../../../core/data/bundle-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
-import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { RequestService } from '../../../core/data/request.service';
-import { Bitstream } from '../../../core/shared/bitstream.model';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import {
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
 } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { ObjectValuesPipe } from '../../../shared/utils/object-values-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
+import { ItemBitstreamsService } from './item-bitstreams.service';
 import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
-import { ItemEditBitstreamDragHandleComponent } from './item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
 
 @Component({
   selector: 'ds-item-bitstreams',
   styleUrls: ['./item-bitstreams.component.scss'],
   templateUrl: './item-bitstreams.component.html',
   imports: [
+    CommonModule,
     AsyncPipe,
     TranslateModule,
     ItemEditBitstreamBundleComponent,
     RouterLink,
-    NgIf,
     VarDirective,
-    ItemEditBitstreamDragHandleComponent,
-    NgForOf,
     ThemedLoadingComponent,
+    AlertComponent,
+    BtnDisabledDirective,
   ],
   providers: [ObjectValuesPipe],
   standalone: true,
@@ -88,33 +88,27 @@ import { ItemEditBitstreamDragHandleComponent } from './item-edit-bitstream-drag
  */
 export class ItemBitstreamsComponent extends AbstractItemUpdateComponent implements OnDestroy {
 
+  // Declared for use in template
+  protected readonly AlertType = AlertType;
+
   /**
-   * The currently listed bundles
+   * All bundles for the current item
    */
-  bundles$: Observable<Bundle[]>;
+  private bundlesSubject = new BehaviorSubject<Bundle[]>([]);
 
   /**
    * The page options to use for fetching the bundles
    */
-  bundlesOptions = {
+  bundlesOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'bundles-pagination-options',
     currentPage: 1,
-    pageSize: 9999,
-  } as any;
+    pageSize: 10,
+  });
 
   /**
    * The bootstrap sizes used for the columns within this table
    */
-  columnSizes = new ResponsiveTableSizes([
-    // Name column
-    new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-    // Description column
-    new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-    // Format column
-    new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-    // Actions column
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3),
-  ]);
+  columnSizes: ResponsiveTableSizes;
 
   /**
    * Are we currently submitting the changes?
@@ -128,6 +122,23 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   itemUpdateSubscription: Subscription;
 
+  /**
+   * The flag indicating to show the load more link
+   */
+  showLoadMoreLink$: BehaviorSubject<boolean> = new BehaviorSubject(true);
+
+  /**
+   * The list of bundles for the current item as an observable
+   */
+  get bundles$(): Observable<Bundle[]> {
+    return this.bundlesSubject.asObservable();
+  }
+
+  /**
+   * An observable which emits a boolean which represents whether the service is currently handling a 'move' request
+   */
+  isProcessingMoveRequest: Observable<boolean>;
+
   constructor(
     public itemService: ItemDataService,
     public objectUpdatesService: ObjectUpdatesService,
@@ -141,19 +152,73 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     public cdRef: ChangeDetectorRef,
     public bundleService: BundleDataService,
     public zone: NgZone,
+    public itemBitstreamsService: ItemBitstreamsService,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
+
+    this.columnSizes = this.itemBitstreamsService.getColumnSizes();
   }
 
   /**
    * Actions to perform after the item has been initialized
    */
   postItemInit(): void {
-    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({ pagination: this.bundlesOptions })).pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page),
-    );
+    this.loadBundles(1);
+  }
+
+  /**
+   * Handles keyboard events that should move the currently selected bitstream up
+   */
+  @HostListener('document:keydown.arrowUp', ['$event'])
+  moveUp(event: KeyboardEvent) {
+    if (this.itemBitstreamsService.hasSelectedBitstream()) {
+      event.preventDefault();
+      this.itemBitstreamsService.moveSelectedBitstreamUp();
+    }
+  }
+
+  /**
+   * Handles keyboard events that should move the currently selected bitstream down
+   */
+  @HostListener('document:keydown.arrowDown', ['$event'])
+  moveDown(event: KeyboardEvent) {
+    if (this.itemBitstreamsService.hasSelectedBitstream()) {
+      event.preventDefault();
+      this.itemBitstreamsService.moveSelectedBitstreamDown();
+    }
+  }
+
+  /**
+   * Handles keyboard events that should cancel the currently selected bitstream.
+   * A cancel means that the selected bitstream is returned to its original position and is no longer selected.
+   * @param event
+   */
+  @HostListener('document:keyup.escape', ['$event'])
+  cancelSelection(event: KeyboardEvent) {
+    if (this.itemBitstreamsService.hasSelectedBitstream()) {
+      event.preventDefault();
+      this.itemBitstreamsService.cancelSelection();
+    }
+  }
+
+  /**
+   * Handles keyboard events that should clear the currently selected bitstream.
+   * A clear means that the selected bitstream remains in its current position but is no longer selected.
+   */
+  @HostListener('document:keydown.enter', ['$event'])
+  @HostListener('document:keydown.space', ['$event'])
+  clearSelection(event: KeyboardEvent) {
+    // Only when no specific element is in focus do we want to clear the currently selected bitstream
+    // Otherwise we might clear the selection when a different action was intended, e.g. clicking a button or selecting
+    // a different bitstream.
+    if (
+      this.itemBitstreamsService.hasSelectedBitstream() &&
+      event.target instanceof Element &&
+      event.target.tagName === 'BODY'
+    ) {
+      event.preventDefault();
+      this.itemBitstreamsService.clearSelection();
+    }
   }
 
   /**
@@ -163,6 +228,26 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     this.notificationsPrefix = 'item.edit.bitstreams.notifications.';
   }
 
+  /**
+   * Load bundles for the current item
+   * @param currentPage The current page to load
+   */
+  loadBundles(currentPage?: number) {
+    this.bundlesOptions = Object.assign(new PaginationComponentOptions(), this.bundlesOptions, {
+      currentPage: currentPage || this.bundlesOptions.currentPage + 1,
+    });
+    this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({ pagination: this.bundlesOptions })).pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      tap((bundlesPL: PaginatedList<Bundle>) =>
+        this.showLoadMoreLink$.next(bundlesPL.pageInfo.currentPage < bundlesPL.pageInfo.totalPages),
+      ),
+      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page),
+    ).subscribe((bundles: Bundle[]) => {
+      this.bundlesSubject.next([...this.bundlesSubject.getValue(), ...bundles]);
+    });
+  }
+
 
   /**
    * Submit the current changes
@@ -171,30 +256,12 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    */
   submit() {
     this.submitting = true;
-    const bundlesOnce$ = this.bundles$.pipe(take(1));
 
-    // Fetch all removed bitstreams from the object update service
-    const removedBitstreams$ = bundlesOnce$.pipe(
-      switchMap((bundles: Bundle[]) => observableZip(
-        ...bundles.map((bundle: Bundle) => this.objectUpdatesService.getFieldUpdates(bundle.self, [], true)),
-      )),
-      map((fieldUpdates: FieldUpdates[]) => ([] as FieldUpdate[]).concat(
-        ...fieldUpdates.map((updates: FieldUpdates) => Object.values(updates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)),
-      )),
-      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field)),
-    );
-
-    // Send out delete requests for all deleted bitstreams
-    const removedResponses$: Observable<RemoteData<NoContent>> = removedBitstreams$.pipe(
-      take(1),
-      switchMap((removedBitstreams: Bitstream[]) => {
-        return this.bitstreamService.removeMultiple(removedBitstreams);
-      }),
-    );
+    const removedResponses$ = this.itemBitstreamsService.removeMarkedBitstreams(this.bundles$.pipe(take(1)));
 
     // Perform the setup actions from above in order and display notifications
     removedResponses$.subscribe((responses: RemoteData<NoContent>) => {
-      this.displayNotifications('item.edit.bitstreams.notifications.remove', [responses]);
+      this.itemBitstreamsService.displayNotifications('item.edit.bitstreams.notifications.remove', [responses]);
       this.submitting = false;
     });
   }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
new file mode 100644
index 0000000000..490897b22a
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.spec.ts
@@ -0,0 +1,712 @@
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
+import { TranslateService } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { ObjectUpdatesServiceStub } from '../../../core/data/object-updates/object-updates.service.stub';
+import { RequestService } from '../../../core/data/request.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { LiveRegionService } from '../../../shared/live-region/live-region.service';
+import { getLiveRegionServiceStub } from '../../../shared/live-region/live-region.service.stub';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { BitstreamDataServiceStub } from '../../../shared/testing/bitstream-data-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import {
+  ItemBitstreamsService,
+  SelectedBitstreamTableEntry,
+} from './item-bitstreams.service';
+import createSpy = jasmine.createSpy;
+import { MoveOperation } from 'fast-json-patch';
+
+describe('ItemBitstreamsService', () => {
+  let service: ItemBitstreamsService;
+  let notificationsService: NotificationsService;
+  let translateService: TranslateService;
+  let objectUpdatesService: ObjectUpdatesService;
+  let bitstreamDataService: BitstreamDataService;
+  let bundleDataService: BundleDataService;
+  let dsoNameService: DSONameService;
+  let requestService: RequestService;
+  let liveRegionService: LiveRegionService;
+
+  beforeEach(() => {
+    notificationsService = new NotificationsServiceStub() as any;
+    translateService = getMockTranslateService();
+    objectUpdatesService = new ObjectUpdatesServiceStub() as any;
+    bitstreamDataService = new BitstreamDataServiceStub() as any;
+    bundleDataService = jasmine.createSpyObj('bundleDataService', {
+      patch: createSuccessfulRemoteDataObject$(new Bundle()),
+    });
+    dsoNameService = new DSONameServiceMock() as any;
+    requestService = jasmine.createSpyObj('requestService', {
+      setStaleByHrefSubstring: of(true),
+    });
+    liveRegionService = getLiveRegionServiceStub();
+
+    service = new ItemBitstreamsService(
+      notificationsService,
+      translateService,
+      objectUpdatesService,
+      bitstreamDataService,
+      bundleDataService,
+      dsoNameService,
+      requestService,
+      liveRegionService,
+    );
+  });
+
+  const defaultEntry: SelectedBitstreamTableEntry = {
+    bitstream: {
+      name: 'bitstream name',
+    } as any,
+    bundle: Object.assign(new Bundle(), {
+      _links: { self: { href: 'self_link' } },
+    }),
+    bundleSize: 10,
+    currentPosition: 0,
+    originalPosition: 0,
+  };
+
+  describe('selectBitstreamEntry', () => {
+    it('should correctly make getSelectedBitstream$ emit', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+    }));
+
+    it('should correctly make getSelectedBitstream return the bitstream', () => {
+      expect(service.getSelectedBitstream()).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      expect(service.getSelectedBitstream()).toEqual(entry);
+    });
+
+    it('should correctly make hasSelectedBitstream return', () => {
+      expect(service.hasSelectedBitstream()).toBeFalse();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      expect(service.hasSelectedBitstream()).toBeTrue();
+    });
+
+    it('should do nothing if no entry was provided', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+      service.selectBitstreamEntry(null);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+    }));
+
+    it('should announce the selected bitstream', () => {
+      const entry = Object.assign({}, defaultEntry);
+
+      spyOn(service, 'announceSelect');
+
+      service.selectBitstreamEntry(entry);
+      expect(service.announceSelect).toHaveBeenCalledWith(entry.bitstream.name);
+    });
+  });
+
+  describe('clearSelection', () => {
+    it('should clear the selected bitstream', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+      service.clearSelection();
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[2]).toEqual({ action: 'Cleared', selectedEntry: entry });
+    }));
+
+    it('should not do anything if there is no selected bitstream', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      service.clearSelection();
+      tick();
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+    }));
+
+    it('should announce the cleared bitstream', () => {
+      const entry = Object.assign({}, defaultEntry);
+
+      spyOn(service, 'announceClear');
+      service.selectBitstreamEntry(entry);
+      service.clearSelection();
+
+      expect(service.announceClear).toHaveBeenCalledWith(entry.bitstream.name);
+    });
+
+    it('should display a notification if the selected bitstream was moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 5,
+          currentPosition: 7,
+        },
+      );
+
+      spyOn(service, 'displaySuccessNotification');
+      service.selectBitstreamEntry(entry);
+      service.clearSelection();
+
+      expect(service.displaySuccessNotification).toHaveBeenCalled();
+    });
+
+    it('should not display a notification if the selected bitstream is in its original position', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 7,
+          currentPosition: 7,
+        },
+      );
+
+      spyOn(service, 'displaySuccessNotification');
+      service.selectBitstreamEntry(entry);
+      service.clearSelection();
+
+      expect(service.displaySuccessNotification).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('cancelSelection', () => {
+    it('should clear the selected bitstream if it has not moved', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry);
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+      service.cancelSelection();
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[2]).toEqual({ action: 'Cleared', selectedEntry: entry });
+    }));
+
+    it('should cancel the selected bitstream if it has moved', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeNull();
+
+      const entry = Object.assign({}, defaultEntry, {
+        originalPosition: 0,
+        currentPosition: 3,
+      });
+
+      service.selectBitstreamEntry(entry);
+      tick();
+
+      expect(emittedActions.length).toBe(2);
+      expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+      service.cancelSelection();
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[2]).toEqual({ action: 'Cancelled', selectedEntry: entry });
+    }));
+
+    it('should announce a clear if the bitstream has not moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 7,
+          currentPosition: 7,
+        },
+      );
+
+      spyOn(service, 'announceClear');
+      spyOn(service, 'announceCancel');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.announceClear).toHaveBeenCalledWith(entry.bitstream.name);
+      expect(service.announceCancel).not.toHaveBeenCalled();
+    });
+
+    it('should announce a cancel if the bitstream has moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 5,
+          currentPosition: 7,
+        },
+      );
+
+      spyOn(service, 'announceClear');
+      spyOn(service, 'announceCancel');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.announceClear).not.toHaveBeenCalled();
+      expect(service.announceCancel).toHaveBeenCalledWith(entry.bitstream.name, entry.originalPosition);
+    });
+
+    it('should return the bitstream to its original position if it has moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 5,
+          currentPosition: 7,
+        },
+      );
+
+      spyOn(service, 'performBitstreamMoveRequest');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.performBitstreamMoveRequest).toHaveBeenCalledWith(entry.bundle, entry.currentPosition, entry.originalPosition);
+    });
+
+    it('should not move the bitstream if it has not moved', () => {
+      const entry = Object.assign({}, defaultEntry,
+        {
+          originalPosition: 7,
+          currentPosition: 7,
+        },
+      );
+
+      spyOn(service, 'performBitstreamMoveRequest');
+
+      service.selectBitstreamEntry(entry);
+      service.cancelSelection();
+
+      expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+    });
+
+    it('should not do anything if there is no selected bitstream', () => {
+      spyOn(service, 'announceClear');
+      spyOn(service, 'announceCancel');
+      spyOn(service, 'performBitstreamMoveRequest');
+
+      service.cancelSelection();
+
+      expect(service.announceClear).not.toHaveBeenCalled();
+      expect(service.announceCancel).not.toHaveBeenCalled();
+      expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('moveSelectedBitstream', () => {
+    beforeEach(() => {
+      spyOn(service, 'performBitstreamMoveRequest').and.callThrough();
+    });
+
+    describe('up', () => {
+      it('should move the selected bitstream one position up', () => {
+        const startPosition = 7;
+        const endPosition = startPosition - 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          },
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          },
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamUp();
+        expect(service.performBitstreamMoveRequest).toHaveBeenCalledWith(entry.bundle, startPosition, endPosition, jasmine.any(Function));
+        expect(service.getSelectedBitstream()).toEqual(movedEntry);
+      });
+
+      it('should emit the move', fakeAsync(() => {
+        const emittedActions = [];
+
+        service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+        expect(emittedActions.length).toBe(1);
+        expect(emittedActions[0]).toBeNull();
+
+        const startPosition = 7;
+        const endPosition = startPosition - 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          },
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          },
+        );
+
+        service.selectBitstreamEntry(entry);
+        tick();
+
+        expect(emittedActions.length).toBe(2);
+        expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+        service.moveSelectedBitstreamUp();
+        tick();
+
+        expect(emittedActions.length).toBe(3);
+        expect(emittedActions[2]).toEqual({ action: 'Moved', selectedEntry: movedEntry });
+      }));
+
+      it('should announce the move', () => {
+        const startPosition = 7;
+        const endPosition = startPosition - 1;
+
+        spyOn(service, 'announceMove');
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          },
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamUp();
+
+        expect(service.announceMove).toHaveBeenCalledWith(entry.bitstream.name, endPosition);
+      });
+
+      it('should not do anything if the bitstream is already at the top', () => {
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: 0,
+          },
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamUp();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+
+      it('should not do anything if there is no selected bitstream', () => {
+        service.moveSelectedBitstreamUp();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('down', () => {
+      it('should move the selected bitstream one position down', () => {
+        const startPosition = 7;
+        const endPosition = startPosition + 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          },
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          },
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamDown();
+        expect(service.performBitstreamMoveRequest).toHaveBeenCalledWith(entry.bundle, startPosition, endPosition, jasmine.any(Function));
+        expect(service.getSelectedBitstream()).toEqual(movedEntry);
+      });
+
+      it('should emit the move', fakeAsync(() => {
+        const emittedActions = [];
+
+        service.getSelectionAction$().subscribe(selected => emittedActions.push(selected));
+
+        expect(emittedActions.length).toBe(1);
+        expect(emittedActions[0]).toBeNull();
+
+        const startPosition = 7;
+        const endPosition = startPosition + 1;
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          },
+        );
+
+        const movedEntry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: endPosition,
+          },
+        );
+
+        service.selectBitstreamEntry(entry);
+        tick();
+
+        expect(emittedActions.length).toBe(2);
+        expect(emittedActions[1]).toEqual({ action: 'Selected', selectedEntry: entry });
+
+        service.moveSelectedBitstreamDown();
+        tick();
+
+        expect(emittedActions.length).toBe(3);
+        expect(emittedActions[2]).toEqual({ action: 'Moved', selectedEntry: movedEntry });
+      }));
+
+      it('should announce the move', () => {
+        const startPosition = 7;
+        const endPosition = startPosition + 1;
+
+        spyOn(service, 'announceMove');
+
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: startPosition,
+          },
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamDown();
+
+        expect(service.announceMove).toHaveBeenCalledWith(entry.bitstream.name, endPosition);
+      });
+
+      it('should not do anything if the bitstream is already at the bottom of the bundle', () => {
+        const entry = Object.assign({}, defaultEntry,
+          {
+            originalPosition: 5,
+            currentPosition: 9,
+          },
+        );
+
+        service.selectBitstreamEntry(entry);
+        service.moveSelectedBitstreamDown();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+
+      it('should not do anything if there is no selected bitstream', () => {
+        service.moveSelectedBitstreamDown();
+
+        expect(service.performBitstreamMoveRequest).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('performBitstreamMoveRequest', () => {
+    const bundle: Bundle = defaultEntry.bundle;
+    const from = 5;
+    const to = 7;
+    const callback = createSpy('callbackFunction');
+
+    it('should correctly create the Move request', () => {
+      const expectedOperation: MoveOperation = {
+        op: 'move',
+        from: `/_links/bitstreams/${from}/href`,
+        path: `/_links/bitstreams/${to}/href`,
+      };
+
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(bundleDataService.patch).toHaveBeenCalledWith(bundle, [expectedOperation]);
+    });
+
+    it('should correctly make the bundle\'s self link stale', () => {
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith(bundle._links.self.href);
+    });
+
+    it('should attempt to show a message should the request have failed', () => {
+      spyOn(service, 'displayFailedResponseNotifications');
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(service.displayFailedResponseNotifications).toHaveBeenCalled();
+    });
+
+    it('should correctly call the provided function once the request has finished', () => {
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      expect(callback).toHaveBeenCalled();
+    });
+
+    it('should emit at the start and end of the request', fakeAsync(() => {
+      const emittedActions = [];
+
+      service.getPerformingMoveRequest$().subscribe(selected => emittedActions.push(selected));
+
+      expect(emittedActions.length).toBe(1);
+      expect(emittedActions[0]).toBeFalse();
+
+      service.performBitstreamMoveRequest(bundle, from, to, callback);
+      tick();
+
+      expect(emittedActions.length).toBe(3);
+      expect(emittedActions[1]).toBeTrue();
+      expect(emittedActions[2]).toBeFalse();
+    }));
+  });
+
+  describe('displayNotifications', () => {
+    it('should display an error notification if a response failed', () => {
+      const responses = [
+        createFailedRemoteDataObject(),
+      ];
+
+      const key = 'some.key';
+
+      service.displayNotifications(key, responses);
+
+      expect(notificationsService.success).not.toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.failed.title');
+    });
+
+    it('should display a success notification if a response succeeded', () => {
+      const responses = [
+        createSuccessfulRemoteDataObject(undefined),
+      ];
+
+      const key = 'some.key';
+
+      service.displayNotifications(key, responses);
+
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(notificationsService.error).not.toHaveBeenCalled();
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.saved.title');
+    });
+
+    it('should display both notifications if some failed and some succeeded', () => {
+      const responses = [
+        createFailedRemoteDataObject(),
+        createSuccessfulRemoteDataObject(undefined),
+      ];
+
+      const key = 'some.key';
+
+      service.displayNotifications(key, responses);
+
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.saved.title');
+      expect(translateService.instant).toHaveBeenCalledWith('some.key.saved.title');
+    });
+  });
+
+  describe('mapBitstreamsToTableEntries', () => {
+    it('should correctly map a Bitstream to a BitstreamTableEntry', () => {
+      const format: BitstreamFormat = new BitstreamFormat();
+
+      const bitstream: Bitstream = Object.assign(new Bitstream(), {
+        uuid: 'testUUID',
+        format: createSuccessfulRemoteDataObject$(format),
+      });
+
+      spyOn(dsoNameService, 'getName').and.returnValue('Test Name');
+      spyOn(bitstream, 'firstMetadataValue').and.returnValue('description');
+
+      const tableEntry = service.mapBitstreamsToTableEntries([bitstream])[0];
+
+      expect(tableEntry.name).toEqual('Test Name');
+      expect(tableEntry.nameStripped).toEqual('TestName');
+      expect(tableEntry.bitstream).toBe(bitstream);
+      expect(tableEntry.id).toEqual('testUUID');
+      expect(tableEntry.description).toEqual('description');
+      expect(tableEntry.downloadUrl).toEqual('/bitstreams/testUUID/download');
+    });
+  });
+
+  describe('nameToHeader', () => {
+    it('should correctly transform a string to an appropriate header ID', () => {
+      const stringA = 'Test String';
+      const stringAResult = 'TestString';
+      expect(service.nameToHeader(stringA)).toEqual(stringAResult);
+
+      const stringB = 'Test String Two';
+      const stringBResult = 'TestStringTwo';
+      expect(service.nameToHeader(stringB)).toEqual(stringBResult);
+
+      const stringC = 'Test           String           Three';
+      const stringCResult = 'TestStringThree';
+      expect(service.nameToHeader(stringC)).toEqual(stringCResult);
+    });
+  });
+
+});
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
new file mode 100644
index 0000000000..eb99c214ca
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.stub.ts
@@ -0,0 +1,79 @@
+import { of } from 'rxjs';
+
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+
+export function getItemBitstreamsServiceStub(): ItemBitstreamsServiceStub {
+  return new ItemBitstreamsServiceStub();
+}
+
+export class ItemBitstreamsServiceStub {
+  getSelectionAction$ = jasmine.createSpy('getSelectedBitstream$').and
+    .returnValue(of(null));
+
+  getSelectedBitstream = jasmine.createSpy('getSelectedBitstream').and
+    .returnValue(null);
+
+  hasSelectedBitstream = jasmine.createSpy('hasSelectedBitstream').and
+    .returnValue(false);
+
+  selectBitstreamEntry = jasmine.createSpy('selectBitstreamEntry');
+
+  clearSelection = jasmine.createSpy('clearSelection');
+
+  cancelSelection = jasmine.createSpy('cancelSelection');
+
+  moveSelectedBitstreamUp = jasmine.createSpy('moveSelectedBitstreamUp');
+
+  moveSelectedBitstreamDown = jasmine.createSpy('moveSelectedBitstreamDown');
+
+  performBitstreamMoveRequest = jasmine.createSpy('performBitstreamMoveRequest');
+
+  getPerformingMoveRequest = jasmine.createSpy('getPerformingMoveRequest').and.returnValue(false);
+
+  getPerformingMoveRequest$ = jasmine.createSpy('getPerformingMoveRequest$').and.returnValue(of(false));
+
+  getInitialBundlesPaginationOptions = jasmine.createSpy('getInitialBundlesPaginationOptions').and
+    .returnValue(new PaginationComponentOptions());
+
+  getInitialBitstreamsPaginationOptions = jasmine.createSpy('getInitialBitstreamsPaginationOptions').and
+    .returnValue(new PaginationComponentOptions());
+
+  getColumnSizes = jasmine.createSpy('getColumnSizes').and
+    .returnValue(
+      new ResponsiveTableSizes([
+        new ResponsiveColumnSizes(2, 2, 3, 4, 4),
+        new ResponsiveColumnSizes(2, 3, 3, 3, 3),
+        new ResponsiveColumnSizes(2, 2, 2, 2, 2),
+        new ResponsiveColumnSizes(6, 5, 4, 3, 3),
+      ]),
+    );
+
+  displayNotifications = jasmine.createSpy('displayNotifications');
+
+  displayFailedResponseNotifications = jasmine.createSpy('displayFailedResponseNotifications');
+
+  displayErrorNotification = jasmine.createSpy('displayErrorNotification');
+
+  displaySuccessFulResponseNotifications = jasmine.createSpy('displaySuccessFulResponseNotifications');
+
+  displaySuccessNotification = jasmine.createSpy('displaySuccessNotification');
+
+  removeMarkedBitstreams = jasmine.createSpy('removeMarkedBitstreams').and
+    .returnValue(createSuccessfulRemoteDataObject$({}));
+
+  mapBitstreamsToTableEntries = jasmine.createSpy('mapBitstreamsToTableEntries').and
+    .returnValue([]);
+
+  nameToHeader = jasmine.createSpy('nameToHeader').and.returnValue('header');
+
+  stripWhiteSpace = jasmine.createSpy('stripWhiteSpace').and.returnValue('string');
+
+  announceSelect = jasmine.createSpy('announceSelect');
+
+  announceMove = jasmine.createSpy('announceMove');
+
+  announceCancel = jasmine.createSpy('announceCancel');
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
new file mode 100644
index 0000000000..2221e037fb
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.service.ts
@@ -0,0 +1,568 @@
+import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { MoveOperation } from 'fast-json-patch';
+import {
+  BehaviorSubject,
+  Observable,
+  zip as observableZip,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { getBitstreamDownloadRoute } from '../../../app-routing-paths';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
+import { LiveRegionService } from '../../../shared/live-region/live-region.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+
+export const MOVE_KEY = 'item.edit.bitstreams.notifications.move';
+
+/**
+ * Interface storing all the information necessary to create a row in the bitstream edit table
+ */
+export interface BitstreamTableEntry {
+  /**
+   * The bitstream
+   */
+  bitstream: Bitstream,
+  /**
+   * The uuid of the Bitstream
+   */
+  id: string,
+  /**
+   * The name of the Bitstream
+   */
+  name: string,
+  /**
+   * The name of the Bitstream with all whitespace removed
+   */
+  nameStripped: string,
+  /**
+   * The description of the Bitstream
+   */
+  description: string,
+  /**
+   * Observable emitting the Format of the Bitstream
+   */
+  format: Observable<BitstreamFormat>,
+  /**
+   * The download url of the Bitstream
+   */
+  downloadUrl: string,
+}
+
+/**
+ * Interface storing information necessary to highlight and reorder the selected bitstream entry
+ */
+export interface SelectedBitstreamTableEntry {
+  /**
+   * The selected entry
+   */
+  bitstream: BitstreamTableEntry,
+  /**
+   * The bundle the bitstream belongs to
+   */
+  bundle: Bundle,
+  /**
+   * The total number of bitstreams in the bundle
+   */
+  bundleSize: number,
+  /**
+   * The original position of the bitstream within the bundle.
+   */
+  originalPosition: number,
+  /**
+   * The current position of the bitstream within the bundle.
+   */
+  currentPosition: number,
+}
+
+/**
+ * Interface storing data regarding a change in selected bitstream
+ */
+export interface SelectionAction {
+  /**
+   * The different types of actions:
+   *  - Selected: Bitstream was selected
+   *  - Moved: Bitstream was moved
+   *  - Cleared: Selection was cleared, bitstream remains at its current position
+   *  - Cancelled: Selection was cancelled, bitstream returns to its original position
+   */
+  action: 'Selected' | 'Moved' | 'Cleared' | 'Cancelled'
+  /**
+   * The table entry to which the selection action applies
+   */
+  selectedEntry: SelectedBitstreamTableEntry,
+}
+
+/**
+ * This service handles the selection and updating of the bitstreams and their order on the
+ * 'Edit Item' -> 'Bitstreams' page.
+ */
+@Injectable(
+  { providedIn: 'root' },
+)
+export class ItemBitstreamsService {
+
+  /**
+   * BehaviorSubject which emits every time the selected bitstream changes.
+   */
+  protected selectionAction$: BehaviorSubject<SelectionAction> = new BehaviorSubject(null);
+
+  protected isPerformingMoveRequest: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  constructor(
+    protected notificationsService: NotificationsService,
+    protected translateService: TranslateService,
+    protected objectUpdatesService: ObjectUpdatesService,
+    protected bitstreamService: BitstreamDataService,
+    protected bundleService: BundleDataService,
+    protected dsoNameService: DSONameService,
+    protected requestService: RequestService,
+    protected liveRegionService: LiveRegionService,
+  ) {
+  }
+
+  /**
+   * Returns the observable emitting the selection actions
+   */
+  getSelectionAction$(): Observable<SelectionAction> {
+    return this.selectionAction$;
+  }
+
+  /**
+   * Returns the latest selection action
+   */
+  getSelectionAction(): SelectionAction {
+    const action = this.selectionAction$.value;
+
+    if (hasNoValue(action)) {
+      return null;
+    }
+
+    return Object.assign({}, action);
+  }
+
+  /**
+   * Returns true if there currently is a selected bitstream
+   */
+  hasSelectedBitstream(): boolean {
+    const selectionAction = this.getSelectionAction();
+
+    if (hasNoValue(selectionAction)) {
+      return false;
+    }
+
+    const action = selectionAction.action;
+
+    return action === 'Selected' || action === 'Moved';
+  }
+
+  /**
+   * Returns a copy of the currently selected bitstream
+   */
+  getSelectedBitstream(): SelectedBitstreamTableEntry {
+    if (!this.hasSelectedBitstream()) {
+      return null;
+    }
+
+    const selectionAction = this.getSelectionAction();
+    return Object.assign({}, selectionAction.selectedEntry);
+  }
+
+  /**
+   * Select the provided entry
+   */
+  selectBitstreamEntry(entry: SelectedBitstreamTableEntry) {
+    if (hasValue(entry) && entry.bitstream !== this.getSelectedBitstream()?.bitstream) {
+      this.announceSelect(entry.bitstream.name);
+      this.updateSelectionAction({ action: 'Selected', selectedEntry: entry });
+    }
+  }
+
+  /**
+   * Makes the {@link selectionAction$} observable emit the provided {@link SelectedBitstreamTableEntry}.
+   * @protected
+   */
+  protected updateSelectionAction(action: SelectionAction) {
+    this.selectionAction$.next(action);
+  }
+
+  /**
+   * Unselects the selected bitstream. Does nothing if no bitstream is selected.
+   */
+  clearSelection() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasValue(selected)) {
+      this.updateSelectionAction({ action: 'Cleared', selectedEntry: selected });
+      this.announceClear(selected.bitstream.name);
+
+      if (selected.currentPosition !== selected.originalPosition) {
+        this.displaySuccessNotification(MOVE_KEY);
+      }
+    }
+  }
+
+  /**
+   * Returns the currently selected bitstream to its original position and unselects the bitstream.
+   * Does nothing if no bitstream is selected.
+   */
+  cancelSelection() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasNoValue(selected) || this.getPerformingMoveRequest()) {
+      return;
+    }
+
+
+    const originalPosition = selected.originalPosition;
+    const currentPosition = selected.currentPosition;
+
+    // If the selected bitstream has not moved, there is no need to return it to its original position
+    if (currentPosition === originalPosition) {
+      this.announceClear(selected.bitstream.name);
+      this.updateSelectionAction({ action: 'Cleared', selectedEntry: selected });
+    } else {
+      this.announceCancel(selected.bitstream.name, originalPosition);
+      this.performBitstreamMoveRequest(selected.bundle, currentPosition, originalPosition);
+      this.updateSelectionAction({ action: 'Cancelled', selectedEntry: selected });
+    }
+  }
+
+  /**
+   * Moves the selected bitstream one position up in the bundle. Does nothing if no bitstream is selected or the
+   * selected bitstream already is at the beginning of the bundle.
+   */
+  moveSelectedBitstreamUp() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasNoValue(selected) || this.getPerformingMoveRequest()) {
+      return;
+    }
+
+    const originalPosition = selected.currentPosition;
+    if (originalPosition > 0) {
+      const newPosition = originalPosition - 1;
+      selected.currentPosition = newPosition;
+
+      const onRequestCompleted = () => {
+        this.announceMove(selected.bitstream.name, newPosition);
+      };
+
+      this.performBitstreamMoveRequest(selected.bundle, originalPosition, newPosition, onRequestCompleted);
+      this.updateSelectionAction({ action: 'Moved', selectedEntry: selected });
+    }
+  }
+
+  /**
+   * Moves the selected bitstream one position down in the bundle. Does nothing if no bitstream is selected or the
+   * selected bitstream already is at the end of the bundle.
+   */
+  moveSelectedBitstreamDown() {
+    const selected = this.getSelectedBitstream();
+
+    if (hasNoValue(selected) || this.getPerformingMoveRequest()) {
+      return;
+    }
+
+    const originalPosition = selected.currentPosition;
+    if (originalPosition < selected.bundleSize - 1) {
+      const newPosition = originalPosition + 1;
+      selected.currentPosition = newPosition;
+
+      const onRequestCompleted = () => {
+        this.announceMove(selected.bitstream.name, newPosition);
+      };
+
+      this.performBitstreamMoveRequest(selected.bundle, originalPosition, newPosition, onRequestCompleted);
+      this.updateSelectionAction({ action: 'Moved', selectedEntry: selected });
+    }
+  }
+
+  /**
+   * Sends out a Move Patch request to the REST API, display notifications,
+   * refresh the bundle's cache (so the lists can properly reload)
+   * @param bundle The bundle to send patch requests to
+   * @param fromIndex The index to move from
+   * @param toIndex The index to move to
+   * @param finish Optional: Function to execute once the response has been received
+   */
+  performBitstreamMoveRequest(bundle: Bundle, fromIndex: number, toIndex: number, finish?: () => void) {
+    if (this.getPerformingMoveRequest()) {
+      console.warn('Attempted to perform move request while previous request has not completed yet');
+      return;
+    }
+
+    const moveOperation: MoveOperation = {
+      op: 'move',
+      from: `/_links/bitstreams/${fromIndex}/href`,
+      path: `/_links/bitstreams/${toIndex}/href`,
+    };
+
+    this.announceLoading();
+    this.isPerformingMoveRequest.next(true);
+    this.bundleService.patch(bundle, [moveOperation]).pipe(
+      getFirstCompletedRemoteData(),
+      tap((response: RemoteData<Bundle>) => this.displayFailedResponseNotifications(MOVE_KEY, [response])),
+      switchMap(() => this.requestService.setStaleByHrefSubstring(bundle.self)),
+      take(1),
+    ).subscribe(() => {
+      this.isPerformingMoveRequest.next(false);
+      finish?.();
+    });
+  }
+
+  /**
+   * Whether the service currently is processing a 'move' request
+   */
+  getPerformingMoveRequest(): boolean {
+    return this.isPerformingMoveRequest.value;
+  }
+
+  /**
+   * Returns an observable which emits when the service starts, or ends, processing a 'move' request
+   */
+  getPerformingMoveRequest$(): Observable<boolean> {
+    return this.isPerformingMoveRequest;
+  }
+
+  /**
+   * Returns the pagination options to use when fetching the bundles
+   */
+  getInitialBundlesPaginationOptions(): PaginationComponentOptions {
+    return Object.assign(new PaginationComponentOptions(), {
+      id: 'bundles-pagination-options',
+      currentPage: 1,
+      pageSize: 9999,
+    });
+  }
+
+  /**
+   * Returns the initial pagination options to use when fetching the bitstreams
+   * @param bundleName The name of the bundle, will be as pagination id.
+   */
+  getInitialBitstreamsPaginationOptions(bundleName: string): PaginationComponentOptions {
+    return Object.assign(new PaginationComponentOptions(),{
+      id: bundleName, // This might behave unexpectedly if the item contains two bundles with the same name
+      currentPage: 1,
+      pageSize: 10,
+    });
+  }
+
+  /**
+   * Returns the {@link ResponsiveTableSizes} for use in the columns of the edit bitstreams table
+   */
+  getColumnSizes(): ResponsiveTableSizes {
+    return new ResponsiveTableSizes([
+      // Name column
+      new ResponsiveColumnSizes(2, 2, 3, 4, 4),
+      // Description column
+      new ResponsiveColumnSizes(2, 3, 3, 3, 3),
+      // Format column
+      new ResponsiveColumnSizes(2, 2, 2, 2, 2),
+      // Actions column
+      new ResponsiveColumnSizes(6, 5, 4, 3, 3),
+    ]);
+  }
+
+  /**
+   * Display notifications
+   * - Error notification for each failed response with their message
+   * - Success notification in case there's at least one successful response
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displayNotifications(key: string, responses: RemoteData<any>[]) {
+    this.displayFailedResponseNotifications(key, responses);
+    this.displaySuccessFulResponseNotifications(key, responses);
+  }
+
+  /**
+   * Display an error notification for each failed response with their message
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displayFailedResponseNotifications(key: string, responses: RemoteData<any>[]) {
+    const failedResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasFailed);
+    failedResponses.forEach((response: RemoteData<Bundle>) => {
+      this.displayErrorNotification(key, response.errorMessage);
+    });
+  }
+
+  /**
+   * Display an error notification with the provided key and message
+   * @param key          The i18n key for the notification messages
+   * @param errorMessage The error message to display
+   */
+  displayErrorNotification(key: string, errorMessage: string) {
+    this.notificationsService.error(this.translateService.instant(`${key}.failed.title`), errorMessage);
+  }
+
+  /**
+   * Display a success notification in case there's at least one successful response
+   * @param key       The i18n key for the notification messages
+   * @param responses The returned responses to display notifications for
+   */
+  displaySuccessFulResponseNotifications(key: string, responses: RemoteData<any>[]) {
+    const successfulResponses = responses.filter((response: RemoteData<Bundle>) => hasValue(response) && response.hasSucceeded);
+    if (successfulResponses.length > 0) {
+      this.displaySuccessNotification(key);
+    }
+  }
+
+  /**
+   * Display a success notification with the provided key
+   * @param key          The i18n key for the notification messages
+   */
+  displaySuccessNotification(key: string) {
+    this.notificationsService.success(this.translateService.instant(`${key}.saved.title`), this.translateService.instant(`${key}.saved.content`));
+  }
+
+  /**
+   * Removes the bitstreams marked for deletion from the Bundles emitted by the provided observable.
+   * @param bundles$
+   */
+  removeMarkedBitstreams(bundles$: Observable<Bundle[]>): Observable<RemoteData<NoContent>> {
+    const bundlesOnce$ = bundles$.pipe(take(1));
+
+    // Fetch all removed bitstreams from the object update service
+    const removedBitstreams$ = bundlesOnce$.pipe(
+      switchMap((bundles: Bundle[]) => observableZip(
+        ...bundles.map((bundle: Bundle) => this.objectUpdatesService.getFieldUpdates(bundle.self, [], true)),
+      )),
+      map((fieldUpdates: FieldUpdates[]) => ([] as FieldUpdate[]).concat(
+        ...fieldUpdates.map((updates: FieldUpdates) => Object.values(updates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)),
+      )),
+      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field)),
+    );
+
+    // Send out delete requests for all deleted bitstreams
+    return removedBitstreams$.pipe(
+      take(1),
+      switchMap((removedBitstreams: Bitstream[]) => {
+        return this.bitstreamService.removeMultiple(removedBitstreams);
+      }),
+    );
+  }
+
+  /**
+   * Creates an array of {@link BitstreamTableEntry}s from an array of {@link Bitstream}s
+   * @param bitstreams The bitstreams array to map to table entries
+   */
+  mapBitstreamsToTableEntries(bitstreams: Bitstream[]): BitstreamTableEntry[] {
+    return bitstreams.map((bitstream) => {
+      const name = this.dsoNameService.getName(bitstream);
+
+      return {
+        bitstream: bitstream,
+        id: bitstream.uuid,
+        name: name,
+        nameStripped: this.nameToHeader(name),
+        description: bitstream.firstMetadataValue('dc.description'),
+        format: bitstream.format.pipe(getFirstSucceededRemoteDataPayload()),
+        downloadUrl: getBitstreamDownloadRoute(bitstream),
+      };
+    });
+  }
+
+  /**
+   * Returns a string appropriate to be used as header ID
+   * @param name
+   */
+  nameToHeader(name: string): string {
+    // Whitespace is stripped from the Bitstream names for accessibility reasons.
+    // To make it clear which headers are relevant for a specific field in the table, the 'headers' attribute is used to
+    // refer to specific headers. The Bitstream's name is used as header ID for the row containing information regarding
+    // that bitstream. As the 'headers' attribute contains a space-separated string of header IDs, the Bitstream's header
+    // ID can not contain spaces itself.
+    return this.stripWhiteSpace(name);
+  }
+
+  /**
+   * Returns a string equal to the input string with all whitespace removed.
+   * @param str
+   */
+  stripWhiteSpace(str: string): string {
+    // '/\s+/g' matches all occurrences of any amount of whitespace characters
+    return str.replace(/\s+/g, '');
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name was selected.
+   * @param bitstreamName The name of the bitstream that was selected.
+   */
+  announceSelect(bitstreamName: string) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.select',
+      { bitstream: bitstreamName });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name was moved to the provided
+   * position.
+   * @param bitstreamName The name of the bitstream that moved.
+   * @param toPosition The zero-indexed position that the bitstream moved to.
+   */
+  announceMove(bitstreamName: string, toPosition: number) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.move',
+      { bitstream: bitstreamName, toIndex: toPosition + 1 });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name is no longer selected and
+   * was returned to the provided position.
+   * @param bitstreamName The name of the bitstream that is no longer selected
+   * @param toPosition The zero-indexed position the bitstream returned to.
+   */
+  announceCancel(bitstreamName: string, toPosition: number) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.cancel',
+      { bitstream: bitstreamName, toIndex: toPosition + 1 });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the bitstream with the provided name is no longer selected.
+   * @param bitstreamName The name of the bitstream that is no longer selected.
+   */
+  announceClear(bitstreamName: string) {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.clear',
+      { bitstream: bitstreamName });
+    this.liveRegionService.addMessage(message);
+  }
+
+  /**
+   * Adds a message to the live region mentioning that the
+   */
+  announceLoading() {
+    const message = this.translateService.instant('item.edit.bitstreams.edit.live.loading');
+    this.liveRegionService.addMessage(message);
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 42b9b9eb64..f55821f04f 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -1,22 +1,137 @@
 <ng-template #bundleView>
-  <div class="row bundle-row">
-    <div class="{{bundleNameColumn.buildClasses()}} font-weight-bold row-element d-flex">
-      <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
-      <div class="float-left d-flex align-items-center">
-        {{'item.edit.bitstreams.bundle.name' | translate:{ name: dsoNameService.getName(bundle) } }}
-      </div>
-    </div>
-    <div class="{{columnSizes.columns[3].buildClasses()}} text-center row-element">
-      <div class="btn-group bundle-action-buttons">
-        <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
-                [queryParams]="{bundle: bundle.id}"
-                [attr.aria-label]="'item.edit.bitstreams.bundle.edit.buttons.upload' | translate"
-                class="btn btn-outline-success btn-sm"
-                title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
-          <i class="fas fa-upload fa-fw"></i>
-        </button>
-      </div>
-    </div>
-  </div>
-  <ds-paginated-drag-and-drop-bitstream-list [bundle]="bundle" [columnSizes]="columnSizes" (dropObject)="dropObject.emit($event)"></ds-paginated-drag-and-drop-bitstream-list>
+
+  @if ((bitstreamsRD$ | async)?.payload; as bitstreamsList) {
+    <ds-pagination
+      [hideGear]="true"
+      [hidePagerWhenSinglePage]="true"
+      [hidePaginationDetail]="true"
+      [paginationOptions]="paginationOptions"
+      [collectionSize]="bitstreamsList.totalElements"
+      [retainScrollPosition]="true"
+      [ngbTooltip]="'item.edit.bitstreams.bundle.tooltip' | translate" placement="bottom"
+      [autoClose]="false" triggers="manual" #dragTooltip="ngbTooltip">
+      @if ((updates$ | async); as updates) {
+        <table class="table" [class.mt-n1]="!isFirstTable"
+          [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
+          <thead [class.visually-hidden]="!isFirstTable">
+            <tr class="header-row font-weight-bold">
+              <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
+                {{'item.edit.bitstreams.headers.name' | translate}}
+              </th>
+              <th id="description" scope="col" class="{{ columnSizes.columns[1].buildClasses() }}">
+                {{'item.edit.bitstreams.headers.description' | translate}}
+              </th>
+              <th id="format" scope="col" class="{{ columnSizes.columns[2].buildClasses() }}">
+                {{'item.edit.bitstreams.headers.format' | translate}}
+              </th>
+              <th id="actions" scope="col" class="{{ columnSizes.columns[3].buildClasses() }} text-center">
+                {{'item.edit.bitstreams.headers.actions' | translate}}
+              </th>
+            </tr>
+          </thead>
+          <tbody cdkDropList (cdkDropListDropped)="drop($event)">
+            <tr class="bundle-row">
+              <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
+                {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
+              </th>
+              <td class="text-center">
+                <div class="btn-group">
+                  <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
+                    [queryParams]="{bundle: bundle.id}"
+                    [attr.aria-label]="'item.edit.bitstreams.bundle.edit.buttons.upload' | translate"
+                    class="btn btn-outline-success btn-sm"
+                    title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
+                    <i class="fas fa-upload fa-fw"></i>
+                  </button>
+                  <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0"
+                    placement="bottom-right">
+                    <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle
+                      [title]="'pagination.options.description' | translate"
+                      [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true"
+                      aria-expanded="false">
+                      <i class="fas fa-cog" aria-hidden="true"></i>
+                    </button>
+                    <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu"
+                      ngbDropdownMenu>
+                      <li role="menuitem">
+                        <span class="dropdown-header" id="pagination-control_results-per-page"
+                        role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+                        <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                          @for (size of paginationOptions.pageSizeOptions; track size) {
+                            <li role="option"
+                              [attr.aria-selected]="size === (pageSize$ | async)">
+                              <button (click)="doPageSizeChange(size)" class="dropdown-item">
+                                <i [ngClass]="{'invisible': size !== (pageSize$ | async) }" class="fas fa-check"
+                                aria-hidden="true"></i> {{size}}
+                              </button>
+                            </li>
+                          }
+                        </ul>
+                      </li>
+                    </ul>
+                  </div>
+                </div>
+              </td>
+            </tr>
+            @for (entry of (tableEntries$ | async); track entry) {
+              @if (updates[entry.id]; as update) {
+                <tr [ngClass]="getRowClass(update, entry)" class="bitstream-row" cdkDrag
+                  (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
+                  <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
+                    scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
+                    <div class="drag-handle text-muted float-left p-1 mr-2 d-inline" tabindex="0" cdkDragHandle
+                      (keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
+                      <i class="fas fa-grip-vertical fa-fw"
+                      [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
+                    </div>
+                    {{ entry.name }}
+                  </th>
+                  <td class="row-element {{ columnSizes.columns[1].buildClasses() }}"
+                    headers="{{ entry.nameStripped }} {{ bundleName }} description">
+                    {{ entry.description }}
+                  </td>
+                  <td class="row-element {{ columnSizes.columns[2].buildClasses() }}"
+                    headers="{{ entry.nameStripped }} {{ bundleName }} format">
+                    {{ (entry.format | async)?.shortDescription }}
+                  </td>
+                  <td class="row-element {{ columnSizes.columns[3].buildClasses() }}"
+                    headers="{{ entry.nameStripped }} {{ bundleName }} actions">
+                    <div class="text-center w-100">
+                      <div class="btn-group relationship-action-buttons">
+                        <a [href]="entry.downloadUrl"
+                          [attr.aria-label]="'item.edit.bitstreams.edit.buttons.download' | translate"
+                          class="btn btn-outline-primary btn-sm"
+                          title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
+                          [attr.data-test]="'download-button' | dsBrowserOnly">
+                          <i class="fas fa-download fa-fw"></i>
+                        </a>
+                        <button [routerLink]="['/bitstreams/', entry.id, 'edit']" class="btn btn-outline-primary btn-sm"
+                          [attr.aria-label]="'item.edit.bitstreams.edit.buttons.edit' | translate"
+                          title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
+                          <i class="fas fa-edit fa-fw"></i>
+                        </button>
+                        <button [dsBtnDisabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
+                          [attr.aria-label]=" 'item. edit bitstreams.edit.buttons.remove' | translate"
+                          class="btn btn-outline-danger btn-sm"
+                          title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
+                          <i class="fas fa-trash-alt fa-fw"></i>
+                        </button>
+                        <button [dsBtnDisabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
+                          [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
+                          class="btn btn-outline-warning btn-sm"
+                          title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
+                          <i class="fas fa-undo-alt fa-fw"></i>
+                        </button>
+                      </div>
+                    </div>
+                  </td>
+                </tr>
+              }
+            }
+          </tbody>
+        </table>
+      }
+    </ds-pagination>
+  }
+
 </ng-template>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
new file mode 100644
index 0000000000..1947119f24
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.scss
@@ -0,0 +1,27 @@
+.header-row {
+  & > th {
+    padding: .75rem;
+  }
+  --bs-table-bg: var(--bs-dark);
+  --bs-table-bg-state: var(--bs-dark);
+  --bs-table-color-state: var(--bs-light);
+}
+
+.bundle-row {
+  --bs-table-color-state: var(--bs-dark);
+  --bs-table-bg: var(--bs-light-bg-subtle);
+  --bs-table-bg-state: var(--bs-light-bg-subtle);
+}
+
+.row-element {
+  padding: 0.75em;
+  border-bottom: var(--bs-table-border-width) solid var(--bs-table-border-color);
+}
+
+.bitstream-name {
+  font-weight: normal;
+}
+
+.table {
+  margin-bottom: 0;
+}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
index d39f9eb265..bd99b29c47 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.spec.ts
@@ -1,3 +1,4 @@
+import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import {
   NO_ERRORS_SCHEMA,
   ViewContainerRef,
@@ -8,11 +9,35 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
+import {
+  of as observableOf,
+  of,
+  Subject,
+} from 'rxjs';
 
+import { BundleDataService } from '../../../../core/data/bundle-data.service';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { Item } from '../../../../core/shared/item.model';
+import { getMockRequestService } from '../../../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import {
+  BitstreamTableEntry,
+  ItemBitstreamsService,
+  SelectedBitstreamTableEntry,
+} from '../item-bitstreams.service';
+import {
+  getItemBitstreamsServiceStub,
+  ItemBitstreamsServiceStub,
+} from '../item-bitstreams.service.stub';
 import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle.component';
 
 describe('ItemEditBitstreamBundleComponent', () => {
@@ -39,9 +64,32 @@ describe('ItemEditBitstreamBundleComponent', () => {
     },
   });
 
+  const restEndpoint = 'fake-rest-endpoint';
+  const bundleService = jasmine.createSpyObj('bundleService', {
+    getBitstreamsEndpoint: observableOf(restEndpoint),
+    getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+  });
+
+  let objectUpdatesService: any;
+  let itemBitstreamsService: ItemBitstreamsServiceStub;
+
   beforeEach(waitForAsync(() => {
+    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
+      initialize: undefined,
+      getFieldUpdatesExclusive: of(null),
+    });
+
+    itemBitstreamsService = getItemBitstreamsServiceStub();
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), ItemEditBitstreamBundleComponent],
+      providers: [
+        { provide: BundleDataService, useValue: bundleService },
+        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
+        { provide: PaginationService, useValue: new PaginationServiceStub() },
+        { provide: RequestService, useValue: getMockRequestService() },
+        { provide: ItemBitstreamsService, useValue: itemBitstreamsService },
+      ],
       schemas: [
         NO_ERRORS_SCHEMA,
       ],
@@ -62,4 +110,251 @@ describe('ItemEditBitstreamBundleComponent', () => {
   it('should create an embedded view of the component', () => {
     expect(viewContainerRef.createEmbeddedView).toHaveBeenCalled();
   });
+
+  describe('on selected entry change', () => {
+    let paginationComponent: any;
+    let testSubject: Subject<SelectedBitstreamTableEntry> = new Subject();
+
+    beforeEach(() => {
+      paginationComponent = jasmine.createSpyObj('paginationComponent', {
+        doPageChange: undefined,
+      });
+      comp.paginationComponent = paginationComponent;
+
+      spyOn<any>(comp, 'getCurrentPageSize').and.returnValue(2);
+    });
+
+    it('should move to the page the selected entry is on if were not on that page', () => {
+
+      const entry: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 1,
+        currentPosition: 2,
+      };
+
+      comp.handleSelectionAction({ action: 'Moved', selectedEntry: entry });
+      expect(paginationComponent.doPageChange).toHaveBeenCalledWith(2);
+    });
+
+    it('should not change page when we are already on the correct page', () => {
+      const entry: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 0,
+        currentPosition: 1,
+      };
+
+      comp.handleSelectionAction({ action: 'Moved', selectedEntry: entry });
+      expect(paginationComponent.doPageChange).not.toHaveBeenCalled();
+    });
+
+    it('should change to the original page when cancelling', () => {
+      const entry: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 3,
+        currentPosition: 0,
+      };
+
+      comp.handleSelectionAction({ action: 'Cancelled', selectedEntry: entry });
+      expect(paginationComponent.doPageChange).toHaveBeenCalledWith(2);
+    });
+
+    it('should not change page when we are already on the correct page when cancelling', () => {
+      const entry: SelectedBitstreamTableEntry = {
+        bitstream: null,
+        bundle: bundle,
+        bundleSize: 5,
+        originalPosition: 0,
+        currentPosition: 3,
+      };
+
+      comp.handleSelectionAction({ action: 'Cancelled', selectedEntry: entry });
+      expect(paginationComponent.doPageChange).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('getRowClass', () => {
+    it('should return \'table-info\' when the bitstream is the selected bitstream', () => {
+      itemBitstreamsService.getSelectedBitstream.and.returnValue({
+        bitstream: { id: 'bitstream-id' },
+      });
+
+      const bitstreamEntry = {
+        id: 'bitstream-id',
+      } as BitstreamTableEntry;
+
+      expect(comp.getRowClass(undefined, bitstreamEntry)).toEqual('table-info');
+    });
+
+    it('should return \'table-warning\' when the update is of type \'UPDATE\'', () => {
+      const update = {
+        changeType: FieldChangeType.UPDATE,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('table-warning');
+    });
+
+    it('should return \'table-success\' when the update is of type \'ADD\'', () => {
+      const update = {
+        changeType: FieldChangeType.ADD,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('table-success');
+    });
+
+    it('should return \'table-danger\' when the update is of type \'REMOVE\'', () => {
+      const update = {
+        changeType: FieldChangeType.REMOVE,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('table-danger');
+    });
+
+    it('should return \'bg-white\' in any other case', () => {
+      const update = {
+        changeType: undefined,
+      } as FieldUpdate;
+
+      expect(comp.getRowClass(update, undefined)).toEqual('bg-white');
+    });
+  });
+
+  describe('drag', () => {
+    let dragTooltip;
+    let paginationComponent;
+
+    beforeEach(() => {
+      dragTooltip = jasmine.createSpyObj('dragTooltip', {
+        open: undefined,
+        close: undefined,
+      });
+      comp.dragTooltip = dragTooltip;
+    });
+
+    describe('Start', () => {
+      it('should open the tooltip when there are multiple pages', () => {
+        paginationComponent = jasmine.createSpyObj('paginationComponent', {
+          doPageChange: undefined,
+        }, {
+          shouldShowBottomPager: of(true),
+        });
+        comp.paginationComponent = paginationComponent;
+
+        comp.dragStart();
+        expect(dragTooltip.open).toHaveBeenCalled();
+      });
+
+      it('should not open the tooltip when there is only a single page', () => {
+        paginationComponent = jasmine.createSpyObj('paginationComponent', {
+          doPageChange: undefined,
+        }, {
+          shouldShowBottomPager: of(false),
+        });
+        comp.paginationComponent = paginationComponent;
+
+        comp.dragStart();
+        expect(dragTooltip.open).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('end', () => {
+      it('should always close the tooltip', () => {
+        paginationComponent = jasmine.createSpyObj('paginationComponent', {
+          doPageChange: undefined,
+        }, {
+          shouldShowBottomPager: of(false),
+        });
+        comp.paginationComponent = paginationComponent;
+
+        comp.dragEnd();
+        expect(dragTooltip.close).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('drop', () => {
+    it('should correctly move the bitstream on drop', () => {
+      const event = {
+        previousIndex: 1,
+        currentIndex: 8,
+        dropPoint: { x: 100, y: 200 },
+      } as CdkDragDrop<any>;
+
+      comp.drop(event);
+      expect(itemBitstreamsService.performBitstreamMoveRequest).toHaveBeenCalledWith(jasmine.any(Bundle), 1, 8, jasmine.any(Function));
+    });
+
+    it('should not move the bitstream if dropped in the same place', () => {
+      const event = {
+        previousIndex: 1,
+        currentIndex: 1,
+        dropPoint: { x: 100, y: 200 },
+      } as CdkDragDrop<any>;
+
+      comp.drop(event);
+      expect(itemBitstreamsService.performBitstreamMoveRequest).not.toHaveBeenCalled();
+    });
+
+    it('should move to a different page if dropped on a page number', () => {
+      spyOn(document, 'elementFromPoint').and.returnValue({
+        textContent: '2',
+        classList: { contains: (token: string) => true },
+      } as Element);
+
+      const event = {
+        previousIndex: 1,
+        currentIndex: 1,
+        dropPoint: { x: 100, y: 200 },
+      } as CdkDragDrop<any>;
+
+      comp.drop(event);
+      expect(itemBitstreamsService.performBitstreamMoveRequest).toHaveBeenCalledWith(jasmine.any(Bundle), 1, 20, jasmine.any(Function));
+    });
+  });
+
+  describe('select', () => {
+    it('should select the bitstream', () => {
+      const event = new KeyboardEvent('keydown');
+      spyOnProperty(event, 'repeat', 'get').and.returnValue(false);
+
+      const entry = { } as BitstreamTableEntry;
+      comp.tableEntries$.next([entry]);
+
+      comp.select(event, entry);
+      expect(itemBitstreamsService.selectBitstreamEntry).toHaveBeenCalledWith(jasmine.objectContaining({ bitstream: entry }));
+    });
+
+    it('should cancel the selection if the bitstream already is selected', () => {
+      const event = new KeyboardEvent('keydown');
+      spyOnProperty(event, 'repeat', 'get').and.returnValue(false);
+
+      const entry = { } as BitstreamTableEntry;
+      comp.tableEntries$.next([entry]);
+
+      itemBitstreamsService.getSelectedBitstream.and.returnValue({ bitstream: entry });
+
+      comp.select(event, entry);
+      expect(itemBitstreamsService.selectBitstreamEntry).not.toHaveBeenCalled();
+      expect(itemBitstreamsService.cancelSelection).toHaveBeenCalled();
+    });
+
+    it('should not do anything if the user is holding down the select key', () => {
+      const event = new KeyboardEvent('keydown');
+      spyOnProperty(event, 'repeat', 'get').and.returnValue(true);
+
+      const entry = { } as BitstreamTableEntry;
+      comp.tableEntries$.next([entry]);
+
+      itemBitstreamsService.getSelectedBitstream.and.returnValue({ bitstream: entry });
+
+      comp.select(event, entry);
+      expect(itemBitstreamsService.selectBitstreamEntry).not.toHaveBeenCalled();
+      expect(itemBitstreamsService.cancelSelection).not.toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
index 60654108c9..969a971ce9 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.ts
@@ -1,34 +1,90 @@
+import {
+  CdkDrag,
+  CdkDragDrop,
+  CdkDropList,
+} from '@angular/cdk/drag-drop';
+import { CommonModule } from '@angular/common';
 import {
   Component,
-  EventEmitter,
   Input,
   OnDestroy,
   OnInit,
-  Output,
   ViewChild,
   ViewContainerRef,
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
+import {
+  NgbDropdownModule,
+  NgbTooltipModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+  shareReplay,
+  Subscription,
+  switchMap,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+  tap,
+} from 'rxjs/operators';
+import { PaginatedList } from 'src/app/core/data/paginated-list.model';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { Bitstream } from 'src/app/core/shared/bitstream.model';
 
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { BundleDataService } from '../../../../core/data/bundle-data.service';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
+import { FieldUpdates } from '../../../../core/data/object-updates/field-updates.model';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { Item } from '../../../../core/shared/item.model';
+import {
+  getAllSucceededRemoteData,
+  paginatedListToArray,
+} from '../../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../../shared/empty.util';
+import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
 import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { PaginatedSearchOptions } from '../../../../shared/search/models/paginated-search-options.model';
+import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
 import { getItemPageRoute } from '../../../item-page-routing-paths';
-import { ItemEditBitstreamDragHandleComponent } from '../item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
-import { PaginatedDragAndDropBitstreamListComponent } from './paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component';
+import {
+  BitstreamTableEntry,
+  ItemBitstreamsService,
+  MOVE_KEY,
+  SelectedBitstreamTableEntry,
+  SelectionAction,
+} from '../item-bitstreams.service';
 
 @Component({
   selector: 'ds-item-edit-bitstream-bundle',
-  styleUrls: ['../item-bitstreams.component.scss'],
+  styleUrls: ['../item-bitstreams.component.scss', './item-edit-bitstream-bundle.component.scss'],
   templateUrl: './item-edit-bitstream-bundle.component.html',
   imports: [
-    PaginatedDragAndDropBitstreamListComponent,
+    CommonModule,
     TranslateModule,
     RouterLink,
-    ItemEditBitstreamDragHandleComponent,
+    PaginationComponent,
+    NgbTooltipModule,
+    CdkDropList,
+    NgbDropdownModule,
+    CdkDrag,
+    BrowserOnlyPipe,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
@@ -38,12 +94,23 @@ import { PaginatedDragAndDropBitstreamListComponent } from './paginated-drag-and
  * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream-bundle element)
  */
 export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
+  protected readonly FieldChangeType = FieldChangeType;
 
   /**
    * The view on the bundle information and bitstreams
    */
   @ViewChild('bundleView', { static: true }) bundleView;
 
+  /**
+   * The view on the pagination component
+   */
+  @ViewChild(PaginationComponent) paginationComponent: PaginationComponent;
+
+  /**
+   * The view on the drag tooltip
+   */
+  @ViewChild('dragTooltip') dragTooltip;
+
   /**
    * The bundle to display bitstreams for
    */
@@ -60,11 +127,9 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
   @Input() columnSizes: ResponsiveTableSizes;
 
   /**
-   * Send an event when the user drops an object on the pagination
-   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
-   * not just within a single page)
+   * Whether this is the first in a series of bundle tables
    */
-  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
+  @Input() isFirstTable = false;
 
   /**
    * The bootstrap sizes used for the Bundle Name column
@@ -77,9 +142,65 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
    */
   itemPageRoute: string;
 
+  /**
+   * The name of the bundle
+   */
+  bundleName: string;
+
+  /**
+   * The number of bitstreams in the bundle
+   */
+  bundleSize: number;
+
+  /**
+   * The bitstreams to show in the table
+   */
+  bitstreamsRD$: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+  /**
+   * The data to show in the table
+   */
+  tableEntries$: BehaviorSubject<BitstreamTableEntry[]> = new BehaviorSubject([]);
+
+  /**
+   * The initial page options to use for fetching the bitstreams
+   */
+  paginationOptions: PaginationComponentOptions;
+
+  /**
+   * The current page options
+   */
+  currentPaginationOptions$: BehaviorSubject<PaginationComponentOptions>;
+
+  /**
+   * The currently selected page size
+   */
+  pageSize$: BehaviorSubject<number>;
+
+  /**
+   * The self url of the bundle, also used when retrieving fieldUpdates
+   */
+  bundleUrl: string;
+
+  /**
+   * The updates to the current bitstreams
+   */
+  updates$: BehaviorSubject<FieldUpdates> = new BehaviorSubject(null);
+
+  /**
+   * Array containing all subscriptions created by this component
+   */
+  subscriptions: Subscription[] = [];
+
+
   constructor(
     protected viewContainerRef: ViewContainerRef,
     public dsoNameService: DSONameService,
+    protected bundleService: BundleDataService,
+    protected objectUpdatesService: ObjectUpdatesService,
+    protected paginationService: PaginationService,
+    protected requestService: RequestService,
+    protected itemBitstreamsService: ItemBitstreamsService,
   ) {
   }
 
@@ -87,10 +208,384 @@ export class ItemEditBitstreamBundleComponent implements OnInit, OnDestroy {
     this.bundleNameColumn = this.columnSizes.combineColumns(0, 2);
     this.viewContainerRef.createEmbeddedView(this.bundleView);
     this.itemPageRoute = getItemPageRoute(this.item);
+    this.bundleName = this.dsoNameService.getName(this.bundle);
+    this.bundleUrl = this.bundle.self;
+
+    this.initializePagination();
+    this.initializeBitstreams();
+    this.initializeSelectionActions();
   }
 
-  ngOnDestroy(): void {
+  ngOnDestroy() {
     this.viewContainerRef.clear();
+    this.subscriptions.forEach(sub => sub?.unsubscribe());
+  }
+
+  protected initializePagination() {
+    this.paginationOptions = this.itemBitstreamsService.getInitialBitstreamsPaginationOptions(this.bundleName);
+
+    this.currentPaginationOptions$ = new BehaviorSubject(this.paginationOptions);
+    this.pageSize$ = new BehaviorSubject(this.paginationOptions.pageSize);
+
+    this.subscriptions.push(
+      this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions)
+        .subscribe((pagination) => {
+          this.currentPaginationOptions$.next(pagination);
+          this.pageSize$.next(pagination.pageSize);
+        }),
+    );
+
+  }
+
+  protected initializeBitstreams() {
+    this.bitstreamsRD$ = this.currentPaginationOptions$.pipe(
+      switchMap((page: PaginationComponentOptions) => {
+        const paginatedOptions = new PaginatedSearchOptions({ pagination: Object.assign({}, page) });
+        return this.bundleService.getBitstreamsEndpoint(this.bundle.id, paginatedOptions).pipe(
+          switchMap((href) => this.requestService.hasByHref$(href)),
+          switchMap(() => this.bundleService.getBitstreams(
+            this.bundle.id,
+            paginatedOptions,
+            followLink('format'),
+          )),
+        );
+      }),
+      getAllSucceededRemoteData(),
+      shareReplay({ bufferSize: 1, refCount: true }),
+    );
+
+    this.subscriptions.push(
+      this.bitstreamsRD$.pipe(
+        take(1),
+        tap(bitstreamsRD => this.bundleSize = bitstreamsRD.payload.totalElements),
+        paginatedListToArray(),
+      ).subscribe((bitstreams) => {
+        this.objectUpdatesService.initialize(this.bundleUrl, bitstreams, new Date());
+      }),
+
+      this.bitstreamsRD$.pipe(
+        paginatedListToArray(),
+        switchMap((bitstreams) => this.objectUpdatesService.getFieldUpdatesExclusive(this.bundleUrl, bitstreams)),
+      ).subscribe((updates) => this.updates$.next(updates)),
+
+      this.bitstreamsRD$.pipe(
+        paginatedListToArray(),
+        map((bitstreams) => this.itemBitstreamsService.mapBitstreamsToTableEntries(bitstreams)),
+      ).subscribe((tableEntries) => this.tableEntries$.next(tableEntries)),
+    );
+  }
+
+  protected initializeSelectionActions() {
+    this.subscriptions.push(
+      this.itemBitstreamsService.getSelectionAction$().subscribe(
+        selectionAction => this.handleSelectionAction(selectionAction)),
+    );
+  }
+
+  /**
+   * Handles a change in selected bitstream by changing the pagination if the change happened on a different page
+   * @param selectionAction
+   */
+  handleSelectionAction(selectionAction: SelectionAction) {
+    if (hasNoValue(selectionAction) || selectionAction.selectedEntry.bundle !== this.bundle) {
+      return;
+    }
+
+    if (selectionAction.action === 'Moved') {
+      // If the currently selected bitstream belongs to this bundle, it has possibly moved to a different page.
+      // In that case we want to change the pagination to the new page.
+      this.redirectToCurrentPage(selectionAction.selectedEntry);
+    }
+
+    if (selectionAction.action === 'Cancelled') {
+      // If the selection is cancelled (and returned to its original position), it is possible the previously selected
+      // bitstream is returned to a different page. In that case we want to change the pagination to the place where
+      // the bitstream was returned to.
+      this.redirectToOriginalPage(selectionAction.selectedEntry);
+    }
+
+    if (selectionAction.action === 'Cleared') {
+      // If the selection is cleared, it is possible the previously selected bitstream is on a different page. In that
+      // case we want to change the pagination to the place where the bitstream is.
+      this.redirectToCurrentPage(selectionAction.selectedEntry);
+    }
+  }
+
+  /**
+   * Redirect the user to the current page of the provided bitstream if it is on a different page.
+   * @param bitstreamEntry The entry that the current position will be taken from to determine the page to move to
+   * @protected
+   */
+  protected redirectToCurrentPage(bitstreamEntry: SelectedBitstreamTableEntry) {
+    const currentPage = this.getCurrentPage();
+    const selectedEntryPage = this.bundleIndexToPage(bitstreamEntry.currentPosition);
+
+    if (currentPage !== selectedEntryPage) {
+      this.changeToPage(selectedEntryPage);
+    }
+  }
+
+  /**
+   * Redirect the user to the original page of the provided bitstream if it is on a different page.
+   * @param bitstreamEntry The entry that the original position will be taken from to determine the page to move to
+   * @protected
+   */
+  protected redirectToOriginalPage(bitstreamEntry: SelectedBitstreamTableEntry) {
+    const currentPage = this.getCurrentPage();
+    const originPage = this.bundleIndexToPage(bitstreamEntry.originalPosition);
+
+    if (currentPage !== originPage) {
+      this.changeToPage(originPage);
+    }
+  }
+
+  /**
+   * Check if a user should be allowed to remove this field
+   */
+  canRemove(fieldUpdate: FieldUpdate): boolean {
+    return fieldUpdate.changeType !== FieldChangeType.REMOVE;
+  }
+
+  /**
+   * Check if a user should be allowed to cancel the update to this field
+   */
+  canUndo(fieldUpdate: FieldUpdate): boolean {
+    return fieldUpdate.changeType >= FieldChangeType.UPDATE;
+  }
+
+  /**
+   * Sends a new remove update for this field to the object updates service
+   */
+  remove(bitstream: Bitstream): void {
+    this.objectUpdatesService.saveRemoveFieldUpdate(this.bundleUrl, bitstream);
+  }
+
+  /**
+   * Cancels the current update for this field in the object updates service
+   */
+  undo(bitstream: Bitstream): void {
+    this.objectUpdatesService.removeSingleFieldUpdate(this.bundleUrl, bitstream.uuid);
+  }
+
+  /**
+   * Returns the css class for a table row depending on the state of the table entry.
+   * @param update
+   * @param bitstream
+   */
+  getRowClass(update: FieldUpdate, bitstream: BitstreamTableEntry): string {
+    const selected = this.itemBitstreamsService.getSelectedBitstream();
+
+    if (hasValue(selected) && bitstream.id === selected.bitstream.id) {
+      return 'table-info';
+    }
+
+    switch (update.changeType) {
+      case FieldChangeType.UPDATE:
+        return 'table-warning';
+      case FieldChangeType.ADD:
+        return 'table-success';
+      case FieldChangeType.REMOVE:
+        return 'table-danger';
+      default:
+        return 'bg-white';
+    }
+  }
+
+  /**
+   * Changes the page size to the provided page size.
+   * @param pageSize
+   */
+  public doPageSizeChange(pageSize: number) {
+    this.paginationComponent.doPageSizeChange(pageSize);
+  }
+
+  /**
+   * Handles start of dragging by opening the tooltip mentioning that it is possible to drag a bitstream to a different
+   * page by dropping it on the page number, only if there are multiple pages.
+   */
+  dragStart() {
+    // Only open the drag tooltip when there are multiple pages
+    this.paginationComponent.shouldShowBottomPager.pipe(
+      take(1),
+      filter((hasMultiplePages) => hasMultiplePages),
+    ).subscribe(() => {
+      this.dragTooltip.open();
+    });
+  }
+
+  /**
+   * Handles end of dragging by closing the tooltip.
+   */
+  dragEnd() {
+    this.dragTooltip.close();
+  }
+
+  /**
+   * Handles dropping by calculation the target position, and changing the page if the bitstream was dropped on a
+   * different page.
+   * @param event
+   */
+  drop(event: CdkDragDrop<any>) {
+    const dragIndex = event.previousIndex;
+    let dropIndex = event.currentIndex;
+    const dragPage = this.getCurrentPage();
+    let dropPage = this.getCurrentPage();
+
+    // Check if the user is hovering over any of the pagination's pages at the time of dropping the object
+    const droppedOnElement = document.elementFromPoint(event.dropPoint.x, event.dropPoint.y);
+    if (hasValue(droppedOnElement) && hasValue(droppedOnElement.textContent) && droppedOnElement.classList.contains('page-link')) {
+      // The user is hovering over a page, fetch the page's number from the element
+      let droppedPage = Number(droppedOnElement.textContent);
+      if (hasValue(droppedPage) && !Number.isNaN(droppedPage)) {
+        droppedPage -= 1;
+
+        if (droppedPage !== dragPage) {
+          dropPage = droppedPage;
+
+          if (dropPage > dragPage) {
+            // When moving to later page, place bitstream at the top
+            dropIndex = 0;
+          } else {
+            // When moving to earlier page, place bitstream at the bottom
+            dropIndex = this.getCurrentPageSize() - 1;
+          }
+        }
+      }
+    }
+
+    const fromIndex = this.pageIndexToBundleIndex(dragIndex, dragPage);
+    const toIndex = this.pageIndexToBundleIndex(dropIndex, dropPage);
+
+    if (fromIndex === toIndex) {
+      return;
+    }
+
+    const selectedBitstream = this.tableEntries$.value[dragIndex];
+
+    const finish = () => {
+      this.itemBitstreamsService.announceMove(selectedBitstream.name, toIndex);
+
+      if (dropPage !== this.getCurrentPage()) {
+        this.changeToPage(dropPage);
+      }
+
+      this.itemBitstreamsService.displaySuccessNotification(MOVE_KEY);
+    };
+
+    this.itemBitstreamsService.performBitstreamMoveRequest(this.bundle, fromIndex, toIndex, finish);
+  }
+
+  /**
+   * Handles a select action for the provided bitstream entry.
+   * If the selected bitstream is currently selected, the selection is cleared.
+   * If no, or a different bitstream, is selected, the provided bitstream becomes the selected bitstream.
+   * @param event The event that triggered the select action
+   * @param bitstream The bitstream that is the target of the select action
+   */
+  select(event: UIEvent, bitstream: BitstreamTableEntry) {
+    event.preventDefault();
+
+    if (event instanceof KeyboardEvent && event.repeat) {
+      // Don't handle hold events, otherwise it would change rapidly between being selected and unselected
+      return;
+    }
+
+    const selectedBitstream = this.itemBitstreamsService.getSelectedBitstream();
+
+    if (hasValue(selectedBitstream) && selectedBitstream.bitstream === bitstream) {
+      this.itemBitstreamsService.cancelSelection();
+    } else {
+      const selectionObject = this.createBitstreamSelectionObject(bitstream);
+
+      if (hasNoValue(selectionObject)) {
+        console.warn('Failed to create selection object');
+        return;
+      }
+
+      this.itemBitstreamsService.selectBitstreamEntry(selectionObject);
+    }
+  }
+
+  /**
+   * Creates a {@link SelectedBitstreamTableEntry} from the provided {@link BitstreamTableEntry} so it can be given
+   * to the {@link ItemBitstreamsService} to select the table entry.
+   * @param bitstream The table entry to create the selection object from.
+   * @protected
+   */
+  protected createBitstreamSelectionObject(bitstream: BitstreamTableEntry): SelectedBitstreamTableEntry {
+    const pageIndex = this.findBitstreamPageIndex(bitstream);
+
+    if (pageIndex === -1) {
+      return null;
+    }
+
+    const position = this.pageIndexToBundleIndex(pageIndex, this.getCurrentPage());
+
+    return {
+      bitstream: bitstream,
+      bundle: this.bundle,
+      bundleSize: this.bundleSize,
+      currentPosition: position,
+      originalPosition: position,
+    };
+  }
+
+  /**
+   * Returns the index of the provided {@link BitstreamTableEntry} relative to the current page
+   * If the current page size is 10, it will return a value from 0 to 9 (inclusive)
+   * Returns -1 if the provided bitstream could not be found
+   * @protected
+   */
+  protected findBitstreamPageIndex(bitstream: BitstreamTableEntry): number {
+    const entries = this.tableEntries$.value;
+    return entries.findIndex(entry => entry === bitstream);
+  }
+
+  /**
+   * Returns the current zero-indexed page
+   * @protected
+   */
+  protected getCurrentPage(): number {
+    // The pagination component uses one-based numbering while zero-based numbering is more convenient for calculations
+    return this.currentPaginationOptions$.value.currentPage - 1;
+  }
+
+  /**
+   * Returns the current page size
+   * @protected
+   */
+  protected getCurrentPageSize(): number {
+    return this.currentPaginationOptions$.value.pageSize;
+  }
+
+  /**
+   * Converts an index relative to the page to an index relative to the bundle
+   * @param index The index relative to the page
+   * @param page  The zero-indexed page number
+   * @protected
+   */
+  protected pageIndexToBundleIndex(index: number, page: number) {
+    return page * this.getCurrentPageSize() + index;
+  }
+
+  /**
+   * Calculates the zero-indexed page number from the index relative to the bundle
+   * @param index The index relative to the bundle
+   * @protected
+   */
+  protected bundleIndexToPage(index: number) {
+    return Math.floor(index / this.getCurrentPageSize());
+  }
+
+  /**
+   * Change the pagination for this bundle to the provided zero-indexed page
+   * @param page The zero-indexed page to change to
+   * @protected
+   */
+  protected changeToPage(page: number) {
+    // Increments page by one because zero-indexing is way easier for calculations but the pagination component
+    // uses one-indexing.
+    this.paginationComponent.doPageChange(page + 1);
   }
 
 }
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
deleted file mode 100644
index c3d6ebc823..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<ds-pagination *ngIf="(objectsRD$ | async)?.payload"
-               [hideGear]="true"
-               [hidePagerWhenSinglePage]="true"
-               [hidePaginationDetail]="true"
-               [paginationOptions]="options"
-               [collectionSize]="(objectsRD$ | async)?.payload?.totalElements">
-  <ng-container *ngIf="(loading$ | async) !== true">
-    <div [id]="bundle.id" class="bundle-bitstreams-list"
-         [ngClass]="{'mb-3': (objectsRD$ | async)?.payload?.totalElements > pageSize}"
-         *ngVar="(updates$ | async) as updates" cdkDropList (cdkDropListDropped)="drop($event)">
-      <ng-container *ngIf="updates">
-        <div class="row bitstream-row" *ngFor="let uuid of customOrder" cdkDrag
-             [id]="uuid"
-             [ngClass]="{
-                  'table-warning': updates[uuid].changeType === 0,
-                  'table-danger': updates[uuid].changeType === 2,
-                  'table-success': updates[uuid].changeType === 1,
-                  'bg-white': updates[uuid].changeType === undefined
-                }">
-          <ds-item-edit-bitstream [fieldUpdate]="updates[uuid]"
-                                  [bundleUrl]="bundle.self"
-                                  [columnSizes]="columnSizes">
-            <div class="d-flex align-items-center bitstream-row-drag-handle" slot="drag-handle" cdkDragHandle tabindex="0">
-              <ds-item-edit-bitstream-drag-handle></ds-item-edit-bitstream-drag-handle>
-            </div>
-          </ds-item-edit-bitstream>
-        </div>
-      </ng-container>
-    </div>
-  </ng-container>
-  <ds-loading *ngIf="(loading$ | async)" [message]="'loading.bitstreams' | translate"></ds-loading>
-</ds-pagination>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
deleted file mode 100644
index cbb3314252..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.spec.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import {
-  ComponentFixture,
-  TestBed,
-  waitForAsync,
-} from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
-import { take } from 'rxjs/operators';
-
-import { BundleDataService } from '../../../../../core/data/bundle-data.service';
-import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
-import { RequestService } from '../../../../../core/data/request.service';
-import { PaginationService } from '../../../../../core/pagination/pagination.service';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { BitstreamFormat } from '../../../../../core/shared/bitstream-format.model';
-import { Bundle } from '../../../../../core/shared/bundle.model';
-import { PaginationComponent } from '../../../../../shared/pagination/pagination.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { ResponsiveColumnSizes } from '../../../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
-import { PaginationServiceStub } from '../../../../../shared/testing/pagination-service.stub';
-import { createPaginatedList } from '../../../../../shared/testing/utils.test';
-import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
-import { VarDirective } from '../../../../../shared/utils/var.directive';
-import { PaginatedDragAndDropBitstreamListComponent } from './paginated-drag-and-drop-bitstream-list.component';
-
-describe('PaginatedDragAndDropBitstreamListComponent', () => {
-  let comp: PaginatedDragAndDropBitstreamListComponent;
-  let fixture: ComponentFixture<PaginatedDragAndDropBitstreamListComponent>;
-  let objectUpdatesService: ObjectUpdatesService;
-  let bundleService: BundleDataService;
-  let objectValuesPipe: ObjectValuesPipe;
-  let requestService: RequestService;
-  let paginationService;
-
-  const columnSizes = new ResponsiveTableSizes([
-    new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-    new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-    new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3),
-  ]);
-
-  const bundle = Object.assign(new Bundle(), {
-    id: 'bundle-1',
-    uuid: 'bundle-1',
-    _links: {
-      self: { href: 'bundle-1-selflink' },
-    },
-  });
-  const date = new Date();
-  const format = Object.assign(new BitstreamFormat(), {
-    shortDescription: 'PDF',
-  });
-  const bitstream1 = Object.assign(new Bitstream(), {
-    uuid: 'bitstreamUUID1',
-    name: 'Fake Bitstream 1',
-    bundleName: 'ORIGINAL',
-    description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format),
-  });
-  const fieldUpdate1 = {
-    field: bitstream1,
-    changeType: undefined,
-  };
-  const bitstream2 = Object.assign(new Bitstream(), {
-    uuid: 'bitstreamUUID2',
-    name: 'Fake Bitstream 2',
-    bundleName: 'ORIGINAL',
-    description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format),
-  });
-  const fieldUpdate2 = {
-    field: bitstream2,
-    changeType: undefined,
-  };
-
-  beforeEach(waitForAsync(() => {
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-      {
-        getFieldUpdates: observableOf({
-          [bitstream1.uuid]: fieldUpdate1,
-          [bitstream2.uuid]: fieldUpdate2,
-        }),
-        getFieldUpdatesExclusive: observableOf({
-          [bitstream1.uuid]: fieldUpdate1,
-          [bitstream2.uuid]: fieldUpdate2,
-        }),
-        getFieldUpdatesByCustomOrder: observableOf({
-          [bitstream1.uuid]: fieldUpdate1,
-          [bitstream2.uuid]: fieldUpdate2,
-        }),
-        saveMoveFieldUpdate: {},
-        saveRemoveFieldUpdate: {},
-        removeSingleFieldUpdate: {},
-        saveAddFieldUpdate: {},
-        discardFieldUpdates: {},
-        reinstateFieldUpdates: observableOf(true),
-        initialize: {},
-        getUpdatedFields: observableOf([bitstream1, bitstream2]),
-        getLastModified: observableOf(date),
-        hasUpdates: observableOf(true),
-        isReinstatable: observableOf(false),
-        isValidPage: observableOf(true),
-        initializeWithCustomOrder: {},
-        addPageToCustomOrder: {},
-      },
-    );
-
-    bundleService = jasmine.createSpyObj('bundleService', {
-      getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
-      getBitstreamsEndpoint: observableOf(''),
-    });
-
-    objectValuesPipe = new ObjectValuesPipe();
-
-    requestService = jasmine.createSpyObj('requestService', {
-      hasByHref$: observableOf(true),
-    });
-
-    paginationService = new PaginationServiceStub();
-
-    TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), PaginatedDragAndDropBitstreamListComponent, VarDirective],
-      providers: [
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: BundleDataService, useValue: bundleService },
-        { provide: ObjectValuesPipe, useValue: objectValuesPipe },
-        { provide: RequestService, useValue: requestService },
-        { provide: PaginationService, useValue: paginationService },
-        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-      ], schemas: [
-        NO_ERRORS_SCHEMA,
-      ],
-    })
-      .overrideComponent(PaginatedDragAndDropBitstreamListComponent, {
-        remove: {
-          imports: [PaginationComponent],
-        },
-      })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PaginatedDragAndDropBitstreamListComponent);
-    comp = fixture.componentInstance;
-    comp.bundle = bundle;
-    comp.columnSizes = columnSizes;
-    fixture.detectChanges();
-  });
-
-  it('should initialize the objectsRD$', (done) => {
-    comp.objectsRD$.pipe(take(1)).subscribe((objects) => {
-      expect(objects.payload.page).toEqual([bitstream1, bitstream2]);
-      done();
-    });
-  });
-
-  it('should initialize the URL', () => {
-    expect(comp.url).toEqual(bundle.self);
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
deleted file mode 100644
index 24d827ac61..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import {
-  CdkDrag,
-  CdkDragHandle,
-  CdkDropList,
-} from '@angular/cdk/drag-drop';
-import {
-  AsyncPipe,
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
-import {
-  Component,
-  ElementRef,
-  Input,
-  OnInit,
-} from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-import { switchMap } from 'rxjs/operators';
-
-import { BundleDataService } from '../../../../../core/data/bundle-data.service';
-import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
-import { RequestService } from '../../../../../core/data/request.service';
-import { PaginationService } from '../../../../../core/pagination/pagination.service';
-import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { Bundle } from '../../../../../core/shared/bundle.model';
-import { ThemedLoadingComponent } from '../../../../../shared/loading/themed-loading.component';
-import { PaginationComponent } from '../../../../../shared/pagination/pagination.component';
-import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
-import { AbstractPaginatedDragAndDropListComponent } from '../../../../../shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component';
-import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { PaginatedSearchOptions } from '../../../../../shared/search/models/paginated-search-options.model';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
-import { VarDirective } from '../../../../../shared/utils/var.directive';
-import { ItemEditBitstreamComponent } from '../../item-edit-bitstream/item-edit-bitstream.component';
-import { ItemEditBitstreamDragHandleComponent } from '../../item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
-
-@Component({
-  selector: 'ds-paginated-drag-and-drop-bitstream-list',
-  styleUrls: ['../../item-bitstreams.component.scss'],
-  templateUrl: './paginated-drag-and-drop-bitstream-list.component.html',
-  imports: [
-    AsyncPipe,
-    NgIf,
-    PaginationComponent,
-    NgClass,
-    VarDirective,
-    CdkDropList,
-    NgForOf,
-    CdkDrag,
-    ItemEditBitstreamComponent,
-    ItemEditBitstreamDragHandleComponent,
-    CdkDragHandle,
-    ThemedLoadingComponent,
-    TranslateModule,
-  ],
-  standalone: true,
-})
-/**
- * A component listing edit-bitstream rows for each bitstream within the given bundle.
- * This component makes use of the AbstractPaginatedDragAndDropListComponent, allowing for users to drag and drop
- * bitstreams within the paginated list. To drag and drop a bitstream between two pages, drag the row on top of the
- * page number you want the bitstream to end up at. Doing so will add the bitstream to the top of that page.
- */
-export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginatedDragAndDropListComponent<Bitstream> implements OnInit {
-  /**
-   * The bundle to display bitstreams for
-   */
-  @Input() bundle: Bundle;
-
-  /**
-   * The bootstrap sizes used for the columns within this table
-   */
-  @Input() columnSizes: ResponsiveTableSizes;
-
-  constructor(protected objectUpdatesService: ObjectUpdatesService,
-              protected elRef: ElementRef,
-              protected objectValuesPipe: ObjectValuesPipe,
-              protected bundleService: BundleDataService,
-              protected paginationService: PaginationService,
-              protected requestService: RequestService) {
-    super(objectUpdatesService, elRef, objectValuesPipe, paginationService);
-  }
-
-  ngOnInit() {
-    super.ngOnInit();
-  }
-
-  /**
-   * Initialize the bitstreams observable depending on currentPage$
-   */
-  initializeObjectsRD(): void {
-    this.objectsRD$ = this.currentPage$.pipe(
-      switchMap((page: PaginationComponentOptions) => {
-        const paginatedOptions = new PaginatedSearchOptions({ pagination: Object.assign({}, page) });
-        return this.bundleService.getBitstreamsEndpoint(this.bundle.id, paginatedOptions).pipe(
-          switchMap((href) => this.requestService.hasByHref$(href)),
-          switchMap(() => this.bundleService.getBitstreams(
-            this.bundle.id,
-            paginatedOptions,
-            followLink('format'),
-          )),
-        );
-      }),
-    );
-  }
-
-  /**
-   * Initialize the URL used for the field-update store, in this case the bundle's self-link
-   */
-  initializeURL(): void {
-    this.url = this.bundle.self;
-  }
-}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
deleted file mode 100644
index 1bce8667ee..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<ng-template #handleView>
-  <div class="drag-handle text-muted float-left p-1 mr-2" tabindex="0">
-    <i class="fas fa-grip-vertical fa-fw" [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
-  </div>
-</ng-template>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
deleted file mode 100644
index b993eb7193..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import {
-  Component,
-  OnDestroy,
-  OnInit,
-  ViewChild,
-  ViewContainerRef,
-} from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-
-@Component({
-  selector: 'ds-item-edit-bitstream-drag-handle',
-  styleUrls: ['../item-bitstreams.component.scss'],
-  templateUrl: './item-edit-bitstream-drag-handle.component.html',
-  imports: [
-    TranslateModule,
-  ],
-  standalone: true,
-})
-/**
- * Component displaying a drag handle for the item-edit-bitstream page
- * Creates an embedded view of the contents
- * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream-drag-handle element)
- */
-export class ItemEditBitstreamDragHandleComponent implements OnInit, OnDestroy {
-  /**
-   * The view on the drag-handle
-   */
-  @ViewChild('handleView', { static: true }) handleView;
-
-  constructor(private viewContainerRef: ViewContainerRef) {
-  }
-
-  ngOnInit(): void {
-    this.viewContainerRef.createEmbeddedView(this.handleView);
-  }
-
-  ngOnDestroy(): void {
-    this.viewContainerRef.clear();
-  }
-
-}
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
deleted file mode 100644
index 7d52ab220f..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<ng-template #bitstreamView>
-  <div class="{{columnSizes.columns[0].buildClasses()}} row-element d-flex">
-    <ng-content select="[slot=drag-handle]"></ng-content>
-    <div class="float-left d-flex align-items-center overflow-hidden">
-      <span class="text-truncate">
-        {{ bitstreamName }}
-      </span>
-    </div>
-  </div>
-  <div class="{{columnSizes.columns[1].buildClasses()}} row-element d-flex align-items-center">
-    <div class="w-100">
-      <div class="text-truncate" [tooltipClass]="'larger-tooltip'" placement="bottom"
-           [ngbTooltip]="bitstream?.firstMetadataValue('dc.description')">
-        {{ bitstream?.firstMetadataValue('dc.description') }}
-      </div>
-    </div>
-  </div>
-  <div class="{{columnSizes.columns[2].buildClasses()}} row-element d-flex align-items-center">
-    <div class="text-center w-100">
-        <span class="text-truncate">
-            {{ (format$ | async)?.shortDescription }}
-        </span>
-    </div>
-  </div>
-  <div class="{{columnSizes.columns[3].buildClasses()}} row-element d-flex align-items-center">
-    <div class="text-center w-100">
-      <div class="btn-group relationship-action-buttons">
-        <a *ngIf="bitstreamDownloadUrl !== null" [routerLink]="bitstreamDownloadUrl"
-           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.download' | translate"
-           class="btn btn-outline-primary btn-sm"
-           title="{{'item.edit.bitstreams.edit.buttons.download' | translate}}"
-           [attr.data-test]="'download-button' | dsBrowserOnly">
-          <i class="fas fa-download fa-fw"></i>
-        </a>
-        <button [routerLink]="['/bitstreams/', bitstream.id, 'edit']" class="btn btn-outline-primary btn-sm"
-                [attr.aria-label]="'item.edit.bitstreams.edit.buttons.edit' | translate"
-                title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
-          <i class="fas fa-edit fa-fw"></i>
-        </button>
-        <button [disabled]="!canRemove()" (click)="remove()"
-                [attr.aria-label]="'item.edit.bitstreams.edit.buttons.remove' | translate"
-                class="btn btn-outline-danger btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
-          <i class="fas fa-trash-alt fa-fw"></i>
-        </button>
-        <button [disabled]="!canUndo()" (click)="undo()"
-                [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
-                class="btn btn-outline-warning btn-sm"
-                title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
-          <i class="fas fa-undo-alt fa-fw"></i>
-        </button>
-      </div>
-    </div>
-  </div>
-</ng-template>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
deleted file mode 100644
index bceb0a1207..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.spec.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import {
-  ComponentFixture,
-  TestBed,
-  waitForAsync,
-} from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-import { ActivatedRoute } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
-
-import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
-import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { ActivatedRouteStub } from '../../../../shared/testing/active-router.stub';
-import { VarDirective } from '../../../../shared/utils/var.directive';
-import { ItemEditBitstreamComponent } from './item-edit-bitstream.component';
-
-let comp: ItemEditBitstreamComponent;
-let fixture: ComponentFixture<ItemEditBitstreamComponent>;
-
-const columnSizes = new ResponsiveTableSizes([
-  new ResponsiveColumnSizes(2, 2, 3, 4, 4),
-  new ResponsiveColumnSizes(2, 3, 3, 3, 3),
-  new ResponsiveColumnSizes(2, 2, 2, 2, 2),
-  new ResponsiveColumnSizes(6, 5, 4, 3, 3),
-]);
-
-const format = Object.assign(new BitstreamFormat(), {
-  shortDescription: 'PDF',
-});
-const bitstream = Object.assign(new Bitstream(), {
-  uuid: 'bitstreamUUID',
-  name: 'Fake Bitstream',
-  bundleName: 'ORIGINAL',
-  description: 'Description',
-  _links: {
-    content: { href: 'content-link' },
-  },
-
-  format: createSuccessfulRemoteDataObject$(format),
-});
-const fieldUpdate = {
-  field: bitstream,
-  changeType: undefined,
-};
-const date = new Date();
-const url = 'thisUrl';
-
-let objectUpdatesService: ObjectUpdatesService;
-
-describe('ItemEditBitstreamComponent', () => {
-  beforeEach(waitForAsync(() => {
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-      {
-        getFieldUpdates: observableOf({
-          [bitstream.uuid]: fieldUpdate,
-        }),
-        getFieldUpdatesExclusive: observableOf({
-          [bitstream.uuid]: fieldUpdate,
-        }),
-        saveRemoveFieldUpdate: {},
-        removeSingleFieldUpdate: {},
-        saveAddFieldUpdate: {},
-        discardFieldUpdates: {},
-        reinstateFieldUpdates: observableOf(true),
-        initialize: {},
-        getUpdatedFields: observableOf([bitstream]),
-        getLastModified: observableOf(date),
-        hasUpdates: observableOf(true),
-        isReinstatable: observableOf(false),
-        isValidPage: observableOf(true),
-      },
-    );
-
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([]),
-        ItemEditBitstreamComponent,
-        VarDirective,
-      ],
-      providers: [
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-      ], schemas: [
-        NO_ERRORS_SCHEMA,
-      ],
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ItemEditBitstreamComponent);
-    comp = fixture.componentInstance;
-    comp.fieldUpdate = fieldUpdate;
-    comp.bundleUrl = url;
-    comp.columnSizes = columnSizes;
-    comp.ngOnChanges(undefined);
-    fixture.detectChanges();
-  });
-
-  describe('when remove is called', () => {
-    beforeEach(() => {
-      comp.remove();
-    });
-
-    it('should call saveRemoveFieldUpdate on objectUpdatesService', () => {
-      expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, bitstream);
-    });
-  });
-
-  describe('when undo is called', () => {
-    beforeEach(() => {
-      comp.undo();
-    });
-
-    it('should call removeSingleFieldUpdate on objectUpdatesService', () => {
-      expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, bitstream.uuid);
-    });
-  });
-
-  describe('when canRemove is called', () => {
-    it('should return true', () => {
-      expect(comp.canRemove()).toEqual(true);
-    });
-  });
-
-  describe('when canUndo is called', () => {
-    it('should return false', () => {
-      expect(comp.canUndo()).toEqual(false);
-    });
-  });
-
-  describe('when the component loads', () => {
-    it('should contain download button with a valid link to the bitstreams download page', () => {
-      fixture.detectChanges();
-      const downloadBtnHref = fixture.debugElement.query(By.css('[data-test="download-button"]')).nativeElement.getAttribute('href');
-      expect(downloadBtnHref).toEqual(comp.bitstreamDownloadUrl);
-    });
-  });
-
-  describe('when the bitstreamDownloadUrl property gets populated', () => {
-    it('should contain the bitstream download page route', () => {
-      expect(comp.bitstreamDownloadUrl).not.toEqual(bitstream._links.content.href);
-      expect(comp.bitstreamDownloadUrl).toEqual(getBitstreamDownloadRoute(bitstream));
-    });
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
deleted file mode 100644
index 81950d3321..0000000000
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
-import {
-  Component,
-  Input,
-  OnChanges,
-  OnDestroy,
-  OnInit,
-  SimpleChanges,
-  ViewChild,
-  ViewContainerRef,
-} from '@angular/core';
-import { RouterLink } from '@angular/router';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule } from '@ngx-translate/core';
-import cloneDeep from 'lodash/cloneDeep';
-import { Observable } from 'rxjs';
-
-import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
-import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import {
-  getFirstSucceededRemoteData,
-  getRemoteDataPayload,
-} from '../../../../core/shared/operators';
-import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
-import { BrowserOnlyPipe } from '../../../../shared/utils/browser-only.pipe';
-
-@Component({
-  selector: 'ds-item-edit-bitstream',
-  styleUrls: ['../item-bitstreams.component.scss'],
-  templateUrl: './item-edit-bitstream.component.html',
-  imports: [
-    RouterLink,
-    TranslateModule,
-    BrowserOnlyPipe,
-    NgbTooltipModule,
-    AsyncPipe,
-    NgIf,
-  ],
-  standalone: true,
-})
-/**
- * Component that displays a single bitstream of an item on the edit page
- * Creates an embedded view of the contents
- * (which means it'll be added to the parents html without a wrapping ds-item-edit-bitstream element)
- */
-export class ItemEditBitstreamComponent implements OnChanges, OnDestroy, OnInit {
-
-  /**
-   * The view on the bitstream
-   */
-  @ViewChild('bitstreamView', { static: true }) bitstreamView;
-
-  /**
-   * The current field, value and state of the bitstream
-   */
-  @Input() fieldUpdate: FieldUpdate;
-
-  /**
-   * The url of the bundle
-   */
-  @Input() bundleUrl: string;
-
-  /**
-   * The bootstrap sizes used for the columns within this table
-   */
-  @Input() columnSizes: ResponsiveTableSizes;
-
-  /**
-   * The bitstream of this field
-   */
-  bitstream: Bitstream;
-
-  /**
-   * The bitstream's name
-   */
-  bitstreamName: string;
-
-  /**
-   * The bitstream's download url
-   */
-  bitstreamDownloadUrl: string;
-
-  /**
-   * The format of the bitstream
-   */
-  format$: Observable<BitstreamFormat>;
-
-  constructor(private objectUpdatesService: ObjectUpdatesService,
-              private dsoNameService: DSONameService,
-              private viewContainerRef: ViewContainerRef) {
-  }
-
-  ngOnInit(): void {
-    this.viewContainerRef.createEmbeddedView(this.bitstreamView);
-  }
-
-  ngOnDestroy(): void {
-    this.viewContainerRef.clear();
-  }
-
-  /**
-   * Update the current bitstream and its format on changes
-   * @param changes
-   */
-  ngOnChanges(changes: SimpleChanges): void {
-    this.bitstream = cloneDeep(this.fieldUpdate.field) as Bitstream;
-    this.bitstreamName = this.dsoNameService.getName(this.bitstream);
-    this.bitstreamDownloadUrl = getBitstreamDownloadRoute(this.bitstream);
-    this.format$ = this.bitstream.format.pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-    );
-  }
-
-  /**
-   * Sends a new remove update for this field to the object updates service
-   */
-  remove(): void {
-    this.objectUpdatesService.saveRemoveFieldUpdate(this.bundleUrl, this.bitstream);
-  }
-
-  /**
-   * Cancels the current update for this field in the object updates service
-   */
-  undo(): void {
-    this.objectUpdatesService.removeSingleFieldUpdate(this.bundleUrl, this.bitstream.uuid);
-  }
-
-  /**
-   * Check if a user should be allowed to remove this field
-   */
-  canRemove(): boolean {
-    return this.fieldUpdate.changeType !== FieldChangeType.REMOVE;
-  }
-
-  /**
-   * Check if a user should be allowed to cancel the update to this field
-   */
-  canUndo(): boolean {
-    return this.fieldUpdate.changeType?.valueOf() >= 0;
-  }
-
-}
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
index 0aa7b27d2e..7c56da4c0e 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -18,7 +18,7 @@
                 [cancelButton]="'item.edit.item-mapper.cancel'"
                 [dangerConfirm]="true"
                 (confirm)="removeMappings($event)"
-                (cancel)="onCancel()"></ds-collection-select>
+              (cancel)="onCancel()"></ds-collection-select>
             </div>
           </ng-template>
         </li>
@@ -28,29 +28,33 @@
             <div class="row mt-2">
               <div class="col-12 col-lg-6">
                 <ds-search-form id="search-form"
-                                [query]="(searchOptions$ | async)?.query"
-                                [currentUrl]="'./'"
-                                [inPlaceSearch]="true"
-                                [searchPlaceholder]="'item.edit.item-mapper.search-form.placeholder' | translate"
-                                (submitSearch)="performedSearch = true">
+                  [query]="(searchOptions$ | async)?.query"
+                  [currentUrl]="'./'"
+                  [inPlaceSearch]="true"
+                  [searchPlaceholder]="'item.edit.item-mapper.search-form.placeholder' | translate"
+                  (submitSearch)="performedSearch = true">
                 </ds-search-form>
               </div>
             </div>
 
-            <div *ngIf="performedSearch">
-              <ds-collection-select class="mt-2"
-                [key]="'map'"
-                [dsoRD$]="mappedCollectionsRD$"
-                [paginationOptions]="(searchOptions$ | async)?.pagination"
-                [sortOptions]="(searchOptions$ | async)?.sort"
-                [confirmButton]="'item.edit.item-mapper.buttons.add'"
-                [cancelButton]="'item.edit.item-mapper.cancel'"
-                (confirm)="mapCollections($event)"
+            @if (performedSearch) {
+              <div>
+                <ds-collection-select class="mt-2"
+                  [key]="'map'"
+                  [dsoRD$]="mappedCollectionsRD$"
+                  [paginationOptions]="(searchOptions$ | async)?.pagination"
+                  [sortOptions]="(searchOptions$ | async)?.sort"
+                  [confirmButton]="'item.edit.item-mapper.buttons.add'"
+                  [cancelButton]="'item.edit.item-mapper.cancel'"
+                  (confirm)="mapCollections($event)"
                 (cancel)="onCancel()"></ds-collection-select>
-            </div>
-            <div *ngIf="!performedSearch" class="alert alert-info w-100" role="alert">
-              {{'item.edit.item-mapper.no-search' | translate}}
-            </div>
+              </div>
+            }
+            @if (!performedSearch) {
+              <div class="alert alert-info w-100" role="alert">
+                {{'item.edit.item-mapper.no-search' | translate}}
+              </div>
+            }
           </ng-template>
         </li>
       </ul>
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index 3c93780a87..f1be1a99a6 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -79,7 +76,6 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
     ThemedSearchFormComponent,
     AsyncPipe,
     TranslateModule,
-    NgIf,
     BrowserOnlyPipe,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
index 22b10b28b6..a16fc5cba3 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
@@ -1,7 +1,8 @@
 <div class="container mt-3">
-    <h2>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h2>
+  <h2>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h2>
+  @if (dsoRD$ | async; as dsoRD) {
     <ds-curation-form
-      *ngIf="dsoRD$ | async as dsoRD"
       [dsoHandle]="dsoRD?.payload.handle"
     ></ds-curation-form>
+  }
 </div>
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
index d7f1d8135e..6767d507f2 100644
--- a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -29,7 +26,6 @@ import { hasValue } from '../../../shared/empty.util';
   templateUrl: './item-curate.component.html',
   imports: [
     CurationFormComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
   ],
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index ed6ba3eabc..dc236be398 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -1,100 +1,99 @@
 <div class="container">
-    <div class="row">
-        <div class="col-12">
+  <div class="row">
+    <div class="col-12">
 
-            <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
-            <p>{{descriptionMessage | translate}}</p>
-            <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
+      <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
+      <p>{{descriptionMessage | translate}}</p>
+      <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
 
-            <ng-container *ngVar="(typeDTOs$ | async) as types">
+      <ng-container>
 
-                <div *ngIf="types && types.length > 0" class="mb-4">
-
-                    {{'virtual-metadata.delete-item.info' | translate}}
-
-                    <div *ngFor="let typeDto of types" class="mb-4">
-                        <div *ngVar="(typeDto.isSelected$ | async) as selected"
-                             class="d-flex flex-row">
-
-                            <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
-                                <label>
-                                    <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
-                                </label>
+        @if ((typeDTOs$ | async) && (typeDTOs$ | async).length > 0) {
+          <div class="mb-4">
+            {{'virtual-metadata.delete-item.info' | translate}}
+            @for (typeDto of (typeDTOs$ | async); track typeDto) {
+              <div class="mb-4">
+                <div *ngVar="(typeDto.isSelected$ | async) as selected"
+                  class="d-flex flex-row">
+                  <div class="m-2" (click)="setSelected(typeDto.relationshipType, !selected)">
+                    <label>
+                      <input type="checkbox" [checked]="selected" [disabled]="isDeleting$ | async">
+                    </label>
+                  </div>
+                  <div class="flex-column flex-grow-1">
+                    <h5 (click)="setSelected(typeDto.relationshipType, !selected)">
+                      {{getRelationshipMessageKey(typeDto.label$ | async) | translate}}
+                    </h5>
+                    @for (relationshipDto of (typeDto.relationshipDTOs$ | async); track relationshipDto.relationship.id) {
+                      <div
+                        class="d-flex flex-row">
+                        <ng-container *ngVar="(relationshipDto.relatedItem$ | async) as relatedItem">
+                          @if (relatedItem) {
+                            <ds-listable-object-component-loader
+                              [object]="relatedItem"
+                              [viewMode]="viewMode">
+                            </ds-listable-object-component-loader>
+                          }
+                          <div class="ms-auto">
+                            <div class="btn-group">
+                              <button class="btn btn-outline-info btn-sm"
+                                (click)="openVirtualMetadataModal(virtualMetadataModal)">
+                                <i class="fas fa-info fa-fw"></i>
+                              </button>
                             </div>
-
-                            <div class="flex-column flex-grow-1">
-                                <h5 (click)="setSelected(typeDto.relationshipType, !selected)">
-                                    {{getRelationshipMessageKey(typeDto.label$ | async) | translate}}
-                                </h5>
-                                <div *ngFor="let relationshipDto of (typeDto.relationshipDTOs$ | async)"
-                                     class="d-flex flex-row">
-                                    <ng-container *ngVar="(relationshipDto.relatedItem$ | async) as relatedItem">
-
-                                        <ds-listable-object-component-loader
-                                                *ngIf="relatedItem"
-                                                [object]="relatedItem"
-                                                [viewMode]="viewMode">
-                                        </ds-listable-object-component-loader>
-                                        <div class="ml-auto">
-                                            <div class="btn-group">
-                                                <button class="btn btn-outline-info btn-sm"
-                                                        (click)="openVirtualMetadataModal(virtualMetadataModal)">
-                                                    <i class="fas fa-info fa-fw"></i>
-                                                </button>
-                                            </div>
-                                        </div>
-
-                                        <ng-template #virtualMetadataModal>
-                                            <div class="thumb-font-1">
-                                                <div class="modal-header">
-                                                    {{'virtual-metadata.delete-item.modal-head' | translate}}
-                                                    <button type="button" class="close"
-                                                            (click)="closeVirtualMetadataModal()" aria-label="Close">
-                                                        <span aria-hidden="true">×</span>
-                                                    </button>
-                                                </div>
-                                                <div class="modal-body">
-                                                    <ds-listable-object-component-loader
-                                                            *ngIf="relatedItem"
-                                                            [object]="relatedItem"
-                                                            [viewMode]="viewMode">
-                                                    </ds-listable-object-component-loader>
-                                                    <div *ngFor="let metadata of (relationshipDto.virtualMetadata$ | async)">
-                                                        <div>
-                                                            <div class="font-weight-bold">
-                                                                {{metadata.metadataField}}
-                                                            </div>
-                                                            <div>
-                                                                {{metadata.metadataValue.value}}
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </ng-template>
-
-                                    </ng-container>
-                                </div>
+                          </div>
+                          <ng-template #virtualMetadataModal>
+                            <div class="thumb-font-1">
+                              <div class="modal-header">
+                                {{'virtual-metadata.delete-item.modal-head' | translate}}
+                                <button type="button" class="btn-close"
+                                  (click)="closeVirtualMetadataModal()" aria-label="Close">
+                                </button>
+                              </div>
+                              <div class="modal-body">
+                                @if (relatedItem) {
+                                  <ds-listable-object-component-loader
+                                    [object]="relatedItem"
+                                    [viewMode]="viewMode">
+                                  </ds-listable-object-component-loader>
+                                }
+                                @for (metadata of (relationshipDto.virtualMetadata$ | async); track metadata) {
+                                  <div>
+                                    <div>
+                                      <div class="fw-bold">
+                                        {{metadata.metadataField}}
+                                      </div>
+                                      <div>
+                                        {{metadata.metadataValue.value}}
+                                      </div>
+                                    </div>
+                                  </div>
+                                }
+                              </div>
                             </div>
-
-                        </div>
-
-                    </div>
-
+                          </ng-template>
+                        </ng-container>
+                      </div>
+                    }
+                  </div>
                 </div>
+              </div>
+            }
+          </div>
+        }
 
-            </ng-container>
+      </ng-container>
 
-            <div class="space-children-mr">
-              <button [disabled]="isDeleting$ | async" (click)="performAction()"
-                      class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
-              </button>
-              <button [disabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
-                      class="btn btn-outline-secondary cancel">
-                {{cancelMessage| translate}}
-              </button>
-            </div>
+      <div class="space-children-mr">
+        <button [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
+          class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
+        </button>
+        <button [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+          class="btn btn-outline-secondary cancel">
+          {{cancelMessage| translate}}
+        </button>
+      </div>
 
-        </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
index ae791ccd8e..e1bd37f9e5 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.ts
@@ -1,9 +1,5 @@
 // eslint-disable-next-line max-classes-per-file
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -56,6 +52,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -103,12 +100,11 @@ class RelationshipDTO {
   imports: [
     TranslateModule,
     ListableObjectComponentLoaderComponent,
-    NgIf,
     ModifyItemOverviewComponent,
     AsyncPipe,
     VarDirective,
-    NgForOf,
     RouterLink,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index 8c47d4f781..e2cd2d88af 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -1,58 +1,62 @@
 <div class="container">
-    <div class="row">
+  <div class="row">
+    <div class="col-12">
+      <h1>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h1>
+      <p>{{'item.edit.move.description' | translate}}</p>
+      <div class="row">
         <div class="col-12">
-            <h1>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle} }}</h1>
-            <p>{{'item.edit.move.description' | translate}}</p>
-            <div class="row">
-                <div class="col-12">
-                  <div class="card mb-3">
-                    <div class="card-header">{{'dso-selector.placeholder' | translate: { type: 'dso-selector.placeholder.type.collection' | translate } }}</div>
-                    <div class="card-body">
-                      <ds-authorized-collection-selector [types]="COLLECTIONS"
-                                                         [currentDSOId]="selectedCollection ? selectedCollection.id : originalCollection.id"
-                                                         (onSelect)="selectDso($event)">
-                      </ds-authorized-collection-selector>
-                    </div>
-                    <div></div>
-                  </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-12">
-                    <p>
-                      <label for="inheritPoliciesCheckbox">
-                        <ng-template #tooltipContent>
-                          {{ 'item.edit.move.inheritpolicies.tooltip' | translate }}
-                        </ng-template>
-                        <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox" [ngbTooltip]="tooltipContent"
-                        >
-                        {{'item.edit.move.inheritpolicies.checkbox' |translate}}
-                      </label>
-                    </p>
-                    <p>
-                        {{'item.edit.move.inheritpolicies.description' | translate}}
-                    </p>
-                </div>
-            </div>
-
-          <div class="button-row bottom">
-            <div class="float-right space-children-mr">
-              <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
-                <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
-              </button>
-              <button class="btn btn-primary" [disabled]="!canMove" (click)="moveToCollection()">
-              <span *ngIf="!processing">
-                <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
-              </span>
-              <span *ngIf="processing">
-                <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
-              </span>
-              </button>
-              <button class="btn btn-danger" [disabled]="!canSubmit" (click)="discard()">
-                <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
-              </button>
+          <div class="card mb-3">
+            <div class="card-header">{{'dso-selector.placeholder' | translate: { type: 'dso-selector.placeholder.type.collection' | translate } }}</div>
+            <div class="card-body">
+              <ds-authorized-collection-selector [types]="COLLECTIONS"
+                [currentDSOId]="selectedCollection ? selectedCollection.id : originalCollection.id"
+                (onSelect)="selectDso($event)">
+              </ds-authorized-collection-selector>
             </div>
+            <div></div>
           </div>
         </div>
+      </div>
+      <div class="row">
+        <div class="col-12">
+          <p>
+            <label class="form-label" for="inheritPoliciesCheckbox">
+              <ng-template #tooltipContent>
+                {{ 'item.edit.move.inheritpolicies.tooltip' | translate }}
+              </ng-template>
+              <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox" [ngbTooltip]="tooltipContent"
+                >
+              {{'item.edit.move.inheritpolicies.checkbox' |translate}}
+            </label>
+          </p>
+          <p>
+            {{'item.edit.move.inheritpolicies.description' | translate}}
+          </p>
+        </div>
+      </div>
+
+      <div class="button-row bottom">
+        <div class="float-end space-children-mr">
+          <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
+            <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
+          </button>
+          <button class="btn btn-primary" [dsBtnDisabled]="!canMove" (click)="moveToCollection()">
+            @if (!processing) {
+              <span>
+                <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
+              </span>
+            }
+            @if (processing) {
+              <span>
+                <i class="fas fa-circle-notch fa-spin"></i> {{'item.edit.move.processing' | translate}}
+              </span>
+            }
+          </button>
+          <button class="btn btn-danger" [dsBtnDisabled]="!canSubmit" (click)="discard()">
+            <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
+          </button>
+        </div>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index 1115260901..1c6e78850a 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -37,6 +34,7 @@ import {
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { AuthorizedCollectionSelectorComponent } from '../../../shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -55,7 +53,7 @@ import {
     RouterLink,
     AsyncPipe,
     AuthorizedCollectionSelectorComponent,
-    NgIf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
index 0977876a19..4948bb282c 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
@@ -1,17 +1,21 @@
-<div class="col-12 col-md-3 h-auto float-left d-flex action-label">
-      <span class="justify-content-center align-self-center font-weight-bold">
-        {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
-      </span>
-</div>
-<div class="col-12 col-md-9 float-left action-button">
-  <span *ngIf="operation.authorized">
-    <button class="btn btn-outline-primary" [disabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
-      {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
-    </button>
-  </span>
-  <span *ngIf="!operation.authorized" [ngbTooltip]="'item.edit.tabs.status.buttons.unauthorized' | translate">
-    <button class="btn btn-outline-primary" [disabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
-      {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
-    </button>
+<div class="col-12 col-md-3 h-auto float-start d-flex action-label">
+  <span class="justify-content-center align-self-center font-weight-bold">
+    {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
   </span>
 </div>
+<div class="col-12 col-md-9 float-start action-button">
+  @if (operation.authorized) {
+    <span>
+      <button class="btn btn-outline-primary" [dsBtnDisabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+        {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
+      </button>
+    </span>
+  }
+  @if (!operation.authorized) {
+    <span [ngbTooltip]="'item.edit.tabs.status.buttons.unauthorized' | translate">
+      <button class="btn btn-outline-primary" [dsBtnDisabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+        {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
+      </button>
+    </span>
+  }
+</div>
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
index e2e6da826f..85ad62de93 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.spec.ts
@@ -6,6 +6,7 @@ import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ItemOperationComponent } from './item-operation.component';
 import { ItemOperation } from './itemOperation.model';
 
@@ -17,7 +18,7 @@ describe('ItemOperationComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ItemOperationComponent],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ItemOperationComponent, BtnDisabledDirective],
     }).compileComponents();
   }));
 
@@ -43,7 +44,8 @@ describe('ItemOperationComponent', () => {
     const span = fixture.debugElement.query(By.css('.action-label span')).nativeElement;
     expect(span.textContent).toContain('item.edit.tabs.status.buttons.key1.label');
     const button = fixture.debugElement.query(By.css('button')).nativeElement;
-    expect(button.disabled).toBeTrue();
+    expect(button.getAttribute('aria-disabled')).toBe('true');
+    expect(button.classList.contains('disabled')).toBeTrue();
     expect(button.textContent).toContain('item.edit.tabs.status.buttons.key1.button');
   });
 });
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 9cf4b30e6c..cb8a754bfb 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -7,6 +7,7 @@ import { RouterLink } from '@angular/router';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ItemOperation } from './itemOperation.model';
 
 @Component({
@@ -16,7 +17,7 @@ import { ItemOperation } from './itemOperation.model';
     TranslateModule,
     RouterLink,
     NgbTooltipModule,
-    NgIf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
index 97aa40c7b0..2b08842e6d 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
@@ -3,13 +3,17 @@
     <div class="col-12">
       <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
       <p>{{descriptionMessage | translate}}</p>
-      <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 p">
-        <div *ngIf="(identifier.identifierType === 'doi')">
-          <p class="float-left">{{doiToUpdateMessage | translate}}: {{identifier.value}}
-            ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
-          </p>
+      @for (identifier of (identifiers$ | async); track identifier) {
+        <div class="w-100 p">
+          @if ((identifier.identifierType === 'doi')) {
+            <div>
+              <p class="float-start">{{doiToUpdateMessage | translate}}: {{identifier.value}}
+                ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
+              </p>
+            </div>
+          }
         </div>
-      </div>
+      }
       <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
       <div class="space-children-mr">
         <button (click)="performAction()" class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
index d9e0283267..4c484d2f4f 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -42,8 +38,6 @@ import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstrac
     RouterLink,
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
index ed7fb190f2..e16c5f9b46 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.html
@@ -1,31 +1,31 @@
-<ng-container *ngIf="shouldDisplayBothRelationshipSides$ | async">
-    <ds-edit-relationship-list
-            [url]="url"
-            [item]="item"
-            [itemType]="itemType"
-            [relationshipType]="relationshipType"
-            [hasChanges]="hasChanges"
-            [currentItemIsLeftItem$]="isLeftItem$"
-            class="d-block mb-4"
-    ></ds-edit-relationship-list>
-    <ds-edit-relationship-list
-            [url]="url"
-            [item]="item"
-            [itemType]="itemType"
-            [relationshipType]="relationshipType"
-            [hasChanges]="hasChanges"
-            [currentItemIsLeftItem$]="isRightItem$"
-    ></ds-edit-relationship-list>
-</ng-container>
+@if (shouldDisplayBothRelationshipSides$ | async) {
+  <ds-edit-relationship-list
+    [url]="url"
+    [item]="item"
+    [itemType]="itemType"
+    [relationshipType]="relationshipType"
+    [hasChanges]="hasChanges"
+    [currentItemIsLeftItem$]="isLeftItem$"
+    class="d-block mb-4"
+  ></ds-edit-relationship-list>
+  <ds-edit-relationship-list
+    [url]="url"
+    [item]="item"
+    [itemType]="itemType"
+    [relationshipType]="relationshipType"
+    [hasChanges]="hasChanges"
+    [currentItemIsLeftItem$]="isRightItem$"
+  ></ds-edit-relationship-list>
+}
 
-<ng-container *ngIf="(shouldDisplayBothRelationshipSides$ | async) === false">
-    <ds-edit-relationship-list
-            [url]="url"
-            [item]="item"
-            [itemType]="itemType"
-            [relationshipType]="relationshipType"
-            [hasChanges]="hasChanges"
-            [currentItemIsLeftItem$]="currentItemIsLeftItem$"
-    ></ds-edit-relationship-list>
-</ng-container>
+@if ((shouldDisplayBothRelationshipSides$ | async) === false) {
+  <ds-edit-relationship-list
+    [url]="url"
+    [item]="item"
+    [itemType]="itemType"
+    [relationshipType]="relationshipType"
+    [hasChanges]="hasChanges"
+    [currentItemIsLeftItem$]="currentItemIsLeftItem$"
+  ></ds-edit-relationship-list>
+}
 
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
index 943a147546..a81a940fe2 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list-wrapper/edit-relationship-list-wrapper.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -31,7 +28,6 @@ import { EditRelationshipListComponent } from '../edit-relationship-list/edit-re
   imports: [
     AsyncPipe,
     EditRelationshipListComponent,
-    NgIf,
   ],
 })
 /**
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index e32938590f..4f0de1a789 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,34 +1,40 @@
 <h2 class="h4">
-    {{relationshipMessageKey$ | async | translate}}
-    <button class="ml-2 btn btn-success" [disabled]="(hasChanges | async)" (click)="openLookup()">
-        <i class="fas fa-plus"></i>
-        <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
-    </button>
+  {{relationshipMessageKey$ | async | translate}}
+  <button class="ms-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
+    <i class="fas fa-plus"></i>
+    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
+  </button>
 </h2>
 <ng-container *ngVar="updates$ | async as updates">
-    <ng-container *ngIf="updates && (loading$ | async) !== true">
-        <ng-container *ngVar="updates | dsObjectValues as updateValues">
-          <ds-pagination
-            [paginationOptions]="paginationConfig"
-            [collectionSize]="(relationshipsRd$ | async)?.payload?.totalElements + (this.nbAddedFields$ | async)"
-            [hideGear]="true"
-            [hidePagerWhenSinglePage]="true">
-            <div class="my-2">
-              <ds-edit-relationship *ngFor="let updateValue of updateValues; trackBy: trackUpdate"
-                                    class="relationship-row d-block alert"
-                                    [fieldUpdate]="updateValue || {}"
-                                    [url]="url"
-                                    [editItem]="item"
+  @if (updates && (loading$ | async) !== true) {
+    <ng-container *ngVar="updates | dsObjectValues as updateValues">
+      <ds-pagination
+        [paginationOptions]="paginationConfig"
+        [collectionSize]="(relationshipsRd$ | async)?.payload?.totalElements + (this.nbAddedFields$ | async)"
+        [hideGear]="true"
+        [hidePagerWhenSinglePage]="true">
+        <div class="my-2">
+          @for (updateValue of updateValues; track trackUpdate($index, updateValue)) {
+            <ds-edit-relationship
+              class="relationship-row d-block alert"
+              [fieldUpdate]="updateValue || {}"
+              [url]="url"
+              [editItem]="item"
                                     [ngClass]="{
                                         'alert-success': updateValue.changeType === 1,
                                         'alert-warning': updateValue.changeType === 0,
                                         'alert-danger': updateValue.changeType === 2
                                   }">
-              </ds-edit-relationship>
-            </div>
-          </ds-pagination>
-          <div *ngIf="updateValues.length === 0">{{"item.edit.relationships.no-relationships" | translate}}</div>
-        </ng-container>
+            </ds-edit-relationship>
+          }
+        </div>
+      </ds-pagination>
+      @if (updateValues.length === 0) {
+        <div>{{"item.edit.relationships.no-relationships" | translate}}</div>
+      }
     </ng-container>
-    <ds-loading *ngIf="loading$ | async"></ds-loading>
+  }
+  @if (loading$ | async) {
+    <ds-loading></ds-loading>
+  }
 </ng-container>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
index ae81da538e..f470b09341 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts
@@ -110,7 +110,7 @@ describe('EditRelationshipListComponent', () => {
     },
   };
 
-  function init(leftType: string, rightType: string): void {
+  function init(leftType: string, rightType: string, leftMaxCardinality?: number, rightMaxCardinality?: number): void {
     entityTypeLeft = Object.assign(new ItemType(), {
       id: leftType,
       uuid: leftType,
@@ -130,6 +130,8 @@ describe('EditRelationshipListComponent', () => {
       rightType: createSuccessfulRemoteDataObject$(entityTypeRight),
       leftwardType: `is${rightType}Of${leftType}`,
       rightwardType: `is${leftType}Of${rightType}`,
+      leftMaxCardinality: leftMaxCardinality,
+      rightMaxCardinality: rightMaxCardinality,
     });
 
     paginationOptions = Object.assign(new PaginationComponentOptions(), {
@@ -386,7 +388,8 @@ describe('EditRelationshipListComponent', () => {
           comp.hasChanges = observableOf(true);
           fixture.detectChanges();
           const element = de.query(By.css('.btn-success'));
-          expect(element.nativeElement?.disabled).toBeTrue();
+          expect(element.nativeElement?.getAttribute('aria-disabled')).toBe('true');
+          expect(element.nativeElement?.classList.contains('disabled')).toBeTrue();
         });
       });
 
@@ -402,4 +405,31 @@ describe('EditRelationshipListComponent', () => {
       }));
     });
   });
+
+  describe('Is repeatable relationship', () => {
+    beforeEach(waitForAsync(() => {
+      currentItemIsLeftItem$ =  new BehaviorSubject<boolean>(true);
+    }));
+    describe('when max cardinality is 1', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 1, undefined)));
+      it('should return false', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeFalse();
+      });
+    });
+    describe('when max cardinality is 2', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', 2, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+    describe('when max cardinality is undefined', () => {
+      beforeEach(waitForAsync(() => init('Publication', 'OrgUnit', undefined, undefined)));
+      it('should return true', () => {
+        const result = (comp as any).isRepeatable();
+        expect(result).toBeTrue();
+      });
+    });
+  });
 });
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
index 2b3e35c229..a5d79bb880 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -65,6 +63,7 @@ import {
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -95,11 +94,10 @@ import { EditRelationshipComponent } from '../edit-relationship/edit-relationshi
     AsyncPipe,
     ObjectValuesPipe,
     VarDirective,
-    NgIf,
-    NgFor,
     TranslateModule,
     NgClass,
     ThemedLoadingComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
@@ -264,6 +262,22 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     return update && update.field ? update.field.uuid : undefined;
   }
 
+  /**
+   * Check whether the current entity can have multiple relationships of this type
+   * This is based on the max cardinality of the relationship
+   * @private
+   */
+  private isRepeatable(): boolean {
+    const isLeft = this.currentItemIsLeftItem$.getValue();
+    if (isLeft) {
+      const leftMaxCardinality = this.relationshipType.leftMaxCardinality;
+      return hasNoValue(leftMaxCardinality) || leftMaxCardinality > 1;
+    } else {
+      const rightMaxCardinality = this.relationshipType.rightMaxCardinality;
+      return hasNoValue(rightMaxCardinality) || rightMaxCardinality > 1;
+    }
+  }
+
   /**
    * Open the dynamic lookup modal to search for items to add as relationships
    */
@@ -281,6 +295,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     modalComp.toAdd = [];
     modalComp.toRemove = [];
     modalComp.isPending = false;
+    modalComp.repeatable = this.isRepeatable();
     modalComp.hiddenQuery = '-search.resourceid:' + this.item.uuid;
 
     this.item.owningCollection.pipe(
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index e65cd237a3..68539d8dc6 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -1,35 +1,37 @@
-<div class="row" *ngIf="relatedItem$ | async">
-  <div class="col-10 relationship">
-    <ds-listable-object-component-loader
-      [object]="relatedItem$ | async"
-      [viewMode]="viewMode"
-      [value]="nameVariant"
-    >
-    </ds-listable-object-component-loader>
-  </div>
-  <div class="col-2">
-    <div class="btn-group relationship-action-buttons">
-      <button [disabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
-              class="btn btn-outline-danger btn-sm"
-              title="{{'item.edit.metadata.edit.buttons.remove' | translate}}">
-        <i class="fas fa-trash-alt fa-fw"></i>
-      </button>
-      <button [disabled]="!canUndo()" (click)="undo()"
-              class="btn btn-outline-warning btn-sm"
-              title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
-        <i class="fas fa-undo-alt fa-fw"></i>
-      </button>
+@if (relatedItem$ | async) {
+  <div class="row">
+    <div class="col-10 relationship">
+      <ds-listable-object-component-loader
+        [object]="relatedItem$ | async"
+        [viewMode]="viewMode"
+        [value]="nameVariant"
+        >
+      </ds-listable-object-component-loader>
+    </div>
+    <div class="col-2 position-relative">
+      <div class="btn-group relationship-action-buttons">
+        <button [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
+          class="btn btn-outline-danger btn-sm"
+          title="{{'item.edit.metadata.edit.buttons.remove' | translate}}">
+          <i class="fas fa-trash-alt fa-fw"></i>
+        </button>
+        <button [dsBtnDisabled]="!canUndo()" (click)="undo()"
+          class="btn btn-outline-warning btn-sm"
+          title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
+          <i class="fas fa-undo-alt fa-fw"></i>
+        </button>
+      </div>
     </div>
   </div>
-</div>
+}
 <ng-template #virtualMetadataModal>
   <ds-virtual-metadata
-          [relationshipId]="relationship.id"
-          [leftItem]="leftItem$ | async"
-          [rightItem]="rightItem$ | async"
-          [url]="url"
-          (close)="closeVirtualMetadataModal()"
-          (save)="remove()"
-  >
+    [relationshipId]="relationship.id"
+    [leftItem]="leftItem$ | async"
+    [rightItem]="rightItem$ | async"
+    [url]="url"
+    (close)="closeVirtualMetadataModal()"
+    (save)="remove()"
+    >
   </ds-virtual-metadata>
 </ng-template>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
index f79d0ee0d1..f14cb8c24f 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -37,6 +34,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -51,9 +49,9 @@ import { VirtualMetadataComponent } from '../../virtual-metadata/virtual-metadat
   imports: [
     ListableObjectComponentLoaderComponent,
     AsyncPipe,
-    NgIf,
     TranslateModule,
     VirtualMetadataComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index 4c8ea49f99..b62256e18e 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -1,54 +1,64 @@
 <div class="item-relationships">
-  <ng-container *ngIf="entityType$ | async as entityType; else noEntityType">
+  @if (entityType$ | async; as entityType) {
     <div class="button-row top d-flex justify-content-end">
       <ng-container *ngTemplateOutlet="buttons"></ng-container>
     </div>
-    <div *ngIf="relationshipTypes$ | async as relationshipTypes; else loading" class="mb-4">
-      <div *ngFor="let relationshipType of relationshipTypes; trackBy: trackById" class="mb-4">
-        <ds-edit-relationship-list-wrapper
-          [url]="url"
-          [item]="item"
-          [itemType]="entityType"
-          [relationshipType]="relationshipType"
-          [hasChanges]="hasChanges$"
-        ></ds-edit-relationship-list-wrapper>
+    @if (relationshipTypes$ | async; as relationshipTypes) {
+      <div class="mb-4">
+        @for (relationshipType of relationshipTypes; track trackById($index, relationshipType)) {
+          <div class="mb-4">
+            <ds-edit-relationship-list-wrapper
+              [url]="url"
+              [item]="item"
+              [itemType]="entityType"
+              [relationshipType]="relationshipType"
+              [hasChanges]="hasChanges$"
+            ></ds-edit-relationship-list-wrapper>
+          </div>
+        }
       </div>
-    </div>
+    } @else {
+      <ds-loading></ds-loading>
+    }
     <div class="button-row bottom">
-      <div class="float-right ml-gap">
+      <div class="float-end ms-gap">
         <ng-container *ngTemplateOutlet="buttons"></ng-container>
       </div>
     </div>
-  </ng-container>
+  } @else {
+    <ds-alert [type]="AlertType.Info" class="d-block mt-2">
+      {{ 'item.edit.relationships.no-entity-type' | translate }}
+    </ds-alert>
+  }
 </div>
 
-<ng-template #noEntityType>
-  <ds-alert [type]="AlertType.Info" class="d-block mt-2">
-    {{ 'item.edit.relationships.no-entity-type' | translate }}
-  </ds-alert>
-</ng-template>
 
-<ng-template #loading>
-  <ds-loading></ds-loading>
-</ng-template>
 
 <ng-template #buttons>
   <div class="d-flex space-children-mr justify-content-end">
-    <button class="btn btn-danger" *ngIf="(isReinstatable$ | async) !== true"
-            [disabled]="(hasChanges$ | async) !== true"
-            (click)="discard()">
-      <i aria-hidden="true" class="fas fa-times"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
-    </button>
-    <button class="btn btn-warning" *ngIf="isReinstatable$ | async" (click)="reinstate()">
-      <i aria-hidden="true" class="fas fa-undo-alt"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
-    </button>
+    @if ((isReinstatable$ | async) !== true) {
+      <button class="btn btn-danger"
+        [dsBtnDisabled]="(hasChanges$ | async) !== true"
+        (click)="discard()">
+        <i aria-hidden="true" class="fas fa-times"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.discard-button' | translate }}</span>
+      </button>
+    }
+    @if (isReinstatable$ | async) {
+      <button class="btn btn-warning" (click)="reinstate()">
+        <i aria-hidden="true" class="fas fa-undo-alt"></i>
+        <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
+      </button>
+    }
     <button class="btn btn-primary"
-            [disabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
-            (click)="submit()">
-      <span *ngIf="isSaving$ | async" aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
-      <i *ngIf="(isSaving$ | async) !== true" aria-hidden="true" class="fas fa-save"></i>
+      [dsBtnDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
+      (click)="submit()">
+      @if (isSaving$ | async) {
+        <span aria-hidden="true" class="spinner-border spinner-border-sm" role="status"></span>
+      }
+      @if ((isSaving$ | async) !== true) {
+        <i aria-hidden="true" class="fas fa-save"></i>
+      }
       <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.save-button' | translate }}</span>
     </button>
   </div>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
index 7b0cc46647..38bc6b8805 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.ts
@@ -1,7 +1,5 @@
 import {
   AsyncPipe,
-  NgForOf,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -42,6 +40,7 @@ import {
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
 import { AlertType } from '../../../shared/alert/alert-type';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
@@ -60,13 +59,12 @@ import { EditRelationshipListWrapperComponent } from './edit-relationship-list-w
     AlertComponent,
     AsyncPipe,
     EditRelationshipListComponent,
-    NgForOf,
-    NgIf,
     NgTemplateOutlet,
     ThemedLoadingComponent,
     TranslateModule,
     VarDirective,
     EditRelationshipListWrapperComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index 7d6e2e9559..ee3004f315 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -1,33 +1,41 @@
 <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
 <div class="row">
-  <div *ngFor="let statusKey of statusDataKeys" class="w-100 pt-1">
-    <div class="col-12 col-md-3 float-left status-label font-weight-bold">
-      {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
-    </div>
-    <div class="col-12 col-md-9 float-left status-data" id="status-{{statusKey}}">
-      {{statusData[statusKey]}}
-    </div>
-  </div>
-
-  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 pt-1">
-    <div *ngIf="(identifier.identifierType==='doi')">
-      <div class="col-12 col-md-3 float-left status-label font-weight-bold">
-        {{identifier.identifierType.toLocaleUpperCase()}}
+  @for (statusKey of statusDataKeys; track statusKey) {
+    <div class="w-100 pt-1">
+      <div class="col-12 col-md-3 float-start status-label font-weight-bold">
+        {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
+      </div>
+      <div class="col-12 col-md-9 float-start status-data" id="status-{{statusKey}}">
+        {{statusData[statusKey]}}
       </div>
-      <div class="col-12 col-md-9 float-left status-label font-weight-bold">{{identifier.value}}
-        ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
     </div>
-  </div>
+  }
 
-  <div class="col-12 col-md-3 float-left status-label font-weight-bold">
+  @for (identifier of (identifiers$ | async); track identifier) {
+    <div class="w-100 pt-1">
+      @if ((identifier.identifierType==='doi')) {
+        <div>
+          <div class="col-12 col-md-3 float-start status-label font-weight-bold">
+            {{identifier.identifierType.toLocaleUpperCase()}}
+          </div>
+          <div class="col-12 col-md-9 float-start status-label font-weight-bold">{{identifier.value}}
+          ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
+        </div>
+      }
+    </div>
+  }
+
+  <div class="col-12 col-md-3 float-start status-label font-weight-bold">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
-  <div class="col-12 col-md-9 float-left status-data" id="status-itemPage">
+  <div class="col-12 col-md-9 float-start status-data" id="status-itemPage">
     <a [routerLink]="itemPageRoute$ | async">{{itemPageRoute$ | async}}</a>
   </div>
 
-  <div *ngFor="let operation of (operations$ | async)" class="w-100" [ngClass]="{'pt-3': operation}">
-    <ds-item-operation [operation]="operation"></ds-item-operation>
-  </div>
+  @for (operation of (operations$ | async); track operation) {
+    <div class="w-100" [ngClass]="{'pt-3': operation}">
+      <ds-item-operation [operation]="operation"></ds-item-operation>
+    </div>
+  }
 
 </div>
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
index 1bb17dc77c..d693d7758b 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -68,9 +66,7 @@ import { ItemOperation } from '../item-operation/itemOperation.model';
   ],
   imports: [
     TranslateModule,
-    NgForOf,
     AsyncPipe,
-    NgIf,
     RouterLink,
     ItemOperationComponent,
     NgClass,
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
index ec0c345d82..2a88d94f55 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.html
@@ -1,4 +1,6 @@
 <div class="mt-2" *ngVar="(itemRD$ | async)?.payload as item">
-  <ds-item-versions *ngIf="item" [item]="item" [displayWhenEmpty]="true" [displayTitle]="false"
-                    [displayActions]="true"></ds-item-versions>
+  @if (item) {
+    <ds-item-versions [item]="item" [displayWhenEmpty]="true" [displayTitle]="false"
+    [displayActions]="true"></ds-item-versions>
+  }
 </div>
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
index a414af0ce4..f2af333be7 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -23,7 +20,6 @@ import { ItemVersionsComponent } from '../../versions/item-versions.component';
   imports: [
     ItemVersionsComponent,
     VarDirective,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
index dbef279d8c..62a1c48c4d 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
@@ -1,18 +1,20 @@
 <table id="metadata" class="table table-striped table-hover table-responsive">
   <thead>
-  <tr>
-    <th scope="col">{{'item.edit.modify.overview.field'| translate}}</th>
-    <th scope="col">{{'item.edit.modify.overview.value'| translate}}</th>
-    <th scope="col">{{'item.edit.modify.overview.language'| translate}}</th>
-  </tr>
+    <tr>
+      <th scope="col">{{'item.edit.modify.overview.field'| translate}}</th>
+      <th scope="col">{{'item.edit.modify.overview.value'| translate}}</th>
+      <th scope="col">{{'item.edit.modify.overview.language'| translate}}</th>
+    </tr>
   </thead>
   <tbody>
-  <ng-container *ngFor="let mdEntry of metadata | keyvalue">
-    <tr *ngFor="let mdValue of mdEntry.value" class="metadata-row">
-      <td>{{mdEntry.key}}</td>
-      <td>{{mdValue.value}}</td>
-      <td>{{mdValue.language}}</td>
-    </tr>
-  </ng-container>
+    @for (mdEntry of metadata | keyvalue; track mdEntry) {
+      @for (mdValue of mdEntry.value; track mdValue) {
+        <tr class="metadata-row">
+          <td>{{mdEntry.key}}</td>
+          <td>{{mdValue.value}}</td>
+          <td>{{mdValue.language}}</td>
+        </tr>
+      }
+    }
   </tbody>
 </table>
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
index 3bd5024837..223c6b58c5 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
@@ -1,7 +1,4 @@
-import {
-  KeyValuePipe,
-  NgFor,
-} from '@angular/common';
+import { KeyValuePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -16,7 +13,7 @@ import { MetadataMap } from '../../../core/shared/metadata.models';
   selector: 'ds-modify-item-overview',
   templateUrl: './modify-item-overview.component.html',
   standalone: true,
-  imports: [NgFor, KeyValuePipe, TranslateModule],
+  imports: [KeyValuePipe, TranslateModule],
 })
 /**
  * Component responsible for rendering a table containing the metadatavalues from the to be edited item
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
index 927f7dbb48..e1fc018ace 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
@@ -1,38 +1,39 @@
 <div [ngClass]="showThumbnails ? 'hide-modal-thumbnail-column' : ''">
-    <div class="modal-header">{{'virtual-metadata.delete-relationship.modal-head' | translate}}
-        <button type="button" class="close" (click)="close.emit()" aria-label="Close">
-            <span aria-hidden="true">×</span>
-        </button>
-    </div>
-    <div class="modal-body">
-        <ng-container *ngFor="let itemDTO of itemDTOs$ | async; trackBy: trackItemDTO">
-            <div *ngVar="(itemDTO.isSelectedVirtualMetadataItem$ | async) as selected"
-                 (click)="setSelectedVirtualMetadataItem(itemDTO.item, !selected)"
-                 class="item d-flex flex-row">
-                <div class="m-2">
-                    <label>
-                        <input class="select" type="checkbox" [checked]="selected">
-                    </label>
-                </div>
-                <div class="flex-column">
-                    <ds-listable-object-component-loader [object]="itemDTO.item">
-                    </ds-listable-object-component-loader>
-                    <div *ngFor="let metadata of virtualMetadata.get(itemDTO.item.uuid)">
-                        <div class="font-weight-bold">
-                            {{metadata.metadataField}}
-                        </div>
-                        <div>
-                            {{metadata.metadataValue.value}}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </ng-container>
-        <div class="d-flex flex-row-reverse m-2">
-            <button class="btn btn-primary save"
-                    (click)="save.emit()">
-                <i aria-hidden="true" class="fas fa-save"></i> {{ 'item.edit.metadata.save-button' | translate }}
-            </button>
+  <div class="modal-header">{{'virtual-metadata.delete-relationship.modal-head' | translate}}
+    <button type="button" class="btn-close" (click)="close.emit()" aria-label="Close">
+    </button>
+  </div>
+  <div class="modal-body">
+    @for (itemDTO of itemDTOs$ | async; track trackItemDTO($index, itemDTO)) {
+      <div *ngVar="(itemDTO.isSelectedVirtualMetadataItem$ | async) as selected"
+        (click)="setSelectedVirtualMetadataItem(itemDTO.item, !selected)"
+        class="item d-flex flex-row">
+        <div class="m-2">
+          <label>
+            <input class="select" type="checkbox" [checked]="selected">
+          </label>
         </div>
+        <div class="flex-column">
+          <ds-listable-object-component-loader [object]="itemDTO.item">
+          </ds-listable-object-component-loader>
+          @for (metadata of virtualMetadata.get(itemDTO.item.uuid); track metadata) {
+            <div>
+              <div class="fw-bold">
+                {{metadata.metadataField}}
+              </div>
+              <div>
+                {{metadata.metadataValue.value}}
+              </div>
+            </div>
+          }
+        </div>
+      </div>
+    }
+    <div class="d-flex flex-row-reverse m-2">
+      <button class="btn btn-primary save"
+        (click)="save.emit()">
+        <i aria-hidden="true" class="fas fa-save"></i> {{ 'item.edit.metadata.save-button' | translate }}
+      </button>
     </div>
+  </div>
 </div>
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
index e02df167f5..3d0f520d3d 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts
@@ -99,7 +99,7 @@ describe('VirtualMetadataComponent', () => {
 
       spyOn(comp.close, 'emit');
       fixture.debugElement
-        .query(By.css('button.close'))
+        .query(By.css('button.btn-close'))
         .triggerEventHandler('click', null);
       expect(comp.close.emit).toHaveBeenCalled();
     });
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
index e8f42c8fc0..ad413db962 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
 } from '@angular/common';
 import {
   Component,
@@ -45,7 +44,6 @@ interface ItemDTO {
   imports: [
     NgClass,
     TranslateModule,
-    NgForOf,
     VarDirective,
     AsyncPipe,
     ListableObjectComponentLoaderComponent,
diff --git a/src/app/item-page/field-components/collections/collections.component.html b/src/app/item-page/field-components/collections/collections.component.html
index 7c08ce5c1c..f5f42bd272 100644
--- a/src/app/item-page/field-components/collections/collections.component.html
+++ b/src/app/item-page/field-components/collections/collections.component.html
@@ -1,21 +1,28 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <div class="collections">
-        <a *ngFor="let collection of (this.collections$ | async); let last=last;" [routerLink]="['/collections', collection.id]">
-            <span>{{ dsoNameService.getName(collection) }}</span><span *ngIf="!last" [innerHTML]="separator"></span>
-        </a>
-    </div>
-
-    <div *ngIf="isLoading$ | async">
-        {{'item.page.collections.loading' | translate}}
-    </div>
-
-    <a
-        *ngIf="(isLoading$ | async) !== true && (hasMore$ | async)"
-        (click)="$event.preventDefault(); handleLoadMore()"
-        class="load-more-btn btn btn-sm btn-outline-secondary"
-        role="button"
-        href="javascript:void(0);"
-    >
-        {{'item.page.collections.load-more' | translate}}
+  <div class="collections">
+    @for (collection of (this.collections$ | async); track collection; let last = $last) {
+      <a [routerLink]="['/collections', collection.id]">
+        <span>{{ dsoNameService.getName(collection) }}</span>@if (!last) {
+        <span [innerHTML]="separator"></span>
+      }
     </a>
+  }
+</div>
+
+@if (isLoading$ | async) {
+  <div>
+    {{'item.page.collections.loading' | translate}}
+  </div>
+}
+
+@if ((isLoading$ | async) !== true && (hasMore$ | async)) {
+  <a
+    (click)="$event.preventDefault(); handleLoadMore()"
+    class="load-more-btn btn btn-sm btn-outline-secondary"
+    role="button"
+    href="javascript:void(0);"
+    >
+    {{'item.page.collections.load-more' | translate}}
+  </a>
+}
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts
index e70dcfba2c..d5347c3285 100644
--- a/src/app/item-page/field-components/collections/collections.component.ts
+++ b/src/app/item-page/field-components/collections/collections.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -51,10 +47,8 @@ import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wr
   imports: [
     MetadataFieldWrapperComponent,
     TranslateModule,
-    NgForOf,
     AsyncPipe,
     RouterLink,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
index 4cef0a1592..2093318e66 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
@@ -1,5 +1,9 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <a class="dont-break-out" *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value" [target]="hasInternalLink(mdValue.value) ? '_self' : '_blank'">
-       {{ linktext || mdValue.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
-    </a>
+  @for (mdValue of mdValues; track mdValue; let last = $last) {
+    <a class="dont-break-out" [href]="mdValue.value" [target]="hasInternalLink(mdValue.value) ? '_self' : '_blank'">
+      {{ linktext || mdValue.value }}@if (!last) {
+      <span [innerHTML]="separator"></span>
+    }
+  </a>
+}
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index 944c70f49a..a583873d6e 100644
--- a/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -26,8 +23,6 @@ import { MetadataValuesComponent } from '../metadata-values/metadata-values.comp
   imports: [
     MetadataFieldWrapperComponent,
     TranslateModule,
-    NgForOf,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.html b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
index 44a3657fa5..015398f041 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.html
@@ -1,13 +1,15 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <ng-container *ngFor="let mdValue of mdValues; let last=last;">
-      <!--
-      Choose a template. Priority: markdown, link, browse link.
-      -->
+  @for (mdValue of mdValues; track mdValue; let last = $last) {
+    <!--
+    Choose a template. Priority: markdown, link, browse link.
+    -->
       <ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : (hasLink(mdValue) ? (hasValue(img) ? linkImg : link) : (hasBrowseDefinition() ? browselink : simple)));
         context: {value: mdValue.value, img}">
-      </ng-container>
-      <span class="separator" *ngIf="!last" [innerHTML]="separator"></span>
     </ng-container>
+    @if (!last) {
+      <span class="separator" [innerHTML]="separator"></span>
+    }
+  }
 </ds-metadata-field-wrapper>
 
 <!-- Render value as markdown -->
@@ -18,9 +20,12 @@
 
 <!-- Render value as a link (href and label) -->
 <ng-template #link let-value="value">
-    <a class="dont-break-out ds-simple-metadata-link" target="_blank" [href]="value">
-      {{value}}
-    </a>
+  <a class="dont-break-out ds-simple-metadata-link"
+    [href]="value"
+    [attr.target]="getLinkAttributes(value).target"
+    [attr.rel]="getLinkAttributes(value).rel">
+    {{value}}
+  </a>
 </ng-template>
 
 <!-- Render value as a link with icon -->
@@ -42,6 +47,6 @@
 <!-- Render value as a link to browse index -->
 <ng-template #browselink let-value="value">
   <a class="dont-break-out preserve-line-breaks ds-browse-link"
-     [routerLink]="['/browse', browseDefinition.id]"
-     [queryParams]="getQueryParams(value)">{{value}}</a>
+    [routerLink]="['/browse', browseDefinition.id]"
+  [queryParams]="getQueryParams(value)">{{value}}</a>
 </ng-template>
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
index 8e93175c46..5670128733 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.spec.ts
@@ -83,4 +83,20 @@ describe('MetadataValuesComponent', () => {
     expect(comp.hasLink(mdValue)).toBe(true);
   });
 
+  it('should return correct target and rel for internal links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(true);
+    const urlValue = '/internal-link';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_self');
+    expect(result.rel).toBe('');
+  });
+
+  it('should return correct target and rel for external links', () => {
+    spyOn(comp, 'hasInternalLink').and.returnValue(false);
+    const urlValue = 'https://www.dspace.org';
+    const result = comp.getLinkAttributes(urlValue);
+    expect(result.target).toBe('_blank');
+    expect(result.rel).toBe('noopener noreferrer');
+  });
+
 });
diff --git a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
index c6ff454737..d12881ce91 100644
--- a/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/item-page/field-components/metadata-values/metadata-values.component.ts
@@ -1,7 +1,5 @@
 import {
   AsyncPipe,
-  NgFor,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -36,7 +34,7 @@ import { ImageField } from '../../simple/field-components/specific-field/image-f
   styleUrls: ['./metadata-values.component.scss'],
   templateUrl: './metadata-values.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgFor, NgTemplateOutlet, NgIf, RouterLink, AsyncPipe, TranslateModule, MarkdownDirective],
+  imports: [MetadataFieldWrapperComponent, NgTemplateOutlet, RouterLink, AsyncPipe, TranslateModule, MarkdownDirective],
 })
 export class MetadataValuesComponent implements OnChanges {
 
@@ -134,4 +132,16 @@ export class MetadataValuesComponent implements OnChanges {
   hasInternalLink(linkValue: string): boolean {
     return linkValue.startsWith(environment.ui.baseUrl);
   }
+
+  /**
+   * This method performs a validation and determines the target of the url.
+   * @returns - Returns the target url.
+   */
+  getLinkAttributes(urlValue: string): { target: string, rel: string } {
+    if (this.hasInternalLink(urlValue)) {
+      return { target: '_self', rel: '' };
+    } else {
+      return { target: '_blank', rel: 'noopener noreferrer' };
+    }
+  }
 }
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
index 8c534e6630..b04d636a13 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.html
@@ -1,84 +1,84 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <div *ngVar="(originals$ | async)?.payload as originals">
-        <div *ngIf="hasValuesInBundle(originals)">
-            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h3>
-            <ds-pagination *ngIf="originals?.page?.length > 0"
-                           [hideGear]="true"
-                           [hidePagerWhenSinglePage]="true"
-                           [paginationOptions]="originalOptions"
-                           [collectionSize]="originals?.totalElements"
-                           [retainScrollPosition]="true">
-
-
-                <div class="file-section row mb-3" *ngFor="let file of originals?.page;">
-                    <div class="col-3">
-                        <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
-                    </div>
-                    <div class="col-7">
-                        <dl class="row">
-                            <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
-                            <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
-
-                            <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
-
-
-                            <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
-
-                          <ng-container *ngIf="file.hasMetadata('dc.description')">
-                            <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
-                            <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
-                          </ng-container>
-                        </dl>
-                    </div>
-                    <div class="col-2">
-                        <ds-file-download-link [bitstream]="file" [item]="item">
-                            {{"item.page.filesection.download" | translate}}
-                        </ds-file-download-link>
-                    </div>
+  <div *ngVar="(originals$ | async)?.payload as originals">
+    @if (hasValuesInBundle(originals)) {
+      <div>
+        <h3 class="h5 simple-view-element-header">{{"item.page.filesection.original.bundle" | translate}}</h3>
+        @if (originals?.page?.length > 0) {
+          <ds-pagination
+            [hideGear]="true"
+            [hidePagerWhenSinglePage]="true"
+            [paginationOptions]="originalOptions"
+            [collectionSize]="originals?.totalElements"
+            [retainScrollPosition]="true">
+            @for (file of originals?.page; track file) {
+              <div class="file-section row mb-3">
+                <div class="col-3">
+                  <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
                 </div>
-            </ds-pagination>
-        </div>
-    </div>
-    <div *ngVar="(licenses$ | async)?.payload as licenses">
-        <div *ngIf="hasValuesInBundle(licenses)">
-            <h3 class="h5 simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h3>
-            <ds-pagination *ngIf="licenses?.page?.length > 0"
-                           [hideGear]="true"
-                           [hidePagerWhenSinglePage]="true"
-                           [paginationOptions]="licenseOptions"
-                           [collectionSize]="licenses?.totalElements"
-                           [retainScrollPosition]="true">
-
-
-                <div class="file-section row" *ngFor="let file of licenses?.page;">
-                    <div class="col-3">
-                        <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
-                    </div>
-                    <div class="col-7">
-                        <dl class="row">
-                            <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
-                            <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
-
-                            <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
-
-                            <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
-                            <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
-
-
-                            <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
-                            <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
-                        </dl>
-                    </div>
-                    <div class="col-2">
-                        <ds-file-download-link [bitstream]="file" [item]="item">
-                            {{"item.page.filesection.download" | translate}}
-                        </ds-file-download-link>
-                    </div>
+                <div class="col-7">
+                  <dl class="row">
+                    <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
+                    <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
+                    <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
+                    <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
+                    @if (file.hasMetadata('dc.description')) {
+                      <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
+                      <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
+                    }
+                  </dl>
                 </div>
-            </ds-pagination>
-        </div>
-    </div>
+                <div class="col-2">
+                  <ds-file-download-link [bitstream]="file" [item]="item">
+                    {{"item.page.filesection.download" | translate}}
+                  </ds-file-download-link>
+                </div>
+              </div>
+            }
+          </ds-pagination>
+        }
+      </div>
+    }
+  </div>
+  <div *ngVar="(licenses$ | async)?.payload as licenses">
+    @if (hasValuesInBundle(licenses)) {
+      <div>
+        <h3 class="h5 simple-view-element-header">{{"item.page.filesection.license.bundle" | translate}}</h3>
+        @if (licenses?.page?.length > 0) {
+          <ds-pagination
+            [hideGear]="true"
+            [hidePagerWhenSinglePage]="true"
+            [paginationOptions]="licenseOptions"
+            [collectionSize]="licenses?.totalElements"
+            [retainScrollPosition]="true">
+            @for (file of licenses?.page; track file) {
+              <div class="file-section row">
+                <div class="col-3">
+                  <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
+                </div>
+                <div class="col-7">
+                  <dl class="row">
+                    <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
+                    <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
+                    <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
+                    <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
+                    <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
+                    <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
+                  </dl>
+                </div>
+                <div class="col-2">
+                  <ds-file-download-link [bitstream]="file" [item]="item">
+                    {{"item.page.filesection.download" | translate}}
+                  </ds-file-download-link>
+                </div>
+              </div>
+            }
+          </ds-pagination>
+        }
+      </div>
+    }
+  </div>
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
index f038b18bfc..463ee85635 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -57,12 +53,10 @@ import { FileSectionComponent } from '../../../simple/field-components/file-sect
   templateUrl: './full-file-section.component.html',
   imports: [
     PaginationComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
     VarDirective,
     ThemedThumbnailComponent,
-    NgForOf,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
     MetadataFieldWrapperComponent,
diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
index b6e1d1e6ed..c6c7d90bf4 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -1,44 +1,60 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
-  <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
-    <div *ngIf="itemRD?.payload as item">
-      <ds-item-alerts [item]="item"></ds-item-alerts>
-      <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
-      <ds-view-tracker [object]="item"></ds-view-tracker>
-      <div *ngIf="!item.isWithdrawn || (isAdmin$|async)" class="full-item-info">
-        <div class="d-flex flex-row">
-          <ds-item-page-title-field class="mr-auto" [item]="item"></ds-item-page-title-field>
-          <ds-dso-edit-menu></ds-dso-edit-menu>
-        </div>
-        <div class="simple-view-link my-3" *ngIf="!fromSubmissionObject">
-          <a class="btn btn-outline-primary" [routerLink]="[(itemPageRoute$ | async)]">
-            {{"item.page.link.simple" | translate}}
-          </a>
-        </div>
-        <div class="table-responsive">
-          <table class="table  table-striped">
-            <tbody>
-            <ng-container *ngFor="let mdEntry of (metadata$ | async) | keyvalue">
-              <tr *ngFor="let mdValue of mdEntry.value">
-                <td>{{mdEntry.key}}</td>
-                <td>{{mdValue.value}}</td>
-                <td>{{mdValue.language}}</td>
-              </tr>
-            </ng-container>
-            </tbody>
-          </table>
-        </div>
-        <ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section>
-        <ds-item-page-collections [item]="item"></ds-item-page-collections>
-        <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
-        <div class="button-row bottom" *ngIf="fromSubmissionObject">
-          <div class="text-right">
-            <button class="btn btn-outline-secondary mr-1" (click)="back()"><i
+  @if (itemRD?.hasSucceeded) {
+    <div class="item-page" @fadeInOut>
+      @if (itemRD?.payload; as item) {
+        <div>
+          <ds-item-alerts [item]="item"></ds-item-alerts>
+          <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
+          <ds-view-tracker [object]="item"></ds-view-tracker>
+          @if (!item.isWithdrawn || (isAdmin$|async)) {
+            <div class="full-item-info">
+              <div class="d-flex flex-row">
+                <ds-item-page-title-field class="me-auto" [item]="item"></ds-item-page-title-field>
+                <ds-dso-edit-menu></ds-dso-edit-menu>
+              </div>
+              @if (!fromSubmissionObject) {
+                <div class="simple-view-link my-3">
+                  <a class="btn btn-outline-primary" [routerLink]="[(itemPageRoute$ | async)]">
+                    {{"item.page.link.simple" | translate}}
+                  </a>
+                </div>
+              }
+              <div class="table-responsive">
+                <table class="table  table-striped">
+                  <tbody>
+                    @for (mdEntry of (metadata$ | async) | keyvalue; track mdEntry) {
+                      @for (mdValue of mdEntry.value; track mdValue) {
+                        <tr>
+                          <td>{{mdEntry.key}}</td>
+                          <td>{{mdValue.value}}</td>
+                          <td>{{mdValue.language}}</td>
+                        </tr>
+                      }
+                    }
+                  </tbody>
+                </table>
+              </div>
+              <ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section>
+              <ds-item-page-collections [item]="item"></ds-item-page-collections>
+              <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
+              @if (fromSubmissionObject) {
+                <div class="button-row bottom">
+                  <div class="text-end">
+                    <button class="btn btn-outline-secondary me-1" (click)="back()"><i
                     class="fas fa-arrow-left"></i> {{'item.page.return' | translate}}</button>
-          </div>
+                  </div>
+                </div>
+              }
+            </div>
+          }
         </div>
-      </div>
+      }
     </div>
-  </div>
-  <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
-  <ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
+  }
+  @if (itemRD?.hasFailed) {
+    <ds-error message="{{'error.item' | translate}}"></ds-error>
+  }
+  @if (itemRD?.isLoading) {
+    <ds-loading message="{{'loading.item' | translate}}"></ds-loading>
+  }
 </div>
diff --git a/src/app/item-page/full/full-item-page.component.ts b/src/app/item-page/full/full-item-page.component.ts
index 88a1254feb..9b982c7a5f 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   KeyValuePipe,
   Location,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -71,8 +69,6 @@ import { ThemedFullFileSectionComponent } from './field-components/file-section/
     ThemedFullFileSectionComponent,
     CollectionsComponent,
     ItemVersionsComponent,
-    NgIf,
-    NgForOf,
     AsyncPipe,
     KeyValuePipe,
     RouterLink,
diff --git a/src/app/item-page/item-page-routes.ts b/src/app/item-page/item-page-routes.ts
index 684ea56459..854d66fabe 100644
--- a/src/app/item-page/item-page-routes.ts
+++ b/src/app/item-page/item-page-routes.ts
@@ -27,7 +27,6 @@ export const ROUTES: Route[] = [
     resolve: {
       dso: itemPageResolver,
       breadcrumb: itemBreadcrumbResolver,
-      menu: dsoEditMenuResolver,
     },
     runGuardsAndResolvers: 'always',
     children: [
@@ -35,10 +34,16 @@ export const ROUTES: Route[] = [
         path: '',
         component: ThemedItemPageComponent,
         pathMatch: 'full',
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
       },
       {
         path: 'full',
         component: ThemedFullItemPageComponent,
+        resolve: {
+          menu: dsoEditMenuResolver,
+        },
       },
       {
         path: ITEM_EDIT_PATH,
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
index 3217680815..a3d87c780d 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
@@ -8,47 +8,49 @@
   "
   preload="none"
   controls
->
-  <ng-container *ngIf="getMediaCap(medias[currentIndex].bitstream.name, captions) as capInfos">
-    <ng-container *ngFor="let capInfo of capInfos">
+  >
+  @if (getMediaCap(medias[currentIndex].bitstream.name, captions); as capInfos) {
+    @for (capInfo of capInfos; track capInfo) {
       <track [src]="capInfo.src" [label]="capInfo.langLabel" [srclang]="capInfo.srclang" />
-    </ng-container>
-  </ng-container>
+    }
+  }
 
 </video>
-<div class="buttons" *ngIf="medias?.length > 1">
-  <button
-    class="btn btn-primary previous"
-    [disabled]="currentIndex === 0"
-    (click)="prevMedia()"
-  >
-    {{ "media-viewer.previous" | translate }}
-  </button>
-
-  <button
-    class="btn btn-primary next"
-    [disabled]="currentIndex === medias.length - 1"
-    (click)="nextMedia()"
-  >
-    {{ "media-viewer.next" | translate }}
-  </button>
-  <div ngbDropdown class="d-inline-block">
+@if (medias?.length > 1) {
+  <div class="buttons">
     <button
-      class="btn btn-outline-primary playlist"
-      id="dropdownBasic1"
-      ngbDropdownToggle
-    >
-      {{ "media-viewer.playlist" | translate }}
-    </button>
-    <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
-      <button
-        ngbDropdownItem
-        *ngFor="let item of medias; index as indexOfelement"
-        class="list-element"
-        (click)="selectedMedia(indexOfelement)"
+      class="btn btn-primary previous"
+      [dsBtnDisabled]="currentIndex === 0"
+      (click)="prevMedia()"
       >
-        {{ dsoNameService.getName(item.bitstream) }}
+      {{ "media-viewer.previous" | translate }}
+    </button>
+    <button
+      class="btn btn-primary next"
+      [dsBtnDisabled]="currentIndex === medias.length - 1"
+      (click)="nextMedia()"
+      >
+      {{ "media-viewer.next" | translate }}
+    </button>
+    <div ngbDropdown class="d-inline-block">
+      <button
+        class="btn btn-outline-primary playlist"
+        id="dropdownBasic1"
+        ngbDropdownToggle
+        >
+        {{ "media-viewer.playlist" | translate }}
       </button>
+      <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
+        @for (item of medias; track item; let indexOfelement = $index) {
+          <button
+            ngbDropdownItem
+            class="list-element"
+            (click)="selectedMedia(indexOfelement)"
+            >
+            {{ dsoNameService.getName(item.bitstream) }}
+          </button>
+        }
+      </div>
     </div>
   </div>
-</div>
+}
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 700431ff3f..3c4c9b94c6 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -12,6 +9,7 @@ import { Bitstream } from 'src/app/core/shared/bitstream.model';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { CaptionInfo } from './caption-info';
 import { languageHelper } from './language-helper';
 
@@ -23,10 +21,9 @@ import { languageHelper } from './language-helper';
   templateUrl: './media-viewer-video.component.html',
   styleUrls: ['./media-viewer-video.component.scss'],
   imports: [
-    NgForOf,
     NgbDropdownModule,
     TranslateModule,
-    NgIf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/media-viewer/media-viewer.component.html b/src/app/item-page/media-viewer/media-viewer.component.html
index a76ee73963..934687c4a0 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.html
+++ b/src/app/item-page/media-viewer/media-viewer.component.html
@@ -1,27 +1,50 @@
 <ng-container *ngVar="mediaList$ | async as mediaList">
-  <ds-loading
-    *ngIf="isLoading"
-    message="{{ 'loading.default' | translate }}"
-    [showMessage]="false"
-  ></ds-loading>
-  <div class="media-viewer" *ngIf="!isLoading">
-    <ng-container *ngIf="mediaList.length > 0; else showThumbnail">
-      <ng-container *ngVar="mediaOptions.video && ['audio', 'video'].includes(mediaList[0]?.format) as showVideo">
-        <ng-container *ngVar="mediaOptions.image && mediaList[0]?.format === 'image' as showImage">
-          <ds-media-viewer-video *ngIf="showVideo" [medias]="mediaList" [captions]="captions$ | async"></ds-media-viewer-video>
-          <ds-media-viewer-image *ngIf="showImage" [images]="mediaList"></ds-media-viewer-image>
-          <ng-container *ngIf="showImage || showVideo; else showThumbnail"></ng-container>
-        </ng-container>
-      </ng-container>
-    </ng-container>
-  </div>
-  <ng-template #showThumbnail>
-    <ds-media-viewer-image *ngIf="mediaOptions.image && mediaOptions.video"
-      [image]="(thumbnailsRD$ | async)?.payload?.page[0]?._links.content.href || thumbnailPlaceholder"
-      [preview]="false"
-    ></ds-media-viewer-image>
-    <ds-thumbnail *ngIf="!(mediaOptions.image && mediaOptions.video)"
+  @if (isLoading) {
+    <ds-loading
+      message="{{ 'loading.default' | translate }}"
+      [showMessage]="false"
+    ></ds-loading>
+  }
+  @if (!isLoading) {
+    <div class="media-viewer">
+      @if (mediaList.length > 0) {
+        <ng-container *ngVar="mediaOptions.video && ['audio', 'video'].includes(mediaList[0]?.format) as showVideo">
+          <ng-container *ngVar="mediaOptions.image && mediaList[0]?.format === 'image' as showImage">
+            @if (showVideo) {
+              <ds-media-viewer-video [medias]="mediaList" [captions]="captions$ | async"></ds-media-viewer-video>
+            }
+            @if (showImage) {
+              <ds-media-viewer-image [images]="mediaList"></ds-media-viewer-image>
+            }
+            @if (showImage || showVideo) {
+            } @else {
+              @if (mediaOptions.image && mediaOptions.video) {
+                <ds-media-viewer-image
+                  [image]="(thumbnailsRD$ | async)?.payload?.page[0]?._links.content.href || thumbnailPlaceholder"
+                  [preview]="false"
+                ></ds-media-viewer-image>
+              }
+              @if (!(mediaOptions.image && mediaOptions.video)) {
+                <ds-thumbnail
                   [thumbnail]="(thumbnailsRD$ | async)?.payload?.page[0]">
-    </ds-thumbnail>
-  </ng-template>
+                </ds-thumbnail>
+              }
+            }
+          </ng-container>
+        </ng-container>
+      } @else {
+        @if (mediaOptions.image && mediaOptions.video) {
+          <ds-media-viewer-image
+            [image]="(thumbnailsRD$ | async)?.payload?.page[0]?._links.content.href || thumbnailPlaceholder"
+            [preview]="false"
+          ></ds-media-viewer-image>
+        }
+        @if (!(mediaOptions.image && mediaOptions.video)) {
+          <ds-thumbnail
+            [thumbnail]="(thumbnailsRD$ | async)?.payload?.page[0]">
+          </ds-thumbnail>
+        }
+      }
+    </div>
+  }
 </ng-container>
diff --git a/src/app/item-page/media-viewer/media-viewer.component.ts b/src/app/item-page/media-viewer/media-viewer.component.ts
index 7513f5dada..9e5d9bd028 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -49,7 +46,6 @@ import { ThemedMediaViewerVideoComponent } from './media-viewer-video/themed-med
     ThemedMediaViewerImageComponent,
     ThemedThumbnailComponent,
     AsyncPipe,
-    NgIf,
     ThemedMediaViewerVideoComponent,
     TranslateModule,
     ThemedLoadingComponent,
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.html b/src/app/item-page/mirador-viewer/mirador-viewer.component.html
index fe8ede6cee..7f2d0c0aac 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.html
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.html
@@ -1,4 +1,8 @@
 <p class="full-text-op">{{'iiifviewer.fullscreen.notice' | translate}}</p>
-<p *ngIf="!isViewerAvailable" id="viewer-message">{{viewerMessage}}</p>
-<iframe title="Mirador Viewer" allowtransparency="true" *ngIf="isViewerAvailable" [src]="iframeViewerUrl | async" id="mirador-viewer"></iframe>
+@if (!isViewerAvailable) {
+  <p id="viewer-message">{{viewerMessage}}</p>
+}
+@if (isViewerAvailable) {
+  <iframe title="Mirador Viewer" allowtransparency="true" [src]="iframeViewerUrl | async" id="mirador-viewer"></iframe>
+}
 
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
index 5ad17569be..f1cdb6e4f4 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformBrowser,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -43,7 +42,6 @@ import { MiradorViewerService } from './mirador-viewer.service';
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index b53c400385..d2f7bc04b6 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -1,65 +1,180 @@
 <div class="container mb-5">
   <h1>{{'person.orcid.registry.auth' | translate}}</h1>
-  <ng-container *ngIf="(isLinkedToOrcid() | async); then orcidLinked; else orcidNotLinked"></ng-container>
+  @if ((isLinkedToOrcid() | async)) {
+    <div data-test="orcidLinked">
+      <div class="row">
+        @if ((hasOrcidAuthorizations() | async)) {
+          <div class="col-sm-6 mb-3" data-test="hasOrcidAuthorizations">
+            <div class="card h-100">
+              <div class="card-header">{{ 'person.page.orcid.granted-authorizations'| translate }}</div>
+              <div class="card-body">
+                <div class="container p-0">
+                  <ul>
+                    @for (auth of (getOrcidAuthorizations() | async); track auth) {
+                      <li data-test="orcidAuthorization">
+                        {{getAuthorizationDescription(auth) | translate}}
+                      </li>
+                    }
+                  </ul>
+                </div>
+              </div>
+            </div>
+          </div>
+        }
+        <div class="col-sm-6 mb-3">
+          <div class="card h-100">
+            <div class="card-header">{{ 'person.page.orcid.missing-authorizations'| translate }}</div>
+            <div class="card-body">
+              <div class="container">
+                @if ((hasMissingOrcidAuthorizations() | async) !== true) {
+                  <ds-alert [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
+                    {{'person.page.orcid.no-missing-authorizations-message' | translate}}
+                  </ds-alert>
+                }
+                @if ((hasMissingOrcidAuthorizations() | async)) {
+                  <ds-alert [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
+                    {{'person.page.orcid.missing-authorizations-message' | translate}}
+                    <ul>
+                      @for (auth of (getMissingOrcidAuthorizations() | async); track auth) {
+                        <li data-test="missingOrcidAuthorization">
+                          {{getAuthorizationDescription(auth) | translate }}
+                        </li>
+                      }
+                    </ul>
+                  </ds-alert>
+                }
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      @if ((onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true) {
+        <ds-alert
+          [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
+          {{ 'person.page.orcid.remove-orcid-message' | translate}}
+        </ds-alert>
+      }
+      @if ((ownerCanDisconnectProfileFromOrcid() | async)) {
+        <div class="row" data-test="unlinkOwner">
+          <div class="col">
+            <button type="submit" class="btn btn-danger float-end" (click)="unlinkOrcid()"
+              [dsBtnDisabled]="(unlinkProcessing | async)">
+              @if ((unlinkProcessing | async) !== true) {
+                <span><i
+                class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
+              }
+              @if ((unlinkProcessing | async)) {
+                <span><i
+                class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
+              }
+            </button>
+            @if ((hasMissingOrcidAuthorizations() | async)) {
+              <button type="submit"
+                class="btn btn-primary float-end" (click)="linkOrcid()">
+                <span><i class="fas fa-check"></i> {{ 'person.page.orcid.grant-authorizations' | translate }}</span>
+              </button>
+            }
+          </div>
+        </div>
+      }
+    </div>
+  } @else {
+    <div data-test="orcidNotLinked">
+      <div class="row">
+        <div class="col-2"><img alt="orcid-logo" src="../../../../assets/images/orcid.logo.icon.svg"/></div>
+        <div class="col">
+          <ds-alert [type]="'alert-info'">{{ getOrcidNotLinkedMessage() | async }}</ds-alert>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col">
+          <button class="btn btn-primary float-end" (click)="linkOrcid()">
+            <i class="fas fa-link"></i>
+            {{'person.page.orcid.link' | translate}}
+          </button>
+        </div>
+      </div>
+    </div>
+  }
 </div>
 
 <ng-template #orcidLinked>
   <div data-test="orcidLinked">
     <div class="row">
-      <div *ngIf="(hasOrcidAuthorizations() | async)" class="col-sm-6 mb-3" data-test="hasOrcidAuthorizations">
-        <div class="card h-100">
-          <div class="card-header">{{ 'person.page.orcid.granted-authorizations'| translate }}</div>
-          <div class="card-body">
-            <div class="container p-0">
-              <ul>
-                <li *ngFor="let auth of (getOrcidAuthorizations() | async)" data-test="orcidAuthorization">
-                  {{getAuthorizationDescription(auth) | translate}}
-                </li>
-              </ul>
+      @if ((hasOrcidAuthorizations() | async)) {
+        <div class="col-sm-6 mb-3" data-test="hasOrcidAuthorizations">
+          <div class="card h-100">
+            <div class="card-header">{{ 'person.page.orcid.granted-authorizations'| translate }}</div>
+            <div class="card-body">
+              <div class="container p-0">
+                <ul>
+                  @for (auth of (getOrcidAuthorizations() | async); track auth) {
+                    <li data-test="orcidAuthorization">
+                      {{getAuthorizationDescription(auth) | translate}}
+                    </li>
+                  }
+                </ul>
+              </div>
             </div>
           </div>
         </div>
-      </div>
+      }
       <div class="col-sm-6 mb-3">
         <div class="card h-100">
           <div class="card-header">{{ 'person.page.orcid.missing-authorizations'| translate }}</div>
           <div class="card-body">
             <div class="container">
-              <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async) !== true" [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
-                {{'person.page.orcid.no-missing-authorizations-message' | translate}}
-              </ds-alert>
-              <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async)" [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
-                {{'person.page.orcid.missing-authorizations-message' | translate}}
-                <ul>
-                  <li *ngFor="let auth of (getMissingOrcidAuthorizations() | async)" data-test="missingOrcidAuthorization">
-                    {{getAuthorizationDescription(auth) | translate }}
-                  </li>
-                </ul>
-              </ds-alert>
+              @if ((hasMissingOrcidAuthorizations() | async) !== true) {
+                <ds-alert [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
+                  {{'person.page.orcid.no-missing-authorizations-message' | translate}}
+                </ds-alert>
+              }
+              @if ((hasMissingOrcidAuthorizations() | async)) {
+                <ds-alert [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
+                  {{'person.page.orcid.missing-authorizations-message' | translate}}
+                  <ul>
+                    @for (auth of (getMissingOrcidAuthorizations() | async); track auth) {
+                      <li data-test="missingOrcidAuthorization">
+                        {{getAuthorizationDescription(auth) | translate }}
+                      </li>
+                    }
+                  </ul>
+                </ds-alert>
+              }
             </div>
           </div>
         </div>
       </div>
     </div>
-    <ds-alert *ngIf="(onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true"
-              [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
-      {{ 'person.page.orcid.remove-orcid-message' | translate}}
-    </ds-alert>
-    <div class="row" *ngIf="(ownerCanDisconnectProfileFromOrcid() | async)" data-test="unlinkOwner">
-      <div class="col">
-        <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
-                [disabled]="(unlinkProcessing | async)">
-          <span *ngIf="(unlinkProcessing | async) !== true"><i
-            class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
-          <span *ngIf="(unlinkProcessing | async)"><i
-            class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
-        </button>
-        <button *ngIf="(hasMissingOrcidAuthorizations() | async)" type="submit"
-                class="btn btn-primary float-right" (click)="linkOrcid()">
-          <span><i class="fas fa-check"></i> {{ 'person.page.orcid.grant-authorizations' | translate }}</span>
-        </button>
+    @if ((onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true) {
+      <ds-alert
+        [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
+        {{ 'person.page.orcid.remove-orcid-message' | translate}}
+      </ds-alert>
+    }
+    @if ((ownerCanDisconnectProfileFromOrcid() | async)) {
+      <div class="row" data-test="unlinkOwner">
+        <div class="col">
+          <button type="submit" class="btn btn-danger float-end" (click)="unlinkOrcid()"
+            [dsBtnDisabled]="(unlinkProcessing | async)">
+            @if ((unlinkProcessing | async) !== true) {
+              <span><i
+              class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
+            }
+            @if ((unlinkProcessing | async)) {
+              <span><i
+              class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
+            }
+          </button>
+          @if ((hasMissingOrcidAuthorizations() | async)) {
+            <button type="submit"
+              class="btn btn-primary float-end" (click)="linkOrcid()">
+              <span><i class="fas fa-check"></i> {{ 'person.page.orcid.grant-authorizations' | translate }}</span>
+            </button>
+          }
+        </div>
       </div>
-    </div>
+    }
   </div>
 </ng-template>
 
@@ -73,7 +188,7 @@
     </div>
     <div class="row">
       <div class="col">
-        <button class="btn btn-primary float-right" (click)="linkOrcid()">
+        <button class="btn btn-primary float-end" (click)="linkOrcid()">
           <i class="fas fa-link"></i>
           {{'person.page.orcid.link' | translate}}
         </button>
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
index 6a3b8af937..2d39ee25a8 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -34,6 +30,7 @@ import {
 import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { AlertComponent } from '../../../shared/alert/alert.component';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-data.utils';
 
@@ -44,9 +41,8 @@ import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-d
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgForOf,
     AlertComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/orcid-page/orcid-page.component.html b/src/app/item-page/orcid-page/orcid-page.component.html
index 7c5ab4a276..586f27bb3f 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -1,19 +1,29 @@
-<ds-loading *ngIf="(processingConnection | async)" [message]="'person.page.orcid.link.processing' | translate"></ds-loading>
-<div class="container" *ngIf="(processingConnection | async) !== true && (connectionStatus | async) !== true" data-test="error-box">
-  <ds-alert [type]="AlertType.Error">{{'person.page.orcid.link.error.message' | translate}}</ds-alert>
-</div>
-<ng-container *ngIf="(processingConnection | async) !== true && (item | async) && (connectionStatus | async)" >
+@if ((processingConnection | async)) {
+  <ds-loading [message]="'person.page.orcid.link.processing' | translate"></ds-loading>
+}
+@if ((processingConnection | async) !== true && (connectionStatus | async) !== true) {
+  <div class="container" data-test="error-box">
+    <ds-alert [type]="AlertType.Error">{{'person.page.orcid.link.error.message' | translate}}</ds-alert>
+  </div>
+}
+@if ((processingConnection | async) !== true && (item | async) && (connectionStatus | async)) {
   <ds-orcid-auth [item]="(item | async)" (unlink)="updateItem()" data-test="orcid-auth"></ds-orcid-auth>
-  <ds-orcid-sync-setting *ngIf="isLinkedToOrcid()" [item]="(item | async)" (settingsUpdated)="updateItem()" data-test="orcid-sync-setting"></ds-orcid-sync-setting>
-  <ds-orcid-queue *ngIf="isLinkedToOrcid()" [item]="(item | async)"></ds-orcid-queue>
-</ng-container>
+  @if (isLinkedToOrcid()) {
+    <ds-orcid-sync-setting [item]="(item | async)" (settingsUpdated)="updateItem()" data-test="orcid-sync-setting"></ds-orcid-sync-setting>
+  }
+  @if (isLinkedToOrcid()) {
+    <ds-orcid-queue [item]="(item | async)"></ds-orcid-queue>
+  }
+}
 
-<div *ngIf="(processingConnection | async) !== true && (item | async)" class="container">
-  <div class="button-row bottom mb-3">
-    <div class="text-right">
-      <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
-        <i class="fas fa-arrow-left"></i> {{'item.orcid.return' | translate}}
-      </a>
+@if ((processingConnection | async) !== true && (item | async)) {
+  <div class="container">
+    <div class="button-row bottom mb-3">
+      <div class="text-end">
+        <a [routerLink]="getItemPage()" role="button" class="btn btn-outline-secondary" data-test="back-button">
+          <i class="fas fa-arrow-left"></i> {{'item.orcid.return' | translate}}
+        </a>
+      </div>
     </div>
   </div>
-</div>
+}
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index e9d9ec035b..014f995ae0 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -1,53 +1,60 @@
 <div>
-  <ds-loading *ngIf="(processing$ | async)"></ds-loading>
+  @if ((processing$ | async)) {
+    <ds-loading></ds-loading>
+  }
   <div class="container">
     <h2>{{ 'person.orcid.registry.queue' | translate }}</h2>
 
-    <ds-alert *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements === 0"
-              [type]="AlertTypeEnum.Info">
-      {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
-    </ds-alert>
-    <ds-pagination *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements > 0"
-                   [paginationOptions]="paginationOptions"
-                   [collectionSize]="(getList() | async)?.payload?.totalElements"
-                   [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
-
-      <div class="table-responsive">
-        <table id="groups" class="table table-sm table-striped table-hover table-bordered">
-          <thead>
-          <tr class="text-center align-middle">
-            <th>{{'person.page.orcid.sync-queue.table.header.type' | translate}}</th>
-            <th>{{'person.page.orcid.sync-queue.table.header.description' | translate}}</th>
-            <th>{{'person.page.orcid.sync-queue.table.header.action' | translate}}</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr *ngFor="let entry of (getList() | async)?.payload?.page" data-test="orcidQueueElementRow">
-            <td style="width: 15%" class="text-center align-middle">
-              <i [ngClass]="getIconClass(entry)" [ngbTooltip]="getIconTooltip(entry) | translate"
-                 class="fa-2x" aria-hidden="true"></i>
-            </td>
-            <td class="text-center align-middle">
-              {{ entry.description }}
-            </td>
-            <td style="width: 20%" class="text-center">
-              <div class="btn-group edit-field">
-                <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
+    @if ((processing$ | async) !== true && (getList() | async)?.payload?.totalElements === 0) {
+      <ds-alert
+        [type]="AlertTypeEnum.Info">
+        {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
+      </ds-alert>
+    }
+    @if ((processing$ | async) !== true && (getList() | async)?.payload?.totalElements > 0) {
+      <ds-pagination
+        [paginationOptions]="paginationOptions"
+        [collectionSize]="(getList() | async)?.payload?.totalElements"
+        [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
+        <div class="table-responsive">
+          <table id="groups" class="table table-sm table-striped table-hover table-bordered">
+            <thead>
+              <tr class="text-center align-middle">
+                <th>{{'person.page.orcid.sync-queue.table.header.type' | translate}}</th>
+                <th>{{'person.page.orcid.sync-queue.table.header.description' | translate}}</th>
+                <th>{{'person.page.orcid.sync-queue.table.header.action' | translate}}</th>
+              </tr>
+            </thead>
+            <tbody>
+              @for (entry of (getList() | async)?.payload?.page; track entry) {
+                <tr data-test="orcidQueueElementRow">
+                  <td style="width: 15%" class="text-center align-middle">
+                    <i [ngClass]="getIconClass(entry)" [ngbTooltip]="getIconTooltip(entry) | translate"
+                    class="fa-2x" aria-hidden="true"></i>
+                  </td>
+                  <td class="text-center align-middle">
+                    {{ entry.description }}
+                  </td>
+                  <td style="width: 20%" class="text-center">
+                    <div class="btn-group edit-field">
+                      <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
                         class="btn btn-outline-primary my-1 col-md" (click)="send(entry)">
-                  <span [ngClass]="getOperationClass(entry)"></span>
-                  <span class="sr-only">{{ getOperationTooltip(entry) | translate }}</span>
-                </button>
-                <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
+                        <span [ngClass]="getOperationClass(entry)"></span>
+                        <span class="sr-only">{{ getOperationTooltip(entry) | translate }}</span>
+                      </button>
+                      <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
                         class="btn btn-outline-danger my-1 col-md" (click)="discardEntry(entry)">
-                  <span class="fas fa-unlink"></span>
-                  <span class="sr-only">{{ 'person.page.orcid.sync-queue.discard' | translate }}</span>
-                </button>
-              </div>
-            </td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </ds-pagination>
+                        <span class="fas fa-unlink"></span>
+                        <span class="sr-only">{{ 'person.page.orcid.sync-queue.discard' | translate }}</span>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              }
+            </tbody>
+          </table>
+        </div>
+      </ds-pagination>
+    }
   </div>
 </div>
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
index 19044e5a70..0d7ece9237 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.html
@@ -12,12 +12,14 @@
                   {{ 'person.page.orcid.synchronization-mode-message' | translate}}
                 </ds-alert>
               </div>
-              <div class="form-group row">
-                <label for="syncMode">{{ 'person.page.orcid.synchronization-mode.label'| translate }}</label>
-                <select class="form-control" [(ngModel)]="currentSyncMode" name="syncMode" id="syncMode"
-                        required>
-                  <option *ngFor="let syncMode of syncModes"
-                          [value]="syncMode.value">{{ syncMode.label | translate }}</option>
+              <div class="mb-3 row">
+                <label class="form-label" for="syncMode">{{ 'person.page.orcid.synchronization-mode.label'| translate }}</label>
+                <select class="form-select" [(ngModel)]="currentSyncMode" name="syncMode" id="syncMode"
+                  required>
+                  @for (syncMode of syncModes; track syncMode) {
+                    <option
+                    [value]="syncMode.value">{{ syncMode.label | translate }}</option>
+                  }
                 </select>
               </div>
             </div>
@@ -36,14 +38,16 @@
                   {{ 'person.page.orcid.synchronization-mode-publication-message' | translate}}
                 </ds-alert>
               </div>
-              <div class="form-group">
-                <div *ngFor="let option of syncPublicationOptions" class="row form-check">
-                  <input type="radio" [(ngModel)]="currentSyncPublications"
-                         name="syncPublications" id="publicationOption_{{option.value}}" [value]="option.value"
-                         required>
-                  <label for="publicationOption_{{option.value}}"
-                         class="ml-2">{{option.label | translate}}</label>
-                </div>
+              <div class="mb-3">
+                @for (option of syncPublicationOptions; track option) {
+                  <div class="row form-check">
+                    <input type="radio" [(ngModel)]="currentSyncPublications"
+                      name="syncPublications" id="publicationOption_{{option.value}}" [value]="option.value"
+                      required>
+                    <label for="publicationOption_{{option.value}}"
+                    class="ms-2 form-label">{{option.label | translate}}</label>
+                  </div>
+                }
               </div>
             </div>
           </div>
@@ -59,13 +63,15 @@
                   {{ 'person.page.orcid.synchronization-mode-funding-message' | translate}}
                 </ds-alert>
               </div>
-              <div class="form-group">
-                <div *ngFor="let option of syncFundingOptions" class="row form-check">
-                  <input type="radio" [(ngModel)]="currentSyncFunding"
-                         name="syncFundings" id="fundingOption_{{option.value}}" [value]="option.value"
-                         required>
-                  <label for="fundingOption_{{option.value}}" class="ml-2">{{option.label | translate}}</label>
-                </div>
+              <div class="mb-3">
+                @for (option of syncFundingOptions; track option) {
+                  <div class="row form-check">
+                    <input type="radio" [(ngModel)]="currentSyncFunding"
+                      name="syncFundings" id="fundingOption_{{option.value}}" [value]="option.value"
+                      required>
+                    <label for="fundingOption_{{option.value}}" class="ms-2 form-label">{{option.label | translate}}</label>
+                  </div>
+                }
               </div>
             </div>
           </div>
@@ -81,13 +87,15 @@
                   {{ 'person.page.orcid.synchronization-mode-profile-message' | translate}}
                 </ds-alert>
               </div>
-              <div class="form-group">
-                <div *ngFor="let option of syncProfileOptions" class="row form-check">
-                  <input type="checkbox" [(ngModel)]="option.checked"
-                         name="syncProfile_{{option.value}}" id="profileOption_{{option.value}}"
-                         [value]="option.value">
-                  <label for="profileOption_{{option.value}}" class="ml-2">{{option.label | translate}}</label>
-                </div>
+              <div class="mb-3">
+                @for (option of syncProfileOptions; track option) {
+                  <div class="row form-check">
+                    <input type="checkbox" [(ngModel)]="option.checked"
+                      name="syncProfile_{{option.value}}" id="profileOption_{{option.value}}"
+                      [value]="option.value">
+                    <label for="profileOption_{{option.value}}" class="ms-2 form-label">{{option.label | translate}}</label>
+                  </div>
+                }
               </div>
             </div>
           </div>
@@ -96,7 +104,7 @@
     </div>
     <div class="row">
       <div class="col">
-        <button type="submit" class="btn btn-primary float-right">
+        <button type="submit" class="btn btn-primary float-end">
           <i class="fas fa-edit"></i>
           {{ 'person.page.orcid.save.preference.changes' | translate }}
         </button>
diff --git a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
index 7c3f71785c..5685627345 100644
--- a/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
+++ b/src/app/item-page/orcid-page/orcid-sync-settings/orcid-sync-settings.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -51,7 +51,6 @@ import { createFailedRemoteDataObjectFromError$ } from '../../../shared/remote-d
     AlertComponent,
     FormsModule,
     TranslateModule,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index 44c83b8626..fda6d8ae88 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -1,21 +1,35 @@
 <ng-container *ngVar="(bitstreams$ | async) as bitstreams">
-  <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="label | translate">
-    <div class="file-section">
-      <ds-file-download-link *ngFor="let file of bitstreams; let last=last;" [bitstream]="file" [item]="item">
-        <span>
-          <span *ngIf="primaryBitsreamId === file.id" class="badge badge-primary">{{ 'item.page.bitstreams.primary' | translate }}</span> 
-          {{ dsoNameService.getName(file) }}
-        </span>
-        <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
-        <span *ngIf="!last" innerHTML="{{separator}}"></span>
-      </ds-file-download-link>
-      <ds-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-loading>
-      <div *ngIf="!isLastPage" class="mt-1" id="view-more">
-        <button class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</button>
+  @if (bitstreams?.length > 0) {
+    <ds-metadata-field-wrapper [label]="label | translate">
+      <div class="file-section">
+        @for (file of bitstreams; track file; let last = $last) {
+          <ds-file-download-link [bitstream]="file" [item]="item">
+            <span>
+              @if (primaryBitsreamId === file.id) {
+                <span class="badge bg-primary">{{ 'item.page.bitstreams.primary' | translate }}</span>
+              }
+              {{ dsoNameService.getName(file) }}
+            </span>
+            <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
+            @if (!last) {
+              <span innerHTML="{{separator}}"></span>
+            }
+          </ds-file-download-link>
+        }
+        @if (isLoading) {
+          <ds-loading message="{{'loading.default' | translate}}" [showMessage]="false"></ds-loading>
+        }
+        @if (!isLastPage) {
+          <div class="mt-1" id="view-more">
+            <button class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</button>
+          </div>
+        }
+        @if (isLastPage && currentPage !== 1) {
+          <div class="mt-1" id="collapse">
+            <button class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</button>
+          </div>
+        }
       </div>
-      <div *ngIf="isLastPage && currentPage !== 1" class="mt-1" id="collapse">
-        <button class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</button>
-      </div>
-    </div>
-  </ds-metadata-field-wrapper>
+    </ds-metadata-field-wrapper>
+  }
 </ng-container>
diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
index 979b79eafc..2e17d09fc1 100644
--- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.spec.ts
@@ -15,8 +15,10 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { ItemPageAbstractFieldComponent } from './item-page-abstract-field.component';
 
@@ -38,6 +40,7 @@ describe('ItemPageAbstractFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageAbstractFieldComponent, {
diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
index 1f38317aca..a9dfe998bc 100644
--- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.spec.ts
@@ -15,9 +15,11 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -41,6 +43,7 @@ describe('ItemPageAuthorFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
index e496676847..c4fdd24d13 100644
--- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.html
@@ -1,28 +1,32 @@
-<div *ngIf="uri && name" class="item-page-field">
-  <ds-metadata-field-wrapper [label]="'item.page.cc.license.title' | translate">
-    <div [ngClass]="{'row': variant === 'full', 'col': variant === 'small'}">
-
-      <!-- 'img' tag is not rendered if any errors occurs when loading it -->
-      <div *ngIf="showImage" [ngClass]="{'col-auto': variant === 'full', 'row': variant === 'small'}"
-        style="align-content: center;"
-      >
-        <a [href]="uri" target="_blank" class="link-anchor dont-break-out ds-simple-metadata-link">
-          <img (error)="showImage = false" [src]="imgSrc" [alt]="name" class="cc-image"
+@if (uri && name) {
+  <div class="item-page-field">
+    <ds-metadata-field-wrapper [label]="'item.page.cc.license.title' | translate">
+      <div [ngClass]="{'row': variant === 'full', 'col': variant === 'small'}">
+        <!-- 'img' tag is not rendered if any errors occurs when loading it -->
+        @if (showImage) {
+          <div [ngClass]="{'col-auto': variant === 'full', 'row': variant === 'small'}"
+            style="align-content: center;"
+            >
+            <a [href]="uri" target="_blank" class="link-anchor dont-break-out ds-simple-metadata-link">
+              <img (error)="showImage = false" [src]="imgSrc" [alt]="name" class="cc-image"
             [ngStyle]="{
               'width': 'var(--ds-thumbnail-max-width)',
               'margin-bottom': variant === 'small'? '1ch' : '0',
             }"
-          />
-        </a>
+                />
+            </a>
+          </div>
+        }
+        <!-- CC name is always displayed if the image fails to load -->
+        <div [ngClass]="{ 'row': variant === 'small', 'col': variant === 'full' }">
+          <span>
+            {{ variant === 'full' && showDisclaimer ? ('item.page.cc.license.disclaimer' | translate) : '' }}
+            @if (showName || !showImage) {
+              <a [href]="uri" target="_blank" id="cc-name">{{ name }}</a>
+            }
+          </span>
+        </div>
       </div>
-
-      <!-- CC name is always displayed if the image fails to load -->
-      <div [ngClass]="{ 'row': variant === 'small', 'col': variant === 'full' }">
-        <span>
-          {{ variant === 'full' && showDisclaimer ? ('item.page.cc.license.disclaimer' | translate) : '' }}
-          <a *ngIf="showName || !showImage" [href]="uri" target="_blank" id="cc-name">{{ name }}</a>
-        </span>
-      </div>
-    </div>
-  </ds-metadata-field-wrapper>
-</div>
+    </ds-metadata-field-wrapper>
+  </div>
+}
diff --git a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
index e06d0c25b5..9653b9932c 100644
--- a/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/cc-license/item-page-cc-license-field.component.ts
@@ -1,6 +1,5 @@
 import {
   NgClass,
-  NgIf,
   NgStyle,
 } from '@angular/common';
 import {
@@ -16,7 +15,7 @@ import { MetadataFieldWrapperComponent } from 'src/app/shared/metadata-field-wra
   selector: 'ds-item-page-cc-license-field',
   templateUrl: './item-page-cc-license-field.component.html',
   standalone: true,
-  imports: [NgIf, NgClass, NgStyle, TranslateModule, MetadataFieldWrapperComponent],
+  imports: [NgClass, NgStyle, TranslateModule, MetadataFieldWrapperComponent],
 })
 /**
  * Displays the item's Creative Commons license image in it's simple item page
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
index 23e4492602..264ae5ddbc 100644
--- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.spec.ts
@@ -15,9 +15,11 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -41,8 +43,8 @@ describe('ItemPageDateFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageDateFieldComponent, {
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
index f46b8fb0f8..a1ac655660 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.spec.ts
@@ -15,9 +15,11 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { ActivatedRouteStub } from '../../../../../shared/testing/active-router.stub';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -43,6 +45,7 @@ describe('GenericItemPageFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
index da1320370a..18c02d95f6 100644
--- a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
@@ -14,8 +14,10 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
 import { GenericItemPageFieldComponent } from '../generic/generic-item-page-field.component';
@@ -49,6 +51,7 @@ describe('ItemPageImgFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
index 5815f18180..6d654effe7 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.spec.ts
@@ -16,6 +16,7 @@ import {
 
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment';
+import { BrowseService } from '../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { MathService } from '../../../../core/shared/math.service';
@@ -26,6 +27,7 @@ import {
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../shared/testing/browse-service.stub';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { MarkdownDirective } from '../../../../shared/utils/markdown.directive';
 import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
@@ -66,6 +68,7 @@ describe('ItemPageFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: appConfig },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
         { provide: MathService, useValue: {} },
       ],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
index 58521569f1..fd3506c91e 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts
@@ -3,17 +3,26 @@ import {
   Component,
   Input,
 } from '@angular/core';
+import intersectionWith from 'lodash/intersectionWith';
 import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  filter,
+  mergeAll,
+  take,
+} from 'rxjs/operators';
 
+import { BrowseService } from '../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
 import { Item } from '../../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
 import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
 import { ImageField } from './image-field';
 
-
 /**
  * This component can be used to represent metadata on a simple item page.
  * It expects one input parameter of type Item to which the metadata belongs.
@@ -30,7 +39,8 @@ import { ImageField } from './image-field';
 })
 export class ItemPageFieldComponent {
 
-  constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
+  constructor(protected browseDefinitionDataService: BrowseDefinitionDataService,
+              protected browseService: BrowseService) {
   }
 
     /**
@@ -74,9 +84,26 @@ export class ItemPageFieldComponent {
      * link in dspace.cfg (webui.browse.link.<n>)
      */
     get browseDefinition(): Observable<BrowseDefinition> {
-      return this.browseDefinitionDataService.findByFields(this.fields).pipe(
+      return this.browseService.getBrowseDefinitions().pipe(
         getFirstCompletedRemoteData(),
-        map((def) => def.payload),
+        getRemoteDataPayload(),
+        getPaginatedListPayload(),
+        mergeAll(),
+        filter((def: BrowseDefinition) =>
+          intersectionWith(def.metadataKeys, this.fields, ItemPageFieldComponent.fieldMatch).length > 0,
+        ),
+        take(1),
       );
     }
+
+    /**
+     * Returns true iff the spec and field match.
+     * @param spec  Specification of a metadata field name: either a metadata field, or a prefix ending in ".*".
+     * @param field A metadata field name.
+     * @private
+     */
+    private static fieldMatch(spec: string, field: string): boolean {
+      return field === spec
+        || (spec.endsWith('.*') && field.substring(0, spec.length - 1) === spec.substring(0, spec.length - 1));
+    }
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
index 85975d4533..34b6682a25 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
@@ -1,6 +1,8 @@
 <h1 class="item-page-title-field">
-  <div *ngIf="item.firstMetadataValue('dspace.entity.type') as type" class="d-inline">
-    {{ type.toLowerCase() + '.page.titleprefix' | translate }}
-  </div>
+  @if (item.firstMetadataValue('dspace.entity.type'); as type) {
+    <div class="d-inline">
+      {{ type.toLowerCase() + '.page.titleprefix' | translate }}
+    </div>
+  }
   <span class="dont-break-out">{{ dsoNameService.getName(item) }}</span>
 </h1>
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
index 27d7fc585e..3655a864bf 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -12,7 +12,7 @@ import { Item } from '../../../../../core/shared/item.model';
   selector: 'ds-base-item-page-title-field',
   templateUrl: './item-page-title-field.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 /**
  * This component is used for displaying the title (defined by the {@link DSONameService}) of an item
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
index 4b86504789..53edcab28e 100644
--- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.spec.ts
@@ -14,8 +14,10 @@ import {
 
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseService } from '../../../../../core/browse/browse.service';
 import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
 import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { BrowseServiceStub } from '../../../../../shared/testing/browse-service.stub';
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component';
 import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
@@ -40,6 +42,7 @@ describe('ItemPageUriFieldComponent', () => {
       providers: [
         { provide: APP_CONFIG, useValue: environment },
         { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+        { provide: BrowseService, useValue: BrowseServiceStub },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageUriFieldComponent, {
diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html
index 912115c961..207fcdab5b 100644
--- a/src/app/item-page/simple/item-page.component.html
+++ b/src/app/item-page/simple/item-page.component.html
@@ -1,15 +1,25 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
-  <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
-    <div *ngIf="itemRD?.payload as item">
-      <ds-item-alerts [item]="item"></ds-item-alerts>
-      <ds-qa-event-notification [item]="item"></ds-qa-event-notification>
-      <ds-notify-requests-status [itemUuid]="item.uuid"></ds-notify-requests-status>
-      <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
-      <ds-view-tracker [object]="item"></ds-view-tracker>
-      <ds-listable-object-component-loader *ngIf="!item.isWithdrawn || (isAdmin$|async)" [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
-      <ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions>
+  @if (itemRD?.hasSucceeded) {
+    <div class="item-page" @fadeInOut>
+      @if (itemRD?.payload; as item) {
+        <div>
+          <ds-item-alerts [item]="item"></ds-item-alerts>
+          <ds-qa-event-notification [item]="item"></ds-qa-event-notification>
+          <ds-notify-requests-status [itemUuid]="item.uuid"></ds-notify-requests-status>
+          <ds-item-versions-notice [item]="item"></ds-item-versions-notice>
+          <ds-view-tracker [object]="item"></ds-view-tracker>
+          @if (!item.isWithdrawn || (isAdmin$|async)) {
+            <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
+          }
+          <ds-item-versions class="mt-2" [item]="item" [displayActions]="false"></ds-item-versions>
+        </div>
+      }
     </div>
-  </div>
-  <ds-error *ngIf="itemRD?.hasFailed" message="{{'error.item' | translate}}"></ds-error>
-  <ds-loading *ngIf="itemRD?.isLoading" message="{{'loading.item' | translate}}"></ds-loading>
+  }
+  @if (itemRD?.hasFailed) {
+    <ds-error message="{{'error.item' | translate}}"></ds-error>
+  }
+  @if (itemRD?.isLoading) {
+    <ds-loading message="{{'loading.item' | translate}}"></ds-loading>
+  }
 </div>
diff --git a/src/app/item-page/simple/item-page.component.scss b/src/app/item-page/simple/item-page.component.scss
index a99cbd688f..2501fc92ca 100644
--- a/src/app/item-page/simple/item-page.component.scss
+++ b/src/app/item-page/simple/item-page.component.scss
@@ -1,4 +1,4 @@
-@include media-breakpoint-down(md) {
+@include media-breakpoint-down(lg) {
   .container {
     width: 100%;
     max-width: none;
diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
index edce420af5..381029df3d 100644
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformServer,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -79,7 +78,6 @@ import { QaEventNotificationComponent } from './qa-event-notification/qa-event-n
     ThemedLoadingComponent,
     TranslateModule,
     AsyncPipe,
-    NgIf,
     NotifyRequestsStatusComponent,
     QaEventNotificationComponent,
   ],
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.html b/src/app/item-page/simple/item-types/publication/publication.component.html
index 86f203deca..b70aa7e0b9 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.html
+++ b/src/app/item-page/simple/item-types/publication/publication.component.html
@@ -1,28 +1,34 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
-<div class="row" *ngIf="iiifEnabled">
-  <div class="col-12">
-    <ds-mirador-viewer  id="iiif-viewer"
-                        [object]="object"
-                        [searchable]="iiifSearchEnabled"
-                        [query]="iiifQuery$ | async">
-    </ds-mirador-viewer>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
+@if (iiifEnabled) {
+  <div class="row">
+    <div class="col-12">
+      <ds-mirador-viewer  id="iiif-viewer"
+        [object]="object"
+        [searchable]="iiifSearchEnabled"
+        [query]="iiifQuery$ | async">
+      </ds-mirador-viewer>
+    </div>
   </div>
-</div>
+}
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ng-container *ngIf="!(mediaViewer.image || mediaViewer.video)">
+    @if (!(mediaViewer.image || mediaViewer.video)) {
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
         <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
-    </ng-container>
-    <div *ngIf="mediaViewer.image || mediaViewer.video" class="mb-2">
-      <ds-media-viewer [item]="object"></ds-media-viewer>
-    </div>
+    }
+    @if (mediaViewer.image || mediaViewer.video) {
+      <div class="mb-2">
+        <ds-media-viewer [item]="object"></ds-media-viewer>
+      </div>
+    }
     <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
     <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.ts b/src/app/item-page/simple/item-types/publication/publication.component.ts
index 2acb02377b..276d9d3534 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -39,7 +36,7 @@ import { ItemComponent } from '../shared/item.component';
   templateUrl: './publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 export class PublicationComponent extends ItemComponent {
 
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
index 962cc2fcad..c74be549a8 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
@@ -1,29 +1,35 @@
-<ds-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-results-back-button>
-<div class="row" *ngIf="iiifEnabled">
-  <div class="col-12">
-    <ds-mirador-viewer id="iiif-viewer"
-                   [object]="object"
-                   [searchable]="iiifSearchEnabled"
-                   [query]="iiifQuery$ | async">
-    </ds-mirador-viewer>
+@if (showBackButton$ | async) {
+  <ds-results-back-button [back]="back"></ds-results-back-button>
+}
+@if (iiifEnabled) {
+  <div class="row">
+    <div class="col-12">
+      <ds-mirador-viewer id="iiif-viewer"
+        [object]="object"
+        [searchable]="iiifSearchEnabled"
+        [query]="iiifQuery$ | async">
+      </ds-mirador-viewer>
+    </div>
   </div>
-</div>
+}
 
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
+  <ds-item-page-title-field [item]="object" class="me-auto">
   </ds-item-page-title-field>
   <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ng-container *ngIf="!(mediaViewer.image || mediaViewer.video)">
+    @if (!(mediaViewer.image || mediaViewer.video)) {
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
         <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
       </ds-metadata-field-wrapper>
-    </ng-container>
-    <div *ngIf="mediaViewer.image || mediaViewer.video" class="mb-2">
-      <ds-media-viewer [item]="object"></ds-media-viewer>
-    </div>
+    }
+    @if (mediaViewer.image || mediaViewer.video) {
+      <div class="mb-2">
+        <ds-media-viewer [item]="object"></ds-media-viewer>
+      </div>
+    }
     <ds-item-page-file-section [item]="object"></ds-item-page-file-section>
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
     <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index a9ef9b2ead..1402831c33 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -41,7 +38,6 @@ import { ItemComponent } from '../shared/item.component';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    NgIf,
     ThemedResultsBackButtonComponent,
     MiradorViewerComponent,
     ThemedItemPageTitleFieldComponent,
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
index 424c2324fa..058dd96952 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
@@ -1,20 +1,30 @@
 <ds-metadata-field-wrapper [label]="label">
-  <ng-container *ngFor="let objectPage of objects; let i = index">
+  @for (objectPage of objects; track objectPage; let i = $index) {
     <ng-container *ngVar="(objectPage | async) as representations">
-      <ds-metadata-representation-loader *ngFor="let rep of representations"
-                                         [mdRepresentation]="rep">
-      </ds-metadata-representation-loader>
-      <ds-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-loading>
-      <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && representations?.length > 0">
-        <div *ngIf="(objects.length * incrementBy) < total" class="float-left">
-          <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</button>
+      @for (rep of representations; track rep) {
+        <ds-metadata-representation-loader
+          [mdRepresentation]="rep">
+        </ds-metadata-representation-loader>
+      }
+      @if ((i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)) {
+        <ds-loading message="{{'loading.default' | translate}}"></ds-loading>
+      }
+      @if ((i + 1) === objects.length && representations?.length > 0) {
+        <div class="d-inline-block w-100 mt-2">
+          @if ((objects.length * incrementBy) < total) {
+            <div class="float-start">
+              <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
+              translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</button>
+            </div>
+          }
+          @if (objects.length > 1) {
+            <div class="float-end">
+              <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
+              translate:{ amount: representations?.length } }}</button>
+            </div>
+          }
         </div>
-        <div *ngIf="objects.length > 1" class="float-right">
-          <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: representations?.length } }}</button>
-        </div>
-      </div>
+      }
     </ng-container>
-  </ng-container>
+  }
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index d8e5cb0e53..f222fc42f6 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -33,7 +29,7 @@ import { AbstractIncrementalListComponent } from '../abstract-incremental-list/a
   selector: 'ds-base-metadata-representation-list',
   templateUrl: './metadata-representation-list.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgFor, VarDirective, MetadataRepresentationLoaderComponent, NgIf, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [MetadataFieldWrapperComponent, VarDirective, MetadataRepresentationLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * This component is used for displaying metadata
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
index c68255f2ed..4dc04e79ad 100644
--- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
@@ -1,5 +1,5 @@
-<ng-container *ngIf="(requestMap$ | async)?.size > 0">
-  <ng-container *ngFor="let entry of (requestMap$ | async) | keyvalue ">
+@if ((requestMap$ | async)?.size > 0) {
+  @for (entry of (requestMap$ | async) | keyvalue ; track entry) {
     <ds-request-status-alert-box [status]="entry.key" [data]="entry.value"></ds-request-status-alert-box>
-  </ng-container>
-</ng-container>
+  }
+}
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
index 305e3cf8f7..ffaf8ab000 100644
--- a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   KeyValuePipe,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -39,8 +37,6 @@ import { RequestStatusAlertBoxComponent } from '../request-status-alert-box/requ
     RequestStatusAlertBoxComponent,
     AsyncPipe,
     KeyValuePipe,
-    NgForOf,
-    NgIf,
   ],
 })
 
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
index f5b1f745f4..4171687cd1 100644
--- a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
@@ -1,23 +1,23 @@
-<ng-container *ngIf="data?.length > 0 && displayOptions">
+@if (data?.length > 0 && displayOptions) {
   <div [ngClass]="{'align-items-center': data.length === 1}"
     class="alert d-flex flex-row sections-gap {{displayOptions.alertType}}">
     <img
       class="source-logo"
       src="assets/images/qa-coar-notify-logo.png"
       alt="notify logo"
-    />
+      />
     <ds-truncatable [id]="status">
       <ds-truncatable-part [id]="status" [minLines]="1">
         <div class="w-100 d-flex flex-column">
-          <ng-container *ngFor="let request of data">
+          @for (request of data; track request) {
             <div [innerHTML]="displayOptions.text | translate: {
                   serviceName: request.serviceName,
                   serviceUrl: request.serviceUrl,
                   offerType: request.offerType
                 }"></div>
-          </ng-container>
+          }
         </div>
       </ds-truncatable-part>
     </ds-truncatable>
   </div>
-</ng-container>
+}
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
index 9ab8f90c18..e5b6fc6cb6 100644
--- a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgClass,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -23,10 +19,8 @@ import { RequestStatusEnum } from '../notify-status.enum';
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    NgIf,
     TruncatablePartComponent,
     TruncatableComponent,
-    NgForOf,
     TranslateModule,
     NgClass,
   ],
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
index 77370f462d..afdb53b81d 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
@@ -1,22 +1,24 @@
-<ng-container *ngIf="(sources$ | async) as sources">
-  <ng-container *ngFor="let source of sources">
-    <div class="alert alert-info d-flex flex-row" *ngIf="source.totalEvents > 0">
-      <div class="source-logo-container">
-        <img class="source-logo"
-             src="assets/images/qa-{{(source.id | dsSplit: ':')[0]}}-logo.png"
-             alt="{{source.id}} logo"
-             onerror="this.src='assets/images/dspace-logo.svg'">
-      </div>
-      <div class="w-100 d-flex justify-content-between">
-        <div class="pl-4 align-self-center">
-          {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
+@if ((sources$ | async); as sources) {
+  @for (source of sources; track source) {
+    @if (source.totalEvents > 0) {
+      <div class="alert alert-info d-flex flex-row">
+        <div class="source-logo-container">
+          <img class="source-logo"
+            src="assets/images/qa-{{(source.id | dsSplit: ':')[0]}}-logo.png"
+            alt="{{source.id}} logo"
+            onerror="this.src='assets/images/dspace-logo.svg'">
+          </div>
+          <div class="w-100 d-flex justify-content-between">
+            <div class="ps-4 align-self-center">
+              {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
+            </div>
+            <button [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
+              [queryParams]="{ forward: true }"
+              class="btn btn-primary align-self-center">
+            {{'item.qa-event-notification-info.check.button' | translate}}
+          </button>
         </div>
-        <button [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
-                [queryParams]="{ forward: true }"
-                class="btn btn-primary align-self-center">
-                {{'item.qa-event-notification-info.check.button' | translate}}
-        </button>
       </div>
-    </div>
-  </ng-container>
-</ng-container>
+    }
+  }
+}
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
index a428f7feb4..e681db4a0a 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -36,8 +32,6 @@ import { SplitPipe } from '../../../shared/utils/split.pipe';
   changeDetection: ChangeDetectionStrategy.OnPush,
   providers: [QualityAssuranceSourceDataService],
   imports: [
-    NgIf,
-    NgForOf,
     AsyncPipe,
     RouterLink,
     TranslateModule,
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
index 3ce96b2ce3..147650b11a 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
@@ -1,28 +1,32 @@
-<ng-container *ngIf="relationTypes.length > 1">
+@if (relationTypes.length > 1) {
   <ul ngbNav #tabs="ngbNav" [destroyOnHide]="true" [activeId]="activeTab$ | async" (navChange)="onTabChange($event)" class="nav-tabs" role="tablist">
-    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" role="presentation">
-      <a ngbNavLink role="tab">
-        {{'item.page.relationships.' + relationType.label | translate}}
-      </a>
-      <ng-template ngbNavContent>
-        <div class="mt-4">
-          <ds-related-entities-search [item]="item"
-                                      [relationType]="relationType.filter"
-                                      [configuration]="relationType.configuration"
-                                      [searchEnabled]="searchEnabled"
-                                      [sideBarWidth]="sideBarWidth">
-          </ds-related-entities-search>
-        </div>
-      </ng-template>
-    </li>
+    @for (relationType of relationTypes; track relationType) {
+      <li [ngbNavItem]="relationType.filter" role="presentation">
+        <a ngbNavLink role="tab">
+          {{'item.page.relationships.' + relationType.label | translate}}
+        </a>
+        <ng-template ngbNavContent>
+          <div class="mt-4">
+            <ds-related-entities-search [item]="item"
+              [relationType]="relationType.filter"
+              [configuration]="relationType.configuration"
+              [searchEnabled]="searchEnabled"
+              [sideBarWidth]="sideBarWidth">
+            </ds-related-entities-search>
+          </div>
+        </ng-template>
+      </li>
+    }
   </ul>
   <div [ngbNavOutlet]="tabs"></div>
-</ng-container>
-<div *ngIf="relationTypes.length === 1" class="mt-4">
-  <ds-related-entities-search *ngVar="relationTypes[0] as relationType" [item]="item"
-                              [relationType]="relationType.filter"
-                              [configuration]="relationType.configuration"
-                              [searchEnabled]="searchEnabled"
-                              [sideBarWidth]="sideBarWidth">
-  </ds-related-entities-search>
-</div>
+}
+@if (relationTypes.length === 1) {
+  <div class="mt-4">
+    <ds-related-entities-search *ngVar="relationTypes[0] as relationType" [item]="item"
+      [relationType]="relationType.filter"
+      [configuration]="relationType.configuration"
+      [searchEnabled]="searchEnabled"
+      [sideBarWidth]="sideBarWidth">
+    </ds-related-entities-search>
+  </div>
+}
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
index fc27a9a1e4..b41f00e104 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -25,7 +21,7 @@ import { RelatedEntitiesSearchComponent } from '../related-entities-search/relat
   selector: 'ds-tabbed-related-entities-search',
   templateUrl: './tabbed-related-entities-search.component.html',
   standalone: true,
-  imports: [NgIf, NgbNavModule, NgFor, RelatedEntitiesSearchComponent, VarDirective, AsyncPipe, TranslateModule],
+  imports: [NgbNavModule, RelatedEntitiesSearchComponent, VarDirective, AsyncPipe, TranslateModule],
 })
 /**
  * A component to show related items as search results, split into tabs by relationship-type
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index 434093ba2a..e6132661fd 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   isPlatformBrowser,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -38,7 +36,7 @@ import { AbstractIncrementalListComponent } from '../abstract-incremental-list/a
   styleUrls: ['./related-items.component.scss'],
   templateUrl: './related-items.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgClass, NgFor, VarDirective, ListableObjectComponentLoaderComponent, NgIf, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [MetadataFieldWrapperComponent, NgClass, VarDirective, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * This component is used for displaying relations between items
diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index 02c207b332..2bfe384bb4 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -1,20 +1,30 @@
 <ds-metadata-field-wrapper [label]="label" [ngClass]="placeholderFontClass">
-  <ng-container *ngFor="let objectPage of objects; let i = index">
+  @for (objectPage of objects; track objectPage; let i = $index) {
     <ng-container *ngVar="(objectPage | async) as itemsRD">
-      <ds-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page"
-                                           [object]="item" [viewMode]="viewMode">
-      </ds-listable-object-component-loader>
-      <ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
-      <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
-        <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
-          <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }}</button>
+      @for (item of itemsRD?.payload?.page; track item) {
+        <ds-listable-object-component-loader
+          [object]="item" [viewMode]="viewMode">
+        </ds-listable-object-component-loader>
+      }
+      @if ((i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)) {
+        <ds-loading message="{{'loading.default' | translate}}"></ds-loading>
+      }
+      @if ((i + 1) === objects.length && itemsRD?.payload?.page?.length > 0) {
+        <div class="d-inline-block w-100 mt-2">
+          @if (itemsRD?.payload?.totalPages > objects.length) {
+            <div class="float-start" id="view-more">
+              <button class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
+              translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }} {{label}}</button>
+            </div>
+          }
+          @if (objects.length > 1) {
+            <div class="float-end" id="view-less">
+              <button class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
+              translate:{ amount: itemsRD?.payload?.page?.length } }} {{label}}</button>
+            </div>
+          }
         </div>
-        <div *ngIf="objects.length > 1" class="float-right" id="view-less">
-          <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: itemsRD?.payload?.page?.length } }}</button>
-        </div>
-      </div>
+      }
     </ng-container>
-  </ng-container>
+  }
 </ds-metadata-field-wrapper>
diff --git a/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
index 6c54a15162..b65883775b 100644
--- a/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
+++ b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'item.version.delete.modal.header' | translate}}
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
index a664245668..0608ee93cc 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
@@ -1,53 +1,60 @@
-    <div class="left-column">
-      <span *ngIf="(workspaceId$ | async) || (workflowId$ | async); then versionNumberWithoutLink else versionNumberWithLink"></span>
-      <ng-template #versionNumberWithLink>
-        <a [routerLink]="getVersionRoute(version.id)">{{version.version}}</a>
-      </ng-template>
-      <ng-template #versionNumberWithoutLink>
-        {{version.version}}
-      </ng-template>
-      <span *ngIf="version?.id === itemVersion?.id">*</span>
+<div class="left-column">
+  @if ((workspaceId$ | async) || (workflowId$ | async)) {
+    {{version.version}}
+  } @else {
+    <a [routerLink]="getVersionRoute(version.id)">{{version.version}}</a>
+  }
+  @if (version?.id === itemVersion?.id) {
+    <span>*</span>
+  }
 
-      <span *ngIf="workspaceId$ | async" class="text-light badge badge-primary ml-3">
-                      {{ "item.version.history.table.workspaceItem" | translate }}
-                    </span>
+  @if (workspaceId$ | async) {
+    <span class="text-light badge bg-primary ms-3">
+      {{ "item.version.history.table.workspaceItem" | translate }}
+    </span>
+  }
 
-      <span *ngIf="workflowId$ | async" class="text-light badge badge-info ml-3">
-                      {{ "item.version.history.table.workflowItem" | translate }}
-                    </span>
+  @if (workflowId$ | async) {
+    <span class="text-light badge bg-info ms-3">
+      {{ "item.version.history.table.workflowItem" | translate }}
+    </span>
+  }
 
-    </div>
+</div>
 
-    <div class="right-column">
+<div class="right-column">
 
-      <div class="btn-group edit-field space-children-mr" *ngIf="displayActions">
-        <!--EDIT WORKSPACE ITEM-->
+  @if (displayActions) {
+    <div class="btn-group edit-field space-children-mr">
+      <!--EDIT WORKSPACE ITEM-->
+      @if (workspaceId$ | async) {
         <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                *ngIf="workspaceId$ | async"
-                (click)="editWorkspaceItem(workspaceId$)"
-                title="{{'item.version.history.table.action.editWorkspaceItem' | translate }}">
+          (click)="editWorkspaceItem(workspaceId$)"
+          title="{{'item.version.history.table.action.editWorkspaceItem' | translate }}">
           <i class="fas fa-pencil-alt fa-fw"></i>
         </button>
-        <!--CREATE-->
-        <ng-container *ngIf="canCreateVersion$ | async">
-          <button class="btn btn-outline-primary btn-sm version-row-element-create"
-                  [disabled]="isAnyBeingEdited() || hasDraftVersion"
-                  (click)="createNewVersion(version)"
-                  title="{{createVersionTitle | translate }}">
-            <i class="fas fa-code-branch fa-fw"></i>
-          </button>
-        </ng-container>
-        <!--DELETE-->
-        <ng-container *ngIf="canDeleteVersion$ | async">
-          <button class="btn btn-sm version-row-element-delete"
-                  [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
-                  [disabled]="isAnyBeingEdited()"
-                  (click)="deleteVersion(version, version.id === itemVersion.id)"
-                  title="{{'item.version.history.table.action.deleteVersion' | translate}}">
-            <i class="fas fa-trash fa-fw"></i>
-          </button>
-        </ng-container>
-      </div>
-
+      }
+      <!--CREATE-->
+      @if (canCreateVersion$ | async) {
+        <button class="btn btn-outline-primary btn-sm version-row-element-create"
+          [dsBtnDisabled]="isAnyBeingEdited() || hasDraftVersion"
+          (click)="createNewVersion(version)"
+          title="{{createVersionTitle | translate }}">
+          <i class="fas fa-code-branch fa-fw"></i>
+        </button>
+      }
+      <!--DELETE-->
+      @if (canDeleteVersion$ | async) {
+        <button class="btn btn-sm version-row-element-delete"
+          [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
+          [dsBtnDisabled]="isAnyBeingEdited()"
+          (click)="deleteVersion(version, version.id === itemVersion.id)"
+          title="{{'item.version.history.table.action.deleteVersion' | translate}}">
+          <i class="fas fa-trash fa-fw"></i>
+        </button>
+      }
     </div>
+  }
+
+</div>
 
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
index 3d017c38a4..92597c044f 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -49,6 +48,7 @@ import { VersionHistory } from '../../../core/shared/version-history.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   getItemEditVersionhistoryRoute,
@@ -66,7 +66,7 @@ import { ItemVersionsSummaryModalComponent } from '../item-versions-summary-moda
     RouterLink,
     TranslateModule,
     NgClass,
-    NgIf,
+    BtnDisabledDirective,
   ],
   templateUrl: './item-versions-row-element-version.component.html',
   styleUrl: './item-versions-row-element-version.component.scss',
diff --git a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
index c0e5e83b33..ae1e862b07 100644
--- a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
@@ -1,41 +1,42 @@
-<div *ngIf="(this.submitted$ | async) !== true; else waiting">
-  <div class="modal-header">{{'item.version.create.modal.header' | translate}}
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-      <span aria-hidden="true">×</span>
-    </button>
-  </div>
-  <div class="modal-body">
-    <p class="pb-2">
-      {{ "item.version.create.modal.text" | translate }}
-      <span *ngIf="!firstVersion">
-        {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }}
-      </span>
-    </p>
-    <div class="form-group">
-      <label for="summary">{{'item.version.create.modal.form.summary.label' | translate }}:</label>
-      <input type="text" id="summary" class="form-control" [(ngModel)]="newVersionSummary"
-             (keyup.enter)="onModalSubmit()"
-             placeholder="{{'item.version.create.modal.form.summary.placeholder' | translate }}"/>
-<!--      (keyup.enter)="$event.preventDefault(); $event.stopImmediatePropagation()"-->
+@if ((this.submitted$ | async) !== true) {
+  <div>
+    <div class="modal-header">{{'item.version.create.modal.header' | translate}}
+      <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
+      </button>
     </div>
-  </div>
-  <div class="modal-footer space-children-mr">
-      <button class="btn btn-outline-secondary btn-sm ml-0"
-              type="button"
-              (click)="onModalClose()"
-              title="{{'item.version.create.modal.button.cancel.tooltip' | translate}}">
+    <div class="modal-body">
+      <p class="pb-2">
+        {{ "item.version.create.modal.text" | translate }}
+        @if (!firstVersion) {
+          <span>
+            {{ "item.version.create.modal.text.startingFrom" | translate : {version: versionNumber} }}
+          </span>
+        }
+      </p>
+      <div class="mb-3">
+        <label for="summary" class="form-label">{{'item.version.create.modal.form.summary.label' | translate }}:</label>
+        <input type="text" id="summary" class="form-control" [(ngModel)]="newVersionSummary"
+          (keyup.enter)="onModalSubmit()"
+          placeholder="{{'item.version.create.modal.form.summary.placeholder' | translate }}"/>
+        <!--      (keyup.enter)="$event.preventDefault(); $event.stopImmediatePropagation()"-->
+      </div>
+    </div>
+    <div class="modal-footer space-children-mr">
+      <button class="btn btn-outline-secondary btn-sm ms-0"
+        type="button"
+        (click)="onModalClose()"
+        title="{{'item.version.create.modal.button.cancel.tooltip' | translate}}">
         <i class="fas fa-times fa-fw"></i> {{'item.version.create.modal.button.cancel' | translate}}
       </button>
-      <button class="btn btn-success btn-sm ml-0"
-              type="submit"
-              (click)="onModalSubmit()"
-              title="{{'item.version.create.modal.button.confirm.tooltip' | translate}}">
+      <button class="btn btn-success btn-sm ms-0"
+        type="submit"
+        (click)="onModalSubmit()"
+        title="{{'item.version.create.modal.button.confirm.tooltip' | translate}}">
         <i class="fas fa-check fa-fw"></i> {{'item.version.create.modal.button.confirm' | translate}}
-    </button>
+      </button>
+    </div>
   </div>
-</div>
-
-<ng-template #waiting>
+} @else {
   <div class="modal-header">{{'item.version.create.modal.submitted.header' | translate}}</div>
   <div class="modal-body">
     <p>{{'item.version.create.modal.submitted.text' | translate}}</p>
@@ -43,4 +44,5 @@
       <ds-loading [showMessage]="false"></ds-loading>
     </div>
   </div>
-</ng-template>
+}
+
diff --git a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
index 8d21501b49..45d0878586 100644
--- a/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -21,7 +18,7 @@ import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.c
   templateUrl: './item-versions-summary-modal.component.html',
   styleUrls: ['./item-versions-summary-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class ItemVersionsSummaryModalComponent implements OnInit, ModalBeforeDismiss {
 
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index ce5107aaa2..8df582fd1a 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -1,92 +1,114 @@
-<div *ngIf="(versionsDTO$ | async) as versionsDTO; else noItemVersion">
-  <div *ngIf="(versionRD$ | async)?.payload as itemVersion">
-    <div class="mb-2" *ngIf="versionsDTO.versionDTOs.length > 0 || displayWhenEmpty">
-      <h2 *ngIf="displayTitle" class="h4">{{"item.version.history.head" | translate}}</h2>
-      <ds-alert [type]="AlertTypeEnum.Info">
-        {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
-      </ds-alert>
-      <ds-pagination *ngIf="versionsDTO.versionDTOs.length > 0"
-                     (paginationChange)="onPageChange()"
-                     [hideGear]="true"
-                     [hidePagerWhenSinglePage]="true"
-                     [paginationOptions]="options"
-                     [collectionSize]="versionsDTO.totalElements"
-                     [retainScrollPosition]="true">
-        <table class="table table-striped table-bordered align-middle my-2">
-          <thead>
-          <tr>
-            <th scope="col">{{"item.version.history.table.version" | translate}}</th>
-            <th scope="col" *ngIf="(showSubmitter$ | async)">{{"item.version.history.table.editor" | translate}}</th>
-            <th scope="col">{{"item.version.history.table.date" | translate}}</th>
-            <th scope="col">{{"item.version.history.table.summary" | translate}}</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr *ngFor="let versionDTO of versionsDTO.versionDTOs" [id]="'version-row-' + versionDTO.version.id">
-            <td class="version-row-element-version">
-              <ds-item-versions-row-element-version [hasDraftVersion]="hasDraftVersion$ | async"
-                                                    [version]="versionDTO.version"
-                                                    [item]="item" [displayActions]="displayActions"
-                                                    [itemVersion]="itemVersion"
-                                                    [versionBeingEditedNumber]="versionBeingEditedNumber"
-                                                    (versionsHistoryChange)="getAllVersions($event)"
-              ></ds-item-versions-row-element-version>
-            </td>
-            <td class="version-row-element-editor" *ngIf="(showSubmitter$ | async)">
-              {{versionDTO.version.submitterName}}
-            </td>
-            <td class="version-row-element-date">
-              {{versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss'}}
-            </td>
-            <td class="version-row-element-summary">
-              <div class="float-left">
-                <ng-container *ngIf="isThisBeingEdited(versionDTO.version); then editSummary else showSummary"></ng-container>
-                <ng-template #showSummary>{{versionDTO.version.summary}}</ng-template>
-                <ng-template #editSummary>
-                  <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
-                         [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
-                         class="form-control" type="text"/>
-                </ng-template>
-              </div>
-
-              <div class="float-right btn-group edit-field space-children-mr" *ngIf="displayActions && versionDTO.canEditVersion | async">
-                <ng-container *ngIf="isThisBeingEdited(versionDTO.version); else notThisBeingEdited">
-                  <!--DISCARD EDIT-->
-                  <button class="btn btn-sm btn-outline-warning"
-                          (click)="disableVersionEditing()"
-                          title="{{'item.version.history.table.action.discardSummary' | translate}}">
-                    <i class="fas fa-undo-alt fa-fw"></i>
-                  </button>
-                  <!--SAVE-->
-                  <button class="btn btn-outline-success btn-sm"
-                          (click)="onSummarySubmit()"
-                          title="{{'item.version.history.table.action.saveSummary' | translate}}">
-                    <i class="fas fa-check fa-fw"></i>
-                  </button>
-                </ng-container>
-                <ng-template #notThisBeingEdited>
-                  <!--EDIT-->
-                  <button class="btn btn-outline-primary btn-sm version-row-element-edit"
-                          [disabled]="isAnyBeingEdited()"
-                          (click)="enableVersionEditing(versionDTO.version)"
-                          title="{{'item.version.history.table.action.editSummary' | translate}}">
-                    <i class="fas fa-edit fa-fw"></i>
-                  </button>
-                </ng-template>
-              </div>
-            </td>
-          </tr>
-          </tbody>
-        </table>
-        <div>*&nbsp;{{"item.version.history.selected" | translate}}</div>
-      </ds-pagination>
-    </div>
+@if ((versionsDTO$ | async); as versionsDTO) {
+  <div>
+    @if ((versionRD$ | async)?.payload; as itemVersion) {
+      <div>
+        @if (versionsDTO.versionDTOs.length > 0 || displayWhenEmpty) {
+          <div class="mb-2">
+            @if (displayTitle) {
+              <h2 class="h4">{{"item.version.history.head" | translate}}</h2>
+            }
+            <ds-alert [type]="AlertTypeEnum.Info">
+              {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
+            </ds-alert>
+            @if (versionsDTO.versionDTOs.length > 0) {
+              <ds-pagination
+                (paginationChange)="onPageChange()"
+                [hideGear]="true"
+                [hidePagerWhenSinglePage]="true"
+                [paginationOptions]="options"
+                [collectionSize]="versionsDTO.totalElements"
+                [retainScrollPosition]="true">
+                <table class="table table-striped table-bordered align-middle my-2">
+                  <thead>
+                    <tr>
+                      <th scope="col">{{"item.version.history.table.version" | translate}}</th>
+                      @if ((showSubmitter$ | async)) {
+                        <th scope="col">{{"item.version.history.table.editor" | translate}}</th>
+                      }
+                      <th scope="col">{{"item.version.history.table.date" | translate}}</th>
+                      <th scope="col">{{"item.version.history.table.summary" | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (versionDTO of versionsDTO.versionDTOs; track versionDTO) {
+                      <tr [id]="'version-row-' + versionDTO.version.id">
+                        <td class="version-row-element-version">
+                          <ds-item-versions-row-element-version [hasDraftVersion]="hasDraftVersion$ | async"
+                            [version]="versionDTO.version"
+                            [item]="item" [displayActions]="displayActions"
+                            [itemVersion]="itemVersion"
+                            [versionBeingEditedNumber]="versionBeingEditedNumber"
+                            (versionsHistoryChange)="getAllVersions($event)"
+                          ></ds-item-versions-row-element-version>
+                        </td>
+                        @if ((showSubmitter$ | async)) {
+                          <td class="version-row-element-editor">
+                            {{versionDTO.version.submitterName}}
+                          </td>
+                        }
+                        <td class="version-row-element-date">
+                          {{versionDTO.version.created | date : 'yyyy-MM-dd HH:mm:ss'}}
+                        </td>
+                        <td class="version-row-element-summary">
+                          <div class="float-start">
+                            @if (isThisBeingEdited(versionDTO.version)) {
+                              <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
+                                [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
+                                class="form-control" type="text"/>
+                            } @else {
+                              <span>{{versionDTO.version.summary}}</span>
+                            }
+                            <ng-template #editSummary>
+                              <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
+                                [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
+                                class="form-control" type="text"/>
+                            </ng-template>
+                          </div>
+                          @if (displayActions && versionDTO.canEditVersion | async) {
+                            <div class="float-end btn-group edit-field space-children-mr">
+                              @if (isThisBeingEdited(versionDTO.version)) {
+                                <!--DISCARD EDIT-->
+                                <button class="btn btn-sm btn-outline-warning"
+                                  (click)="disableVersionEditing()"
+                                  title="{{'item.version.history.table.action.discardSummary' | translate}}">
+                                  <i class="fas fa-undo-alt fa-fw"></i>
+                                </button>
+                                <!--SAVE-->
+                                <button class="btn btn-outline-success btn-sm"
+                                  (click)="onSummarySubmit()"
+                                  title="{{'item.version.history.table.action.saveSummary' | translate}}">
+                                  <i class="fas fa-check fa-fw"></i>
+                                </button>
+                              } @else {
+                                <!--EDIT-->
+                                <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+                                  [dsBtnDisabled]="isAnyBeingEdited()"
+                                  (click)="enableVersionEditing(versionDTO.version)"
+                                  title="{{'item.version.history.table.action.editSummary' | translate}}">
+                                  <i class="fas fa-edit fa-fw"></i>
+                                </button>
+                              }
+                            </div>
+                          }
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+                <div>*&nbsp;{{"item.version.history.selected" | translate}}</div>
+              </ds-pagination>
+            }
+          </div>
+        }
+      </div>
+    }
   </div>
-</div>
+} @else {
+  @if (displayWhenEmpty) {
+    <ds-alert
+      [content]="'item.version.history.empty'"
+      [type]="AlertTypeEnum.Info">
+    </ds-alert>
+  }
+}
 
-<ng-template #noItemVersion>
-  <ds-alert *ngIf="displayWhenEmpty"
-            [content]="'item.version.history.empty'"
-            [type]="AlertTypeEnum.Info">
-  </ds-alert>
-</ng-template>
diff --git a/src/app/item-page/versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
index ee3c0110c8..b6ef946815 100644
--- a/src/app/item-page/versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -42,6 +42,7 @@ import { VersionHistory } from '../../core/shared/version-history.model';
 import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
 import { AlertComponent } from '../../shared/alert/alert.component';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
@@ -158,7 +159,7 @@ describe('ItemVersionsComponent', () => {
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterModule.forRoot([]), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemVersionsComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterModule.forRoot([]), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemVersionsComponent, VarDirective, BtnDisabledDirective],
       providers: [
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
@@ -234,8 +235,9 @@ describe('ItemVersionsComponent', () => {
     it('should not disable the delete button', () => {
       const deleteButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.version-row-element-delete'));
       expect(deleteButtons.length).not.toBe(0);
-      deleteButtons.forEach((btn: DebugElement) => {
-        expect(btn.nativeElement.disabled).toBe(false);
+      deleteButtons.forEach((btn) => {
+        expect(btn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+        expect(btn.nativeElement.classList.contains('disabled')).toBeFalse();
       });
     });
 
diff --git a/src/app/item-page/versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
index 43a6fd44a4..6ae2af1438 100644
--- a/src/app/item-page/versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   DatePipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -48,6 +46,7 @@ import { Version } from '../../core/shared/version.model';
 import { VersionHistory } from '../../core/shared/version-history.model';
 import { AlertComponent } from '../../shared/alert/alert.component';
 import { AlertType } from '../../shared/alert/alert-type';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   hasValue,
   hasValueOperator,
@@ -81,10 +80,9 @@ interface VersionDTO {
     FormsModule,
     ItemVersionsRowElementVersionComponent,
     NgClass,
-    NgFor,
-    NgIf,
     PaginationComponent,
     TranslateModule,
+    BtnDisabledDirective,
   ],
 })
 
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.html b/src/app/item-page/versions/notice/item-versions-notice.component.html
index 90502c5df7..1ceaf16d41 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.html
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.html
@@ -1,5 +1,7 @@
-<ds-alert *ngIf="(showLatestVersionNotice$ | async) === true"
-          [content]="('item.version.notice' | translate:{ destination: getItemPage(((latestVersion$ | async)?.item | async)?.payload) })"
-          [dismissible]="false"
-          [type]="AlertTypeEnum.Warning">
-</ds-alert>
+@if ((showLatestVersionNotice$ | async) === true) {
+  <ds-alert
+    [content]="('item.version.notice' | translate:{ destination: getItemPage(((latestVersion$ | async)?.item | async)?.payload) })"
+    [dismissible]="false"
+    [type]="AlertTypeEnum.Warning">
+  </ds-alert>
+}
diff --git a/src/app/item-page/versions/notice/item-versions-notice.component.ts b/src/app/item-page/versions/notice/item-versions-notice.component.ts
index c136d3f06f..adbc41b511 100644
--- a/src/app/item-page/versions/notice/item-versions-notice.component.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -41,7 +38,7 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
   selector: 'ds-item-versions-notice',
   templateUrl: './item-versions-notice.component.html',
   standalone: true,
-  imports: [NgIf, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [AlertComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component for displaying a warning notice when the item is not the latest version within its version history
diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html
index e32840ead8..cde54f8fd7 100644
--- a/src/app/login-page/login-page.component.html
+++ b/src/app/login-page/login-page.component.html
@@ -2,7 +2,7 @@
   <div class="text-center mt-5 row justify-content-center">
     <div>
       <img class="mb-4 login-logo" src="assets/images/dspace-logo.svg" [alt]="'repository.image.logo' | translate">
-      <h1 class="h3 mb-0 font-weight-normal">{{"login.form.header" | translate}}</h1>
+      <h1 class="h3 mb-0 fw-normal">{{"login.form.header" | translate}}</h1>
       <ds-log-in
       [isStandalonePage]="true"></ds-log-in>
     </div>
diff --git a/src/app/logout-page/logout-page.component.html b/src/app/logout-page/logout-page.component.html
index edb86583fd..78074b30e8 100644
--- a/src/app/logout-page/logout-page.component.html
+++ b/src/app/logout-page/logout-page.component.html
@@ -2,7 +2,7 @@
   <div class="text-center mt-5 row justify-content-md-center">
     <div class="mx-auto">
       <img class="mb-4 login-logo" src="assets/images/dspace-logo.svg" [alt]="'repository.image.logo' | translate">
-      <h1 class="h3 mb-0 font-weight-normal">{{"logout.form.header" | translate}}</h1>
+      <h1 class="h3 mb-0 fw-normal">{{"logout.form.header" | translate}}</h1>
       <ds-log-out></ds-log-out>
     </div>
   </div>
diff --git a/src/app/menu-resolver.service.ts b/src/app/menu-resolver.service.ts
index 144cad4547..31210883ae 100644
--- a/src/app/menu-resolver.service.ts
+++ b/src/app/menu-resolver.service.ts
@@ -7,7 +7,9 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   combineLatest,
   combineLatest as observableCombineLatest,
+  mergeMap,
   Observable,
+  of as observableOf,
 } from 'rxjs';
 import {
   filter,
@@ -17,6 +19,7 @@ import {
 } from 'rxjs/operators';
 
 import { PUBLICATION_CLAIMS_PATH } from './admin/admin-notifications/admin-notifications-routing-paths';
+import { AuthService } from './core/auth/auth.service';
 import { BrowseService } from './core/browse/browse.service';
 import { ConfigurationDataService } from './core/data/configuration-data.service';
 import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
@@ -62,6 +65,7 @@ export class MenuResolverService  {
     protected modalService: NgbModal,
     protected scriptDataService: ScriptDataService,
     protected configurationDataService: ConfigurationDataService,
+    protected authService: AuthService,
   ) {
   }
 
@@ -71,7 +75,7 @@ export class MenuResolverService  {
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     return combineLatest([
       this.createPublicMenu$(),
-      this.createAdminMenu$(),
+      this.createAdminMenuIfLoggedIn$(),
     ]).pipe(
       map((menusDone: boolean[]) => menusDone.every(Boolean)),
     );
@@ -147,6 +151,15 @@ export class MenuResolverService  {
     return this.waitForMenu$(MenuID.PUBLIC);
   }
 
+  /**
+   * Initialize all menu sections and items for {@link MenuID.ADMIN}, only if the user is logged in.
+   */
+  createAdminMenuIfLoggedIn$() {
+    return this.authService.isAuthenticated().pipe(
+      mergeMap((isAuthenticated) => isAuthenticated ? this.createAdminMenu$() : observableOf(true)),
+    );
+  }
+
   /**
    * Initialize all menu sections and items for {@link MenuID.ADMIN}
    */
@@ -157,7 +170,6 @@ export class MenuResolverService  {
     this.createImportMenuSections();
     this.createAccessControlMenuSections();
     this.createReportMenuSections();
-
     return this.waitForMenu$(MenuID.ADMIN);
   }
 
diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index 386bbb0cae..720c071104 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -26,7 +26,9 @@ import { ConfigurationDataServiceStub } from './shared/testing/configuration-dat
 import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { createPaginatedList } from './shared/testing/utils.test';
 import createSpy = jasmine.createSpy;
+import { AuthService } from './core/auth/auth.service';
 import { MenuResolverService } from './menu-resolver.service';
+import { AuthServiceStub } from './shared/testing/auth-service.stub';
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
@@ -80,6 +82,7 @@ describe('menuResolver', () => {
         { provide: ScriptDataService, useValue: scriptService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: NgbModal, useValue: mockNgbModal },
+        { provide: AuthService, useValue: AuthServiceStub },
         MenuResolverService,
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -94,19 +97,19 @@ describe('menuResolver', () => {
   describe('resolve', () => {
     it('should create all menus', (done) => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(observableOf(true));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(observableOf(true));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(observableOf(true));
 
       resolver.resolve(null, null).subscribe(resolved => {
         expect(resolved).toBeTrue();
         expect(resolver.createPublicMenu$).toHaveBeenCalled();
-        expect(resolver.createAdminMenu$).toHaveBeenCalled();
+        expect(resolver.createAdminMenuIfLoggedIn$).toHaveBeenCalled();
         done();
       });
     });
 
     it('should return an Observable that emits true as soon as all menus are created', () => {
       spyOn(resolver, 'createPublicMenu$').and.returnValue(cold('--(t|)', BOOLEAN));
-      spyOn(resolver, 'createAdminMenu$').and.returnValue(cold('----(t|)', BOOLEAN));
+      spyOn(resolver, 'createAdminMenuIfLoggedIn$').and.returnValue(cold('----(t|)', BOOLEAN));
 
       expect(resolver.resolve(null, null)).toBeObservable(cold('----(t|)', BOOLEAN));
     });
diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.html b/src/app/my-dspace-page/collection-selector/collection-selector.component.html
index a87118fc4e..2e6d3b03bf 100644
--- a/src/app/my-dspace-page/collection-selector/collection-selector.component.html
+++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{'dso-selector.create.submission.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 0157110035..39565e6cdd 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,26 +1,30 @@
-  <div class="add" *ngIf="(moreThanOne$ | async) !== true">
-    <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate" [disabled]="(initialized$ | async) !== true"
-            (click)="openPage(singleEntity)" role="button"
-            title="{{'mydspace.new-submission-external' | translate}}">
+@if ((moreThanOne$ | async) !== true) {
+  <div class="add">
+    <button class="btn btn-lg btn-outline-primary mt-1 ms-2"
+      [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="(initialized$ | async) !== true"
+      (click)="openPage(singleEntity)" role="button"
+      title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
     </button>
   </div>
+}
+@if ((moreThanOne$ | async)) {
   <div class="add w-100" display="dynamic" placement="bottom-right"
-       ngbDropdown
-       *ngIf="(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-outline-primary mt-1 ml-2" id="dropdownImport" ngbDropdownToggle
-            type="button" [disabled]="(initialized$ | async) !== true"
-            [attr.aria-label]="'mydspace.new-submission-external' | translate"
-            [attr.data-test]="'import-dropdown' | dsBrowserOnly"
-            title="{{'mydspace.new-submission-external' | translate}}">
+    ngbDropdown
+    >
+    <button class="btn btn-lg btn-outline-primary mt-1 ms-2" id="dropdownImport" ngbDropdownToggle
+      type="button" [dsBtnDisabled]="(initialized$ | async) !== true"
+      [attr.aria-label]="'mydspace.new-submission-external' | translate"
+      [attr.data-test]="'import-dropdown' | dsBrowserOnly"
+      title="{{'mydspace.new-submission-external' | translate}}">
       <i class="fa fa-file-import" aria-hidden="true"></i>
       <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu p-0"
-         id="importControlsDropdownMenu"
-         aria-labelledby="dropdownImport">
+      class="dropdown-menu p-0"
+      id="importControlsDropdownMenu"
+      aria-labelledby="dropdownImport">
       <ds-entity-dropdown [isSubmission]="false" (selectionChange)="openPage($event)"></ds-entity-dropdown>
     </div>
   </div>
+}
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
index e9787e8645..2d39ef241d 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
@@ -191,7 +191,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index 86960725a5..7a89089051 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -27,6 +24,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
@@ -44,7 +42,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     TranslateModule,
     BrowserOnlyPipe,
-    NgIf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 730b1db1c7..0e167475bf 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,24 +1,28 @@
-  <div class="add" *ngIf="(moreThanOne$ | async) !== true">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
-            [disabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
+@if ((moreThanOne$ | async) !== true) {
+  <div class="add">
+    <button class="btn btn-lg btn-primary mt-1 ms-2" [attr.aria-label]="'mydspace.new-submission' | translate"
+      [dsBtnDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
   </div>
+}
+@if ((moreThanOne$ | async)) {
   <div class="add w-100" display="dynamic" placement="bottom-right"
-       ngbDropdown
-       *ngIf="(moreThanOne$ | async)">
-    <button class="btn btn-lg btn-primary mt-1 ml-2" id="dropdownSubmission" ngbDropdownToggle
-            type="button"  [disabled]="(initialized$ | async) !== true"
-            [attr.aria-label]="'mydspace.new-submission' | translate"
-            [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
-            title="{{'mydspace.new-submission' | translate}}">
+    ngbDropdown
+    >
+    <button class="btn btn-lg btn-primary mt-1 ms-2" id="dropdownSubmission" ngbDropdownToggle
+      type="button"  [dsBtnDisabled]="(initialized$ | async) !== true"
+      [attr.aria-label]="'mydspace.new-submission' | translate"
+      [attr.data-test]="'submission-dropdown' | dsBrowserOnly"
+      title="{{'mydspace.new-submission' | translate}}">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
       <span class="caret" aria-hidden="true"></span>
     </button>
     <div ngbDropdownMenu
-         class="dropdown-menu p-0"
-         id="entityControlsDropdownMenu"
-         aria-labelledby="dropdownSubmission">
+      class="dropdown-menu p-0"
+      id="entityControlsDropdownMenu"
+      aria-labelledby="dropdownSubmission">
       <ds-entity-dropdown [isSubmission]="true" (selectionChange)="openDialog($event)"></ds-entity-dropdown>
     </div>
   </div>
+}
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
index 9e50556fe3..3da919a009 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
@@ -196,7 +196,7 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index 02c714b4fb..25cfe437bd 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -28,6 +25,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { hasValue } from '../../../shared/empty.util';
 import { EntityDropdownComponent } from '../../../shared/entity-dropdown/entity-dropdown.component';
@@ -46,7 +44,7 @@ import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
     AsyncPipe,
     TranslateModule,
     BrowserOnlyPipe,
-    NgIf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
index d0052b9355..6cdc1c0722 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.html
@@ -1,10 +1,12 @@
 <div class="parent mb-3">
   <div class="upload">
-    <ds-uploader *ngIf="uploadFilesOptions.url !== ''"
-                 [uploadFilesOptions]="uploadFilesOptions"
-                 (onCompleteItem)="onCompleteItem($event)"
-                 (onUploadError)="onUploadError($event)"
-                 (onFileSelected)="afterFileLoaded($event)"></ds-uploader>
+    @if (uploadFilesOptions.url !== '') {
+      <ds-uploader
+        [uploadFilesOptions]="uploadFilesOptions"
+        (onCompleteItem)="onCompleteItem($event)"
+        (onUploadError)="onUploadError($event)"
+      (onFileSelected)="afterFileLoaded($event)"></ds-uploader>
+    }
 
   </div>
   <div class="add">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
index cf7cb7ab72..7d014b9393 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -38,7 +38,6 @@ import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submissi
     MyDSpaceNewExternalDropdownComponent,
     MyDSpaceNewSubmissionDropdownComponent,
     UploaderComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html
index 9e5cadc12b..564946edcd 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.html
+++ b/src/app/my-dspace-page/my-dspace-page.component.html
@@ -4,9 +4,11 @@
   <ds-my-dspace-new-submission *dsShowOnlyForRole="[roleTypeEnum.Submitter]"></ds-my-dspace-new-submission>
 </div>
 
-<ds-search *ngIf="configuration && context"
-           [configuration]="configuration"
-           [configurationList]="(configurationList$ | async)"
-           [context]="context"
-           [viewModeList]="viewModeList"
-></ds-search>
+@if (configuration && context) {
+  <ds-search
+    [configuration]="configuration"
+    [configurationList]="(configurationList$ | async)"
+    [context]="context"
+    [viewModeList]="viewModeList"
+  ></ds-search>
+}
diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts
index 0607b27fef..7acb900739 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -49,7 +46,6 @@ export const MYDSPACE_ROUTE = '/mydspace';
     MyDSpaceNewSubmissionComponent,
     AsyncPipe,
     RoleDirective,
-    NgIf,
     SuggestionsNotificationComponent,
     MyDspaceQaEventsNotificationsComponent,
   ],
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
index e44d2c6e48..f2deb49c9f 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
@@ -1,29 +1,30 @@
-<ng-container *ngIf="(sources$ | async)?.length > 0">
-  <ng-container *ngFor="let source of sources$ | async">
-    <div
-      class="alert alert-info d-flex flex-row"
-      *ngIf="source.totalEvents > 0"
-    >
-    <div class="source-logo-container">
-      <img
-        class="source-logo"
-        src="assets/images/qa-{{ source.id }}-logo.png"
-        onerror="this.src='assets/images/dspace-logo.svg'"
-        alt="{{ source.id }} logo"
-      />
-    </div>
-      <div class="w-100 d-flex justify-content-between">
-        <div class="pl-4 align-self-center">
-          {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
-        </div>
-        <button
-          [routerLink]="[getQualityAssuranceRoute(), source.id]"
-          [queryParams]="{ forward: true }"
-          class="btn btn-primary align-self-center"
+@if ((sources$ | async)?.length > 0) {
+  @for (source of sources$ | async; track source) {
+    @if (source.totalEvents > 0) {
+      <div
+        class="alert alert-info d-flex flex-row"
         >
-          {{ "mydspace.qa-event-notification-info.check.button" | translate }}
-        </button>
+        <div class="source-logo-container">
+          <img
+            class="source-logo"
+            src="assets/images/qa-{{ source.id }}-logo.png"
+            onerror="this.src='assets/images/dspace-logo.svg'"
+            alt="{{ source.id }} logo"
+            />
+        </div>
+        <div class="w-100 d-flex justify-content-between">
+          <div class="ps-4 align-self-center">
+            {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
+          </div>
+          <button
+            [routerLink]="[getQualityAssuranceRoute(), source.id]"
+            [queryParams]="{ forward: true }"
+            class="btn btn-primary align-self-center"
+            >
+            {{ "mydspace.qa-event-notification-info.check.button" | translate }}
+          </button>
+        </div>
       </div>
-    </div>
-  </ng-container>
-</ng-container>
+    }
+  }
+}
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
index 9da65fb2e6..8bc141e258 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -32,10 +28,8 @@ import {
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     AsyncPipe,
-    NgForOf,
     TranslateModule,
     RouterLink,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
index 7f9b4a546f..116e3a4a4e 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.html
@@ -1,35 +1,41 @@
 <div class="ds-menu-item-wrapper text-md-center"
-    [id]="'expandable-navbar-section-' + section.id"
-    (mouseenter)="onMouseEnter($event, isActive)"
-    (mouseleave)="onMouseLeave($event, isActive)"
-    data-test="navbar-section-wrapper"
-    *ngVar="(active | async) as isActive">
-    <a href="javascript:void(0);" routerLinkActive="active"
-       role="menuitem"
-       (keyup.enter)="toggleSection($event)"
-       (keyup.space)="toggleSection($event)"
-       (click)="toggleSection($event)"
-       (keydown.space)="$event.preventDefault()"
-       aria-haspopup="menu"
-       data-test="navbar-section-toggler"
-       [attr.aria-expanded]="isActive"
-       [attr.aria-controls]="expandableNavbarSectionId(section.id)"
-       class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
-       [class.disabled]="section.model?.disabled">
-      <span class="flex-fill">
-        <ng-container
-          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
-<!--        <span class="sr-only">{{'nav.expandable-navbar-section-suffix' | translate}}</span>-->
-      </span>
-      <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
-    </a>
-    <div @slide *ngIf="isActive" (click)="deactivateSection($event)"
-        [id]="expandableNavbarSectionId(section.id)"
-        role="menu"
-        class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
-        <div *ngFor="let subSection of (subSections$ | async)" class="text-nowrap" role="presentation">
+  [id]="'expandable-navbar-section-' + section.id"
+  (mouseenter)="onMouseEnter($event)"
+  (mouseleave)="onMouseLeave($event)"
+  data-test="navbar-section-wrapper">
+  <a href="javascript:void(0);" routerLinkActive="active"
+    role="menuitem"
+    (keyup.enter)="toggleSection($event)"
+    (keyup.space)="toggleSection($event)"
+    (click)="toggleSection($event)"
+    (keydown)="keyDown($event)"
+    aria-haspopup="menu"
+    data-test="navbar-section-toggler"
+    [attr.aria-expanded]="(active$ | async).valueOf()"
+    [attr.aria-controls]="expandableNavbarSectionId()"
+    class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
+    [class.disabled]="section.model?.disabled">
+    <span class="flex-fill">
+      <ng-container
+      *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+    </span>
+    <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
+  </a>
+  @if ((active$ | async).valueOf() === true) {
+    <div (click)="deactivateSection($event)"
+      [id]="expandableNavbarSectionId()"
+      [dsHoverOutsideOfParentSelector]="'#expandable-navbar-section-' + section.id"
+      (dsHoverOutside)="deactivateSection($event, false)"
+      role="menu"
+      class="dropdown-menu show nav-dropdown-menu m-0 shadow-none border-top-0 px-3 px-md-0 pt-0 pt-md-1">
+      <div @slide role="presentation">
+        @for (subSection of (subSections$ | async); track subSection) {
+          <div class="text-nowrap" role="presentation">
             <ng-container
-                    *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
-        </div>
+            *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;"></ng-container>
+          </div>
+        }
+      </div>
     </div>
+  }
 </div>
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
index 8849fbd809..ab0934e902 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss
@@ -5,7 +5,9 @@
 
   .dropdown-menu {
     overflow: hidden;
-    @include media-breakpoint-down(sm) {
+    min-width: 100%;
+    top: 100%;
+    @include media-breakpoint-down(xs) {
       border: 0;
       background-color: var(--ds-expandable-navbar-bg);
     }
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
index d03c8d89eb..6f374b3aa5 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.spec.ts
@@ -1,6 +1,11 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  DebugElement,
+} from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
+  flush,
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
@@ -10,9 +15,11 @@ import { of as observableOf } from 'rxjs';
 
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
+import { LinkMenuItemModel } from '../../shared/menu/menu-item/models/link.model';
+import { MenuSection } from '../../shared/menu/menu-section.model';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
-import { VarDirective } from '../../shared/utils/var.directive';
+import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
 
 describe('ExpandableNavbarSectionComponent', () => {
@@ -23,11 +30,17 @@ describe('ExpandableNavbarSectionComponent', () => {
   describe('on larger screens', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [NoopAnimationsModule, ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        imports: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          NoopAnimationsModule,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
           { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+          TestComponent,
         ],
       }).compileComponents();
     }));
@@ -41,10 +54,6 @@ describe('ExpandableNavbarSectionComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should create', () => {
-      expect(component).toBeTruthy();
-    });
-
     describe('when the mouse enters the section header (while inactive)', () => {
       beforeEach(() => {
         spyOn(component, 'onMouseEnter').and.callThrough();
@@ -141,6 +150,8 @@ describe('ExpandableNavbarSectionComponent', () => {
     });
 
     describe('when spacebar is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
       beforeEach(() => {
         spyOn(component, 'toggleSection').and.callThrough();
         spyOn(menuService, 'toggleActiveSection');
@@ -149,15 +160,27 @@ describe('ExpandableNavbarSectionComponent', () => {
         component.ngOnInit();
         fixture.detectChanges();
 
-        const sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
-        // dispatch the (keyup.space) action used in our component HTML
-        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
       });
 
       it('should call toggleSection on the menuService', () => {
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { code: 'Space', key: ' ' }));
+
         expect(component.toggleSection).toHaveBeenCalled();
         expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
+
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Space', key: ' ' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
+      });
     });
 
     describe('when spacebar is pressed on section header (while active)', () => {
@@ -179,12 +202,116 @@ describe('ExpandableNavbarSectionComponent', () => {
         expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
+
+    describe('when enter is pressed on section header (while inactive)', () => {
+      let sidebarToggler: DebugElement;
+
+      beforeEach(() => {
+        spyOn(component, 'toggleSection').and.callThrough();
+        spyOn(menuService, 'toggleActiveSection');
+        // Make sure section is 'inactive'. Requires calling ngOnInit() to update component 'active' property.
+        spyOn(menuService, 'isSectionActive').and.returnValue(observableOf(false));
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        sidebarToggler = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+      });
+
+      // Should not do anything in order to work correctly with NVDA: https://www.nvaccess.org/
+      it('should not do anything on keydown space', () => {
+        const event: Event = new KeyboardEvent('keydown', { code: 'Enter' });
+        spyOn(event, 'preventDefault').and.callThrough();
+
+        // dispatch the (keyup.space) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(event);
+
+        expect(event.preventDefault).toHaveBeenCalled();
+      });
+    });
+
+    describe('when arrow down is pressed on section header', () => {
+      it('should call activateSection', () => {
+        spyOn(component, 'activateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'ArrowDown' }));
+
+        expect(component.focusOnFirstChildSection).toBe(true);
+        expect(component.activateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('when tab is pressed on section header', () => {
+      it('should call deactivateSection', () => {
+        spyOn(component, 'deactivateSection').and.callThrough();
+
+        const sidebarToggler: DebugElement = fixture.debugElement.query(By.css('[data-test="navbar-section-toggler"]'));
+        // dispatch the (keydown.ArrowDown) action used in our component HTML
+        sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(component.deactivateSection).toHaveBeenCalled();
+      });
+    });
+
+    describe('navigateDropdown', () => {
+      beforeEach(fakeAsync(() => {
+        jasmine.getEnv().allowRespy(true);
+        spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([
+          Object.assign(new MenuSection(), {
+            id: 'subSection1',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+          Object.assign(new MenuSection(), {
+            id: 'subSection2',
+            model: Object.assign(new LinkMenuItemModel(), {
+              type: 'TEST_LINK',
+            }),
+            parentId: component.section.id,
+          }),
+        ]));
+        component.ngOnInit();
+        flush();
+        fixture.detectChanges();
+        component.focusOnFirstChildSection = true;
+        component.active$.next(true);
+        fixture.detectChanges();
+      }));
+
+      it('should close the modal on Tab', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Tab' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
+      });
+
+      it('should close the modal on Escape', () => {
+        spyOn(menuService, 'deactivateSection').and.callThrough();
+
+        const firstSubsection: DebugElement = fixture.debugElement.queryAll(By.css('.dropdown-menu a[role="menuitem"]'))[0];
+        firstSubsection.nativeElement.focus();
+        firstSubsection.nativeElement.dispatchEvent(new KeyboardEvent('keydown', { code: 'Escape' }));
+
+        expect(menuService.deactivateSection).toHaveBeenCalled();
+      });
+    });
   });
 
   describe('on smaller, mobile screens', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
-        imports: [NoopAnimationsModule, ExpandableNavbarSectionComponent, TestComponent, VarDirective],
+        imports: [
+          ExpandableNavbarSectionComponent,
+          HoverOutsideDirective,
+          NoopAnimationsModule,
+          TestComponent,
+        ],
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
@@ -253,7 +380,9 @@ describe('ExpandableNavbarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``,
+  template: `
+    <a role="menuitem">link</a>
+  `,
   standalone: true,
 })
 class TestComponent {
diff --git a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 92da978af7..84a7cad594 100644
--- a/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,14 +1,14 @@
 import {
   AsyncPipe,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
+  AfterViewChecked,
   Component,
   HostListener,
   Inject,
   Injector,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import { RouterLinkActive } from '@angular/router';
@@ -19,7 +19,8 @@ import { slide } from '../../shared/animations/slide';
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
-import { VarDirective } from '../../shared/utils/var.directive';
+import { MenuSection } from '../../shared/menu/menu-section.model';
+import { HoverOutsideDirective } from '../../shared/utils/hover-outside.directive';
 import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 
 /**
@@ -31,9 +32,15 @@ import { NavbarSectionComponent } from '../navbar-section/navbar-section.compone
   styleUrls: ['./expandable-navbar-section.component.scss'],
   animations: [slide],
   standalone: true,
-  imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    HoverOutsideDirective,
+    NgComponentOutlet,
+    RouterLinkActive,
+  ],
 })
-export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements OnInit {
+export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements AfterViewChecked, OnInit, OnDestroy {
+
   /**
    * This section resides in the Public Navbar
    */
@@ -44,6 +51,11 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   mouseEntered = false;
 
+  /**
+   * Whether the section was expanded
+   */
+  focusOnFirstChildSection = false;
+
   /**
    * True if screen size was small before a resize event
    */
@@ -54,6 +66,18 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
    */
   isMobile$: Observable<boolean>;
 
+  /**
+   * Boolean used to add the event listeners to the items in the expandable menu when expanded. This is done for
+   * performance reasons, there is currently an *ngIf on the menu to prevent the {@link HoverOutsideDirective} to tank
+   * performance when not expanded.
+   */
+  addArrowEventListeners = false;
+
+  /**
+   * List of current dropdown items who have event listeners
+   */
+  private dropdownItems: NodeListOf<HTMLElement>;
+
   @HostListener('window:resize', ['$event'])
   onResize() {
     this.isMobile$.pipe(
@@ -68,29 +92,80 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
     });
   }
 
-  constructor(@Inject('sectionDataProvider') menuSection,
-              protected menuService: MenuService,
-              protected injector: Injector,
-              private windowService: HostWindowService,
+  constructor(
+    @Inject('sectionDataProvider') public section: MenuSection,
+    protected menuService: MenuService,
+    protected injector: Injector,
+    protected windowService: HostWindowService,
   ) {
-    super(menuSection, menuService, injector);
+    super(section, menuService, injector);
     this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit() {
     super.ngOnInit();
+    this.subs.push(this.active$.subscribe((active: boolean) => {
+      if (active === true) {
+        this.addArrowEventListeners = true;
+      } else {
+        this.focusOnFirstChildSection = undefined;
+        this.unsubscribeFromEventListeners();
+      }
+    }));
+  }
+
+  ngAfterViewChecked(): void {
+    if (this.addArrowEventListeners) {
+      this.dropdownItems = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+      this.dropdownItems.forEach((item: HTMLElement) => {
+        item.addEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      if (this.focusOnFirstChildSection && this.dropdownItems.length > 0) {
+        this.dropdownItems.item(0).focus();
+      }
+      this.addArrowEventListeners = false;
+    }
+  }
+
+  ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.unsubscribeFromEventListeners();
+  }
+
+  /**
+   * Activate this section if it's currently inactive, deactivate it when it's currently active.
+   * Also saves whether this toggle was performed by a keyboard event (non-click event) in order to know if thi first
+   * item should be focussed when activating a section.
+   *
+   *  @param {Event} event The user event that triggered this method
+   */
+  override toggleSection(event: Event): void {
+    this.focusOnFirstChildSection = event.type !== 'click';
+    super.toggleSection(event);
+  }
+
+  /**
+   * Removes all the current event listeners on the dropdown items (called when the menu is closed & on component
+   * destruction)
+   */
+  unsubscribeFromEventListeners(): void {
+    if (this.dropdownItems) {
+      this.dropdownItems.forEach((item: HTMLElement) => {
+        item.removeEventListener('keydown', this.navigateDropdown.bind(this));
+      });
+      this.dropdownItems = undefined;
+    }
   }
 
   /**
    * When the mouse enters the section toggler activate the menu section
    * @param $event
-   * @param isActive
    */
-  onMouseEnter($event: Event, isActive: boolean) {
+  onMouseEnter($event: Event): void {
     this.isMobile$.pipe(
       first(),
     ).subscribe((isMobile) => {
-      if (!isMobile && !isActive && !this.mouseEntered) {
+      if (!isMobile && !this.active$.value && !this.mouseEntered) {
         this.activateSection($event);
       }
       this.mouseEntered = true;
@@ -100,13 +175,12 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   /**
    * When the mouse leaves the section toggler deactivate the menu section
    * @param $event
-   * @param isActive
    */
-  onMouseLeave($event: Event, isActive: boolean) {
+  onMouseLeave($event: Event): void {
     this.isMobile$.pipe(
       first(),
     ).subscribe((isMobile) => {
-      if (!isMobile && isActive && this.mouseEntered) {
+      if (!isMobile && this.active$.value && this.mouseEntered) {
         this.deactivateSection($event);
       }
       this.mouseEntered = false;
@@ -115,9 +189,60 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
 
   /**
    * returns the ID of the DOM element representing the navbar section
-   * @param sectionId
    */
-  expandableNavbarSectionId(sectionId: string) {
-    return `expandable-navbar-section-${sectionId}-dropdown`;
+  expandableNavbarSectionId(): string {
+    return `expandable-navbar-section-${this.section.id}-dropdown`;
+  }
+
+  /**
+   * Handles the navigation between the menu items
+   *
+   * @param event
+   */
+  navigateDropdown(event: KeyboardEvent): void {
+    if (event.code === 'Tab') {
+      this.deactivateSection(event, false);
+      return;
+    } else if (event.code === 'Escape') {
+      this.deactivateSection(event, false);
+      (document.querySelector(`a[aria-controls="${this.expandableNavbarSectionId()}"]`) as HTMLElement)?.focus();
+      return;
+    }
+    event.preventDefault();
+    event.stopPropagation();
+
+    const items: NodeListOf<Element> = document.querySelectorAll(`#${this.expandableNavbarSectionId()} *[role="menuitem"]`);
+    if (items.length === 0) {
+      return;
+    }
+    const currentIndex: number = Array.from(items).findIndex((item: Element) => item === event.target);
+
+    if (event.key === 'ArrowDown') {
+      (items[(currentIndex + 1) % items.length] as HTMLElement).focus();
+    } else if (event.key === 'ArrowUp') {
+      (items[(currentIndex - 1 + items.length) % items.length] as HTMLElement).focus();
+    }
+  }
+
+  /**
+   * Handles all the keydown events on the dropdown toggle
+   *
+   * @param event
+   */
+  keyDown(event: KeyboardEvent): void {
+    switch (event.code) {
+      // Works for both Tab & Shift Tab
+      case 'Tab':
+        this.deactivateSection(event, false);
+        break;
+      case 'ArrowDown':
+        this.focusOnFirstChildSection = true;
+        this.activateSection(event);
+        break;
+      case 'Space':
+      case 'Enter':
+        event.preventDefault();
+        break;
+    }
   }
 }
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index 90cf07caa4..479f206f90 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,19 +1,19 @@
 <nav [ngClass]="{'open': (menuCollapsed | async) !== true}"
-     [@slideMobileNav]="(windowService.isXsOrSm() | async) !== true ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
-     class="navbar navbar-light navbar-expand-md px-md-0 pt-md-0 pt-3 navbar-container" role="navigation"
-     [attr.aria-label]="'nav.main.description' | translate" id="main-navbar">
+  [@slideMobileNav]="(windowService.isXsOrSm() | async) !== true ? 'default' : ((menuCollapsed | async) ? 'collapsed' : 'expanded')"
+  class="navbar navbar-light navbar-expand-md px-md-0 navbar-container" role="navigation"
+  [attr.aria-label]="'nav.main.description' | translate" id="main-navbar">
   <!-- TODO remove navbar-container class when https://github.com/twbs/bootstrap/issues/24726 is fixed -->
   <div class="navbar-inner-container w-100" [class.container]="(isMobile$ | async) !== true">
     <div class="w-100">
       <div id="collapsingNav">
-        <ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+        @if ((isMobile$ | async) && (isAuthenticated$ | async)) {
           <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
-        </ng-container>
-        <div class="navbar-nav align-items-md-center mr-auto shadow-none gapx-3">
-          <ng-container *ngFor="let section of (sections | async)">
+        }
+        <div class="navbar-nav align-items-md-center me-auto shadow-none gapx-3">
+          @for (section of (sections | async); track section) {
             <ng-container
-              *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-          </ng-container>
+            *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+          }
         </div>
       </div>
     </div>
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 8b922439cf..eb5fb89ffa 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -43,7 +41,7 @@ import { ThemeService } from '../shared/theme-support/theme.service';
   templateUrl: './navbar.component.html',
   animations: [slideMobileNav],
   standalone: true,
-  imports: [NgbDropdownModule, NgClass, NgIf, ThemedUserMenuComponent, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
+  imports: [NgbDropdownModule, NgClass, ThemedUserMenuComponent, NgComponentOutlet, AsyncPipe, TranslateModule],
 })
 export class NavbarComponent extends MenuComponent implements OnInit {
   /**
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
index 058457fd40..2955a44998 100644
--- a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
@@ -1,10 +1,12 @@
-<ng-container *ngIf="ePersonId">
-  <ng-container *ngIf="getEPersonData$() | async as ePersonData">
-    <ng-container *ngFor="let property of properties">
-      <span *ngIf="ePersonData[property]">
-        {{ ePersonData[property] }}
-      </span>
+@if (ePersonId) {
+  @if (getEPersonData$() | async; as ePersonData) {
+    @for (property of properties; track property) {
+      @if (ePersonData[property]) {
+        <span>
+          {{ ePersonData[property] }}
+        </span>
+      }
       <br>
-    </ng-container>
-  </ng-container>
-</ng-container>
+      }
+    }
+  }
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
index 7fe17040e8..36b9a606d8 100644
--- a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -21,8 +17,6 @@ import {
   templateUrl: './ePerson-data.component.html',
   standalone: true,
   imports: [
-    NgIf,
-    NgFor,
     AsyncPipe,
   ],
   styleUrls: ['./ePerson-data.component.scss'],
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index 8a9f40e2b2..d44fb29e7d 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -6,13 +6,17 @@
           {{'notifications.events.title'| translate}}
         </div>
       </h1>
-      <ds-alert *ngIf="!targetId"  [type]="'alert-info'">
-        <span [innerHTML]="'quality-assurance.events.description' | translate : {topic: selectedTopicName, source: sourceId}"></span>
-      </ds-alert>
-      <ds-alert *ngIf="targetId" [type]="'alert-info'">
-        <span [innerHTML]="'quality-assurance.events.description-with-topic-and-target' | translate : {topic: selectedTopicName, source: sourceId}"></span>
-        <a [routerLink]="itemPageUrl" target="_blank">{{(getTargetItemTitle() | async)}}</a>
-      </ds-alert>
+      @if (!targetId) {
+        <ds-alert  [type]="'alert-info'">
+          <span [innerHTML]="'quality-assurance.events.description' | translate : {topic: selectedTopicName, source: sourceId}"></span>
+        </ds-alert>
+      }
+      @if (targetId) {
+        <ds-alert [type]="'alert-info'">
+          <span [innerHTML]="'quality-assurance.events.description-with-topic-and-target' | translate : {topic: selectedTopicName, source: sourceId}"></span>
+          <a [routerLink]="itemPageUrl" target="_blank">{{(getTargetItemTitle() | async)}}</a>
+        </ds-alert>
+      }
     </div>
   </div>
   <div class="row">
@@ -21,208 +25,271 @@
         {{'quality-assurance.events.topic' | translate}} {{this.showTopic}}
       </h2>
 
-      <ds-loading class="container" *ngIf="(isEventPageLoading | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      @if ((isEventPageLoading | async)) {
+        <ds-loading class="container" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      }
 
-      <ds-pagination *ngIf="(isEventPageLoading | async) !== true"
-                      [paginationOptions]="paginationConfig"
-                      [collectionSize]="(totalElements$ | async)"
-                      [sortOptions]="paginationSortConfig"
-                      (paginationChange)="getQualityAssuranceEvents()">
-
-        <ng-container>
-          <div *ngIf="(eventsUpdated$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
-            {{'quality-assurance.noEvents' | translate}}
-          </div>
-          <div *ngIf="(eventsUpdated$ | async)?.length !== 0" class="table-responsive mt-2">
-            <table id="events" class="table table-striped table-hover table-bordered">
-              <thead>
-              <tr>
-                <th scope="col" class="trust-col">{{'quality-assurance.event.table.trust' | translate}}</th>
-                <th scope="col" class="title-col">{{'quality-assurance.event.table.publication' | translate}}</th>
-                <th *ngIf="hasDetailColumn() && showTopic.indexOf('/PROJECT') !== -1" scope="col" class="content-col">
-                  {{'quality-assurance.event.table.project-details' | translate}}
-                </th>
-                <ng-container *ngIf="hasDetailColumn() && (showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1)">
-                  <th scope="col" class="content-col">
-                    {{'quality-assurance.event.table.reasons' | translate}}
-                  </th>
-                  <th scope="col" class="content-col">
-                    {{'quality-assurance.event.table.person-who-requested' | translate}}
-                  </th>
-                </ng-container>
-                <th scope="col" class="button-col">{{'quality-assurance.event.table.actions' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-                <tr *ngFor="let eventElement of (eventsUpdated$ | async); let i = index">
-                  <td>{{eventElement?.event?.trust}}
-                  </td>
-                  <td><a *ngIf="eventElement?.target"
-                         target="_blank"
-                         rel="noopener noreferrer"
-                         [routerLink]="['/items', eventElement?.target?.id]">{{eventElement.title}}</a>
-                    <span *ngIf="!eventElement?.target">{{eventElement.title}}</span>
-                    <div *ngIf="eventElement?.event?.message?.serviceId">
-                      <span class="small pr-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
-                      <span [title]="eventElement.event.message.serviceId">
-                        <a [href]="eventElement.event.message.serviceId" target="_blank">{{eventElement.event.message.serviceId}}</a>
-                      </span>
-                    </div>
-                    <div *ngIf="eventElement?.event?.message?.href" class="d-flex align-items-center">
-                      <span class="small pr-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
-                      <span [title]="eventElement.event.message.href" class="text-truncate d-inline-block w-75">
-                        <a [href]="eventElement.event.message.href" target="_blank">{{eventElement.event.message.href}}</a>
-                      </span>
-                    </div>
-                  </td>
-                  <td *ngIf="showTopic.indexOf('/PID') !== -1">
-                    <p><span class="small">{{'quality-assurance.event.table.pidtype' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.type}}</span></p>
-                    <p><span class="small">{{'quality-assurance.event.table.pidvalue' | translate}}</span><br>
-                      <a *ngIf="hasPIDHref(eventElement.event.message); else noPID" href="{{getPIDHref(eventElement.event.message)}}" rel="noopener noreferrer" target="_blank">
-                        {{eventElement.event.message.value}}
-                      </a>
-                      <ng-template #noPID><span class="badge badge-info">{{eventElement.event.message.value}}</span></ng-template>
-                    </p>
-                  </td>
-                  <td *ngIf="showTopic.indexOf('/SUBJECT') !== -1">
-                    <p><span class="small">{{'quality-assurance.event.table.subjectValue' | translate}}
-                       </span><br><span class="badge badge-info">{{eventElement.event.message.value}}</span></p>
-                  </td>
-                  <td *ngIf="showTopic.indexOf('/ABSTRACT') !== -1">
-                    <p class="abstract-container" [class.show]="showMore">
-                      <span class="small">{{'quality-assurance.event.table.abstract' | translate}}</span><br>
-                      <span class="text-ellipsis">{{eventElement.event.message.abstract}}</span>
-                    </p>
-                    <button class="btn btn-outline-primary btn-sm" (click)="showMore = !showMore">
-                      <i *ngIf="!showMore" class="fas fa-angle-down"></i>
-                      <i *ngIf="showMore" class="fas fa-angle-up"></i>
-                      {{ (showMore ? 'quality-assurance.event.table.less': 'quality-assurance.event.table.more') | translate }}
-                    </button>
-                  </td>
-                  <ng-container *ngIf="showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1">
-                    <td>
-                      <p>
-                        <span *ngIf="eventElement.event.message">
-                          <span>{{eventElement.event.message.reason}}</span><br>
-                        </span>
-                      </p>
-                    </td>
-                    <td>
-                      <p>
-                        <span *ngIf="eventElement.event.originalId">
-                          <ds-eperson-data [ePersonId]="eventElement.event.originalId" [properties]="['email']"></ds-eperson-data>
-                        </span>
-                      </p>
-                    </td>
-                  </ng-container>
-
-                  <td *ngIf="showTopic.indexOf('/PROJECT') !== -1">
-                    <p>
-                      {{'quality-assurance.event.table.suggestedProject' | translate}}
-                    </p>
-                    <p>
-                      <span class="small">{{'quality-assurance.event.table.project' | translate}}</span><br>
-                      <a href="{{sourceUrlForProjectSearch}}{{ eventElement.event.message.sourceId}}" rel="noopener noreferrer" target="_blank">{{eventElement.event.message.title}}</a>
-                    </p>
-                    <p>
-                      <span *ngIf="eventElement.event.message.acronym"><span class="small">{{'quality-assurance.event.table.acronym' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.acronym}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.code"><span class="small">{{'quality-assurance.event.table.code' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.code}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.funder"><span class="small">{{'quality-assurance.event.table.funder' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.funder}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.fundingProgram"><span class="small">{{'quality-assurance.event.table.fundingProgram' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.fundingProgram}}</span><br></span>
-                      <span *ngIf="eventElement.event.message.jurisdiction"><span class="small">{{'quality-assurance.event.table.jurisdiction' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.jurisdiction}}</span></span>
-                    </p>
-                    <hr>
-                    <div>
-                      {{(eventElement.hasProject ? 'quality-assurance.event.project.found' : 'quality-assurance.event.project.notFound') | translate}}
-                      <a target="_blank" rel="noopener noreferrer" *ngIf="eventElement.hasProject" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}} </a>
-                      <div class="btn-group">
-                        <button *ngIf="!eventElement.hasProject"
-                                class="btn btn-outline-primary btn-sm"
-                                [disabled]="eventElement.isRunning"
-                                (click)="openModalLookup(eventElement); $event.stopPropagation();"
-                                [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
-                        >
-                          <i class="fas fa-search"></i>
-                        </button>
-                        <button *ngIf="eventElement.hasProject"
-                                class="btn btn-outline-danger btn-sm"
-                                [disabled]="eventElement.isRunning"
-                                (click)="removeProject(eventElement)"
-                                [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
-                        >
-                          <i class="fas fa-trash-alt"></i>
-                        </button>
-                      </div>
-                    </div>
-                  </td>
-                  <td>
-                    <div *ngIf="(isAdmin$ | async) || !isReinstateWithdrawnRequest" class="btn-group button-width">
-                      <button *ngIf="showTopic.indexOf('/PROJECT') !== -1"
-                              class="btn btn-outline-success btn-sm button-width"
-                              ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
-                              container="body"
-                              [disabled]="eventElement.isRunning"
-                              (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
-                              [attr.aria-label]="'quality-assurance.event.action.import' | translate"
-                      >
-                        <i class="fas fa-check"></i>
-                      </button>
-                      <button *ngIf="showTopic.indexOf('/PROJECT') === -1"
-                              class="btn btn-outline-success btn-sm button-width"
-                              ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
-                              container="body"
-                              [disabled]="eventElement.isRunning"
-                              (click)="executeAction('ACCEPTED', eventElement)"
-                              [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
-                      >
-                        <i class="fas fa-check"></i>
-                      </button>
-                      <button class="btn btn-outline-dark btn-sm button-width"
-                              ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
-                              container="body"
-                              [disabled]="eventElement.isRunning"
-                              (click)="openModal('DISCARDED', eventElement, ignoreModal)"
-                              [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
-                      >
-                        <i class="fas fa-ban"></i>
-                      </button>
-                      <button class="btn btn-outline-danger btn-sm button-width"
-                              *ngIf="(isAdmin$ | async)"
-                              ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
-                              container="body"
-                              [disabled]="eventElement.isRunning"
-                              (click)="openModal('REJECTED', eventElement, rejectModal)"
-                              [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
-                      >
-                        <i class="fas fa-trash-alt"></i>
-                      </button>
-                      <button class="btn btn-outline-danger btn-sm button-width"
-                              *ngIf="(isAdmin$ | async) === false"
-                              ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
-                              container="body"
-                              [disabled]="eventElement.isRunning"
-                              [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
-                              (click)="openModal('UNDO', eventElement, undoModal)">
-                        <i class="fas fa-trash-alt"></i>
-                      </button>
-                    </div>
-                    <div *ngIf="(isAdmin$ | async) !== true && isReinstateWithdrawnRequest" class="btn-group button-width">
-                      <button class="btn btn-outline-danger btn-sm button-width"
-                              ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
-                              container="body"
-                              [disabled]="eventElement.isRunning"
-                              [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
-                              (click)="openModal('UNDO', eventElement, undoModal)">
-                        <i class="fas fa-trash-alt"></i>
-                      </button>
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </ng-container>
-      </ds-pagination>
+      @if ((isEventPageLoading | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="paginationConfig"
+          [collectionSize]="(totalElements$ | async)"
+          [sortOptions]="paginationSortConfig"
+          (paginationChange)="getQualityAssuranceEvents()">
+          <ng-container>
+            @if ((eventsUpdated$ | async)?.length === 0) {
+              <div class="alert alert-info w-100 mb-2 mt-2" role="alert">
+                {{'quality-assurance.noEvents' | translate}}
+              </div>
+            }
+            @if ((eventsUpdated$ | async)?.length !== 0) {
+              <div class="table-responsive mt-2">
+                <table id="events" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr>
+                      <th scope="col" class="trust-col">{{'quality-assurance.event.table.trust' | translate}}</th>
+                      <th scope="col" class="title-col">{{'quality-assurance.event.table.publication' | translate}}</th>
+                      @if (hasDetailColumn() && showTopic.indexOf('/PROJECT') !== -1) {
+                        <th scope="col" class="content-col">
+                          {{'quality-assurance.event.table.project-details' | translate}}
+                        </th>
+                      }
+                      @if (hasDetailColumn() && (showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1)) {
+                        <th scope="col" class="content-col">
+                          {{'quality-assurance.event.table.reasons' | translate}}
+                        </th>
+                        <th scope="col" class="content-col">
+                          {{'quality-assurance.event.table.person-who-requested' | translate}}
+                        </th>
+                      }
+                      <th scope="col" class="button-col">{{'quality-assurance.event.table.actions' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (eventElement of (eventsUpdated$ | async); track eventElement; let i = $index) {
+                      <tr>
+                        <td>{{eventElement?.event?.trust}}
+                        </td>
+                        <td>@if (eventElement?.target) {
+                          <a
+                            target="_blank"
+                            rel="noopener noreferrer"
+                          [routerLink]="['/items', eventElement?.target?.id]">{{eventElement.title}}</a>
+                        }
+                        @if (!eventElement?.target) {
+                          <span>{{eventElement.title}}</span>
+                        }
+                        @if (eventElement?.event?.message?.serviceId) {
+                          <div>
+                            <span class="small pe-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
+                            <span [title]="eventElement.event.message.serviceId">
+                              <a [href]="eventElement.event.message.serviceId" target="_blank">{{eventElement.event.message.serviceId}}</a>
+                            </span>
+                          </div>
+                        }
+                        @if (eventElement?.event?.message?.href) {
+                          <div class="d-flex align-items-center">
+                            <span class="small pe-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
+                            <span [title]="eventElement.event.message.href" class="text-truncate d-inline-block w-75">
+                              <a [href]="eventElement.event.message.href" target="_blank">{{eventElement.event.message.href}}</a>
+                            </span>
+                          </div>
+                        }
+                      </td>
+                      @if (showTopic.indexOf('/PID') !== -1) {
+                        <td>
+                          <p><span class="small">{{'quality-assurance.event.table.pidtype' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.type}}</span></p>
+                          <p><span class="small">{{'quality-assurance.event.table.pidvalue' | translate}}</span><br>
+                          @if (hasPIDHref(eventElement.event.message)) {
+                            <a href="{{getPIDHref(eventElement.event.message)}}" rel="noopener noreferrer" target="_blank">
+                              {{eventElement.event.message.value}}
+                            </a>
+                          } @else {
+                            <span class="badge bg-info">{{eventElement.event.message.value}}</span>
+                          }
+                        </p>
+                      </td>
+                    }
+                    @if (showTopic.indexOf('/SUBJECT') !== -1) {
+                      <td>
+                        <p><span class="small">{{'quality-assurance.event.table.subjectValue' | translate}}
+                          </span><br><span class="badge bg-info">{{eventElement.event.message.value}}</span></p>
+                        </td>
+                      }
+                      @if (showTopic.indexOf('/ABSTRACT') !== -1) {
+                        <td>
+                          <p class="abstract-container" [class.show]="showMore">
+                            <span class="small">{{'quality-assurance.event.table.abstract' | translate}}</span><br>
+                            <span class="text-ellipsis">{{eventElement.event.message.abstract}}</span>
+                          </p>
+                          <button class="btn btn-outline-primary btn-sm" (click)="showMore = !showMore">
+                            @if (!showMore) {
+                              <i class="fas fa-angle-down"></i>
+                            }
+                            @if (showMore) {
+                              <i class="fas fa-angle-up"></i>
+                            }
+                            {{ (showMore ? 'quality-assurance.event.table.less': 'quality-assurance.event.table.more') | translate }}
+                          </button>
+                        </td>
+                      }
+                      @if (showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1) {
+                        <td>
+                          <p>
+                            @if (eventElement.event.message) {
+                              <span>
+                                <span>{{eventElement.event.message.reason}}</span><br>
+                              </span>
+                            }
+                          </p>
+                        </td>
+                        <td>
+                          <p>
+                            @if (eventElement.event.originalId) {
+                              <span>
+                                <ds-eperson-data [ePersonId]="eventElement.event.originalId" [properties]="['email']"></ds-eperson-data>
+                              </span>
+                            }
+                          </p>
+                        </td>
+                      }
+                      @if (showTopic.indexOf('/PROJECT') !== -1) {
+                        <td>
+                          <p>
+                            {{'quality-assurance.event.table.suggestedProject' | translate}}
+                          </p>
+                          <p>
+                            <span class="small">{{'quality-assurance.event.table.project' | translate}}</span><br>
+                            <a href="{{sourceUrlForProjectSearch}}{{ eventElement.event.message.sourceId}}" rel="noopener noreferrer" target="_blank">{{eventElement.event.message.title}}</a>
+                          </p>
+                          <p>
+                            @if (eventElement.event.message.acronym) {
+                              <span><span class="small">{{'quality-assurance.event.table.acronym' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.acronym}}</span><br></span>
+                            }
+                            @if (eventElement.event.message.code) {
+                              <span><span class="small">{{'quality-assurance.event.table.code' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.code}}</span><br></span>
+                            }
+                            @if (eventElement.event.message.funder) {
+                              <span><span class="small">{{'quality-assurance.event.table.funder' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.funder}}</span><br></span>
+                            }
+                            @if (eventElement.event.message.fundingProgram) {
+                              <span><span class="small">{{'quality-assurance.event.table.fundingProgram' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.fundingProgram}}</span><br></span>
+                            }
+                            @if (eventElement.event.message.jurisdiction) {
+                              <span><span class="small">{{'quality-assurance.event.table.jurisdiction' | translate}}</span>&nbsp;<span class="badge bg-info">{{eventElement.event.message.jurisdiction}}</span></span>
+                            }
+                          </p>
+                          <hr>
+                            <div>
+                              {{(eventElement.hasProject ? 'quality-assurance.event.project.found' : 'quality-assurance.event.project.notFound') | translate}}
+                              @if (eventElement.hasProject) {
+                                <a target="_blank" rel="noopener noreferrer" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}} </a>
+                              }
+                              <div class="btn-group">
+                                @if (!eventElement.hasProject) {
+                                  <button
+                                    class="btn btn-outline-primary btn-sm"
+                                    [dsBtnDisabled]="eventElement.isRunning"
+                                    (click)="openModalLookup(eventElement); $event.stopPropagation();"
+                                    [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
+                                    >
+                                    <i class="fas fa-search"></i>
+                                  </button>
+                                }
+                                @if (eventElement.hasProject) {
+                                  <button
+                                    class="btn btn-outline-danger btn-sm"
+                                    [dsBtnDisabled]="eventElement.isRunning"
+                                    (click)="removeProject(eventElement)"
+                                    [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
+                                    >
+                                    <i class="fas fa-trash-alt"></i>
+                                  </button>
+                                }
+                              </div>
+                            </div>
+                          </td>
+                        }
+                        <td>
+                          @if ((isAdmin$ | async) || !isReinstateWithdrawnRequest) {
+                            <div class="btn-group button-width">
+                              @if (showTopic.indexOf('/PROJECT') !== -1) {
+                                <button
+                                  class="btn btn-outline-success btn-sm button-width"
+                                  ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
+                                  container="body"
+                                  [dsBtnDisabled]="eventElement.isRunning"
+                                  (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
+                                  [attr.aria-label]="'quality-assurance.event.action.import' | translate"
+                                  >
+                                  <i class="fas fa-check"></i>
+                                </button>
+                              }
+                              @if (showTopic.indexOf('/PROJECT') === -1) {
+                                <button
+                                  class="btn btn-outline-success btn-sm button-width"
+                                  ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
+                                  container="body"
+                                  [dsBtnDisabled]="eventElement.isRunning"
+                                  (click)="executeAction('ACCEPTED', eventElement)"
+                                  [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
+                                  >
+                                  <i class="fas fa-check"></i>
+                                </button>
+                              }
+                              <button class="btn btn-outline-dark btn-sm button-width"
+                                ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
+                                container="body"
+                                [dsBtnDisabled]="eventElement.isRunning"
+                                (click)="openModal('DISCARDED', eventElement, ignoreModal)"
+                                [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
+                                >
+                                <i class="fas fa-ban"></i>
+                              </button>
+                              @if ((isAdmin$ | async)) {
+                                <button class="btn btn-outline-danger btn-sm button-width"
+                                  ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
+                                  container="body"
+                                  [dsBtnDisabled]="eventElement.isRunning"
+                                  (click)="openModal('REJECTED', eventElement, rejectModal)"
+                                  [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
+                                  >
+                                  <i class="fas fa-trash-alt"></i>
+                                </button>
+                              }
+                              @if ((isAdmin$ | async) === false) {
+                                <button class="btn btn-outline-danger btn-sm button-width"
+                                  ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
+                                  container="body"
+                                  [dsBtnDisabled]="eventElement.isRunning"
+                                  [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
+                                  (click)="openModal('UNDO', eventElement, undoModal)">
+                                  <i class="fas fa-trash-alt"></i>
+                                </button>
+                              }
+                            </div>
+                          }
+                          @if ((isAdmin$ | async) !== true && isReinstateWithdrawnRequest) {
+                            <div class="btn-group button-width">
+                              <button class="btn btn-outline-danger btn-sm button-width"
+                                ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
+                                container="body"
+                                [dsBtnDisabled]="eventElement.isRunning"
+                                [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
+                                (click)="openModal('UNDO', eventElement, undoModal)">
+                                <i class="fas fa-trash-alt"></i>
+                              </button>
+                            </div>
+                          }
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            }
+          </ng-container>
+        </ds-pagination>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
index 0d96e7e065..bcefd317c8 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
@@ -351,7 +351,7 @@ describe('QualityAssuranceEventsComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
index df6d36d226..6adaf9dea9 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.ts
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -65,6 +61,7 @@ import {
 } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
 import { AlertComponent } from '../../../shared/alert/alert.component';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -86,7 +83,7 @@ import { EPersonDataComponent } from './ePerson-data/ePerson-data.component';
   templateUrl: './quality-assurance-events.component.html',
   styleUrls: ['./quality-assurance-events.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent],
+  imports: [AlertComponent, ThemedLoadingComponent, PaginationComponent, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule, EPersonDataComponent, BtnDisabledDirective],
 })
 export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
index 026f863412..36ac863cf4 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -1,7 +1,7 @@
 <div class="modal-header">
   <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | translate }}</h4>
   <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
-          (click)="close()">
+    (click)="close()">
     <span aria-hidden="true">&times;</span>
   </button>
 </div>
@@ -14,16 +14,18 @@
       </a>
     </div>
   </div>
-  <div *ngIf="externalSourceEntry.projectTitle">
-    <small>{{ (labelPrefix + label + '.bountToLocal' |translate) }}</small>
-    <div class="mb-3">
-      <div class="text-truncate">
-        <a target="_blank" [routerLink]="'/items/{{externalSourceEntry.projectId}}'">
-          {{externalSourceEntry.projectTitle}}
-        </a>
+  @if (externalSourceEntry.projectTitle) {
+    <div>
+      <small>{{ (labelPrefix + label + '.bountToLocal' |translate) }}</small>
+      <div class="mb-3">
+        <div class="text-truncate">
+          <a target="_blank" [routerLink]="'/items/{{externalSourceEntry.projectId}}'">
+            {{externalSourceEntry.projectTitle}}
+          </a>
+        </div>
       </div>
     </div>
-  </div>
+  }
 
   <h4>{{ (labelPrefix + label + '.select' | translate) }}</h4>
 
@@ -32,32 +34,38 @@
     <div id="project-search" class="input-group mb-3">
       <input type="text" class="form-control" (keyup.enter)="search(projectTitle)" [(ngModel)]="projectTitle" placeholder="{{labelPrefix + label + '.placeholder' |translate}}" aria-label="" aria-describedby="">
       <div class="input-group-append">
-        <button type="button" class="btn btn-outline-secondary" [disabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
-        <button type="button" class="btn btn-primary" [disabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
+        <button type="button" class="btn btn-outline-secondary" [dsBtnDisabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
+        <button type="button" class="btn btn-primary" [dsBtnDisabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
       </div>
     </div>
 
-    <ds-loading *ngIf="(isLoading$ | async)" message="{{'loading.search-results' | translate}}"></ds-loading>
-    <ds-search-results *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length > 0 && (isLoading$ | async) !== true"
-                              [searchResults]="(localEntitiesRD$ | async)"
-                              [sortConfig]="this.searchOptions?.sort"
-                              [searchConfig]="this.searchOptions"
-                              [selectable]="true"
-                              [disableHeader]="true"
-                              [hidePaginationDetail]="false"
-                              [selectionConfig]="{ repeatable: false, listId: entityListId }"
-                              [showCsvExport]="false"
-                              [linkType]="linkTypes.ExternalLink"
-                              [context]="context"
-                              (deselectObject)="deselectEntity()"
-                              (selectObject)="selectEntity($event)">
-    </ds-search-results>
+    @if ((isLoading$ | async)) {
+      <ds-loading message="{{'loading.search-results' | translate}}"></ds-loading>
+    }
+    @if ((localEntitiesRD$ | async)?.payload?.page?.length > 0 && (isLoading$ | async) !== true) {
+      <ds-search-results
+        [searchResults]="(localEntitiesRD$ | async)"
+        [sortConfig]="this.searchOptions?.sort"
+        [searchConfig]="this.searchOptions"
+        [selectable]="true"
+        [disableHeader]="true"
+        [hidePaginationDetail]="false"
+        [selectionConfig]="{ repeatable: false, listId: entityListId }"
+        [showCsvExport]="false"
+        [linkType]="linkTypes.ExternalLink"
+        [context]="context"
+        (deselectObject)="deselectEntity()"
+        (selectObject)="selectEntity($event)">
+      </ds-search-results>
+    }
 
-    <div *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length < 1 && (isLoading$ | async) !== true">
-      <ds-alert [type]="'alert-info'">
-        <p class="lead mb-0">{{(labelPrefix + label + '.notFound' | translate)}}</p>
-      </ds-alert>
-    </div>
+    @if ((localEntitiesRD$ | async)?.payload?.page?.length < 1 && (isLoading$ | async) !== true) {
+      <div>
+        <ds-alert [type]="'alert-info'">
+          <p class="lead mb-0">{{(labelPrefix + label + '.notFound' | translate)}}</p>
+        </ds-alert>
+      </div>
+    }
 
   </div>
 </div>
@@ -66,6 +74,6 @@
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + label + '.cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [disabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
   </div>
 </div>
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
index dada55a423..bc0fb62326 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
@@ -4,10 +4,10 @@ import {
   NO_ERRORS_SCHEMA,
 } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   inject,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
@@ -86,7 +86,7 @@ describe('ProjectEntryImportModalComponent test suite', () => {
   const searchServiceStub: any = getMockSearchService();
 
 
-  beforeEach(async (() => {
+  beforeEach(waitForAsync (() => {
     TestBed.configureTestingModule({
       imports: [
         CommonModule,
@@ -231,7 +231,7 @@ describe('ProjectEntryImportModalComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
   eventData = eventData;
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
index 99f57b84ca..63e9848020 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -30,6 +27,7 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { AlertComponent } from '../../../shared/alert/alert.component';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -105,7 +103,7 @@ export interface QualityAssuranceEventData {
   styleUrls: ['./project-entry-import-modal.component.scss'],
   templateUrl: './project-entry-import-modal.component.html',
   standalone: true,
-  imports: [RouterLink, NgIf, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, FormsModule, ThemedLoadingComponent, ThemedSearchResultsComponent, AlertComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component to display a modal window for linking a project to an Quality Assurance event
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
index 7d24452c9b..6155b7901f 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.html
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -1,58 +1,69 @@
 <div class="container">
-    <div class="row">
-      <div class="col-12">
-        <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
-        <ds-alert [type]="'alert-info'" [content]="'quality-assurance.source.description'"></ds-alert>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-12">
-        <h2 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h2>
-
-        <ds-loading class="container" *ngIf="(isSourceLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
-        <ds-pagination *ngIf="(isSourceLoading() | async) !== true"
-                       [paginationOptions]="paginationConfig"
-                       [collectionSize]="(totalElements$ | async)"
-                       [hideGear]="false"
-                       [hideSortOptions]="true"
-                       (paginationChange)="getQualityAssuranceSource()">
-
-          <ds-loading class="container" *ngIf="(isSourceProcessing() | async)" message="'quality-assurance.loading' | translate"></ds-loading>
-          <ng-container *ngIf="(isSourceProcessing() | async) !== true">
-            <div *ngIf="(sources$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
-              {{'quality-assurance.noSource' | translate}}
-            </div>
-            <div *ngIf="(sources$ | async)?.length !== 0" class="table-responsive mt-2">
-              <table id="epeople" class="table table-striped table-hover table-bordered">
-                <thead>
-                <tr>
-                  <th scope="col">{{'quality-assurance.table.source' | translate}}</th>
-                  <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
-                  <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
-                </tr>
-                </thead>
-                <tbody>
-                  <tr *ngFor="let sourceElement of (sources$ | async); let i = index">
-                    <td>{{sourceElement.id}}</td>
-                    <td>{{sourceElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
-                    <td>
-                      <div class="btn-group edit-field">
-                        <button
-                                class="btn btn-outline-primary btn-sm"
-                                title="{{'quality-assurance.source-list.button.detail' | translate : { param: sourceElement.id } }}"
-                                [routerLink]="[sourceElement.id]">
-                          <span class="badge badge-info">{{sourceElement.totalEvents}}</span>
-                          <i class="fas fa-info fa-fw"></i>
-                        </button>
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </ng-container>
-        </ds-pagination>
-      </div>
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
+      <ds-alert [type]="'alert-info'" [content]="'quality-assurance.source.description'"></ds-alert>
     </div>
   </div>
+  <div class="row">
+    <div class="col-12">
+      <h2 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h2>
+
+      @if ((isSourceLoading() | async)) {
+        <ds-loading class="container" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      }
+      @if ((isSourceLoading() | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="paginationConfig"
+          [collectionSize]="(totalElements$ | async)"
+          [hideGear]="false"
+          [hideSortOptions]="true"
+          (paginationChange)="getQualityAssuranceSource()">
+          @if ((isSourceProcessing() | async)) {
+            <ds-loading class="container" message="'quality-assurance.loading' | translate"></ds-loading>
+          }
+          @if ((isSourceProcessing() | async) !== true) {
+            @if ((sources$ | async)?.length === 0) {
+              <div class="alert alert-info w-100 mb-2 mt-2" role="alert">
+                {{'quality-assurance.noSource' | translate}}
+              </div>
+            }
+            @if ((sources$ | async)?.length !== 0) {
+              <div class="table-responsive mt-2">
+                <table id="epeople" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr>
+                      <th scope="col">{{'quality-assurance.table.source' | translate}}</th>
+                      <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
+                      <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (sourceElement of (sources$ | async); track sourceElement; let i = $index) {
+                      <tr>
+                        <td>{{sourceElement.id}}</td>
+                        <td>{{sourceElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
+                        <td>
+                          <div class="btn-group edit-field">
+                            <button
+                              class="btn btn-outline-primary btn-sm"
+                              title="{{'quality-assurance.source-list.button.detail' | translate : { param: sourceElement.id } }}"
+                              [routerLink]="[sourceElement.id]">
+                              <span class="badge bg-info">{{sourceElement.totalEvents}}</span>
+                              <i class="fas fa-info fa-fw"></i>
+                            </button>
+                          </div>
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            }
+          }
+        </ds-pagination>
+      }
+    </div>
+  </div>
+</div>
 
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
index 36309fd937..e9c0133725 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
@@ -167,7 +167,7 @@ describe('QualityAssuranceSourceComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
index 44a748d1a0..575394fd2f 100644
--- a/src/app/notifications/qa/source/quality-assurance-source.component.ts
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   AfterViewInit,
@@ -40,7 +38,7 @@ import { NotificationsStateService } from '../../notifications-state.service';
   templateUrl: './quality-assurance-source.component.html',
   styleUrls: ['./quality-assurance-source.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, AsyncPipe, TranslateModule, DatePipe],
+  imports: [AlertComponent, ThemedLoadingComponent, PaginationComponent, RouterLink, AsyncPipe, TranslateModule, DatePipe],
 })
 export class QualityAssuranceSourceComponent implements OnDestroy, OnInit, AfterViewInit {
 
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
index c2882f94ef..84c91d2150 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.html
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
@@ -2,60 +2,75 @@
   <div class="row">
     <div class="col-12">
       <h1 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h1>
-      <ds-alert *ngIf="!targetId" [type]="'alert-info'">{{'quality-assurance.topics.description'| translate:{source: sourceId} }}</ds-alert>
-      <ds-alert *ngIf="targetId" [type]="'alert-info'">
-        {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
-        <a [routerLink]="itemPageUrl">{{(getTargetItemTitle() | async)}}</a>
-      </ds-alert>
+      @if (!targetId) {
+        <ds-alert [type]="'alert-info'">{{'quality-assurance.topics.description'| translate:{source: sourceId} }}</ds-alert>
+      }
+      @if (targetId) {
+        <ds-alert [type]="'alert-info'">
+          {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
+          <a [routerLink]="itemPageUrl">{{(getTargetItemTitle() | async)}}</a>
+        </ds-alert>
+      }
     </div>
   </div>
   <div class="row">
     <div class="col-12">
       <h2 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h2>
 
-      <ds-loading class="container" *ngIf="(isTopicsLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
-      <ds-pagination *ngIf="(isTopicsLoading() | async) !== true"
-                     [paginationOptions]="paginationConfig"
-                     [collectionSize]="(totalElements$ | async)"
-                     [hideGear]="false"
-                     [hideSortOptions]="true"
-                     (paginationChange)="getQualityAssuranceTopics(sourceId, targetId)">
-
-        <ds-loading class="container" *ngIf="(isTopicsProcessing() | async)" message="'quality-assurance.loading' | translate"></ds-loading>
-        <ng-container *ngIf="(isTopicsProcessing() | async) !== true">
-          <div *ngIf="(topics$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
-            {{'quality-assurance.noTopics' | translate}}
-          </div>
-          <div *ngIf="(topics$ | async)?.length !== 0" class="table-responsive mt-2">
-            <table id="epeople" class="table table-striped table-hover table-bordered">
-              <thead>
-              <tr>
-                <th scope="col">{{'quality-assurance.table.topic' | translate}}</th>
-                <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
-                <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
-              </tr>
-              </thead>
-              <tbody>
-                <tr *ngFor="let topicElement of (topics$ | async); let i = index">
-                  <td>{{topicElement.name}}</td>
-                  <td>{{topicElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
-                  <td>
-                    <div class="btn-group edit-field">
-                      <button
+      @if ((isTopicsLoading() | async)) {
+        <ds-loading class="container" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      }
+      @if ((isTopicsLoading() | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="paginationConfig"
+          [collectionSize]="(totalElements$ | async)"
+          [hideGear]="false"
+          [hideSortOptions]="true"
+          (paginationChange)="getQualityAssuranceTopics(sourceId, targetId)">
+          @if ((isTopicsProcessing() | async)) {
+            <ds-loading class="container" message="'quality-assurance.loading' | translate"></ds-loading>
+          }
+          @if ((isTopicsProcessing() | async) !== true) {
+            @if ((topics$ | async)?.length === 0) {
+              <div class="alert alert-info w-100 mb-2 mt-2" role="alert">
+                {{'quality-assurance.noTopics' | translate}}
+              </div>
+            }
+            @if ((topics$ | async)?.length !== 0) {
+              <div class="table-responsive mt-2">
+                <table id="epeople" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr>
+                      <th scope="col">{{'quality-assurance.table.topic' | translate}}</th>
+                      <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
+                      <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (topicElement of (topics$ | async); track topicElement; let i = $index) {
+                      <tr>
+                        <td>{{topicElement.name}}</td>
+                        <td>{{topicElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
+                        <td>
+                          <div class="btn-group edit-field">
+                            <button
                               class="btn btn-outline-primary btn-sm"
                               title="{{'quality-assurance.topics-list.button.detail' | translate : { param: topicElement.name } }}"
                               [routerLink]="[getQualityAssuranceRoute(), sourceId, topicElement.id]">
-                        <span class="badge badge-info">{{topicElement.totalEvents}}</span>
-                        <i class="fas fa-info fa-fw"></i>
-                      </button>
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </ng-container>
-      </ds-pagination>
+                              <span class="badge bg-info">{{topicElement.totalEvents}}</span>
+                              <i class="fas fa-info fa-fw"></i>
+                            </button>
+                          </div>
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            }
+          }
+        </ds-pagination>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
index c764128e46..38792eb632 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
@@ -175,7 +175,7 @@ describe('QualityAssuranceTopicsComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
index 176dba95ac..f700b68689 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   AfterViewInit,
@@ -54,7 +52,7 @@ import { NotificationsStateService } from '../../notifications-state.service';
   templateUrl: './quality-assurance-topics.component.html',
   styleUrls: ['./quality-assurance-topics.component.scss'],
   standalone: true,
-  imports: [AlertComponent, NgIf, ThemedLoadingComponent, PaginationComponent, NgFor, RouterLink, AsyncPipe, TranslateModule, DatePipe],
+  imports: [AlertComponent, ThemedLoadingComponent, PaginationComponent, RouterLink, AsyncPipe, TranslateModule, DatePipe],
 })
 export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, AfterViewInit {
   /**
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
index 2a46191dee..96a0eb82e5 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.html
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -1,29 +1,35 @@
 <div class="d-inline">
   <div ngbDropdown class="d-inline">
-    <button *ngIf="isCollectionFixed; else chooseCollection" class="btn btn-success" type="button" (click)="approveAndImportCollectionFixed()">
-      <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
-    </button>
-    <ng-template #chooseCollection>
+    @if (isCollectionFixed) {
+      <button class="btn btn-success" type="button" (click)="approveAndImportCollectionFixed()">
+        <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
+      </button>
+    } @else {
       <button class="btn btn-success" id="dropdownSubmission" ngbDropdownToggle
-              type="button">
+        type="button">
         <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
         <span class="caret"></span>
       </button>
-
       <div ngbDropdownMenu
-           class="dropdown-menu"
-           id="entityControlsDropdownMenu"
-           aria-labelledby="dropdownSubmission">
+        class="dropdown-menu"
+        id="entityControlsDropdownMenu"
+        aria-labelledby="dropdownSubmission">
         <ds-entity-dropdown (selectionChange)="openDialog($event)"></ds-entity-dropdown>
       </div>
-    </ng-template>
+    }
 
   </div>
-  <button (click)="ignoreSuggestion()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
-    {{ ignoreSuggestionLabel() | translate}}</button>
-  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [disabled]="!hasEvidence" class="btn btn-info ml-2">
+  <button (click)="ignoreSuggestion()" class="btn btn-danger ms-2"><i class="fa fa-ban"></i>
+{{ ignoreSuggestionLabel() | translate}}</button>
+@if (!isBulk) {
+  <button (click)="toggleSeeEvidences()" [dsBtnDisabled]="!hasEvidence" class="btn btn-info ms-2">
     <i class="fa fa-eye"></i>
-    <ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
-    <ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
+    @if (!seeEvidence) {
+      {{ 'suggestion.seeEvidence' | translate}}
+    }
+    @if (seeEvidence) {
+      {{ 'suggestion.hideEvidence' | translate}}
+    }
   </button>
+}
 </div>
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
index 36d58acbbf..dc0e075667 100644
--- a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -15,6 +15,7 @@ import { take } from 'rxjs/operators';
 import { Suggestion } from '../../core/notifications/suggestions/models/suggestion.model';
 import { Collection } from '../../core/shared/collection.model';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { ThemedCreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
 import { EntityDropdownComponent } from '../../shared/entity-dropdown/entity-dropdown.component';
 import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-approve-and-import';
@@ -29,8 +30,8 @@ import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestio
   imports: [
     EntityDropdownComponent,
     TranslateModule,
-    NgIf,
     NgbDropdownModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
index e23c244eb4..a343f5dc7e 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
@@ -1,20 +1,24 @@
 <div>
-  <div class="table-responsive" *ngIf="evidences">
-    <table class="table">
-      <thead>
-        <tr>
-          <th>{{'suggestion.evidence.score' | translate}}</th>
-          <th>{{'suggestion.evidence.type' | translate}}</th>
-          <th>{{'suggestion.evidence.notes' | translate}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr *ngFor="let evidence of evidences | dsObjectKeys">
-          <td>{{evidences[evidence].score}}</td>
-          <td>{{evidence | translate}}</td>
-          <td>{{evidences[evidence].notes}}</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
+  @if (evidences) {
+    <div class="table-responsive">
+      <table class="table">
+        <thead>
+          <tr>
+            <th>{{'suggestion.evidence.score' | translate}}</th>
+            <th>{{'suggestion.evidence.type' | translate}}</th>
+            <th>{{'suggestion.evidence.notes' | translate}}</th>
+          </tr>
+        </thead>
+        <tbody>
+          @for (evidence of evidences | dsObjectKeys; track evidence) {
+            <tr>
+              <td>{{evidences[evidence].score}}</td>
+              <td>{{evidence | translate}}</td>
+              <td>{{evidences[evidence].notes}}</td>
+            </tr>
+          }
+        </tbody>
+      </table>
+    </div>
+  }
 </div>
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
index e07a1dce75..d968826b70 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -22,8 +19,6 @@ import { ObjectKeysPipe } from '../../../shared/utils/object-keys-pipe';
   animations: [fadeIn],
   imports: [
     TranslateModule,
-    NgIf,
-    NgFor,
     ObjectKeysPipe,
   ],
   standalone: true,
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
index ef27876f2c..63fda69813 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
@@ -4,8 +4,8 @@
     <div class="col-1 text-center align-self-center">
       <div class="">
         <input type="checkbox" class="form-check-input"
-               [checked]="isSelected" (change)="changeSelected($event)"
-               [attr.aria-label]="object.display"/>
+          [checked]="isSelected" (change)="changeSelected($event)"
+          [attr.aria-label]="object.display"/>
       </div>
     </div>
     <!-- Total Score Panel -->
@@ -17,29 +17,31 @@
     </div>
     <!-- Suggestion Panel -->
     <div class="col">
-        <!-- Object Preview -->
-        <ds-item-search-result-list-element
-          [showLabel]="false"
-          [showThumbnails]="false"
-          [object]="listableObject"
-          [linkType]="0"
-        ></ds-item-search-result-list-element>
-        <!-- Actions -->
+      <!-- Object Preview -->
+      <ds-item-search-result-list-element
+        [showLabel]="false"
+        [showThumbnails]="false"
+        [object]="listableObject"
+        [linkType]="0"
+      ></ds-item-search-result-list-element>
+      <!-- Actions -->
       <ds-suggestion-actions class="parent mt-2" [hasEvidence]="hasEvidences()"
-                             [seeEvidence]="seeEvidence"
-                             [object]="object"
-                             [isCollectionFixed]="isCollectionFixed"
-                             (approveAndImport)="onApproveAndImport($event)"
-                             (seeEvidences)="onSeeEvidences($event)"
-                             (ignoreSuggestionClicked)="onIgnoreSuggestion($event)"
+        [seeEvidence]="seeEvidence"
+        [object]="object"
+        [isCollectionFixed]="isCollectionFixed"
+        (approveAndImport)="onApproveAndImport($event)"
+        (seeEvidences)="onSeeEvidences($event)"
+        (ignoreSuggestionClicked)="onIgnoreSuggestion($event)"
       ></ds-suggestion-actions>
     </div>
   </div>
   <!-- Evidences Panel -->
-  <div *ngIf="seeEvidence" class="mt-2 row">
-    <div class="col offset-3">
-      <ds-suggestion-evidences [evidences]="object.evidences"></ds-suggestion-evidences>
+  @if (seeEvidence) {
+    <div class="mt-2 row">
+      <div class="col offset-3">
+        <ds-suggestion-evidences [evidences]="object.evidences"></ds-suggestion-evidences>
+      </div>
     </div>
-  </div>
+  }
 </div>
 <hr>
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
index 3f803c468d..ceb33f8fac 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
@@ -1,17 +1,17 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 
-import { ItemSearchResultListElementComponent } from '../../../themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { Item } from '../../core/shared/item.model';
 import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock';
+import { ItemSearchResultListElementComponent } from '../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { SuggestionActionsComponent } from '../suggestion-actions/suggestion-actions.component';
 import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-evidences.component';
 import { SuggestionListElementComponent } from './suggestion-list-element.component';
@@ -22,7 +22,7 @@ describe('SuggestionListElementComponent', () => {
   let scheduler: TestScheduler;
 
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
index 11bc64935b..9e55ba0825 100644
--- a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -6,14 +6,13 @@ import {
   OnInit,
   Output,
 } from '@angular/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Suggestion } from 'src/app/core/notifications/suggestions/models/suggestion.model';
 
-import { ItemSearchResultListElementComponent } from '../../../themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { Item } from '../../core/shared/item.model';
 import { fadeIn } from '../../shared/animations/fade';
 import { isNotEmpty } from '../../shared/empty.util';
+import { ItemSearchResultListElementComponent } from '../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 import { SuggestionActionsComponent } from '../suggestion-actions/suggestion-actions.component';
 import { SuggestionApproveAndImport } from './suggestion-approve-and-import';
 import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-evidences.component';
@@ -27,7 +26,6 @@ import { SuggestionEvidencesComponent } from './suggestion-evidences/suggestion-
   templateUrl: './suggestion-list-element.component.html',
   animations: [fadeIn],
   imports: [
-    NgIf,
     TranslateModule,
     ItemSearchResultListElementComponent,
     SuggestionActionsComponent,
@@ -62,13 +60,6 @@ export class SuggestionListElementComponent implements OnInit {
    */
   @Output() selected = new EventEmitter<boolean>();
 
-  /**
-   * Initialize instance variables
-   *
-   * @param {NgbModal} modalService
-   */
-  constructor(private modalService: NgbModal) { }
-
   ngOnInit() {
     this.listableObject = {
       indexableObject: Object.assign(new Item(), { id: this.object.id, metadata: this.object.metadata }),
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
index 2b2a668916..25c1268dc5 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
@@ -3,49 +3,60 @@
     <div class="col-12">
       <h1 id="header" class="border-bottom pb-2">{{'suggestion.title'| translate}}</h1>
 
-      <ds-loading class="container" *ngIf="(isTargetsLoading() | async)" message="{{'suggestion.loading' | translate}}"></ds-loading>
-      <ds-pagination *ngIf="(isTargetsLoading() | async) !== true"
-                     [paginationOptions]="paginationConfig"
-                     [collectionSize]="(totalElements$ | async)"
-                     [hideGear]="false"
-                     [retainScrollPosition]="false"
-                     (paginationChange)="getSuggestionTargets()">
-
-        <ds-loading class="container" *ngIf="(isTargetsProcessing() | async)" message="'suggestion.loading' | translate"></ds-loading>
-        <ng-container *ngIf="(isTargetsProcessing() | async) !== true">
-          <div *ngIf="(targets$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
-            {{'suggestion.noTargets' | translate}}
-          </div>
-          <div *ngIf="(targets$|async)?.length !== 0" class="table-responsive mt-2">
-            <table id="epeople" class="table table-striped table-hover table-bordered">
-              <thead>
-                <tr class="text-center">
-                  <th scope="col">{{'suggestion.table.name' | translate}}</th>
-                  <th scope="col">{{'suggestion.table.actions' | translate}}</th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr *ngFor="let targetElement of (targets$ | async); let i = index" class="text-center">
-                  <td>
-                    <a target="_blank" [routerLink]="['/entities/person/', getTargetUuid(targetElement)]">{{targetElement.display}}</a>
-                  </td>
-                  <td>
-                    <div class="btn-group edit-field">
-                      <button (click)="redirectToSuggestions(targetElement.id)"
+      @if ((isTargetsLoading() | async)) {
+        <ds-loading class="container" message="{{'suggestion.loading' | translate}}"></ds-loading>
+      }
+      @if ((isTargetsLoading() | async) !== true) {
+        <ds-pagination
+          [paginationOptions]="paginationConfig"
+          [collectionSize]="(totalElements$ | async)"
+          [hideGear]="false"
+          [retainScrollPosition]="false"
+          (paginationChange)="getSuggestionTargets()">
+          @if ((isTargetsProcessing() | async)) {
+            <ds-loading class="container" message="'suggestion.loading' | translate"></ds-loading>
+          }
+          @if ((isTargetsProcessing() | async) !== true) {
+            @if ((targets$ | async)?.length === 0) {
+              <div class="alert alert-info w-100 mb-2 mt-2" role="alert">
+                {{'suggestion.noTargets' | translate}}
+              </div>
+            }
+            @if ((targets$|async)?.length !== 0) {
+              <div class="table-responsive mt-2">
+                <table id="epeople" class="table table-striped table-hover table-bordered">
+                  <thead>
+                    <tr class="text-center">
+                      <th scope="col">{{'suggestion.table.name' | translate}}</th>
+                      <th scope="col">{{'suggestion.table.actions' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    @for (targetElement of (targets$ | async); track targetElement; let i = $index) {
+                      <tr class="text-center">
+                        <td>
+                          <a target="_blank" [routerLink]="['/entities/person/', getTargetUuid(targetElement)]">{{targetElement.display}}</a>
+                        </td>
+                        <td>
+                          <div class="btn-group edit-field">
+                            <button (click)="redirectToSuggestions(targetElement.id)"
                               class="btn btn-outline-primary btn-sm"
                               title="{{('suggestion.button.review.title' | translate: { total: targetElement.total.toString() }) +
                                 targetElement.display}}">
-                        <span>{{'suggestion.button.review' | translate: { total: targetElement.total.toString() } }} </span>
-                        <i class="fas fa-lightbulb"></i>
-                      </button>
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-        </ng-container>
-      </ds-pagination>
+                              <span>{{'suggestion.button.review' | translate: { total: targetElement.total.toString() } }} </span>
+                              <i class="fas fa-lightbulb"></i>
+                            </button>
+                          </div>
+                        </td>
+                      </tr>
+                    }
+                  </tbody>
+                </table>
+              </div>
+            }
+          }
+        </ds-pagination>
+      }
     </div>
   </div>
 </div>
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
index 8654890138..ccb56629c6 100644
--- a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   AfterViewInit,
   Component,
@@ -46,8 +42,6 @@ import { SuggestionTargetsStateService } from '../suggestion-targets.state.servi
     AsyncPipe,
     TranslateModule,
     PaginationComponent,
-    NgIf,
-    NgFor,
     RouterLink,
   ],
   standalone: true,
diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
index de92e98ef8..4a1b413872 100644
--- a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
@@ -13,6 +13,10 @@ import {
   switchMap,
   tap,
 } from 'rxjs/operators';
+import { ConfigurationDataService } from 'src/app/core/data/configuration-data.service';
+import { RemoteData } from 'src/app/core/data/remote-data';
+import { ConfigurationProperty } from 'src/app/core/shared/configuration-property.model';
+import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators';
 
 import {
   AuthActionTypes,
@@ -72,14 +76,23 @@ export class SuggestionTargetsEffects {
   ), { dispatch: false });
 
   /**
-   * Show a notification on error.
+   * Retrieve the current user suggestions after retrieving the authenticated user
    */
   retrieveUserTargets$ = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS),
     switchMap((action: RetrieveAuthenticatedEpersonSuccessAction) => {
-      return this.suggestionsService.retrieveCurrentUserSuggestions(action.payload).pipe(
-        map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
-      );
+      return this.configurationService.findByPropertyName('researcher-profile.entity-type').pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((configRD: RemoteData<ConfigurationProperty> ) => {
+          if (configRD.hasSucceeded && configRD.payload.values.length > 0) {
+            return this.suggestionsService.retrieveCurrentUserSuggestions(action.payload).pipe(
+              map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
+            );
+          } else {
+            return of(new AddUserSuggestionsAction([]));
+          }
+        },
+        ));
     })));
 
   /**
@@ -91,16 +104,35 @@ export class SuggestionTargetsEffects {
       return this.store$.select((state: any) => state.core.auth.userId)
         .pipe(
           switchMap((userId: string) => {
-            return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
-              .pipe(
-                map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
-                catchError((error: unknown) => {
-                  if (error instanceof Error) {
-                    console.error(error.message);
-                  }
-                  return of(new RefreshUserSuggestionsErrorAction());
-                }),
-              );
+            if (!userId) {
+              return of(new AddUserSuggestionsAction([]));
+            }
+            return this.configurationService.findByPropertyName('researcher-profile.entity-type').pipe(
+              getFirstCompletedRemoteData(),
+              switchMap((configRD: RemoteData<ConfigurationProperty> ) => {
+                if (configRD.hasSucceeded && configRD.payload.values.length > 0) {
+                  return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
+                    .pipe(
+                      map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
+                      catchError((error: unknown) => {
+                        if (error instanceof Error) {
+                          console.error(error.message);
+                        }
+                        return of(new RefreshUserSuggestionsErrorAction());
+                      }),
+                    );
+                } else {
+                  return of(new AddUserSuggestionsAction([]));
+                }
+              },
+              ),
+              catchError((error: unknown) => {
+                if (error instanceof Error) {
+                  console.error(error.message);
+                }
+                return of(new RefreshUserSuggestionsErrorAction());
+              }),
+            );
           }),
           catchError((error: unknown) => {
             if (error instanceof Error) {
@@ -119,6 +151,7 @@ export class SuggestionTargetsEffects {
    * @param {TranslateService} translate
    * @param {NotificationsService} notificationsService
    * @param {SuggestionsService} suggestionsService
+   * @param {ConfigurationDataService} configurationService
    */
   constructor(
     private actions$: Actions,
@@ -126,6 +159,7 @@ export class SuggestionTargetsEffects {
     private translate: TranslateService,
     private notificationsService: NotificationsService,
     private suggestionsService: SuggestionsService,
+    private configurationService: ConfigurationDataService,
   ) {
   }
 }
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.html b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
index 838bdb95ad..476cbe5109 100644
--- a/src/app/notifications/suggestions-notification/suggestions-notification.component.html
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
@@ -1,9 +1,13 @@
-<ng-container *ngIf="(suggestionsRD$ | async) as suggestions">
-  <ng-container *ngFor="let suggestion of suggestions" class="alert alert-info">
-    <div class="alert alert-success d-block" *ngIf="suggestion.total > 0">
-      <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
-      {{ 'notification.suggestion.please' | translate }}
-      <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
-    </div>
-  </ng-container>
-</ng-container>
+@if ((suggestionsRD$ | async); as suggestions) {
+  @for (suggestion of suggestions; track suggestion) {
+    <ng-container class="alert alert-info">
+      @if (suggestion.total > 0) {
+        <div class="alert alert-success d-block">
+          <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
+          {{ 'notification.suggestion.please' | translate }}
+          <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
+        </div>
+      }
+    </ng-container>
+  }
+}
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
index 568cafb9de..208c1bfcbd 100644
--- a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -26,8 +22,6 @@ import { SuggestionsService } from '../suggestions.service';
     RouterLink,
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgForOf,
   ],
   styleUrls: ['./suggestions-notification.component.scss'],
 })
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.html b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
index 474dfa329e..b04d3deaef 100644
--- a/src/app/notifications/suggestions-popup/suggestions-popup.component.html
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
@@ -1,27 +1,32 @@
-<div class="notifications-wrapper position-fixed top right" *ngIf="suggestionsRD$ | async">
-  <div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
-    <button (click)="removePopup()"
-            type="button" class="close pt-0 pr-1 pl-0 pb-0" data-dismiss="alert" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
-    </button>
-
-    <div class="d-flex flex-row">
-      <div class="d-flex flex-column justify-content-center align-items-center">
-        <div class="notification-icon d-flex justify-content-center"><i class="fas fa-2x fa-check-circle"></i></div>
-      </div>
-      <div class="d-flex flex-column justify-content-center align-content-stretch text-left p-2">
-        <ng-container *ngIf="(suggestionsRD$ | async) as suggestions">
-          <ng-container *ngFor="let suggestion of suggestions" class="alert alert-info">
-            <div *ngIf="suggestion.total > 0">
-              <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
-              {{ 'notification.suggestion.please' | translate }}
-              <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
-            </div>
-          </ng-container>
-        </ng-container>
+@if (suggestionsRD$ | async) {
+  <div class="notifications-wrapper position-fixed top right">
+    <div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
+      <button (click)="removePopup()"
+        type="button" class="close pt-0 pe-1 pe-0 pb-0" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <div class="d-flex flex-row">
+        <div class="d-flex flex-column justify-content-center align-items-center">
+          <div class="notification-icon d-flex justify-content-center"><i class="fas fa-2x fa-check-circle"></i></div>
+        </div>
+        <div class="d-flex flex-column justify-content-center align-content-stretch text-left p-2">
+          @if ((suggestionsRD$ | async); as suggestions) {
+            @for (suggestion of suggestions; track suggestion) {
+              <ng-container class="alert alert-info">
+                @if (suggestion.total > 0) {
+                  <div>
+                    <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
+                    {{ 'notification.suggestion.please' | translate }}
+                    <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
+                  </div>
+                }
+              </ng-container>
+            }
+          }
+        </div>
       </div>
     </div>
   </div>
-</div>
+}
 
 
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
index 3959e675bc..4ef3aa00a6 100644
--- a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -31,7 +31,7 @@ describe('SuggestionsPopupComponent', () => {
       jasmine.createSpy('getNotificationSuggestionInterpolation').and.returnValue(mockNotificationInterpolation),
   });
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SuggestionsPopupComponent],
       providers: [
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
index d2256c789d..ab5a9bbab0 100644
--- a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
@@ -1,9 +1,5 @@
 import { trigger } from '@angular/animations';
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -45,8 +41,6 @@ import { SuggestionsService } from '../suggestions.service';
     AsyncPipe,
     TranslateModule,
     RouterLink,
-    NgIf,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index 7558939ef3..d984df0e9b 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -1,106 +1,125 @@
-<div class="container" *ngIf="(processRD$ | async)?.payload as process">
+@if ((processRD$ | async)?.payload; as process) {
+  <div class="container">
     <div class="row">
       <div class="col-10">
         <h1 class="flex-grow-1">
           {{ 'process.detail.title' | translate:{ id: process?.processId, name: process?.scriptName } }}
         </h1>
       </div>
-      <div *ngIf="isRefreshing$ | async" class="col-2 refresh-counter">
-        {{ 'process.detail.refreshing' | translate }} <i class="fas fa-sync-alt fa-spin"></i>
-      </div>
+      @if (isRefreshing$ | async) {
+        <div class="col-2 refresh-counter">
+          {{ 'process.detail.refreshing' | translate }} <i class="fas fa-sync-alt fa-spin"></i>
+        </div>
+      }
     </div>
-
     <ds-process-detail-field id="process-name" [title]="'process.detail.script'">
-        <div>{{ process?.scriptName }}</div>
+      <div>{{ process?.scriptName }}</div>
     </ds-process-detail-field>
-
-    <ds-process-detail-field *ngIf="process?.parameters && process?.parameters?.length > 0" id="process-arguments"
-                             [title]="'process.detail.arguments'">
-        <div *ngFor="let argument of process?.parameters">{{ argument?.name }} {{ argument?.value }}</div>
-    </ds-process-detail-field>
-
+    @if (process?.parameters && process?.parameters?.length > 0) {
+      <ds-process-detail-field id="process-arguments"
+        [title]="'process.detail.arguments'">
+        @for (argument of process?.parameters; track argument) {
+          <div>{{ argument?.name }} {{ argument?.value }}</div>
+        }
+      </ds-process-detail-field>
+    }
     <div *ngVar="(filesRD$ | async)?.payload?.page as files">
-        <ds-process-detail-field *ngIf="files && files?.length > 0" id="process-files"
-                                 [title]="'process.detail.output-files'">
+      @if (files && files?.length > 0) {
+        <ds-process-detail-field id="process-files"
+          [title]="'process.detail.output-files'">
           <div class="d-flex flex-column">
-            <ds-file-download-link *ngFor="let file of files; let last=last;" [bitstream]="file">
-              <span>{{getFileName(file)}}</span>
-              <span>({{(file?.sizeBytes) | dsFileSize }})</span>
-            </ds-file-download-link>
+            @for (file of files; track file; let last = $last) {
+              <ds-file-download-link [bitstream]="file">
+                <span>{{getFileName(file)}}</span>
+                <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+              </ds-file-download-link>
+            }
           </div>
         </ds-process-detail-field>
+      }
     </div>
-
-    <ds-process-detail-field *ngIf="process && process.startTime" id="process-start-time"
-                             [title]="'process.detail.start-time' | translate">
+    @if (process && process.startTime) {
+      <ds-process-detail-field id="process-start-time"
+        [title]="'process.detail.start-time' | translate">
         <div>{{ process.startTime | date:dateFormat:'UTC' }}</div>
-    </ds-process-detail-field>
-
-    <ds-process-detail-field *ngIf="process && process.endTime" id="process-end-time"
-                             [title]="'process.detail.end-time' | translate">
+      </ds-process-detail-field>
+    }
+    @if (process && process.endTime) {
+      <ds-process-detail-field id="process-end-time"
+        [title]="'process.detail.end-time' | translate">
         <div>{{ process.endTime | date:dateFormat:'UTC' }}</div>
-    </ds-process-detail-field>
-
-    <ds-process-detail-field *ngIf="process && process.processStatus" id="process-status"
-                             [title]="'process.detail.status' | translate">
+      </ds-process-detail-field>
+    }
+    @if (process && process.processStatus) {
+      <ds-process-detail-field id="process-status"
+        [title]="'process.detail.status' | translate">
         <div>{{ process.processStatus }}</div>
-    </ds-process-detail-field>
-
-    <ds-process-detail-field *ngIf="isProcessFinished(process)" id="process-output" [title]="'process.detail.output'">
-        <button *ngIf="!showOutputLogs && process?._links?.output?.href !== undefined" id="showOutputButton"
-                class="btn btn-primary" (click)="showProcessOutputLogs()">
+      </ds-process-detail-field>
+    }
+    @if (isProcessFinished(process)) {
+      <ds-process-detail-field id="process-output" [title]="'process.detail.output'">
+        @if (!showOutputLogs && process?._links?.output?.href !== undefined) {
+          <button id="showOutputButton"
+            class="btn btn-primary" (click)="showProcessOutputLogs()">
             {{ 'process.detail.logs.button' | translate }}
-        </button>
-        <ds-loading *ngIf="retrievingOutputLogs$ | async" class="ds-themed-loading"
-                           message="{{ 'process.detail.logs.loading' | translate }}"></ds-loading>
-        <pre class="font-weight-bold text-secondary bg-light p-3" tabindex="0"
-             *ngIf="showOutputLogs && (outputLogs$ | async)?.length > 0">{{ (outputLogs$ | async) }}</pre>
-        <p id="no-output-logs-message" *ngIf="((retrievingOutputLogs$ | async) !== true && showOutputLogs)
-      && (outputLogs$ | async | dsHasNoValue) || (outputLogs$ | async)?.length === 0 || !process._links.output">
+          </button>
+        }
+        @if (retrievingOutputLogs$ | async) {
+          <ds-loading class="ds-themed-loading"
+          message="{{ 'process.detail.logs.loading' | translate }}"></ds-loading>
+        }
+        @if (showOutputLogs && (outputLogs$ | async)?.length > 0) {
+          <pre class="fw-bold text-secondary bg-light p-3" tabindex="0"
+          >{{ (outputLogs$ | async) }}</pre>
+        }
+        @if (((retrievingOutputLogs$ | async) !== true && showOutputLogs)
+          && (outputLogs$ | async | dsHasNoValue) || (outputLogs$ | async)?.length === 0 || !process._links.output) {
+          <p id="no-output-logs-message">
             {{ 'process.detail.logs.none' | translate }}
-        </p>
-    </ds-process-detail-field>
-
+          </p>
+        }
+      </ds-process-detail-field>
+    }
     <ds-process-detail-field id="process-actions" [title]="'process.detail.actions'">
-        <button class="btn btn-success mr-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
-                class="fas fa-plus pr-2"></i>{{'process.detail.create' | translate}}</button>
-        <button *ngIf="isProcessFinished(process)" id="delete" class="btn btn-danger"
-                (click)="openDeleteModal(deleteModal)">
-            <i class="fas fa-trash pr-2"></i>{{ 'process.detail.delete.button' | translate }}
+      <button class="btn btn-success me-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
+      class="fas fa-plus pe-2"></i>{{'process.detail.create' | translate}}</button>
+      @if (isProcessFinished(process)) {
+        <button id="delete" class="btn btn-danger"
+          (click)="openDeleteModal(deleteModal)">
+          <i class="fas fa-trash pe-2"></i>{{ 'process.detail.delete.button' | translate }}
         </button>
+      }
     </ds-process-detail-field>
-
     <div style="text-align: right;">
-        <a class="btn btn-outline-secondary mt-3" [routerLink]="'/processes'">{{'process.detail.back' | translate}}</a>
+      <a class="btn btn-outline-secondary mt-3" [routerLink]="'/processes'">{{'process.detail.back' | translate}}</a>
     </div>
-</div>
+  </div>
+}
 
 <ng-template #deleteModal >
 
-    <div *ngIf="(processRD$ | async)?.payload as process">
-
-        <div class="modal-header">
-            <div>
-                <h4>{{'process.detail.delete.header' | translate }}</h4>
-            </div>
-            <button type="button" class="close"
-                    (click)="closeModal()" aria-label="Close">
-                <span aria-hidden="true">×</span>
-            </button>
+  @if ((processRD$ | async)?.payload; as process) {
+    <div>
+      <div class="modal-header">
+        <div>
+          <h4>{{'process.detail.delete.header' | translate }}</h4>
         </div>
-
-        <div class="modal-body">
-            <div>{{'process.detail.delete.body' | translate }}</div>
-            <div class="mt-4">
-                <button class="btn btn-primary mr-2" (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
-                <button id="delete-confirm" class="btn btn-danger"
-                        (click)="deleteProcess(process)">{{ 'process.detail.delete.confirm' | translate }}
-                </button>
-            </div>
+        <button type="button" class="btn-close"
+          (click)="closeModal()" aria-label="Close">
+          <span aria-hidden="true">×</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div>{{'process.detail.delete.body' | translate }}</div>
+        <div class="mt-4">
+          <button class="btn btn-primary me-2" (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
+          <button id="delete-confirm" class="btn btn-danger"
+            (click)="deleteProcess(process)">{{ 'process.detail.delete.confirm' | translate }}
+          </button>
         </div>
-
-
+      </div>
     </div>
+  }
 
 </ng-template>
 
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
index 957df17b69..0be0a69454 100644
--- a/src/app/process-page/detail/process-detail.component.ts
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   DatePipe,
   isPlatformBrowser,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import {
@@ -76,7 +74,7 @@ import { ProcessDetailFieldComponent } from './process-detail-field/process-deta
   selector: 'ds-process-detail',
   templateUrl: './process-detail.component.html',
   standalone: true,
-  imports: [NgIf, ProcessDetailFieldComponent, NgFor, VarDirective, ThemedFileDownloadLinkComponent, ThemedLoadingComponent, RouterLink, AsyncPipe, DatePipe, FileSizePipe, TranslateModule, HasNoValuePipe],
+  imports: [ProcessDetailFieldComponent, VarDirective, ThemedFileDownloadLinkComponent, ThemedLoadingComponent, RouterLink, AsyncPipe, DatePipe, FileSizePipe, TranslateModule, HasNoValuePipe],
 })
 /**
  * A component displaying detailed information about a DSpace Process
diff --git a/src/app/process-page/form/process-form.component.html b/src/app/process-page/form/process-form.component.html
index 211129489e..3bb6a796c6 100644
--- a/src/app/process-page/form/process-form.component.html
+++ b/src/app/process-page/form/process-form.component.html
@@ -1,25 +1,31 @@
 <div class="container">
-    <div class="row">
-        <h1 class="col-12">
-            {{headerKey | translate}}
-        </h1>
-        <div class="col-12 col-md-6 mb-2">
-            <form #form="ngForm" (ngSubmit)="submitForm(form)">
-                <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
-                <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
-                <a [routerLink]="['/processes']" class="btn btn-danger float-left">{{ 'process.new.cancel' | translate }}</a>
-                <button type="submit" class="btn btn-primary float-right">{{ 'process.new.submit' | translate }}</button>
-            </form>
-        </div>
-        <div class="col-12 col-md-6">
-            <ds-script-help *ngIf="selectedScript" [script]="selectedScript"></ds-script-help>
-        </div>
+  <div class="row">
+    <h1 class="col-12">
+      {{headerKey | translate}}
+    </h1>
+    <div class="col-12 col-md-6 mb-2">
+      <form #form="ngForm" (ngSubmit)="submitForm(form)">
+        <ds-scripts-select [script]="selectedScript" (select)="selectedScript = $event; parameters = undefined"></ds-scripts-select>
+        <ds-process-parameters [initialParams]="parameters" [script]="selectedScript" (updateParameters)="parameters = $event"></ds-process-parameters>
+        <a [routerLink]="['/processes']" class="btn btn-danger float-start">{{ 'process.new.cancel' | translate }}</a>
+        <button type="submit" class="btn btn-primary float-end">{{ 'process.new.submit' | translate }}</button>
+      </form>
     </div>
+    <div class="col-12 col-md-6">
+      @if (selectedScript) {
+        <ds-script-help [script]="selectedScript"></ds-script-help>
+      }
+    </div>
+  </div>
 
-    <div *ngIf="missingParameters.length > 0" class="mt-3 alert alert-danger validation-error">
-        {{'process.new.parameter.required.missing' | translate}}
-        <ul>
-            <li *ngFor="let missing of missingParameters">{{missing}}</li>
-        </ul>
+  @if (missingParameters.length > 0) {
+    <div class="mt-3 alert alert-danger validation-error">
+      {{'process.new.parameter.required.missing' | translate}}
+      <ul>
+        @for (missing of missingParameters; track missing) {
+          <li>{{missing}}</li>
+        }
+      </ul>
     </div>
+  }
 </div>
diff --git a/src/app/process-page/form/process-form.component.ts b/src/app/process-page/form/process-form.component.ts
index b85c1cd0bf..65c1f20a8c 100644
--- a/src/app/process-page/form/process-form.component.ts
+++ b/src/app/process-page/form/process-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -43,7 +40,7 @@ import { ScriptsSelectComponent } from './scripts-select/scripts-select.componen
   templateUrl: './process-form.component.html',
   styleUrls: ['./process-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ScriptsSelectComponent, ProcessParametersComponent, RouterLink, ScriptHelpComponent, NgIf, NgFor, TranslateModule],
+  imports: [FormsModule, ScriptsSelectComponent, ProcessParametersComponent, RouterLink, ScriptHelpComponent, TranslateModule],
 })
 export class ProcessFormComponent implements OnInit {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
index 1f1559b50b..1d82530f38 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
@@ -1,20 +1,26 @@
-<div class="form-row gap-2 mb-2 mx-0">
-    <select id="process-parameters"
-            class="form-control col"
-            name="parameter-{{index}}"
-            [attr.aria-label]="'process.new.select-parameter' | translate"
-            [(ngModel)]="selectedParameter"
-            #param="ngModel">
-        <option [ngValue]="undefined">{{ 'process.new.add-parameter' | translate }}</option>
-        <option *ngFor="let param of parameters" [ngValue]="param.name">
-            {{param.nameLong || param.name}}
-        </option>
-    </select>
-    <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col px-0" [index]="index"></ds-parameter-value-input>
-    <button *ngIf="removable" [attr.aria-label]="'process.new.delete-parameter' | translate"
-            (click)="removeParameter.emit(parameterValue);" class="btn btn-danger col-1 remove-button">
+<div class="row gap-2 mb-2 mx-0">
+  <select id="process-parameters"
+    class="form-select col"
+    name="parameter-{{index}}"
+    [attr.aria-label]="'process.new.select-parameter' | translate"
+    [(ngModel)]="selectedParameter"
+    #param="ngModel">
+    <option [ngValue]="undefined">{{ 'process.new.add-parameter' | translate }}</option>
+    @for (param of parameters; track param) {
+      <option [ngValue]="param.name">
+        {{param.nameLong || param.name}}
+      </option>
+    }
+  </select>
+  <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col px-0" [index]="index"></ds-parameter-value-input>
+  @if (removable) {
+    <button [attr.aria-label]="'process.new.delete-parameter' | translate"
+      (click)="removeParameter.emit(parameterValue);" class="btn btn-danger col-1 remove-button">
       <i class="fas fa-trash"></i>
     </button>
-    <span *ngIf="!removable" class="col-1"></span>
+  }
+  @if (!removable) {
+    <span class="col-1"></span>
+  }
 </div>
 
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
index cbb4abfae3..73cb655267 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -34,7 +31,7 @@ import { ParameterValueInputComponent } from '../parameter-value-input/parameter
     deps: [[new Optional(), NgForm]],
   }],
   standalone: true,
-  imports: [FormsModule, NgFor, ParameterValueInputComponent, NgIf, TranslateModule],
+  imports: [FormsModule, ParameterValueInputComponent, TranslateModule],
 })
 export class ParameterSelectComponent {
   @Input() index: number;
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
index 4e77f4ed1b..59876136fe 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.html
@@ -1,7 +1,11 @@
 <input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" class="form-control" name="date-value-{{index}}" id="date-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
-<div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error mb-0">
-    <div *ngIf="string.errors.required">
+@if (string.invalid && (string.dirty || string.touched)) {
+  <div
+    class="alert alert-danger validation-error mb-0">
+    @if (string.errors.required) {
+      <div>
         {{'process.new.parameter.string.required' | translate}}
-    </div>
-</div>
+      </div>
+    }
+  </div>
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
index 74ee21471c..f87fdeab55 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -26,7 +26,7 @@ import { ValueInputComponent } from '../value-input.component';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [FormsModule, NgIf, TranslateModule],
+  imports: [FormsModule, TranslateModule],
 })
 export class DateValueInputComponent extends ValueInputComponent<string> implements OnInit {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
index a741eacc86..101df27b69 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
@@ -1,13 +1,17 @@
-<label for="file-upload-{{index}}" class="d-flex align-items-center m-0">
-    <span class="btn btn-primary">
-        {{'process.new.parameter.file.upload-button' | translate}}
-    </span>
-    <span class="file-name ml-1">{{fileObject?.name}}</span>
+<label for="file-upload-{{index}}" class="form-label d-flex align-items-center m-0">
+  <span class="btn btn-primary">
+    {{'process.new.parameter.file.upload-button' | translate}}
+  </span>
+  <span class="file-name ms-1">{{fileObject?.name}}</span>
 </label>
 <input requireFile #file="ngModel" type="file" name="file-upload-{{index}}" id="file-upload-{{index}}" class="form-control-file d-none" [ngModel]="fileObject" (ngModelChange)="setFile($event)"/>
-<div *ngIf="file.invalid && (file.dirty || file.touched)"
-     class="alert alert-danger validation-error">
-    <div *ngIf="file.errors.required">
+@if (file.invalid && (file.dirty || file.touched)) {
+  <div
+    class="alert alert-danger validation-error">
+    @if (file.errors.required) {
+      <div>
         {{'process.new.parameter.file.required' | translate}}
-    </div>
-</div>
+      </div>
+    }
+  </div>
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
index 7e64382ba2..6cf098f983 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Optional,
@@ -26,7 +26,7 @@ import { ValueInputComponent } from '../value-input.component';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [FileValueAccessorDirective, FormsModule, FileValidator, NgIf, TranslateModule],
+  imports: [FileValueAccessorDirective, FormsModule, FileValidator, TranslateModule],
 })
 export class FileValueInputComponent extends ValueInputComponent<File> {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
index 57bd4ee7e5..aa2425562e 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.html
@@ -1,7 +1,19 @@
-<div [ngSwitch]="parameter?.type">
-  <ds-string-value-input *ngSwitchCase="parameterTypes.STRING" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
-  <ds-string-value-input *ngSwitchCase="parameterTypes.OUTPUT" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
-  <ds-date-value-input *ngSwitchCase="parameterTypes.DATE" [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-date-value-input>
-  <ds-file-value-input *ngSwitchCase="parameterTypes.FILE" (updateValue)="updateValue.emit($event)" [index]="index"></ds-file-value-input>
-  <ds-boolean-value-input *ngSwitchCase="parameterTypes.BOOLEAN" (updateValue)="updateValue.emit($event)" [index]="index"></ds-boolean-value-input>
+<div>
+  @switch (parameter?.type) {
+    @case (parameterTypes.STRING) {
+      <ds-string-value-input [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
+    }
+    @case (parameterTypes.OUTPUT) {
+      <ds-string-value-input [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-string-value-input>
+    }
+    @case (parameterTypes.DATE) {
+      <ds-date-value-input [initialValue]="initialValue" (updateValue)="updateValue.emit($event)" [index]="index"></ds-date-value-input>
+    }
+    @case (parameterTypes.FILE) {
+      <ds-file-value-input (updateValue)="updateValue.emit($event)" [index]="index"></ds-file-value-input>
+    }
+    @case (parameterTypes.BOOLEAN) {
+      <ds-boolean-value-input (updateValue)="updateValue.emit($event)" [index]="index"></ds-boolean-value-input>
+    }
+  }
 </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
index 0a65011105..45d069c9ba 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgSwitch,
-  NgSwitchCase,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -33,7 +30,7 @@ import { StringValueInputComponent } from './string-value-input/string-value-inp
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [NgSwitch, NgSwitchCase, StringValueInputComponent, DateValueInputComponent, FileValueInputComponent, BooleanValueInputComponent],
+  imports: [StringValueInputComponent, DateValueInputComponent, FileValueInputComponent, BooleanValueInputComponent],
 })
 export class ParameterValueInputComponent {
   @Input() index: number;
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
index bf60f9f024..fc6fab9c0d 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.html
@@ -1,7 +1,11 @@
 <input [attr.aria-label]="'process.new.parameter.label' | translate" required #string="ngModel" type="text" name="string-value-{{index}}" class="form-control" id="string-value-{{index}}" [ngModel]="value" (ngModelChange)="setValue($event)"/>
-<div *ngIf="string.invalid && (string.dirty || string.touched)"
-     class="alert alert-danger validation-error mb-0">
-    <div *ngIf="string.errors.required">
+@if (string.invalid && (string.dirty || string.touched)) {
+  <div
+    class="alert alert-danger validation-error mb-0">
+    @if (string.errors.required) {
+      <div>
         {{'process.new.parameter.string.required' | translate}}
-    </div>
-</div>
+      </div>
+    }
+  </div>
+}
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
index d7fa528544..1e718379eb 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -26,7 +26,7 @@ import { ValueInputComponent } from '../value-input.component';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [FormsModule, NgIf, TranslateModule],
+  imports: [FormsModule, TranslateModule],
 })
 export class StringValueInputComponent extends ValueInputComponent<string> implements OnInit {
   /**
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.html b/src/app/process-page/form/process-parameters/process-parameters.component.html
index a937524e88..af82cac94b 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.html
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.html
@@ -1,11 +1,14 @@
-<div class="form-group" *ngIf="script?.parameters?.length" data-testID="parameters-select-container">
-  <label>{{'process.new.select-parameters' | translate}}</label>
-  <ds-parameter-select
-    *ngFor="let value of parameterValues; let i = index; let last = last"
-    [parameters]="script.parameters"
-    [parameterValue]="value"
-    [removable]="!last"
-    [index]="i"
-    (removeParameter)="removeParameter(i)"
-    (changeParameter)="updateParameter($event, i)"></ds-parameter-select>
-</div>
+@if (script?.parameters?.length) {
+  <div class="mb-3" data-testID="parameters-select-container">
+    <label class="form-label">{{'process.new.select-parameters' | translate}}</label>
+    @for (value of parameterValues; track value; let i = $index; let last = $last) {
+      <ds-parameter-select
+        [parameters]="script.parameters"
+        [parameterValue]="value"
+        [removable]="!last"
+        [index]="i"
+        (removeParameter)="removeParameter(i)"
+      (changeParameter)="updateParameter($event, i)"></ds-parameter-select>
+    }
+  </div>
+}
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.ts b/src/app/process-page/form/process-parameters/process-parameters.component.ts
index ac174e338b..81d260577b 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.ts
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -38,7 +35,7 @@ import { ParameterSelectComponent } from './parameter-select/parameter-select.co
     deps: [[new Optional(), NgForm]],
   }],
   standalone: true,
-  imports: [NgIf, NgFor, ParameterSelectComponent, TranslateModule],
+  imports: [ParameterSelectComponent, TranslateModule],
 })
 export class ProcessParametersComponent implements OnChanges, OnInit {
   /**
diff --git a/src/app/process-page/form/script-help/script-help.component.html b/src/app/process-page/form/script-help/script-help.component.html
index 7615edcfd4..1412138a9c 100644
--- a/src/app/process-page/form/script-help/script-help.component.html
+++ b/src/app/process-page/form/script-help/script-help.component.html
@@ -3,20 +3,30 @@
   <span>{{script?.description}}</span>
 
   <table class="table-borderless mt-3">
-    <tr *ngFor="let param of script?.parameters">
-      <td class="align-top text-nowrap">{{param.name}} {{param.nameLong}}
-        <ng-container *ngTemplateOutlet="type; context: param"></ng-container>
-      </td>
-      <td>{{param.description}}</td>
-    </tr>
+    @for (param of script?.parameters; track param) {
+      <tr>
+        <td class="align-top text-nowrap">{{param.name}} {{param.nameLong}}
+          <ng-container *ngTemplateOutlet="type; context: param"></ng-container>
+        </td>
+        <td>{{param.description}}</td>
+      </tr>
+    }
   </table>
 </div>
 
 <ng-template #type let-type="type">
-    <ng-container [ngSwitch]="type">
-        <span *ngSwitchCase="parameterTypes.DATE"><{{'process.new.parameter.type.value' | translate}}></span>
-        <span *ngSwitchCase="parameterTypes.STRING"><{{'process.new.parameter.type.value' | translate}}></span>
-        <span *ngSwitchCase="parameterTypes.OUTPUT"><{{'process.new.parameter.type.value' | translate}}></span>
-        <span *ngSwitchCase="parameterTypes.FILE"><{{'process.new.parameter.type.file' | translate}}></span>
-    </ng-container>
+  @switch (type) {
+    @case (parameterTypes.DATE) {
+      <span><{{'process.new.parameter.type.value' | translate}}></span>
+    }
+    @case (parameterTypes.STRING) {
+      <span><{{'process.new.parameter.type.value' | translate}}></span>
+    }
+    @case (parameterTypes.OUTPUT) {
+      <span><{{'process.new.parameter.type.value' | translate}}></span>
+    }
+    @case (parameterTypes.FILE) {
+      <span><{{'process.new.parameter.type.file' | translate}}></span>
+    }
+  }
 </ng-template>
diff --git a/src/app/process-page/form/script-help/script-help.component.ts b/src/app/process-page/form/script-help/script-help.component.ts
index d06bf13f32..81bd9d710b 100644
--- a/src/app/process-page/form/script-help/script-help.component.ts
+++ b/src/app/process-page/form/script-help/script-help.component.ts
@@ -1,9 +1,4 @@
-import {
-  NgFor,
-  NgSwitch,
-  NgSwitchCase,
-  NgTemplateOutlet,
-} from '@angular/common';
+import { NgTemplateOutlet } from '@angular/common';
 import {
   Component,
   Input,
@@ -21,7 +16,7 @@ import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
   templateUrl: './script-help.component.html',
   styleUrls: ['./script-help.component.scss'],
   standalone: true,
-  imports: [NgFor, NgTemplateOutlet, NgSwitch, NgSwitchCase, TranslateModule],
+  imports: [NgTemplateOutlet, TranslateModule],
 })
 export class ScriptHelpComponent {
   /**
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index 9cd86d1a6d..88ca77b07f 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -1,20 +1,52 @@
-<div class="form-group" *ngIf="scripts$ | async">
-    <label for="process-script">{{'process.new.select-script' | translate}}</label>
-    <select required id="process-script"
-            class="form-control"
-            name="script"
-            [(ngModel)]="selectedScript"
-            #script="ngModel">
-        <option [ngValue]="undefined">{{'process.new.select-script.placeholder' | translate}}</option>
-        <option *ngFor="let script of scripts$ | async" [ngValue]="script.id">
-            {{script.name}}
-        </option>
-    </select>
-
-    <div *ngIf="script.invalid && (script.dirty || script.touched)"
-         class="alert alert-danger validation-error">
-        <div *ngIf="script.errors.required">
-            {{'process.new.select-script.required' | translate}}
-        </div>
+<div class="d-flex w-100 flex-column gap-3">
+  <div>
+    <div ngbDropdown class="d-flex">
+      <input id="process-script"
+        class="form-select"
+        required
+        [ngModel]="selectedScript"
+        placeholder="{{'process.new.select-script.placeholder' | translate}}"
+        [ngModelOptions]="{standalone: true}"
+        ngbDropdownToggle
+        role="combobox"
+        #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="process-script" class="w-100 scrollable-menu"
+        role="menu"
+        (scroll)="onScroll($event)"
+        infiniteScroll
+        [infiniteScrollDistance]="5"
+        [infiniteScrollThrottle]="300"
+        [infiniteScrollUpDistance]="1.5"
+        [fromRoot]="true"
+        [scrollWindow]="false">
+        @for (script of scripts; track script) {
+          <button class="dropdown-item"
+            role="menuitem"
+            type="button"
+            title="{{ script.name }}"
+            (click)="onSelect(script);">
+            <span class="text-truncate">{{ script.name }}</span>
+          </button>
+        }
+        @if ((isLoading$ | async)) {
+          <button class="dropdown-item disabled" role="menuitem">
+            <ds-loading message="{{'loading.default' | translate}}">
+            </ds-loading>
+          </button>
+        }
+      </div>
     </div>
+  </div>
+  <div>
+    @if (script.invalid && (script.dirty || script.touched)) {
+      <div
+        class="alert alert-danger validation-error">
+        @if (script.errors.required) {
+          <div>
+            {{ 'process.new.select-script.required' | translate }}
+          </div>
+        }
+      </div>
+    }
+  </div>
 </div>
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.scss b/src/app/process-page/form/scripts-select/scripts-select.component.scss
index e69de29bb2..4f9ca62310 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.scss
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.scss
@@ -0,0 +1,23 @@
+.dropdown-item {
+  padding: 0.35rem 1rem;
+
+  &:active {
+    color: white !important;
+  }
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
+
+li:not(:last-of-type) .dropdown-item {
+  border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
+}
+
+#entityControlsDropdownMenu {
+  outline: 0;
+  left: 0 !important;
+  box-shadow: var(--bs-btn-focus-box-shadow);
+}
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
index 6b8c39eb8f..7b095926fb 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.spec.ts
@@ -87,7 +87,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();
@@ -101,7 +101,7 @@ describe('ScriptsSelectComponent', () => {
     fixture.detectChanges();
     tick();
 
-    const select = fixture.debugElement.query(By.css('select'));
+    const select = fixture.debugElement.query(By.css('#process-script'));
     select.triggerEventHandler('blur', null);
 
     fixture.detectChanges();
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.ts b/src/app/process-page/form/scripts-select/scripts-select.component.ts
index 63c11bd91a..9216a8cfc2 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.ts
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -19,32 +15,29 @@ import {
 } from '@angular/forms';
 import {
   ActivatedRoute,
-  Params,
   Router,
 } from '@angular/router';
+import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
-  Observable,
+  BehaviorSubject,
   Subscription,
 } from 'rxjs';
 import {
-  distinctUntilChanged,
-  filter,
   map,
-  switchMap,
-  take,
+  tap,
 } from 'rxjs/operators';
 
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import {
-  getFirstSucceededRemoteData,
+  getFirstCompletedRemoteData,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
-import {
-  hasNoValue,
-  hasValue,
-} from '../../../shared/empty.util';
+import { hasValue } from '../../../shared/empty.util';
+import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
 import { Script } from '../../scripts/script.model';
 import { controlContainerFactory } from '../process-form-factory';
 
@@ -61,7 +54,7 @@ const SCRIPT_QUERY_PARAMETER = 'script';
     useFactory: controlContainerFactory,
     deps: [[new Optional(), NgForm]] }],
   standalone: true,
-  imports: [NgIf, FormsModule, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, AsyncPipe, TranslateModule, InfiniteScrollModule, ThemedLoadingComponent, NgbDropdownModule],
 })
 export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
@@ -71,9 +64,19 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
    * All available scripts
    */
-  scripts$: Observable<Script[]>;
+  scripts: Script[] = [];
+
   private _selectedScript: Script;
-  private routeSub: Subscription;
+  private subscription: Subscription;
+
+  private _isLastPage = false;
+
+  scriptOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+
+  isLoading$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   constructor(
     private scriptService: ScriptDataService,
@@ -87,31 +90,46 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
    * Checks if the route contains a script ID and auto selects this scripts
    */
   ngOnInit() {
-    this.scripts$ = this.scriptService.findAll({ elementsPerPage: 9999 })
-      .pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((paginatedList: PaginatedList<Script>) => paginatedList.page),
-      );
+    this.loadScripts();
+  }
 
-    this.routeSub = this.route.queryParams
-      .pipe(
-        filter((params: Params) => hasNoValue(params.id)),
-        map((params: Params) => params[SCRIPT_QUERY_PARAMETER]),
-        distinctUntilChanged(),
-        switchMap((id: string) =>
-          this.scripts$
-            .pipe(
-              take(1),
-              map((scripts) =>
-                scripts.find((script) => script.id === id),
-              ),
-            ),
-        ),
-      ).subscribe((script: Script) => {
-        this._selectedScript = script;
-        this.select.emit(script);
-      });
+  /**
+   * Load the scripts and check if the route contains a script
+   */
+  loadScripts() {
+    if (this.isLoading$.value) {return;}
+    this.isLoading$.next(true);
+
+    this.subscription = this.scriptService.findAll(this.scriptOptions).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      tap((paginatedList: PaginatedList<Script>) => {
+        this._isLastPage = paginatedList?.pageInfo?.currentPage >= paginatedList?.pageInfo?.totalPages;
+      }),
+      map((paginatedList: PaginatedList<Script>) => paginatedList.page),
+    ).subscribe((newScripts: Script[]) => {
+      this.scripts = [...this.scripts, ...newScripts];
+      this.isLoading$.next(false);
+
+      const param = this.route.snapshot.queryParams[SCRIPT_QUERY_PARAMETER];
+      if (hasValue(param)) {
+        this._selectedScript = this.scripts.find((script) => script.id === param);
+        this.select.emit(this._selectedScript);
+      }
+    });
+  }
+
+  /**
+   * Load more scripts when the user scrolls to the bottom of the list
+   * @param event The scroll event
+   */
+  onScroll(event: any) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading$.value && !this._isLastPage) {
+        this.scriptOptions.currentPage++;
+        this.loadScripts();
+      }
+    }
   }
 
   /**
@@ -133,14 +151,25 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
     );
   }
 
+  selectScript(script: Script) {
+    this._selectedScript = script;
+  }
+
+  onSelect(newScript: Script) {
+    this.selectScript(newScript);
+    // this._selectedScript = newScript;
+    this.select.emit(newScript);
+    this.selectedScript = newScript.name;
+  }
+
   @Input()
   set script(value: Script) {
     this._selectedScript = value;
   }
 
   ngOnDestroy(): void {
-    if (hasValue(this.routeSub)) {
-      this.routeSub.unsubscribe();
+    if (hasValue(this.subscription)) {
+      this.subscription.unsubscribe();
     }
   }
 }
diff --git a/src/app/process-page/new/new-process.component.html b/src/app/process-page/new/new-process.component.html
index 6e86952638..91ecd4a75b 100644
--- a/src/app/process-page/new/new-process.component.html
+++ b/src/app/process-page/new/new-process.component.html
@@ -1,6 +1,5 @@
-<ng-container *ngIf="fromExisting$ | async | dsHasValue; else newProcess">
-    <ds-process-form *ngVar="fromExisting$ | async as process" headerKey="process.new.header" [selectedScript]="script$ | async" [parameters]="process.parameters"></ds-process-form>
-</ng-container>
-<ng-template #newProcess>
-    <ds-process-form headerKey="process.new.header"></ds-process-form>
-</ng-template>
+@if (fromExisting$ | async | dsHasValue) {
+  <ds-process-form *ngVar="fromExisting$ | async as process" headerKey="process.new.header" [selectedScript]="script$ | async" [parameters]="process.parameters"></ds-process-form>
+} @else {
+  <ds-process-form headerKey="process.new.header"></ds-process-form>
+}
diff --git a/src/app/process-page/new/new-process.component.ts b/src/app/process-page/new/new-process.component.ts
index 12a7ea682e..bed8ddbd6c 100644
--- a/src/app/process-page/new/new-process.component.ts
+++ b/src/app/process-page/new/new-process.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +28,7 @@ import { Script } from '../scripts/script.model';
   templateUrl: './new-process.component.html',
   styleUrls: ['./new-process.component.scss'],
   standalone: true,
-  imports: [NgIf, VarDirective, ProcessFormComponent, AsyncPipe, HasValuePipe],
+  imports: [VarDirective, ProcessFormComponent, AsyncPipe, HasValuePipe],
 })
 export class NewProcessComponent implements OnInit {
   /**
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index cc4b39572b..ff46c26482 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -1,78 +1,86 @@
 <div class="container">
-    <div class="d-flex">
-        <h1 class="flex-grow-1">{{'process.overview.title' | translate}}</h1>
-    </div>
-    <ng-container *ngTemplateOutlet="buttons"></ng-container>
+  <div class="d-flex">
+    <h1 class="flex-grow-1">{{'process.overview.title' | translate}}</h1>
+  </div>
+  <ng-container *ngTemplateOutlet="buttons"></ng-container>
 
-    <div class="sections">
-        <ds-process-overview-table
-                [processStatus]="ProcessStatus.RUNNING"
-                [useAutoRefreshingSearchBy]="true"
-                [getInfoValueMethod]="processOverviewService.timeStarted"/>
-        <ds-process-overview-table
-                [processStatus]="ProcessStatus.SCHEDULED"
-                [useAutoRefreshingSearchBy]="true"
-                [getInfoValueMethod]="processOverviewService.timeCreated"/>
-        <ds-process-overview-table
-                [processStatus]="ProcessStatus.COMPLETED"
-                [sortField]="ProcessSortField.endTime"
-                [useAutoRefreshingSearchBy]="true"
-                [getInfoValueMethod]="processOverviewService.timeCompleted"/>
-        <ds-process-overview-table
-                [processStatus]="ProcessStatus.FAILED"
-                [sortField]="ProcessSortField.endTime"
-                [useAutoRefreshingSearchBy]="true"
-                [getInfoValueMethod]="processOverviewService.timeCompleted"/>
-    </div>
+  <div class="sections">
+    <ds-process-overview-table
+      [processStatus]="ProcessStatus.RUNNING"
+      [useAutoRefreshingSearchBy]="true"
+      [getInfoValueMethod]="processOverviewService.timeStarted"/>
+    <ds-process-overview-table
+      [processStatus]="ProcessStatus.SCHEDULED"
+      [useAutoRefreshingSearchBy]="true"
+      [getInfoValueMethod]="processOverviewService.timeCreated"/>
+    <ds-process-overview-table
+      [processStatus]="ProcessStatus.COMPLETED"
+      [sortField]="ProcessSortField.endTime"
+      [useAutoRefreshingSearchBy]="true"
+      [getInfoValueMethod]="processOverviewService.timeCompleted"/>
+    <ds-process-overview-table
+      [processStatus]="ProcessStatus.FAILED"
+      [sortField]="ProcessSortField.endTime"
+      [useAutoRefreshingSearchBy]="true"
+      [getInfoValueMethod]="processOverviewService.timeCompleted"/>
+  </div>
 
-    <ng-container *ngTemplateOutlet="buttons"></ng-container>
+  <ng-container *ngTemplateOutlet="buttons"></ng-container>
 </div>
 
 <ng-template #buttons>
-    <div class="d-flex justify-content-end mb-2">
-        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-primary mr-2"
-                (click)="processBulkDeleteService.clearAllProcesses()"><i
-            class="fas fa-undo pr-2"></i>{{'process.overview.delete.clear' | translate }}
-        </button>
-        <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-danger mr-2"
-                (click)="openDeleteModal(deleteModal)"><i
-            class="fas fa-trash pr-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
-        </button>
-        <button class="btn btn-success" routerLink="/processes/new"><i
-            class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
-    </div>
+  <div class="d-flex justify-content-end mb-2">
+    @if (processBulkDeleteService.hasSelected()) {
+      <button class="btn btn-primary me-2"
+        (click)="processBulkDeleteService.clearAllProcesses()"><i
+      class="fas fa-undo pe-2"></i>{{'process.overview.delete.clear' | translate }}
+    </button>
+  }
+  @if (processBulkDeleteService.hasSelected()) {
+    <button class="btn btn-danger me-2"
+      (click)="openDeleteModal(deleteModal)"><i
+    class="fas fa-trash pe-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
+  </button>
+}
+<button class="btn btn-success" routerLink="/processes/new"><i
+class="fas fa-plus pe-2"></i>{{'process.overview.new' | translate}}</button>
+</div>
 </ng-template>
 
 <ng-template #deleteModal>
 
-    <div>
+  <div>
 
-        <div class="modal-header">
-            <div>
-                <h4>{{'process.overview.delete.header' | translate }}</h4>
-            </div>
-            <button type="button" class="close"
-                    (click)="closeModal()" aria-label="Close">
-                <span aria-hidden="true">×</span>
-            </button>
-        </div>
-
-        <div class="modal-body">
-            <div *ngIf="(processBulkDeleteService.isProcessing$() | async) !== true">{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
-            <div *ngIf="processBulkDeleteService.isProcessing$() |async" class="alert alert-info">
-                <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
-                <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
-            </div>
-            <div class="mt-4">
-                <button class="btn btn-primary mr-2" [disabled]="processBulkDeleteService.isProcessing$() |async"
-                        (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
-                <button id="delete-confirm" class="btn btn-danger"
-                        [disabled]="processBulkDeleteService.isProcessing$() |async"
-                        (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
-                </button>
-            </div>
-        </div>
+    <div class="modal-header">
+      <div>
+        <h4>{{'process.overview.delete.header' | translate }}</h4>
+      </div>
+      <button type="button" class="btn-close"
+        (click)="closeModal()" aria-label="Close">
+        <span aria-hidden="true">×</span>
+      </button>
     </div>
 
+    <div class="modal-body">
+      @if ((processBulkDeleteService.isProcessing$() | async) !== true) {
+        <div>{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
+      }
+      @if (processBulkDeleteService.isProcessing$() |async) {
+        <div class="alert alert-info">
+          <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
+          <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
+        </div>
+      }
+      <div class="mt-4">
+        <button class="btn btn-primary me-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
+        (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
+        <button id="delete-confirm" class="btn btn-danger"
+          [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
+          (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
+        </button>
+      </div>
+    </div>
+  </div>
+
 
 </ng-template>
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 1d10a87b64..16f405feaf 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgFor,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -16,6 +14,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { hasValue } from '../../shared/empty.util';
 import { PaginationComponent } from '../../shared/pagination/pagination.component';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -31,7 +30,7 @@ import { ProcessOverviewTableComponent } from './table/process-overview-table.co
   selector: 'ds-process-overview',
   templateUrl: './process-overview.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, PaginationComponent, NgFor, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent],
+  imports: [RouterLink, PaginationComponent, VarDirective, AsyncPipe, DatePipe, TranslateModule, NgTemplateOutlet, ProcessOverviewTableComponent, BtnDisabledDirective],
 })
 /**
  * Component displaying a list of all processes in a paginated table
diff --git a/src/app/process-page/overview/table/process-overview-table.component.html b/src/app/process-page/overview/table/process-overview-table.component.html
index 0d699d9f38..a9aa922977 100644
--- a/src/app/process-page/overview/table/process-overview-table.component.html
+++ b/src/app/process-page/overview/table/process-overview-table.component.html
@@ -2,11 +2,13 @@
   <div class="d-flex" (click)="collapse.toggle()" [attr.aria-expanded]="!collapse.collapsed" role="button">
     <h2 class="flex-grow-1">
       {{'process.overview.table.' + processStatus.toLowerCase() + '.title' | translate}}
-      <span class="badge badge-pill badge-primary badge-nb-processes"
-            *ngIf="(processesRD$ | async) as processesRD">
-        {{processesRD?.payload?.totalElements}}
-      </span>
-      <span class="ml-2 toggle-icon">
+      @if ((processesRD$ | async); as processesRD) {
+        <span class="badge rounded-pill bg-primary badge-nb-processes ps-2 pe-2"
+          >
+          {{processesRD?.payload?.totalElements}}
+        </span>
+      }
+      <span class="ms-2 toggle-icon">
         <i class="fas" [ngClass]="collapse.collapsed ? 'fa-angle-right' : 'fa-angle-down'"></i>
       </span>
     </h2>
@@ -15,50 +17,55 @@
   <div ngbCollapse #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
 
     <ng-container *ngVar="(processesRD$ | async) as processesRD">
-      <ds-loading *ngIf="!processesRD || processesRD.isLoading"/>
+      @if (!processesRD || processesRD.isLoading) {
+        <ds-loading/>
+      }
 
-      <ds-pagination *ngIf="processesRD?.payload?.totalElements > 0"
-                     [paginationOptions]="(paginationOptions$ | async)"
-                     [collectionSize]="processesRD?.payload?.totalElements"
-                     [retainScrollPosition]="true"
-                     [hideGear]="true">
-
-        <div class="table-responsive mt-1">
-          <table class="table table-striped table-hover">
-            <thead>
-            <tr>
-              <th scope="col" class="id-header">{{'process.overview.table.id' | translate}}</th>
-              <th scope="col" class="name-header">{{'process.overview.table.name' | translate}}</th>
-              <th scope="col" class="user-header">{{'process.overview.table.user' | translate}}</th>
-              <th scope="col" class="info-header">{{'process.overview.table.' + processStatus.toLowerCase() + '.info' | translate}}</th>
-              <th scope="col" class="actions-header">{{'process.overview.table.actions' | translate}}</th>
-            </tr>
-            </thead>
-
-            <tbody>
-            <tr *ngFor="let tableEntry of processesRD?.payload?.page"
-                [class]="getRowClass(tableEntry.process)">
-              <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.processId}}</a></td>
-              <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.scriptName}}</a></td>
-              <td>{{tableEntry.user}}</td>
-              <td>{{tableEntry.info}}</td>
-              <td>
-                <button [attr.aria-label]="'process.overview.delete-process' | translate"
+      @if (processesRD?.payload?.totalElements > 0) {
+        <ds-pagination
+          [paginationOptions]="(paginationOptions$ | async)"
+          [collectionSize]="processesRD?.payload?.totalElements"
+          [retainScrollPosition]="true"
+          [hideGear]="true">
+          <div class="table-responsive mt-1">
+            <table class="table table-striped table-hover">
+              <thead>
+                <tr>
+                  <th scope="col" class="id-header">{{'process.overview.table.id' | translate}}</th>
+                  <th scope="col" class="name-header">{{'process.overview.table.name' | translate}}</th>
+                  <th scope="col" class="user-header">{{'process.overview.table.user' | translate}}</th>
+                  <th scope="col" class="info-header">{{'process.overview.table.' + processStatus.toLowerCase() + '.info' | translate}}</th>
+                  <th scope="col" class="actions-header">{{'process.overview.table.actions' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                @for (tableEntry of processesRD?.payload?.page; track tableEntry) {
+                  <tr
+                    [class]="getRowClass(tableEntry.process)">
+                    <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.processId}}</a></td>
+                    <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.scriptName}}</a></td>
+                    <td>{{tableEntry.user}}</td>
+                    <td>{{tableEntry.info}}</td>
+                    <td>
+                      <button [attr.aria-label]="'process.overview.delete-process' | translate"
                         (click)="processBulkDeleteService.toggleDelete(tableEntry.process.processId)"
                         class="btn btn-outline-danger">
-                  <i class="fas fa-trash"></i>
-                </button>
-              </td>
-            </tr>
-            </tbody>
-          </table>
+                        <i class="fas fa-trash"></i>
+                      </button>
+                    </td>
+                  </tr>
+                }
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
+      }
+
+      @if (processesRD?.payload?.totalElements === 0) {
+        <div>
+          <p>{{'process.overview.table.empty' | translate}}</p>
         </div>
-
-      </ds-pagination>
-
-      <div *ngIf="processesRD?.payload?.totalElements === 0">
-        <p>{{'process.overview.table.empty' | translate}}</p>
-      </div>
+      }
     </ng-container>
 
   </div>
diff --git a/src/app/process-page/overview/table/process-overview-table.component.ts b/src/app/process-page/overview/table/process-overview-table.component.ts
index 492b44af1f..d1c1f27f52 100644
--- a/src/app/process-page/overview/table/process-overview-table.component.ts
+++ b/src/app/process-page/overview/table/process-overview-table.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   isPlatformBrowser,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -91,8 +89,6 @@ export interface ProcessOverviewTableEntry {
     TranslateModule,
     PaginationComponent,
     RouterLink,
-    NgForOf,
-    NgIf,
     ThemedLoadingComponent,
     VarDirective,
   ],
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
index a5bbb38d02..42a5267909 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
@@ -1,37 +1,38 @@
 <div>
   <div class="modal-header"><h4>{{'dso-selector.claim.item.head' | translate}}</h4>
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
-    </button>
+  <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+  </button>
+</div>
+<div class="modal-body">
+  <div class="alert alert-info" role="alert">
+    {{'dso-selector.claim.item.body' | translate}}
   </div>
-  <div class="modal-body">
-    <div class="alert alert-info" role="alert">
-      {{'dso-selector.claim.item.body' | translate}}
-    </div>
-    <div class="dropdown-divider"></div>
-    <div class="scrollable-menu list-group container">
-      <div *ngFor="let listEntry of (listEntries$ | async)?.payload.page" class="row">
+  <div class="dropdown-divider"></div>
+  <div class="scrollable-menu list-group container">
+    @for (listEntry of (listEntries$ | async)?.payload.page; track listEntry) {
+      <div class="row">
         <button class="list-group-item list-group-item-action border-0 list-entry"
-                title="{{ dsoNameService.getName(listEntry.indexableObject) }}"
-                (click)="selectItem(listEntry.indexableObject)" #listEntryElement>
+          title="{{ dsoNameService.getName(listEntry.indexableObject) }}"
+          (click)="selectItem(listEntry.indexableObject)" #listEntryElement>
           <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
-                                               [linkType]=linkTypes.None></ds-listable-object-component-loader>
+          [linkType]=linkTypes.None></ds-listable-object-component-loader>
         </button>
       </div>
-      <div class="row">
-        <div class="col-md mt-2">
-        </div>
+    }
+    <div class="row">
+      <div class="col-md mt-2">
       </div>
     </div>
   </div>
-  <div class="modal-footer">
-    <div class="mr-5">
-      <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
-      {{ 'dso-selector.claim.item.not-mine-label' | translate }}
-    </div>
-    <button type="submit" class="btn btn-primary ml-5 mr-2" (click)="createFromScratch()" [disabled]="!checked">
-      <i class="fas fa-plus"></i>
-      {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
-    </button>
-  </div>
+</div>
+<div class="modal-footer">
+  <div class="me-5">
+    <input type="checkbox" [checked]="checked" (change)="toggleCheckbox()"/>
+    {{ 'dso-selector.claim.item.not-mine-label' | translate }}
+  </div>
+  <button type="submit" class="btn btn-primary ms-5 me-2" (click)="createFromScratch()" [dsBtnDisabled]="!checked">
+    <i class="fas fa-plus"></i>
+    {{ 'dso-selector.claim.item.create-from-scratch' | translate }}
+  </button>
+</div>
 </div>
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
index 4ff9b637f6..6adca2cbe7 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -25,6 +22,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { DSOSelectorModalWrapperComponent } from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { CollectionElementLinkType } from '../../shared/object-collection/collection-element-link.type';
 import { ListableObjectComponentLoaderComponent } from '../../shared/object-collection/shared/listable-object/listable-object-component-loader.component';
@@ -41,7 +39,7 @@ import { ProfileClaimService } from '../profile-claim/profile-claim.service';
     ListableObjectComponentLoaderComponent,
     AsyncPipe,
     TranslateModule,
-    NgForOf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.html b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.html
index b9142fa2c6..669748e190 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.html
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.html
@@ -1,7 +1,9 @@
-<ds-form *ngIf="formModel"
-         [formId]="'profile-page-metadata-form-id'"
-         [formModel]="formModel"
-         [formGroup]="formGroup"
-         [displaySubmit]="false"
-         [displayCancel]="false">
-</ds-form>
+@if (formModel) {
+  <ds-form
+    [formId]="'profile-page-metadata-form-id'"
+    [formModel]="formModel"
+    [formGroup]="formGroup"
+    [displaySubmit]="false"
+    [displayCancel]="false">
+  </ds-form>
+}
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
index b1529fdb57..13dca64f8a 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -35,7 +35,6 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
   templateUrl: './profile-page-metadata-form.component.html',
   imports: [
     FormComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index 8d48da08d9..0190c36d0c 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -1,38 +1,52 @@
 <div *ngVar="(researcherProfile$ | async) as researcherProfile">
-  <div *ngIf="researcherProfile">
-    <p>{{'researcher.profile.associated' | translate}}</p>
-    <p class="align-items-center researcher-profile-switch" >
-      <span class="mr-3">{{'researcher.profile.status' | translate}}</span>
-      <ui-switch [checkedLabel]="'researcher.profile.public.visibility' | translate"
-                 [uncheckedLabel]="'researcher.profile.private.visibility' | translate"
-                 [checked]="researcherProfile.visible"
-                 (change)="toggleProfileVisibility(researcherProfile)" ></ui-switch>
-    </p>
-  </div>
-  <div *ngIf="!researcherProfile">
-    <p>{{'researcher.profile.not.associated' | translate}}</p>
-  </div>
-  <button *ngIf="!researcherProfile" class="btn btn-primary mr-2"
-          [disabled]="(isProcessingCreate() | async)"
-          (click)="createProfile()">
-    <span *ngIf="(isProcessingCreate() | async)">
-        <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
-    </span>
-    <span *ngIf="(isProcessingCreate() | async) !== true">
-        <i class="fas fa-plus"></i> &nbsp;{{'researcher.profile.create.new' | translate}}
-    </span>
-  </button>
-  <ng-container *ngIf="researcherProfile">
-    <button class="btn btn-primary mr-2" [disabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
+  @if (researcherProfile) {
+    <div>
+      <p>{{'researcher.profile.associated' | translate}}</p>
+      <p class="align-items-center researcher-profile-switch" >
+        <span class="me-3">{{'researcher.profile.status' | translate}}</span>
+        <ui-switch [checkedLabel]="'researcher.profile.public.visibility' | translate"
+          [uncheckedLabel]="'researcher.profile.private.visibility' | translate"
+          [checked]="researcherProfile.visible"
+        (change)="toggleProfileVisibility(researcherProfile)" ></ui-switch>
+      </p>
+    </div>
+  }
+  @if (!researcherProfile) {
+    <div>
+      <p>{{'researcher.profile.not.associated' | translate}}</p>
+    </div>
+  }
+  @if (!researcherProfile) {
+    <button class="btn btn-primary me-2"
+      [dsBtnDisabled]="(isProcessingCreate() | async)"
+      (click)="createProfile()">
+      @if ((isProcessingCreate() | async)) {
+        <span>
+          <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
+        </span>
+      }
+      @if ((isProcessingCreate() | async) !== true) {
+        <span>
+          <i class="fas fa-plus"></i> &nbsp;{{'researcher.profile.create.new' | translate}}
+        </span>
+      }
+    </button>
+  }
+  @if (researcherProfile) {
+    <button class="btn btn-primary me-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
       <i class="fas fa-info-circle"></i> {{'researcher.profile.view' | translate}}
     </button>
-    <button class="btn btn-danger" [disabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
-        <span *ngIf="(isProcessingDelete() | async)">
-            <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
+    <button class="btn btn-danger" [dsBtnDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
+      @if ((isProcessingDelete() | async)) {
+        <span>
+          <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
-        <span *ngIf="(isProcessingDelete() | async) !== true">
-            <i class="fas fa-trash-alt"></i> &nbsp;{{'researcher.profile.delete' | translate}}
+      }
+      @if ((isProcessingDelete() | async) !== true) {
+        <span>
+          <i class="fas fa-trash-alt"></i> &nbsp;{{'researcher.profile.delete' | translate}}
         </span>
+      }
     </button>
-  </ng-container>
+  }
 </div>
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index cfbbacac12..4c87eee07e 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -36,6 +33,7 @@ import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteDataPayload,
 } from '../../core/shared/operators';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
@@ -48,11 +46,11 @@ import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/prof
   selector: 'ds-profile-page-researcher-form',
   templateUrl: './profile-page-researcher-form.component.html',
   imports: [
-    NgIf,
     AsyncPipe,
     TranslateModule,
     UiSwitchModule,
     VarDirective,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
index 0f944e0016..228a85bdf4 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.html
@@ -1,10 +1,16 @@
 <ds-alert class="mb-4" [type]="'alert-info'">{{FORM_PREFIX + 'info' | translate}}</ds-alert>
-<ds-form *ngIf="formModel"
-         [formId]="FORM_PREFIX"
-         [formModel]="formModel"
-         [formGroup]="formGroup"
-         [displaySubmit]="false"
-         [displayCancel]="false">
-</ds-form>
-<div id="notSame" class="container-fluid text-danger" *ngIf="formGroup.hasError('notSame')">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
-<div id="emptyPassword" class="container-fluid text-danger" *ngIf="(formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
+@if (formModel) {
+  <ds-form
+    [formId]="FORM_PREFIX"
+    [formModel]="formModel"
+    [formGroup]="formGroup"
+    [displaySubmit]="false"
+    [displayCancel]="false">
+  </ds-form>
+}
+@if (formGroup.hasError('notSame')) {
+  <div id="notSame" class="container-fluid text-danger">{{FORM_PREFIX + 'error.matching-passwords' | translate}}</div>
+}
+@if ((formGroup.dirty || formGroup.touched) && formGroup.hasError('emptyPassword')) {
+  <div id="emptyPassword" class="container-fluid text-danger">{{FORM_PREFIX + 'error.empty-password' | translate}}</div>
+}
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
index 0fdee2080b..228535297f 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -34,7 +34,6 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
   selector: 'ds-profile-page-security-form',
   templateUrl: './profile-page-security-form.component.html',
   imports: [
-    NgIf,
     FormComponent,
     AlertComponent,
     TranslateModule,
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 3dc7c9d489..eeb6f8e41c 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,56 +1,86 @@
 <ng-container *ngVar="(user$ | async) as user">
-  <div class="container" *ngIf="user">
-    <h1>{{'profile.title' | translate}}</h1>
-    <ng-container *ngIf="isResearcherProfileEnabled$ | async">
-      <div class="card mb-4">
-        <div class="card-header">{{'profile.card.researcher' | translate}}</div>
-        <div class="card-body">
-          <div class="mb-4">
-            <ds-profile-page-researcher-form [user]="user" ></ds-profile-page-researcher-form>
+  @if (user) {
+    <div class="container">
+      <h1>{{'profile.title' | translate}}</h1>
+      @if (isResearcherProfileEnabled$ | async) {
+        <div class="card mb-4">
+          <div class="card-header">{{'profile.card.researcher' | translate}}</div>
+          <div class="card-body">
+            <div class="mb-4">
+              <ds-profile-page-researcher-form [user]="user" ></ds-profile-page-researcher-form>
+            </div>
+            <ds-suggestions-notification></ds-suggestions-notification>
           </div>
-          <ds-suggestions-notification></ds-suggestions-notification>
+        </div>
+      }
+      <div class="card mb-4">
+        <div class="card-header">{{'profile.card.identify' | translate}}</div>
+        <div class="card-body">
+          <ds-profile-page-metadata-form [user]="user"></ds-profile-page-metadata-form>
         </div>
       </div>
-    </ng-container>
-    <div class="card mb-4">
-      <div class="card-header">{{'profile.card.identify' | translate}}</div>
-      <div class="card-body">
-        <ds-profile-page-metadata-form [user]="user"></ds-profile-page-metadata-form>
+      @if (canChangePassword$ | async) {
+        <div class="card mb-4 security-section">
+          <div class="card-header">{{'profile.card.security' | translate}}</div>
+          <div class="card-body">
+            <ds-profile-page-security-form
+              [FORM_PREFIX]="'profile.security.form.'"
+              (isInvalid)="setInvalid($event)"
+              (passwordValue)="setPasswordValue($event)"
+              (currentPasswordValue)="setCurrentPasswordValue($event)"
+            ></ds-profile-page-security-form>
+          </div>
+        </div>
+      }
+      <div class="col-12 text-end pe-0">
+        <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
       </div>
+      @if ((groupsRD$ | async); as groupsRD;) {
+        <ng-container *ngTemplateOutlet="groupsRD?.isLoading ? loader : content"></ng-container>
+        <ng-template #content>
+          @if (groupsRD?.payload) {
+            <ds-pagination
+              [hideGear]="true"
+              [hidePagerWhenSinglePage]="true"
+              [hidePaginationDetail]="true"
+              [paginationOptions]="optionsGroupsPagination"
+              [collectionSize]="groupsRD?.payload?.totalElements">
+              @if (groupsRD?.payload?.page; as groups) {
+                @if (groups?.length > 0) {
+                  <div>
+                    <h2 class="mt-4">{{ 'profile.groups.head' | translate }}</h2>
+                    <ul class="list-group list-group-flush">
+                      @for (group of groups; track group) {
+                        <li class="list-group-item">{{ dsoNameService.getName(group) }}</li>
+                      }
+                    </ul>
+                  </div>
+                }
+              }
+            </ds-pagination>
+          }
+        </ng-template>
+        <ng-template #loader>
+          <ds-loading [showMessage]="false"></ds-loading>
+        </ng-template>
+        @if (groupsRD?.hasFailed) {
+          <ds-error message="{{ 'error.profile-groups' | translate }}"></ds-error>
+        }
+      }
+      <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
+        @if (specialGroups?.length > 0) {
+          <div data-test="specialGroups">
+            <h2 class="mt-4">{{'profile.special.groups.head' | translate}}</h2>
+            <ul class="list-group list-group-flush">
+              @for (specialGroup of specialGroups; track specialGroup) {
+                <li class="list-group-item">
+                  {{ dsoNameService.getName(specialGroup) }}
+                </li>
+              }
+            </ul>
+          </div>
+        }
+      </ng-container>
     </div>
-    <div *ngIf="canChangePassword$ | async" class="card mb-4 security-section">
-      <div class="card-header">{{'profile.card.security' | translate}}</div>
-      <div class="card-body">
-        <ds-profile-page-security-form
-                [FORM_PREFIX]="'profile.security.form.'"
-                (isInvalid)="setInvalid($event)"
-                (passwordValue)="setPasswordValue($event)"
-                (currentPasswordValue)="setCurrentPasswordValue($event)"
-        ></ds-profile-page-security-form>
-      </div>
-    </div>
-    <div class="col-12 text-right pr-0">
-      <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
-    </div>
-
-    <ng-container *ngVar="(groupsRD$ | async)?.payload?.page as groups">
-      <div *ngIf="groups?.length > 0">
-        <h2 class="mt-4">{{'profile.groups.head' | translate}}</h2>
-        <ul class="list-group list-group-flush">
-          <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
-        </ul>
-      </div>
-    </ng-container>
-
-    <ng-container *ngVar="(specialGroupsRD$ | async)?.payload?.page as specialGroups">
-      <div *ngIf="specialGroups?.length > 0" data-test="specialGroups">
-        <h2 class="mt-4">{{'profile.special.groups.head' | translate}}</h2>
-        <ul class="list-group list-group-flush">
-          <li *ngFor="let specialGroup of specialGroups" class="list-group-item">
-            {{ dsoNameService.getName(specialGroup) }}
-          </li>
-        </ul>
-     </div>
-    </ng-container>
-  </div>
+  }
 </ng-container>
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 82a0a9d67b..ebd3939432 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -1,3 +1,4 @@
+import { NgTemplateOutlet } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
@@ -29,7 +30,10 @@ import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { SuggestionsNotificationComponent } from '../notifications/suggestions-notification/suggestions-notification.component';
+import { ErrorComponent } from '../shared/error/error.component';
+import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
+import { PaginationComponent } from '../shared/pagination/pagination.component';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject$,
@@ -134,6 +138,10 @@ describe('ProfilePageComponent', () => {
             ProfilePageSecurityFormComponent,
             ProfilePageResearcherFormComponent,
             SuggestionsNotificationComponent,
+            NgTemplateOutlet,
+            PaginationComponent,
+            ThemedLoadingComponent,
+            ErrorComponent,
           ],
         },
       })
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 75760105e0..7799615bc6 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
-  NgForOf,
-  NgIf,
+  NgTemplateOutlet,
 } from '@angular/common';
 import {
   Component,
@@ -33,8 +32,10 @@ import { RemoteData } from '../core/data/remote-data';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { Group } from '../core/eperson/models/group.model';
+import { PaginationService } from '../core/pagination/pagination.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import {
+  getAllCompletedRemoteData,
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   getRemoteDataPayload,
@@ -44,7 +45,11 @@ import {
   hasValue,
   isNotEmpty,
 } from '../shared/empty.util';
+import { ErrorComponent } from '../shared/error/error.component';
+import { ThemedLoadingComponent } from '../shared/loading/themed-loading.component';
 import { NotificationsService } from '../shared/notifications/notifications.service';
+import { PaginationComponent } from '../shared/pagination/pagination.component';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { followLink } from '../shared/utils/follow-link-config.model';
 import { VarDirective } from '../shared/utils/var.directive';
 import { ThemedProfilePageMetadataFormComponent } from './profile-page-metadata-form/themed-profile-page-metadata-form.component';
@@ -62,9 +67,11 @@ import { ProfilePageSecurityFormComponent } from './profile-page-security-form/p
     TranslateModule,
     ProfilePageResearcherFormComponent,
     VarDirective,
-    NgIf,
-    NgForOf,
     SuggestionsNotificationComponent,
+    NgTemplateOutlet,
+    PaginationComponent,
+    ThemedLoadingComponent,
+    ErrorComponent,
   ],
   standalone: true,
 })
@@ -122,6 +129,15 @@ export class ProfilePageComponent implements OnInit {
   private currentUser: EPerson;
   canChangePassword$: Observable<boolean>;
 
+  /**
+   * Default configuration for group pagination
+   **/
+  optionsGroupsPagination = Object.assign(new PaginationComponentOptions(),{
+    id: 'page_groups',
+    currentPage: 1,
+    pageSize: 20,
+  });
+
   isResearcherProfileEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
   constructor(private authService: AuthService,
@@ -131,6 +147,7 @@ export class ProfilePageComponent implements OnInit {
               private authorizationService: AuthorizationDataService,
               private configurationService: ConfigurationDataService,
               public dsoNameService: DSONameService,
+              private paginationService: PaginationService,
   ) {
   }
 
@@ -142,7 +159,18 @@ export class ProfilePageComponent implements OnInit {
       getRemoteDataPayload(),
       tap((user: EPerson) => this.currentUser = user),
     );
-    this.groupsRD$ = this.user$.pipe(switchMap((user: EPerson) => user.groups));
+    this.groupsRD$ = this.paginationService.getCurrentPagination(this.optionsGroupsPagination.id, this.optionsGroupsPagination).pipe(
+      switchMap((pageOptions: PaginationComponentOptions) => {
+        return this.epersonService.findById(this.currentUser.id, true, true, followLink('groups',{
+          findListOptions: {
+            elementsPerPage: pageOptions.pageSize,
+            currentPage: pageOptions.currentPage,
+          } }));
+      }),
+      getAllCompletedRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((user: EPerson) => user?.groups),
+    );
     this.canChangePassword$ = this.user$.pipe(switchMap((user: EPerson) => this.authorizationService.isAuthorized(FeatureID.CanChangePassword, user._links.self.href)));
     this.specialGroupsRD$ = this.authService.getSpecialGroupsFromAuthStatus();
 
@@ -188,7 +216,8 @@ export class ProfilePageComponent implements OnInit {
    */
   updateSecurity() {
     const passEntered = isNotEmpty(this.password);
-    if (this.invalidSecurity) {
+    const validCurrentPassword = isNotEmpty(this.currentPassword);
+    if (validCurrentPassword && !passEntered) {
       this.notificationsService.error(this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'error.general'));
     }
     if (!this.invalidSecurity && passEntered) {
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
index 02bb9d4ca9..29a84b80ea 100644
--- a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 
 import { QualityAssuranceEventsComponent } from '../../notifications/qa/events/quality-assurance-events.component';
@@ -12,7 +12,7 @@ describe('QualityAssuranceEventsPageComponent', () => {
   let component: QualityAssuranceEventsPageComponent;
   let fixture: ComponentFixture<QualityAssuranceEventsPageComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [QualityAssuranceEventsPageComponent],
       schemas: [NO_ERRORS_SCHEMA],
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
index 7445863fd5..981bd5fa33 100644
--- a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
@@ -1,8 +1,8 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
-  async,
   ComponentFixture,
   TestBed,
+  waitForAsync,
 } from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 
@@ -14,7 +14,7 @@ describe('QualityAssuranceTopicsPageComponent', () => {
   let component: QualityAssuranceTopicsPageComponent;
   let fixture: ComponentFixture<QualityAssuranceTopicsPageComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [QualityAssuranceTopicsPageComponent],
       providers: [
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index d90638bb11..8171565766 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -1,66 +1,77 @@
 <div class="container">
-    <h1>{{MESSAGE_PREFIX + '.header'|translate}}</h1>
-    <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
+  <h1>{{MESSAGE_PREFIX + '.header'|translate}}</h1>
+  <p>{{MESSAGE_PREFIX + '.info' | translate}}</p>
 
-    <p *ngIf="validMailDomains.length !== 0 && typeRequest === TYPE_REQUEST_REGISTER">
+  @if (validMailDomains.length !== 0 && typeRequest === TYPE_REQUEST_REGISTER) {
+    <p>
       {{ MESSAGE_PREFIX + '.info.maildomain' | translate}} {{ validMailDomains.join(', ')}}
     </p>
+  }
 
-    <form [class]="'ng-invalid'" [formGroup]="form">
-
-        <div class="form-group">
-            <div class="row">
-                <div class="col-12">
-                    <label class="font-weight-bold"
-                           for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
-                    <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
-                           type="text" id="email" formControlName="email"
-                           [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
-                           [attr.aria-describedby]="(!email.errors) ? '' : (email.errors.required ? 'email-errors-required' : 'email-error-not-valid')"
-                           [attr.aria-invalid]="email.invalid"/>
-                    <div *ngIf="email.invalid && (email.dirty || email.touched)"
-                         class="invalid-feedback show-feedback">
-                    <span *ngIf="email.errors && email.errors.required" id="email-errors-required">
-                        {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
-                    </span>
-                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)" id="email-error-not-valid">
-                        {{ MESSAGE_PREFIX + '.email.error.not-email-form' | translate }}
-                        <ng-container *ngIf="validMailDomains.length > 0">
-                          {{ MESSAGE_PREFIX + '.email.error.not-valid-domain' | translate: { domains: validMailDomains.join(', ') } }}
-                        </ng-container>
-                    </span>
-                    </div>
-                </div>
-                <div class="col-12">
-                    {{MESSAGE_PREFIX + '.email.hint' |translate}}
-                </div>
+  <form [class]="'ng-invalid'" [formGroup]="form">
 
+    <div class="mb-3">
+      <div class="row">
+        <div class="col-12">
+          <label class="fw-bold form-label"
+          for="email">{{MESSAGE_PREFIX + '.email' | translate}}</label>
+          <input [className]="(email.invalid) && (email.dirty || email.touched) ? 'form-control is-invalid' :'form-control'"
+            type="text" id="email" formControlName="email"
+            [attr.aria-label]="MESSAGE_PREFIX + '.aria.label' | translate"
+            [attr.aria-describedby]="(!email.errors) ? '' : (email.errors.required ? 'email-errors-required' : 'email-error-not-valid')"
+            [attr.aria-invalid]="email.invalid"/>
+          @if (email.invalid && (email.dirty || email.touched)) {
+            <div
+              class="invalid-feedback show-feedback">
+              @if (email.errors && email.errors.required) {
+                <span id="email-errors-required">
+                  {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
+                </span>
+              }
+              @if (email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)) {
+                <span id="email-error-not-valid">
+                  {{ MESSAGE_PREFIX + '.email.error.not-email-form' | translate }}
+                  @if (validMailDomains.length > 0) {
+                    {{ MESSAGE_PREFIX + '.email.error.not-valid-domain' | translate: { domains: validMailDomains.join(', ') } }}
+                  }
+                </span>
+              }
             </div>
-
+          }
+        </div>
+        <div class="col-12">
+          {{MESSAGE_PREFIX + '.email.hint' |translate}}
         </div>
 
-    <ds-alert [type]="AlertTypeEnum.Warning" *ngIf="registrationVerification && !isRecaptchaCookieAccepted()">
-      <p class="m-0" [innerHTML]="MESSAGE_PREFIX + '.google-recaptcha.must-accept-cookies' | translate"></p>
-      <p class="m-0"><a href="javascript:void(0);" (click)="this.orejimeService.showSettings()">{{ MESSAGE_PREFIX + '.google-recaptcha.open-cookie-settings' | translate }}</a></p>
-    </ds-alert>
+      </div>
 
-    <div class="my-3" *ngIf="isRecaptchaCookieAccepted() && (googleRecaptchaService.captchaVersion() | async) === 'v2'">
-      <ds-google-recaptcha [captchaMode]="(googleRecaptchaService.captchaMode() | async)"
-                           (executeRecaptcha)="register($event)" (checkboxChecked)="onCheckboxChecked($event)"
-                           (showNotification)="showNotification($event)"></ds-google-recaptcha>
     </div>
 
-    <ng-container *ngIf="(!registrationVerification  || ((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible')); else v2Invisible">
-      <button class="btn btn-primary" [disabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
-        {{ MESSAGE_PREFIX + '.submit' | translate }}
-      </button>
-    </ng-container>
+    @if (registrationVerification && !isRecaptchaCookieAccepted()) {
+      <ds-alert [type]="AlertTypeEnum.Warning">
+        <p class="m-0" [innerHTML]="MESSAGE_PREFIX + '.google-recaptcha.must-accept-cookies' | translate"></p>
+        <p class="m-0"><a href="javascript:void(0);" (click)="this.orejimeService.showSettings()">{{ MESSAGE_PREFIX + '.google-recaptcha.open-cookie-settings' | translate }}</a></p>
+      </ds-alert>
+    }
 
-    <ng-template #v2Invisible>
-      <button class="btn btn-primary" [disabled]="form.invalid" (click)="executeRecaptcha()">
+    @if (isRecaptchaCookieAccepted() && (googleRecaptchaService.captchaVersion() | async) === 'v2') {
+      <div class="my-3">
+        <ds-google-recaptcha [captchaMode]="(googleRecaptchaService.captchaMode() | async)"
+          (executeRecaptcha)="register($event)" (checkboxChecked)="onCheckboxChecked($event)"
+        (showNotification)="showNotification($event)"></ds-google-recaptcha>
+      </div>
+    }
+
+    @if ((!registrationVerification  || ((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible'))) {
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
-    </ng-template>
-    </form>
+    } @else {
+      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid" (click)="executeRecaptcha()">
+        {{ MESSAGE_PREFIX + '.submit' | translate }}
+      </button>
+    }
+
+  </form>
 
 </div>
diff --git a/src/app/register-email-form/register-email-form.component.ts b/src/app/register-email-form/register-email-form.component.ts
index d96de8461b..ca9a0e8ded 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -54,6 +51,7 @@ import {
 import { Registration } from '../core/shared/registration.model';
 import { AlertComponent } from '../shared/alert/alert.component';
 import { AlertType } from '../shared/alert/alert-type';
+import { BtnDisabledDirective } from '../shared/btn-disabled.directive';
 import { OrejimeService } from '../shared/cookies/orejime.service';
 import { isNotEmpty } from '../shared/empty.util';
 import { GoogleRecaptchaComponent } from '../shared/google-recaptcha/google-recaptcha.component';
@@ -66,7 +64,7 @@ export const TYPE_REQUEST_REGISTER = 'register';
   selector: 'ds-base-register-email-form',
   templateUrl: './register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component responsible to render an email registration form.
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index dd9528925a..987863ef27 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -1,91 +1,94 @@
-<div class="container" *ngIf="(registration$ |async)">
+@if ((registration$ |async)) {
+  <div class="container">
     <h3 class="mb-4">{{'register-page.create-profile.header' | translate}}</h3>
     <div class="card mb-4">
-        <div class="card-header">{{'register-page.create-profile.identification.header' | translate}}</div>
-        <div class="card-body">
-            <div class="row">
+      <div class="card-header">{{'register-page.create-profile.identification.header' | translate}}</div>
+      <div class="card-body">
+        <div class="row">
+          <div class="col-12">
+            <label class="fw-bold form-label me-4"
+            for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
+            <span id="email">{{(registration$ |async).email}}</span></div>
+          </div>
+          <form [class]="'ng-invalid'" [formGroup]="userInfoForm" (ngSubmit)="submitEperson()">
+            <div class="mb-3">
+              <div class="row">
                 <div class="col-12">
-                    <label class="font-weight-bold mr-4"
-                           for="email">{{'register-page.create-profile.identification.email' | translate}}</label>
-                    <span id="email">{{(registration$ |async).email}}</span></div>
-            </div>
-            <form [class]="'ng-invalid'" [formGroup]="userInfoForm" (ngSubmit)="submitEperson()">
-
-                <div class="form-group">
-                    <div class="row">
-                        <div class="col-12">
-                            <label for="firstName">{{'register-page.create-profile.identification.first-name' | translate}}</label>
-                            <input [className]="(firstName.invalid) && (firstName.dirty || firstName.touched) ? 'form-control is-invalid' :'form-control'"
-                                   type="text" id="firstName" formControlName="firstName"/>
-                            <div *ngIf="firstName.invalid && (firstName.dirty || firstName.touched)"
-                                 class="invalid-feedback show-feedback">
-                    <span *ngIf="firstName.errors && firstName.errors.required">
-                        {{ 'register-page.create-profile.identification.first-name.error' | translate }}
-                    </span>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="row">
-                        <div class="col-12">
-                            <label
-                                    for="lastName">{{'register-page.create-profile.identification.last-name' | translate}}</label>
-                            <input
-                                    [className]="(lastName.invalid) && (lastName.dirty || lastName.touched) ? 'form-control is-invalid' :'form-control'"
-                                    id="lastName" formControlName="lastName">
-                            <div *ngIf="lastName.invalid && (lastName.dirty || lastName.touched)"
-                                 class="invalid-feedback show-feedback">
-                    <span *ngIf="lastName.errors && lastName.errors.required">
-                        {{ 'register-page.create-profile.identification.last-name.error' | translate }}
-                    </span>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-12">
-                            <label
-                                    for="contactPhone">{{'register-page.create-profile.identification.contact' | translate}}</label>
-                            <input class="form-control" id="contactPhone" formControlName="contactPhone">
-                        </div>
-                    </div>
-                    <div class="row">
-                        <div class="col-12">
-                            <label
-                                    for="language">{{'register-page.create-profile.identification.language' |translate}}</label>
-
-                            <select id="language" formControlName="language" class="form-control">
-                                <option [value]="''"></option>
-                                <option *ngFor="let lang of activeLangs" [value]="lang.code">{{lang.label}}</option>
-                            </select>
-                        </div>
+                  <label for="firstName" class="form-label">{{'register-page.create-profile.identification.first-name' | translate}}</label>
+                  <input [className]="(firstName.invalid) && (firstName.dirty || firstName.touched) ? 'form-control is-invalid' :'form-control'"
+                    type="text" id="firstName" formControlName="firstName"/>
+                  @if (firstName.invalid && (firstName.dirty || firstName.touched)) {
+                    <div
+                      class="invalid-feedback show-feedback">
+                      @if (firstName.errors && firstName.errors.required) {
+                        <span>
+                          {{ 'register-page.create-profile.identification.first-name.error' | translate }}
+                        </span>
+                      }
                     </div>
+                  }
                 </div>
-            </form>
+              </div>
+              <div class="row">
+                <div class="col-12">
+                  <label
+                  for="lastName" class="form-label">{{'register-page.create-profile.identification.last-name' | translate}}</label>
+                  <input
+                    [className]="(lastName.invalid) && (lastName.dirty || lastName.touched) ? 'form-control is-invalid' :'form-control'"
+                    id="lastName" formControlName="lastName">
+                  @if (lastName.invalid && (lastName.dirty || lastName.touched)) {
+                    <div
+                      class="invalid-feedback show-feedback">
+                      @if (lastName.errors && lastName.errors.required) {
+                        <span>
+                          {{ 'register-page.create-profile.identification.last-name.error' | translate }}
+                        </span>
+                      }
+                    </div>
+                  }
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-12">
+                  <label class="form-label"
+                  for="contactPhone">{{'register-page.create-profile.identification.contact' | translate}}</label>
+                  <input class="form-control" id="contactPhone" formControlName="contactPhone">
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-12">
+                  <label class="form-label"
+                  for="language">{{'register-page.create-profile.identification.language' |translate}}</label>
+                  <select id="language" formControlName="language" class="form-select">
+                    <option [value]="''"></option>
+                    @for (lang of activeLangs; track lang) {
+                      <option [value]="lang.code">{{lang.label}}</option>
+                    }
+                  </select>
+                </div>
+              </div>
+            </div>
+          </form>
         </div>
-    </div>
-
-    <div class="card mb-4">
+      </div>
+      <div class="card mb-4">
         <div class="card-header">{{'register-page.create-profile.security.header' | translate}}</div>
         <div class="card-body">
-
-            <ds-profile-page-security-form
-                    [passwordCanBeEmpty]="false"
-                    [FORM_PREFIX]="'register-page.create-profile.security.'"
-                    (isInvalid)="setInValid($event)"
-                    (passwordValue)="setPasswordValue($event)"
-            ></ds-profile-page-security-form>
+          <ds-profile-page-security-form
+            [passwordCanBeEmpty]="false"
+            [FORM_PREFIX]="'register-page.create-profile.security.'"
+            (isInvalid)="setInValid($event)"
+            (passwordValue)="setPasswordValue($event)"
+          ></ds-profile-page-security-form>
         </div>
-    </div>
-
-
-    <div class="row">
+      </div>
+      <div class="row">
         <div class="col-12">
-            <button
-                    [disabled]="isInValidPassword || userInfoForm.invalid"
-                    class="btn btn-default btn-primary"
-                    (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
+          <button
+            [dsBtnDisabled]="isInValidPassword || userInfoForm.invalid"
+            class="btn btn-default btn-primary"
+          (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
         </div>
+      </div>
     </div>
-
-
-</div>
+  }
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index 7e88c5a1c0..e1c523427a 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -43,6 +39,7 @@ import {
 } from '../../core/shared/operators';
 import { Registration } from '../../core/shared/registration.model';
 import { ProfilePageSecurityFormComponent } from '../../profile-page/profile-page-security-form/profile-page-security-form.component';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { isEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 
@@ -56,10 +53,9 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
   imports: [
     ProfilePageSecurityFormComponent,
     TranslateModule,
-    NgIf,
     AsyncPipe,
     ReactiveFormsModule,
-    NgForOf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
index b00bc079dd..8fa823d455 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
@@ -1,9 +1,12 @@
 <div class="container" *ngVar="(itemRequestRD$ | async) as itemRequestRD">
   <h3 class="mb-4">{{'deny-request-copy.header' | translate}}</h3>
-  <div *ngIf="itemRequestRD && itemRequestRD.hasSucceeded">
-    <p>{{'deny-request-copy.intro' | translate}}</p>
-
-    <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="deny($event)"></ds-email-request-copy>
-  </div>
-  <ds-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-loading>
+  @if (itemRequestRD && itemRequestRD.hasSucceeded) {
+    <div>
+      <p>{{'deny-request-copy.intro' | translate}}</p>
+      <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="deny($event)"></ds-email-request-copy>
+    </div>
+  }
+  @if (!itemRequestRD || itemRequestRD?.isLoading) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
index 7d87755f9e..745516ea66 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -48,7 +45,7 @@ import { ThemedEmailRequestCopyComponent } from '../email-request-copy/themed-em
   styleUrls: ['./deny-request-copy.component.scss'],
   templateUrl: './deny-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ThemedEmailRequestCopyComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ThemedEmailRequestCopyComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component for denying an item request
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 286e87554b..50e3e73470 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -1,26 +1,28 @@
 <form>
-  <div class="form-group">
-    <label for="subject">{{ 'grant-deny-request-copy.email.subject' | translate }}</label>
+  <div class="mb-3">
+    <label for="subject" class="form-label">{{ 'grant-deny-request-copy.email.subject' | translate }}</label>
     <input type="text" class="form-control" id="subject" [ngClass]="{'is-invalid': !subject || subject.length === 0}" [(ngModel)]="subject" name="subject">
-    <div *ngIf="!subject || subject.length === 0" class="invalid-feedback">
-      {{ 'grant-deny-request-copy.email.subject.empty' | translate }}
-    </div>
+    @if (!subject || subject.length === 0) {
+      <div class="invalid-feedback">
+        {{ 'grant-deny-request-copy.email.subject.empty' | translate }}
+      </div>
+    }
   </div>
-  <div class="form-group">
-    <label for="message">{{ 'grant-deny-request-copy.email.message' | translate }}</label>
+  <div class="mb-3">
+    <label for="message" class="form-label">{{ 'grant-deny-request-copy.email.message' | translate }}</label>
     <textarea class="form-control" id="message" rows="8" [(ngModel)]="message" name="message"></textarea>
   </div>
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [disabled]="!subject || subject.length === 0"
-            class="btn btn-primary"
-            title="{{'grant-deny-request-copy.email.send' | translate }}">
+      [dsBtnDisabled]="!subject || subject.length === 0"
+      class="btn btn-primary"
+      title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{'grant-deny-request-copy.email.send' | translate }}
     </button>
     <button (click)="return()"
-            class="btn btn-outline-secondary mr-1"
-            title="{{'grant-deny-request-copy.email.back' | translate }}">
+      class="btn btn-outline-secondary me-1"
+      title="{{'grant-deny-request-copy.email.back' | translate }}">
       <i class="fas fa-arrow-left"></i> {{'grant-deny-request-copy.email.back' | translate }}
     </button>
   </div>
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
index 66a9e0b17f..fc9d42aa60 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -1,7 +1,6 @@
 import {
   Location,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -12,6 +11,7 @@ import {
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import { RequestCopyEmail } from './request-copy-email.model';
 
 
@@ -20,7 +20,7 @@ import { RequestCopyEmail } from './request-copy-email.model';
   styleUrls: ['./email-request-copy.component.scss'],
   templateUrl: './email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule],
+  imports: [FormsModule, NgClass, TranslateModule, BtnDisabledDirective],
 })
 /**
  * A form component for an email to send back to the user requesting an item
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
index 37b275d8f8..2b15f577f8 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.html
@@ -1,30 +1,36 @@
 <div class="container" *ngVar="(itemRequestRD$ | async) as itemRequestRD">
   <h3 class="mb-4">{{'grant-deny-request-copy.header' | translate}}</h3>
-  <div *ngIf="itemRequestRD && itemRequestRD.hasSucceeded">
-    <div *ngIf="!itemRequestRD.payload.decisionDate">
-      <p [innerHTML]="'grant-deny-request-copy.intro1' | translate:{ url: (itemUrl$ | async), name: (itemName$ | async) }"></p>
-      <p>{{'grant-deny-request-copy.intro2' | translate}}</p>
-
-      <div class="btn-group ">
-        <a [routerLink]="grantRoute$ | async"
-           class="btn btn-outline-primary"
-           title="{{'grant-deny-request-copy.grant' | translate }}">
-          {{'grant-deny-request-copy.grant' | translate }}
-        </a>
-
-        <a [routerLink]="denyRoute$ | async"
-           class="btn btn-outline-danger"
-           title="{{'grant-deny-request-copy.deny' | translate }}">
-          {{'grant-deny-request-copy.deny' | translate }}
-        </a>
-      </div>
+  @if (itemRequestRD && itemRequestRD.hasSucceeded) {
+    <div>
+      @if (!itemRequestRD.payload.decisionDate) {
+        <div>
+          <p [innerHTML]="'grant-deny-request-copy.intro1' | translate:{ url: (itemUrl$ | async), name: (itemName$ | async) }"></p>
+          <p>{{'grant-deny-request-copy.intro2' | translate}}</p>
+          <div class="btn-group ">
+            <a [routerLink]="grantRoute$ | async"
+              class="btn btn-outline-primary"
+              title="{{'grant-deny-request-copy.grant' | translate }}">
+              {{'grant-deny-request-copy.grant' | translate }}
+            </a>
+            <a [routerLink]="denyRoute$ | async"
+              class="btn btn-outline-danger"
+              title="{{'grant-deny-request-copy.deny' | translate }}">
+              {{'grant-deny-request-copy.deny' | translate }}
+            </a>
+          </div>
+        </div>
+      }
+      @if (itemRequestRD.payload.decisionDate) {
+        <div class="processed-message">
+          <p>{{'grant-deny-request-copy.processed' | translate}}</p>
+          <p class="text-center">
+            <a routerLink="/home" class="btn btn-primary">{{'grant-deny-request-copy.home-page' | translate}}</a>
+          </p>
+        </div>
+      }
     </div>
-    <div *ngIf="itemRequestRD.payload.decisionDate" class="processed-message">
-      <p>{{'grant-deny-request-copy.processed' | translate}}</p>
-      <p class="text-center">
-        <a routerLink="/home" class="btn btn-primary">{{'grant-deny-request-copy.home-page' | translate}}</a>
-      </p>
-    </div>
-  </div>
-  <ds-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-loading>
+  }
+  @if (!itemRequestRD || itemRequestRD?.isLoading) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
index 101b462914..53ec4b7eec 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -42,7 +39,7 @@ import {
   styleUrls: ['./grant-deny-request-copy.component.scss'],
   templateUrl: './grant-deny-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, RouterLink, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, RouterLink, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component for an author to decide to grant or deny an item request
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
index d2c2cfc3c8..c85f9005b6 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
@@ -1,17 +1,20 @@
 <div class="container" *ngVar="(itemRequestRD$ | async) as itemRequestRD">
   <h3 class="mb-4">{{'grant-request-copy.header' | translate}}</h3>
-  <div *ngIf="itemRequestRD && itemRequestRD.hasSucceeded">
-    <p>{{'grant-request-copy.intro' | translate}}</p>
-
-    <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="grant($event)">
-      <p>{{ 'grant-deny-request-copy.email.permissions.info' | translate }}</p>
-      <form class="mb-3">
-        <div class="form-check">
-          <input class="form-check-input" type="checkbox" value="" id="permissions" [(ngModel)]="suggestOpenAccess" name="permissions">
-          <label class="form-check-label" for="permissions">{{ 'grant-deny-request-copy.email.permissions.label' | translate }}</label>
-        </div>
-      </form>
-    </ds-email-request-copy>
-  </div>
-  <ds-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-loading>
+  @if (itemRequestRD && itemRequestRD.hasSucceeded) {
+    <div>
+      <p>{{'grant-request-copy.intro' | translate}}</p>
+      <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="grant($event)">
+        <p>{{ 'grant-deny-request-copy.email.permissions.info' | translate }}</p>
+        <form class="mb-3">
+          <div class="form-check">
+            <input class="form-check-input" type="checkbox" value="" id="permissions" [(ngModel)]="suggestOpenAccess" name="permissions">
+            <label class="form-check-label" for="permissions">{{ 'grant-deny-request-copy.email.permissions.label' | translate }}</label>
+          </div>
+        </form>
+      </ds-email-request-copy>
+    </div>
+  }
+  @if (!itemRequestRD || itemRequestRD?.isLoading) {
+    <ds-loading></ds-loading>
+  }
 </div>
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
index b14f15f34b..4a71226919 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -41,7 +38,7 @@ import { ThemedEmailRequestCopyComponent } from '../email-request-copy/themed-em
   styleUrls: ['./grant-request-copy.component.scss'],
   templateUrl: './grant-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ThemedEmailRequestCopyComponent, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ThemedEmailRequestCopyComponent, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component for granting an item request
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index 1fb9f786b4..91cb236abe 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -13,9 +13,11 @@
     <ds-breadcrumbs></ds-breadcrumbs>
     <main class="my-cs" id="main-content">
 
-      <div class="container d-flex justify-content-center align-items-center h-100" *ngIf="shouldShowRouteLoader">
-        <ds-loading [showMessage]="false"></ds-loading>
-      </div>
+      @if (shouldShowRouteLoader) {
+        <div class="container d-flex justify-content-center align-items-center h-100">
+          <ds-loading [showMessage]="false"></ds-loading>
+        </div>
+      }
       <div [class.d-none]="shouldShowRouteLoader">
         <router-outlet></router-outlet>
       </div>
@@ -28,8 +30,10 @@
 <ds-notifications-board [options]="notificationOptions">
 </ds-notifications-board>
 
-<div class="ds-full-screen-loader" *ngIf="shouldShowFullscreenLoader">
-  <ds-loading [showMessage]="false"></ds-loading>
-</div>
+@if (shouldShowFullscreenLoader) {
+  <div class="ds-full-screen-loader">
+    <ds-loading [showMessage]="false"></ds-loading>
+  </div>
+}
 
 <ds-live-region></ds-live-region>
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index b5c1c9be48..69cc73547a 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -61,7 +60,6 @@ import { SystemWideAlertBannerComponent } from '../system-wide-alert/alert-banne
     SystemWideAlertBannerComponent,
     ThemedHeaderNavbarWrapperComponent,
     ThemedBreadcrumbsComponent,
-    NgIf,
     NgClass,
     ThemedLoadingComponent,
     RouterOutlet,
diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
index e9b5f285fb..a13abcdf53 100644
--- a/src/app/search-navbar/search-navbar.component.html
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -3,7 +3,7 @@
     <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
       <input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"
              formControlName="query" type="text" placeholder="{{searchExpanded ? ('nav.search' | translate) : ''}}"
-             class="bg-transparent position-absolute form-control dropdown-menu-right pl-1 pr-4"
+             class="d-inline-block bg-transparent position-absolute form-control dropdown-menu-right p1"
              [class.display]="searchExpanded ? 'inline-block' : 'none'"
              [tabIndex]="searchExpanded ? 0 : -1"
              [attr.data-test]="'header-search-box' | dsBrowserOnly">
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index a276482b53..965cebfb3c 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -1,7 +1,8 @@
 input[type="text"] {
-  margin-top: calc(-0.5 * var(--bs-font-size-base));
+  margin-top: calc(-0.3 * var(--bs-font-size-base));
   background-color: #fff !important;
   border-color: var(--ds-header-icon-color);
+  right: 0;
 
   &.collapsed {
     opacity: 0;
diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
index afbe34d550..61d7776594 100644
--- a/src/app/search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -1,12 +1,12 @@
 import {
   AsyncPipe,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
   Inject,
+  PLATFORM_ID,
 } from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -46,7 +46,7 @@ import { ViewModeSwitchComponent } from '../shared/view-mode-switch/view-mode-sw
     },
   ],
   standalone: true,
-  imports: [NgIf, NgTemplateOutlet, PageWithSidebarComponent, ViewModeSwitchComponent, ThemedSearchResultsComponent, ThemedSearchSidebarComponent, ThemedSearchFormComponent, SearchLabelsComponent, AsyncPipe, TranslateModule],
+  imports: [NgTemplateOutlet, PageWithSidebarComponent, ViewModeSwitchComponent, ThemedSearchResultsComponent, ThemedSearchSidebarComponent, ThemedSearchFormComponent, SearchLabelsComponent, AsyncPipe, TranslateModule],
 })
 
 export class ConfigurationSearchPageComponent extends SearchComponent {
@@ -57,7 +57,8 @@ export class ConfigurationSearchPageComponent extends SearchComponent {
               protected routeService: RouteService,
               protected router: Router,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
   ) {
-    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig);
+    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig, platformId);
   }
 }
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
index 2ec3b51219..1c1aec7a76 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -1,14 +1,15 @@
 <form #ngForm="ngForm">
-  <div *ngIf="showWarning" class="alert alert-warning">
-    {{'access-control-no-access-conditions-warning-message' | translate}}
-  </div>
+  @if (showWarning) {
+    <div class="alert alert-warning">
+      {{'access-control-no-access-conditions-warning-message' | translate}}
+    </div>
+  }
 
-  <ng-container *ngFor="let control of form.accessControls; trackBy: trackById">
+  @for (control of form.accessControls; track trackById($index, control)) {
     <div ngModelGroup="access-control-item-{{control.id}}" class="access-control-item mt-3">
-
       <div class="d-flex flex-column">
         <div>
-          <label for="accesscontroloption-{{control.id}}">
+          <label class="form-label" for="accesscontroloption-{{control.id}}">
             {{'access-control-option-label' | translate}}
           </label>
           <select
@@ -17,94 +18,96 @@
             [(ngModel)]="control.itemName"
             (ngModelChange)="accessControlChanged(control, $event)"
             name="itemName-{{control.id}}"
-            class="form-control">
+            class="form-select">
             <option value=""></option>
-            <option *ngFor="let option of dropdownOptions" [value]="option.name">
-              {{ option.name }}
-            </option>
+            @for (option of dropdownOptions; track option) {
+              <option [value]="option.name">
+                {{ option.name }}
+              </option>
+            }
           </select>
           <small class="form-text text-muted">
             {{'access-control-option-note' | translate}}
           </small>
         </div>
-
-        <div *ngIf="control.hasStartDate" class="mt-3">
-          <label for="accesscontrolstartdate-{{control.id}}">
-            {{'access-control-option-start-date' | translate}}
-          </label>
-          <div class="input-group">
-            <input
-              id="accesscontrolstartdate-{{control.id}}"
-              class="form-control"
-              placeholder="yyyy-mm-dd"
-              [(ngModel)]="control.startDate"
-              name="startDate-{{control.id}}"
-              [maxDate]="control.maxStartDate | toDate"
-              ngbDatepicker
-              placement="top-start top-end bottom-start bottom-end"
-              #d="ngbDatepicker"
-            />
-            <div class="input-group-append">
-              <button
-                class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
-                (click)="d.toggle()" type="button">
-              </button>
+        @if (control.hasStartDate) {
+          <div class="mt-3">
+            <label class="form-label" for="accesscontrolstartdate-{{control.id}}">
+              {{'access-control-option-start-date' | translate}}
+            </label>
+            <div class="input-group">
+              <input
+                id="accesscontrolstartdate-{{control.id}}"
+                class="form-control"
+                placeholder="yyyy-mm-dd"
+                [(ngModel)]="control.startDate"
+                name="startDate-{{control.id}}"
+                [maxDate]="control.maxStartDate | toDate"
+                ngbDatepicker
+                placement="top-start top-end bottom-start bottom-end"
+                #d="ngbDatepicker"
+                />
+              <div class="input-group-append">
+                <button
+                  class="btn btn-outline-secondary fas fa-calendar"
+                  [dsBtnDisabled]="ngForm.disabled"
+                  (click)="d.toggle()" type="button">
+                </button>
+              </div>
             </div>
+            <small class="form-text text-muted">
+              {{'access-control-option-start-date-note' | translate}}
+            </small>
           </div>
-          <small class="form-text text-muted">
-            {{'access-control-option-start-date-note' | translate}}
-          </small>
-        </div>
-
-        <div *ngIf="control.hasEndDate" class="mt-3">
-          <label for="accesscontrolenddate-{{control.id}}">
-            {{'access-control-option-end-date' | translate}}
-          </label>
-          <div class="input-group">
-            <input
-              id="accesscontrolenddate-{{control.id}}"
-              class="form-control"
-              placeholder="yyyy-mm-dd"
-              [(ngModel)]="control.endDate"
-              name="endDate-{{control.id}}"
-              [maxDate]="control.maxEndDate | toDate"
-              ngbDatepicker
-              placement="top-start top-end bottom-start bottom-end"
-              #d1="ngbDatepicker"
-            />
-            <div class="input-group-append">
-              <button
-                type="button" class="btn btn-outline-secondary fas fa-calendar"
-                [disabled]="ngForm.disabled"
-                (click)="d1.toggle()">
-              </button>
+        }
+        @if (control.hasEndDate) {
+          <div class="mt-3">
+            <label class="form-label" for="accesscontrolenddate-{{control.id}}">
+              {{'access-control-option-end-date' | translate}}
+            </label>
+            <div class="input-group">
+              <input
+                id="accesscontrolenddate-{{control.id}}"
+                class="form-control"
+                placeholder="yyyy-mm-dd"
+                [(ngModel)]="control.endDate"
+                name="endDate-{{control.id}}"
+                [maxDate]="control.maxEndDate | toDate"
+                ngbDatepicker
+                placement="top-start top-end bottom-start bottom-end"
+                #d1="ngbDatepicker"
+                />
+              <div class="input-group-append">
+                <button
+                  type="button" class="btn btn-outline-secondary fas fa-calendar"
+                  [dsBtnDisabled]="ngForm.disabled"
+                  (click)="d1.toggle()">
+                </button>
+              </div>
             </div>
+            <small class="form-text text-muted">
+              {{'access-control-option-end-date-note' | translate}}
+            </small>
           </div>
-          <small class="form-text text-muted">
-            {{'access-control-option-end-date-note' | translate}}
-          </small>
-        </div>
+        }
       </div>
-
       <div>
         <span aria-hidden="true" class="mb-2 d-inline-block">&nbsp;</span>
         <div class="input-group">
-
           <button type="button" class="btn btn-outline-danger"
-                  [attr.aria-label]="'access-control-remove' | translate"
-                  [disabled]="ngForm.disabled || form.accessControls.length === 1"
-                  (click)="removeAccessControlItem(control.id)">
+            [attr.aria-label]="'access-control-remove' | translate"
+            [dsBtnDisabled]="ngForm.disabled || form.accessControls.length === 1"
+            (click)="removeAccessControlItem(control.id)">
             <i class="fas fa-trash"></i>
           </button>
         </div>
       </div>
     </div>
-  </ng-container>
+  }
 
   <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
-          [disabled]="ngForm.disabled"
-          (click)="addAccessControlItem()">
+    [dsBtnDisabled]="ngForm.disabled"
+    (click)="addAccessControlItem()">
     <i class="fas fa-plus"></i>
     {{'access-control-add-more' | translate}}
   </button>
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
index dc6fe4d297..10366446f6 100644
--- a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -16,6 +13,7 @@ import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { dateToISOFormat } from '../../date.util';
 import { ToDatePipe } from './to-date.pipe';
 
@@ -25,7 +23,7 @@ import { ToDatePipe } from './to-date.pipe';
   styleUrls: ['./access-control-array-form.component.scss'],
   exportAs: 'accessControlArrayForm',
   standalone: true,
-  imports: [FormsModule, NgIf, NgFor, NgbDatepickerModule, TranslateModule, ToDatePipe],
+  imports: [FormsModule, NgbDatepickerModule, TranslateModule, ToDatePipe, BtnDisabledDirective],
 })
 export class AccessControlArrayFormComponent implements OnInit {
   @Input() dropdownOptions: AccessesConditionOption[] = [];
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.html b/src/app/shared/access-control-form-container/access-control-form-container.component.html
index ce0f5845c6..e4e43bafa9 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.html
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -1,19 +1,20 @@
 <div class="container">
   <div class="card border-0">
     <div class="card-body">
-      <ds-alert
-        *ngIf="titleMessage"
-        [type]="AlertType.Info"
-        [content]="titleMessage"
-        class="d-block pb-3">
-      </ds-alert>
+      @if (titleMessage) {
+        <ds-alert
+          [type]="AlertType.Info"
+          [content]="titleMessage"
+          class="d-block pb-3">
+        </ds-alert>
+      }
 
-      <div class="row">
-        <div class="col-12 col-md-6 border-right d-flex flex-column justify-content-between">
+      <div class="row mt-5">
+        <div class="col-12 col-md-6 border-end d-flex flex-column justify-content-between">
 
           <div>
             <div class="d-flex align-items-center">
-              <h2 class="h3 mb-0 mr-4">
+              <h2 class="h3 mb-0 me-4">
                 {{ 'access-control-item-header-toggle' | translate }}
               </h2>
               <ui-switch
@@ -30,18 +31,18 @@
               <div class="col-12 col-md-8">
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
-                         name="itemMode" id="itemReplace" value="replace"
-                         [disabled]="!state.item.toggleStatus"
-                         [(ngModel)]="state.item.accessMode">
+                    name="itemMode" id="itemReplace" value="replace"
+                    [disabled]="!state.item.toggleStatus"
+                    [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemReplace">
                     {{'access-control-replace-all' | translate}}
                   </label>
                 </div>
                 <div class="form-check">
                   <input class="form-check-input" type="radio"
-                         name="itemMode" id="itemAdd" value="add"
-                         [disabled]="!state.item.toggleStatus"
-                         [(ngModel)]="state.item.accessMode">
+                    name="itemMode" id="itemAdd" value="add"
+                    [disabled]="!state.item.toggleStatus"
+                    [(ngModel)]="state.item.accessMode">
                   <label class="form-check-label" for="itemAdd">
                     {{'access-control-add-to-existing' | translate}}
                   </label>
@@ -60,14 +61,12 @@
               [dropdownOptions]="(dropdownData$ | async)?.itemAccessConditionOptions || []">
             </ds-access-control-array-form>
           </div>
-
         </div>
 
         <div class="col-12 col-md-6 d-flex flex-column justify-content-between">
-
           <div>
             <div class="d-flex align-items-center">
-              <h2 class="h3 mb-0 mr-4">
+              <h2 class="h3 mb-0 me-4">
                 {{'access-control-bitstream-header-toggle' | translate}}
               </h2>
               <ui-switch
@@ -77,42 +76,43 @@
               </ui-switch>
             </div>
 
-            <div *ngIf="showLimitToSpecificBitstreams" class="row mt-3">
-            <fieldset class="col-12">
-              <legend class="h4">
-                {{'access-control-limit-to-specific' | translate}}
-              </legend>
-              <div class="form-check">
-                <input class="form-check-input" type="radio"
-                       name="changesLimit" id="processAll" value="all"
-                       [disabled]="!state.bitstream.toggleStatus"
-                       [(ngModel)]="state.bitstream.changesLimit">
-                <label class="form-check-label" for="processAll">
-                  {{'access-control-process-all-bitstreams' | translate}}
-                </label>
+            @if (showLimitToSpecificBitstreams) {
+              <div class="row mt-3">
+                <fieldset class="col-12">
+                  <legend class="h4">
+                    {{'access-control-limit-to-specific' | translate}}
+                  </legend>
+                  <div class="form-check">
+                    <input class="form-check-input" type="radio"
+                      name="changesLimit" id="processAll" value="all"
+                      [disabled]="!state.bitstream.toggleStatus"
+                      [(ngModel)]="state.bitstream.changesLimit">
+                    <label class="form-check-label" for="processAll">
+                      {{'access-control-process-all-bitstreams' | translate}}
+                    </label>
+                  </div>
+                  <div class="form-check">
+                    <input class="form-check-input mt-2" type="radio"
+                      name="changesLimit" id="processSelected" value="selected"
+                      [disabled]="!state.bitstream.toggleStatus"
+                      [(ngModel)]="state.bitstream.changesLimit">
+                    <label class="form-check-label" for="processSelected">
+                      {{ state.bitstream.selectedBitstreams.length }}
+                      {{'access-control-bitstreams-selected' | translate}}
+                      @if (itemRD) {
+                        <button
+                          [attr.aria-label]="'access-control-bitstreams-select' | translate"
+                          [dsBtnDisabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
+                          (click)="openSelectBitstreamsModal(itemRD.payload)"
+                          class="btn btn-outline-dark border-0" type="button">
+                          <i class="fa fa-search"></i>
+                        </button>
+                      }
+                    </label>
+                  </div>
+                </fieldset>
               </div>
-              <div class="form-check">
-                <input class="form-check-input mt-2" type="radio"
-                       name="changesLimit" id="processSelected" value="selected"
-                       [disabled]="!state.bitstream.toggleStatus"
-                       [(ngModel)]="state.bitstream.changesLimit">
-                <label class="form-check-label" for="processSelected">
-                  {{ state.bitstream.selectedBitstreams.length }}
-                  {{'access-control-bitstreams-selected' | translate}}
-
-                  <button
-                    *ngIf="itemRD"
-                    [attr.aria-label]="'access-control-bitstreams-select' | translate"
-                    [disabled]="!state.bitstream.toggleStatus || state.bitstream.changesLimit !== 'selected'"
-                    (click)="openSelectBitstreamsModal(itemRD.payload)"
-                    class="btn btn-outline-dark border-0" type="button">
-                    <i class="fa fa-search"></i>
-                  </button>
-
-                </label>
-              </div>
-            </fieldset>
-            </div>
+            }
           </div>
 
           <fieldset class="row mt-3">
@@ -122,18 +122,18 @@
             <div class="col-12 col-md-8">
               <div class="form-check">
                 <input class="form-check-input" type="radio"
-                       name="bitstreamMode" id="bitstreamReplace" value="replace"
-                       [disabled]="!state.bitstream.toggleStatus"
-                       [(ngModel)]="state.bitstream.accessMode">
+                  name="bitstreamMode" id="bitstreamReplace" value="replace"
+                  [disabled]="!state.bitstream.toggleStatus"
+                  [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamReplace">
                   {{'access-control-replace-all' | translate}}
                 </label>
               </div>
               <div class="form-check">
                 <input class="form-check-input" type="radio"
-                       name="bitstreamMode" id="bitstreamAdd" value="add"
-                       [disabled]="!state.bitstream.toggleStatus"
-                       [(ngModel)]="state.bitstream.accessMode">
+                  name="bitstreamMode" id="bitstreamAdd" value="add"
+                  [disabled]="!state.bitstream.toggleStatus"
+                  [(ngModel)]="state.bitstream.accessMode">
                 <label class="form-check-label" for="bitstreamAdd">
                   {{'access-control-add-to-existing' | translate}}
                 </label>
@@ -154,18 +154,22 @@
         </div>
       </div>
 
-      <hr *ngIf="showSubmit">
+      @if (showSubmit) {
+        <hr>
+        }
 
-      <div *ngIf="showSubmit" class="d-flex justify-content-end">
-        <button class="btn btn-outline-primary mr-3" (click)="reset()" type="button">
-          {{ 'access-control-cancel' | translate }}
-        </button>
-        <button class="btn btn-primary"
-                [disabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
-                (click)="submit()" type="submit">
-          {{ 'access-control-execute' | translate }}
-        </button>
+        @if (showSubmit) {
+          <div class="d-flex justify-content-end">
+            <button class="btn btn-outline-primary me-3" (click)="reset()" type="button">
+              {{ 'access-control-cancel' | translate }}
+            </button>
+            <button class="btn btn-primary"
+              [dsBtnDisabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+              (click)="submit()" type="submit">
+              {{ 'access-control-execute' | translate }}
+            </button>
+          </div>
+        }
       </div>
     </div>
   </div>
-</div>
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.scss b/src/app/shared/access-control-form-container/access-control-form-container.component.scss
index e69de29bb2..ee06dd3e3f 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.scss
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.scss
@@ -0,0 +1,5 @@
+
+
+fieldset > legend.col-12.col-md-3 {
+  width: 100%;
+}
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
index 69368b16c5..0fc12a7889 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
@@ -32,10 +32,7 @@ describe('AccessControlFormContainerComponent', () => {
   @Component({
     selector: 'ds-ngb-modal', template: '',
     standalone: true,
-    imports: [CommonModule,
-      FormsModule,
-      NgbDatepickerModule,
-      UiSwitchModule],
+    imports: [FormsModule, NgbDatepickerModule, UiSwitchModule],
   })
   class MockNgbModalComponent {
   }
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
index 56a6e92323..515faabbac 100644
--- a/src/app/shared/access-control-form-container/access-control-form-container.component.ts
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -31,6 +28,7 @@ import { Item } from '../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { AlertComponent } from '../alert/alert.component';
 import { AlertType } from '../alert/alert-type';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
 import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
 import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
@@ -46,7 +44,7 @@ import {
   styleUrls: ['./access-control-form-container.component.scss'],
   exportAs: 'dsAccessControlForm',
   standalone: true,
-  imports: [NgIf, AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule],
+  imports: [AlertComponent, UiSwitchModule, FormsModule, AccessControlArrayFormComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class AccessControlFormContainerComponent<T extends DSpaceObject> implements OnDestroy {
 
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
index 8cf0ecea38..5773e9395a 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
@@ -2,34 +2,34 @@
   <h4 class="modal-title">
     {{'access-control-select-bitstreams-modal.title' | translate}}
   </h4>
-  <button type="button" class="close" aria-label="Close"
-          (click)="activeModal.dismiss('Cross click')">
-    <span aria-hidden="true">&times;</span>
+  <button type="button" class="btn-close" aria-label="Close"
+    (click)="activeModal.dismiss('Cross click')">
   </button>
 </div>
 <div class="modal-body">
-  <ng-container *ngIf="data$ | async as data">
-    <ds-viewable-collection
-      *ngIf="data.payload.page.length > 0"
-      [config]="paginationConfig"
-      [context]="context"
-      [objects]="data"
-      [selectable]="true"
-      [selectionConfig]="{ repeatable: true, listId: LIST_ID }"
-      [showPaginator]="true"
-      (pageChange)="loadForPage($event)">
-    </ds-viewable-collection>
-
-    <div *ngIf="data && data.payload.page.length === 0"
-      class="alert alert-info w-100" role="alert">
-      {{'access-control-select-bitstreams-modal.no-items' | translate}}
-    </div>
-
-  </ng-container>
+  @if (data$ | async; as data) {
+    @if (data.payload.page.length > 0) {
+      <ds-viewable-collection
+        [config]="paginationConfig"
+        [context]="context"
+        [objects]="data"
+        [selectable]="true"
+        [selectionConfig]="{ repeatable: true, listId: LIST_ID }"
+        [showPaginator]="true"
+        (pageChange)="loadForPage($event)">
+      </ds-viewable-collection>
+    }
+    @if (data && data.payload.page.length === 0) {
+      <div
+        class="alert alert-info w-100" role="alert">
+        {{'access-control-select-bitstreams-modal.no-items' | translate}}
+      </div>
+    }
+  }
 </div>
 <div class="modal-footer">
   <button type="button" class="btn btn-outline-dark"
-          (click)="activeModal.close('Close click')">
+    (click)="activeModal.close('Close click')">
     {{'access-control-select-bitstreams-modal.close' | translate}}
   </button>
 </div>
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
index 12b38a419b..75ab8c8878 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -33,7 +30,7 @@ export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-contro
   templateUrl: './item-access-control-select-bitstreams-modal.component.html',
   styleUrls: ['./item-access-control-select-bitstreams-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, ObjectCollectionComponent, AsyncPipe, TranslateModule],
+  imports: [ObjectCollectionComponent, AsyncPipe, TranslateModule],
 })
 export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
 
diff --git a/src/app/shared/alert/alert.component.html b/src/app/shared/alert/alert.component.html
index 3bc4782a77..ae5732b25a 100644
--- a/src/app/shared/alert/alert.component.html
+++ b/src/app/shared/alert/alert.component.html
@@ -1,9 +1,12 @@
-<div *ngIf="!dismissed" class="alert {{type}} alert-dismissible fade show w-100 p-3" role="alert" [@enterLeave]="animate">
-  <span *ngIf="content" [innerHTML]="content | translate"></span>
-
-  <ng-content></ng-content>
-
-  <button *ngIf="dismissible" type="button" class="close" data-dismiss="alert" aria-label="Close" (click)="dismiss()">
-    <span aria-hidden="true">&times;</span>
-  </button>
-</div>
+@if (!dismissed) {
+  <div class="alert {{type}} alert-dismissible fade show w-100 p-3" role="alert" [@enterLeave]="animate">
+    @if (content) {
+      <span [innerHTML]="content | translate"></span>
+    }
+    <ng-content></ng-content>
+    @if (dismissible) {
+      <button type="button" class="btn-close" data-dismiss="alert" aria-label="Close" (click)="dismiss()">
+      </button>
+    }
+  </div>
+}
diff --git a/src/app/shared/alert/alert.component.scss b/src/app/shared/alert/alert.component.scss
index 907edae24b..aa843c8e0c 100644
--- a/src/app/shared/alert/alert.component.scss
+++ b/src/app/shared/alert/alert.component.scss
@@ -1,4 +1,4 @@
-.close {
+.btn-close {
   opacity: 0.75;
   &:focus {
     outline: none !important;
diff --git a/src/app/shared/alert/alert.component.spec.ts b/src/app/shared/alert/alert.component.spec.ts
index 264f110137..c89bc3b235 100644
--- a/src/app/shared/alert/alert.component.spec.ts
+++ b/src/app/shared/alert/alert.component.spec.ts
@@ -91,7 +91,7 @@ describe('AlertComponent test suite', () => {
 
     it('should dismiss alert when click on close icon', () => {
       spyOn(comp, 'dismiss');
-      const btn = fixture.debugElement.query(By.css('.close'));
+      const btn = fixture.debugElement.query(By.css('.btn-close'));
 
       btn.nativeElement.click();
 
@@ -111,7 +111,7 @@ describe('AlertComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/shared/alert/alert.component.ts b/src/app/shared/alert/alert.component.ts
index 15dcd51ddd..7cad34f592 100644
--- a/src/app/shared/alert/alert.component.ts
+++ b/src/app/shared/alert/alert.component.ts
@@ -1,5 +1,4 @@
 import { trigger } from '@angular/animations';
-import { NgIf } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -30,7 +29,7 @@ import { AlertType } from './alert-type';
   templateUrl: './alert.component.html',
   styleUrls: ['./alert.component.scss'],
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 export class AlertComponent {
 
diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts
index 92e5084d81..59fc682145 100644
--- a/src/app/shared/animations/slide.ts
+++ b/src/app/shared/animations/slide.ts
@@ -22,7 +22,6 @@ export const slideMobileNav = trigger('slideMobileNav', [
   state('expanded', style({ height: '*', minHeight: '*' })),
 
   state('collapsed', style({ height: 0, minHeight: 0 })),
-
   transition('expanded <=> collapsed', animate('300ms')),
 ]);
 
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 74ae821634..4dac66b749 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -1,52 +1,61 @@
-<div class="navbar-nav mr-auto" *ngIf="(isMobile$ | async) !== true; else mobileButtons" data-test="auth-nav">
-  <div *ngIf="(isAuthenticated | async) !== true && (showAuth | async)"
-      class="nav-item"
-      (click)="$event.stopPropagation();">
-    <div ngbDropdown #loginDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);" class="dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
-         (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly"
-         role="menuitem"
-         aria-haspopup="menu"
-         aria-controls="loginDropdownMenu"
-         [attr.aria-expanded]="loginDrop.isOpen()"
-         ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
-      <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
-           role="menu"
-           [attr.aria-label]="'nav.login' | translate">
-        <ds-log-in
-          [isStandalonePage]="false"></ds-log-in>
+@if ((isMobile$ | async) !== true) {
+  <div class="navbar-nav me-auto" data-test="auth-nav">
+    @if ((isAuthenticated | async) !== true && (showAuth | async)) {
+      <div
+        class="nav-item"
+        (click)="$event.stopPropagation();">
+        <div ngbDropdown #loginDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+          <a href="javascript:void(0);" class="dropdownLogin px-0.5" [attr.aria-label]="'nav.login' |translate"
+            (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly"
+            role="menuitem"
+            aria-haspopup="menu"
+            aria-controls="loginDropdownMenu"
+            [attr.aria-expanded]="loginDrop.isOpen()"
+          ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
+          <div id="loginDropdownMenu" [ngClass]="{'ps-3 pe-3': (loading | async)}" ngbDropdownMenu
+            role="menu"
+            [attr.aria-label]="'nav.login' | translate">
+            <ds-log-in
+            [isStandalonePage]="false"></ds-log-in>
+          </div>
+        </div>
       </div>
+    }
+    @if ((isAuthenticated | async) && (showAuth | async)) {
+      <div class="nav-item">
+        <div ngbDropdown #loggedInDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
+          <a href="javascript:void(0);"
+            role="menuitem"
+            [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
+            aria-controls="user-menu-dropdown"
+            (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate"
+            class="dropdownLogout px-1"
+            [attr.data-test]="'user-menu' | dsBrowserOnly"
+            ngbDropdownToggle>
+            <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
+            <div id="logoutDropdownMenu" ngbDropdownMenu>
+              <ds-user-menu [inExpandableNavbar]="false" (changedRoute)="loggedInDrop.close()"></ds-user-menu>
+            </div>
+          </div>
+        </div>
+      }
     </div>
-  </div>
-  <div *ngIf="(isAuthenticated | async) && (showAuth | async)" class="nav-item">
-    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-      <a href="javascript:void(0);"
-         role="menuitem"
-         [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
-         aria-controls="user-menu-dropdown"
-         (click)="$event.preventDefault()" [title]="'nav.user-profile-menu-and-logout' | translate"
-         class="dropdownLogout px-1"
-         [attr.data-test]="'user-menu' | dsBrowserOnly"
-         ngbDropdownToggle>
-        <i class="fas fa-user-circle fa-lg fa-fw"></i></a>
-      <div id="logoutDropdownMenu" ngbDropdownMenu>
-        <ds-user-menu [inExpandableNavbar]="false"></ds-user-menu>
-      </div>
+  } @else {
+    <div data-test="auth-nav">
+      @if ((isAuthenticated | async) !== true) {
+        <a routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button">
+          {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
+        </a>
+      }
+      @if ((isAuthenticated | async)) {
+        <a role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
+          <i class="fas fa-sign-out-alt fa-lg fa-fw"></i>
+          <span class="sr-only">(current)</span>
+        </a>
+      }
     </div>
-  </div>
-</div>
+  }
 
 
-<ng-template #mobileButtons>
-  <div data-test="auth-nav">
-    <a *ngIf="(isAuthenticated | async) !== true" routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button">
-      {{ 'nav.login' | translate }}<span class="sr-only">(current)</span>
-    </a>
-    <a *ngIf="(isAuthenticated | async)" role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
-      <i class="fas fa-sign-out-alt fa-lg fa-fw"></i>
-      <span class="sr-only">(current)</span>
-    </a>
-  </div>
-</ng-template>
 
-<!-- Do not use ul/li in this menu as it breaks e2e accessibility tests -->
+  <!-- Do not use ul/li in this menu as it breaks e2e accessibility tests -->
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index 16899cf73e..49c701f77d 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -58,7 +57,7 @@ import { ThemedUserMenuComponent } from './user-menu/themed-user-menu.component'
   styleUrls: ['./auth-nav-menu.component.scss'],
   animations: [fadeInOut, fadeOut],
   standalone: true,
-  imports: [NgClass, NgIf, NgbDropdownModule, ThemedLogInComponent, RouterLink, RouterLinkActive, ThemedUserMenuComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgClass, NgbDropdownModule, ThemedLogInComponent, RouterLink, RouterLinkActive, ThemedUserMenuComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AuthNavMenuComponent implements OnInit {
   /**
diff --git a/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
index 38112cfa7c..6b5e509393 100644
--- a/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
@@ -1,6 +1,8 @@
 import {
   Component,
+  EventEmitter,
   Input,
+  Output,
 } from '@angular/core';
 
 import { ThemedComponent } from '../../theme-support/themed.component';
@@ -23,7 +25,12 @@ export class ThemedUserMenuComponent extends ThemedComponent<UserMenuComponent>{
    */
   @Input() inExpandableNavbar: boolean;
 
-  protected inAndOutputNames: (keyof UserMenuComponent & keyof this)[] = ['inExpandableNavbar'];
+  /**
+   * Emits an event when the route changes
+   */
+  @Output() changedRoute: EventEmitter<any> = new EventEmitter<any>();
+
+  protected inAndOutputNames: (keyof UserMenuComponent & keyof this)[] = ['inExpandableNavbar', 'changedRoute'];
 
   protected getComponentName(): string {
     return 'UserMenuComponent';
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
index 4c36cc2f24..7e3232701b 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.html
@@ -1,32 +1,36 @@
-<ds-loading *ngIf="(loading$ | async)"></ds-loading>
-<ul *ngIf="(loading$ | async) !== true" class="user-menu" role="menu"
+@if ((loading$ | async)) {
+  <ds-loading></ds-loading>
+}
+@if ((loading$ | async) !== true) {
+  <ul class="user-menu" role="menu"
     [ngClass]="inExpandableNavbar ? 'user-menu-mobile pb-2 mb-2 border-bottom' : 'user-menu-dropdown'"
     [attr.aria-label]="'nav.user-profile-menu-and-logout' |translate" id="user-menu-dropdown">
-  <li class="ds-menu-item-wrapper username-email-wrapper" role="presentation">
-    {{dsoNameService.getName(user$ | async)}}<br>
-    <span class="text-muted">{{(user$ | async)?.email}}</span>
-  </li>
-  <li class="ds-menu-item-wrapper" role="presentation">
-    <a class="ds-menu-item" role="menuitem"
-       [routerLink]="[profileRoute]"
-       routerLinkActive="active">{{'nav.profile' | translate}}</a>
-  </li>
-  <li class="ds-menu-item-wrapper" role="presentation">
-    <a class="ds-menu-item" role="menuitem"
-       [routerLink]="[mydspaceRoute]"
-       routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
-  </li>
-  <li class="ds-menu-item-wrapper" role="presentation">
-    <a class="ds-menu-item" role="menuitem"
-       [routerLink]="[subscriptionsRoute]"
-       routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
-  </li>
-  <ng-container *ngIf="!inExpandableNavbar">
-    <li class="dropdown-divider" aria-hidden="true"></li>
-    <li class="ds-menu-item-wrapper" role="presentation">
-      <ds-log-out data-test="log-out-component"></ds-log-out>
+    <li class="ds-menu-item-wrapper username-email-wrapper" role="presentation">
+      {{dsoNameService.getName(user$ | async)}}<br>
+      <span class="text-muted">{{(user$ | async)?.email}}</span>
     </li>
-  </ng-container>
-</ul>
+    <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
+      <a class="ds-menu-item" role="menuitem"
+        [routerLink]="[profileRoute]"
+      routerLinkActive="active">{{'nav.profile' | translate}}</a>
+    </li>
+    <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
+      <a class="ds-menu-item" role="menuitem"
+        [routerLink]="[mydspaceRoute]"
+      routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
+    </li>
+    <li class="ds-menu-item-wrapper" role="presentation" (click)="onMenuItemClick()">
+      <a class="ds-menu-item" role="menuitem"
+        [routerLink]="[subscriptionsRoute]"
+      routerLinkActive="active">{{'nav.subscriptions' | translate}}</a>
+    </li>
+    @if (!inExpandableNavbar) {
+      <li class="dropdown-divider" aria-hidden="true"></li>
+      <li class="ds-menu-item-wrapper" role="presentation">
+        <ds-log-out data-test="log-out-component"></ds-log-out>
+      </li>
+    }
+  </ul>
+}
 
 
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
index c7ddf2ac34..f0758ce1c2 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.spec.ts
@@ -203,6 +203,17 @@ describe('UserMenuComponent', () => {
       expect(components).toBeFalsy();
     });
 
+    it('should call onMenuItemClick when li is clicked', () => {
+      spyOn(component, 'onMenuItemClick');
+      const lis = fixture.debugElement.queryAll(By.css('.ds-menu-item-wrapper'));
+      const secondLi = lis[1];
+      secondLi.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        },
+      });
+      expect(component.onMenuItemClick).toHaveBeenCalled();
+    });
+
   });
 
 });
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index 51590e8c8a..af59028ced 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -1,12 +1,13 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
+  EventEmitter,
   Input,
   OnInit,
+  Output,
 } from '@angular/core';
 import {
   RouterLink,
@@ -40,7 +41,7 @@ import { LogOutComponent } from '../../log-out/log-out.component';
   templateUrl: './user-menu.component.html',
   styleUrls: ['./user-menu.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, RouterLinkActive, NgClass, RouterLink, LogOutComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedLoadingComponent, RouterLinkActive, NgClass, RouterLink, LogOutComponent, AsyncPipe, TranslateModule],
 })
 export class UserMenuComponent implements OnInit {
 
@@ -49,6 +50,11 @@ export class UserMenuComponent implements OnInit {
    */
   @Input() inExpandableNavbar = false;
 
+  /**
+   * Emits an event when the route changes
+   */
+  @Output() changedRoute: EventEmitter<any> = new EventEmitter<any>();
+
   /**
    * True if the authentication is loading.
    * @type {Observable<boolean>}
@@ -96,4 +102,11 @@ export class UserMenuComponent implements OnInit {
     this.user$ = this.authService.getAuthenticatedUserFromStore();
 
   }
+
+  /**
+   * Emits an event when the menu item is clicked
+   */
+  onMenuItemClick() {
+    this.changedRoute.emit();
+  }
 }
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 675a2392b2..bd8f70932d 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -1,29 +1,43 @@
 <ng-container *ngVar="(objects$ | async) as objects">
-  <h1 *ngIf="displayTitle">{{title | translate}}</h1>
+  @if (displayTitle) {
+    <h1>{{title | translate}}</h1>
+  }
   <ds-starts-with-loader [paginationId]="paginationConfig?.id" [startsWithOptions]="startsWithOptions" [type]="type">
   </ds-starts-with-loader>
-  <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
-      <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-        <ds-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-results-back-button>
+  @if (objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0) {
+    <div @fadeIn>
+      @if (shouldDisplayResetButton$ |async) {
+        <div class="mb-2 reset">
+          <ds-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-results-back-button>
+        </div>
+      }
+      <ds-viewable-collection
+        [config]="paginationConfig"
+        [sortConfig]="sortConfig"
+        [showPaginator]="showPaginator"
+        [objects]="objects"
+        (prev)="goPrev()"
+        (next)="goNext()">
+      </ds-viewable-collection>
+    </div>
+  }
+  @if (!objects || objects?.isLoading) {
+    <ds-loading message="{{'loading.browse-by' | translate}}"></ds-loading>
+  }
+  @if (objects?.hasFailed) {
+    <ds-error message="{{'error.browse-by' | translate}}"></ds-error>
+  }
+  @if (!objects?.isLoading && objects?.payload?.page.length === 0) {
+    <div>
+      @if (shouldDisplayResetButton$ |async) {
+        <div class="d-inline-block mb-4 reset">
+          <ds-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-results-back-button>
+        </div>
+      }
+      <div class="alert alert-info w-100" role="alert">
+        {{'browse.empty' | translate}}
       </div>
-    <ds-viewable-collection
-      [config]="paginationConfig"
-      [sortConfig]="sortConfig"
-      [showPaginator]="showPaginator"
-      [objects]="objects"
-      (prev)="goPrev()"
-      (next)="goNext()">
-    </ds-viewable-collection>
-  </div>
-  <ds-loading *ngIf="!objects || objects?.isLoading" message="{{'loading.browse-by' | translate}}"></ds-loading>
-  <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
-  <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
-    <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
-      <ds-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-results-back-button>
     </div>
-    <div class="alert alert-info w-100" role="alert">
-      {{'browse.empty' | translate}}
-    </div>
-  </div>
+  }
 </ng-container>
 
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 361bc39492..84a48172df 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -2,7 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -59,7 +58,7 @@ import { VarDirective } from '../utils/var.directive';
     fadeInOut,
   ],
   standalone: true,
-  imports: [VarDirective, NgClass, NgComponentOutlet, NgIf, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
+  imports: [VarDirective, NgClass, NgComponentOutlet, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
 })
 /**
  * Component to display a browse-by page for any ListableObject
diff --git a/src/app/shared/btn-disabled.directive.ts b/src/app/shared/btn-disabled.directive.ts
new file mode 100644
index 0000000000..427d1654da
--- /dev/null
+++ b/src/app/shared/btn-disabled.directive.ts
@@ -0,0 +1,63 @@
+import {
+  Directive,
+  HostBinding,
+  HostListener,
+  Input,
+} from '@angular/core';
+
+@Directive({
+  selector: '[dsBtnDisabled]',
+  standalone: true,
+})
+
+/**
+ * This directive can be added to a html element to disable it (make it non-interactive).
+ * It acts as a replacement for HTML's disabled attribute.
+ *
+ * This directive should always be used instead of the HTML disabled attribute as it is more accessible.
+ */
+export class BtnDisabledDirective {
+
+    @Input() set dsBtnDisabled(value: boolean) {
+    this.isDisabled = !!value;
+  }
+
+    /**
+     * Binds the aria-disabled attribute to the directive's isDisabled property.
+     * This is used to make the element accessible to screen readers. If the element is disabled, the screen reader will announce it as such.
+     */
+    @HostBinding('attr.aria-disabled') isDisabled = false;
+
+    /**
+     * Binds the class attribute to the directive's isDisabled property.
+     * This is used to style the element when it is disabled (make it look disabled).
+     */
+    @HostBinding('class.disabled') get disabledClass() { return this.isDisabled; }
+
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via mouse click).
+     * @param event The click event.
+     */
+    @HostListener('click', ['$event'])
+    handleClick(event: Event) {
+      if (this.isDisabled) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+      }
+    }
+
+    /**
+     * Prevents the default action and stops the event from propagating when the element is disabled.
+     * This is used to prevent the element from being interacted with when it is disabled (via keystrokes).
+     * @param event The keydown event.
+     */
+  @HostListener('keydown', ['$event'])
+    handleKeydown(event: KeyboardEvent) {
+      if (this.isDisabled && (event.key === 'Enter' || event.key === 'Space')) {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+      }
+    }
+}
+
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 64aa6f2f6b..985de3dfd7 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -1,44 +1,54 @@
-<div *ngIf="searchField" class="form-group w-100 pr-2 pl-2 my-2">
-  <input type="search"
-         class="form-control w-100"
-         (click)="$event.stopPropagation();"
-         placeholder="{{ 'submission.sections.general.search-collection' | translate }}"
-         [formControl]="searchField"
-         #searchFieldEl>
-</div>
+@if (searchField) {
+  <div class="mb-3 w-100 pe-2 ps-2 my-2">
+    <input type="search"
+      class="form-control w-100"
+      (click)="$event.stopPropagation();"
+      placeholder="{{ 'submission.sections.general.search-collection' | translate }}"
+      [formControl]="searchField"
+      #searchFieldEl>
+  </div>
+}
 <div class="dropdown-divider m-0"></div>
 <ul class="scrollable-menu p-0 m-0"
-    role="menu"
-     (scroll)="onScroll($event)"
-     infiniteScroll
-     [infiniteScrollDistance]="1.5"
-     [infiniteScrollThrottle]="0"
-     [infiniteScrollUpDistance]="1.5"
-     [fromRoot]="true"
-     [scrollWindow]="false"
-     (scrolled)="onScrollDown()">
+  role="menu"
+  (scroll)="onScroll($event)"
+  infiniteScroll
+  [infiniteScrollDistance]="1.5"
+  [infiniteScrollThrottle]="0"
+  [infiniteScrollUpDistance]="1.5"
+  [fromRoot]="true"
+  [scrollWindow]="false"
+  (scrolled)="onScrollDown()">
 
-  <li class="dropdown-item disabled" role="menuitem" *ngIf="searchListCollection?.length === 0 && (isLoading | async) !== true">
-    {{'submission.sections.general.no-collection' | translate}}
-  </li>
-  <ng-container *ngIf="searchListCollection?.length > 0">
-    <li *ngFor="let listItem of searchListCollection"
-            class="dropdown-item collection-item"
-            role="menuitem"
-            title="{{ listItem.collection.name }}"
-            (click)="onSelect(listItem)">
-      <div class="list-unstyled mb-0">
-        <div class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities">
-          {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
-        </div>
-        <div class="list-item text-truncate text-primary font-weight-bold">{{ listItem.collection.name}}</div>
-      </div>
+  @if (searchListCollection?.length === 0 && (isLoading | async) !== true) {
+    <li class="dropdown-item disabled" role="menuitem">
+      {{'submission.sections.general.no-collection' | translate}}
     </li>
-  </ng-container>
-  <li *ngIf="(isLoading | async)">
-    <button class="dropdown-item disabled">
-      <ds-loading message="{{'loading.default' | translate}}">
-      </ds-loading>
-    </button>
-  </li>
+  }
+  @if (searchListCollection?.length > 0) {
+    @for (listItem of searchListCollection; track listItem) {
+      <li
+        class="dropdown-item collection-item"
+        role="menuitem"
+        title="{{ listItem.collection.name }}"
+        (click)="onSelect(listItem)">
+        <div class="list-unstyled mb-0">
+          @for (item of listItem.communities; track item) {
+            <div class="list-item text-truncate text-secondary">
+              {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
+            </div>
+          }
+          <div class="list-item text-truncate text-primary fw-bold">{{ listItem.collection.name}}</div>
+        </div>
+      </li>
+    }
+  }
+  @if ((isLoading | async)) {
+    <li>
+      <button class="dropdown-item disabled">
+        <ds-loading message="{{'loading.default' | translate}}">
+        </ds-loading>
+      </button>
+    </li>
+  }
 </ul>
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
index 0fef74b389..a55b0b9558 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -76,7 +72,7 @@ export interface CollectionListEntry {
   templateUrl: './collection-dropdown.component.html',
   styleUrls: ['./collection-dropdown.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgFor, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class CollectionDropdownComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
index 1d752869e5..084efd2094 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.html
@@ -1,45 +1,55 @@
 <div class="container-fluid">
   <div class="row">
-    <div class="col-12 d-inline-block mb-1">
-      <span>{{type.value + '.edit.logo.label' | translate}}</span>
+    <div class="col-12 d-inline-block">
+      <label class="form-label">{{type.value + '.edit.logo.label' | translate}}</label>
     </div>
     <ng-container *ngVar="(dso?.logo | async)?.payload as logo">
-      <div class="col-12 d-inline-block alert" id="logo-section" *ngIf="logo">
-        <div class="row">
-          <div class="col-8 d-inline-block">
-            <ds-comcol-page-logo [alternateText]="type.value + '.logo.alt'" [logo]="logo"></ds-comcol-page-logo>
-          </div>
-          <div class="col-4 d-inline-block">
-            <div *ngIf="logo" class="float-right">
-              <button
-                (click)="confirmLogoDeleteWithModal()"
-                class="btn btn-danger"
-                type="button">{{ 'community.edit.logo.delete.title' | translate }}
-              </button>
+      @if (logo) {
+        <div class="col-12 d-inline-block alert" id="logo-section">
+          <div class="row">
+            <div class="col-8 d-inline-block">
+              <ds-comcol-page-logo [alternateText]="type.value + '.logo.alt'" [logo]="logo"></ds-comcol-page-logo>
+            </div>
+            <div class="col-4 d-inline-block">
+              @if (logo) {
+                <div class="float-end">
+                  <button
+                    (click)="confirmLogoDeleteWithModal()"
+                    class="btn btn-danger"
+                    type="button">{{ 'community.edit.logo.delete.title' | translate }}
+                  </button>
+                </div>
+              }
             </div>
           </div>
         </div>
-      </div>
-      <div *ngIf="!logo" class="col-12 d-inline-block">
-        <ds-uploader  *ngIf="initializedUploaderOptions | async"
-                      [ariaLabel]="type.value + '.browse.logo'"
-                      [dropMsg]="type.value + '.edit.logo.upload'"
-                      [dropOverDocumentMsg]="type.value + '.edit.logo.upload'"
-                      [enableDragOverDocument]="true"
-                      [uploadFilesOptions]="uploadFilesOptions"
-                      (onCompleteItem)="onCompleteItem()"
-                      (onUploadError)="onUploadError()"></ds-uploader>
-      </div>
+      }
+      @if (!logo) {
+        <div class="col-12 d-inline-block">
+          @if (initializedUploaderOptions | async) {
+            <ds-uploader
+              [ariaLabel]="type.value + '.browse.logo'"
+              [dropMsg]="type.value + '.edit.logo.upload'"
+              [dropOverDocumentMsg]="type.value + '.edit.logo.upload'"
+              [enableDragOverDocument]="true"
+              [uploadFilesOptions]="uploadFilesOptions"
+              (onCompleteItem)="onCompleteItem()"
+            (onUploadError)="onUploadError()"></ds-uploader>
+          }
+        </div>
+      }
     </ng-container>
   </div>
 </div>
-<ds-form *ngIf="formModel"
-         [formId]="'comcol-form-id'"
-         [formModel]="formModel"
-         [displayCancel]="false"
-         (submitForm)="onSubmit()">
-  <button (click)="back.emit()" before class="btn btn-outline-secondary" type="button">
-    <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type.value + '.edit.return' | translate }}
-  </button>
-</ds-form>
+@if (formModel) {
+  <ds-form
+    [formId]="'comcol-form-id'"
+    [formModel]="formModel"
+    [displayCancel]="false"
+    (submitForm)="onSubmit()">
+    <button (click)="back.emit()" before class="btn btn-outline-secondary" type="button">
+      <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type.value + '.edit.return' | translate }}
+    </button>
+  </ds-form>
+}
 
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
index 0c80ce0d1d..23b58cad34 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -81,7 +80,6 @@ import { ComcolPageLogoComponent } from '../../comcol-page-logo/comcol-page-logo
     UploaderComponent,
     AsyncPipe,
     ComcolPageLogoComponent,
-    NgIf,
     NgClass,
     VarDirective,
   ],
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index 2639a4c099..b136f83dc5 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -1,7 +1,7 @@
-<div class="card p-2 m-3 {{(comcolRole$ | async)?.name}}">
+<div class="card p-2 mb-3 mt-3 custom-alignment {{(comcolRole$ | async)?.name}}">
 
   <div class="card-body d-flex flex-column"
-       *ngVar="group$ | async as group">
+    *ngVar="group$ | async as group">
 
     <h2 class="h4 w-100">
       {{ roleName$ | async }}
@@ -13,34 +13,48 @@
 
     <div class="d-flex flex-md-row justify-content-between flex-column">
       <div class="w-100 d-flex align-items-center">
-        <ds-loading *ngIf="groupRD$ | async | dsHasNoValue"></ds-loading>
-        <div *ngIf="hasNoGroup$ | async">
-          {{'comcol-role.edit.no-group' | translate}}
-        </div>
-        <div *ngIf="hasAnonymousGroup$ | async">
-          {{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.anonymous-group' | translate}}
-        </div>
-        <a *ngIf="hasCustomGroup$ | async" [routerLink]="editGroupLink$ | async">
-          {{ dsoNameService.getName(group) }}
-        </a>
+        @if (groupRD$ | async | dsHasNoValue) {
+          <ds-loading></ds-loading>
+        }
+        @if (hasNoGroup$ | async) {
+          <div>
+            {{'comcol-role.edit.no-group' | translate}}
+          </div>
+        }
+        @if (hasAnonymousGroup$ | async) {
+          <div>
+            {{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.anonymous-group' | translate}}
+          </div>
+        }
+        @if (hasCustomGroup$ | async) {
+          <a [routerLink]="editGroupLink$ | async">
+            {{ dsoNameService.getName(group) }}
+          </a>
+        }
       </div>
 
       <div class="flex-shrink-0">
-        <button *ngIf="hasNoGroup$ | async"
-             class="btn btn-primary create"
-             (click)="create()">
-          <i class="fas fa-plus" aria-hidden="true"></i> {{'comcol-role.edit.create' | translate}}
-        </button>
-        <button *ngIf="hasAnonymousGroup$ | async"
-             class="btn btn-primary restrict"
-             (click)="create()">
-          {{'comcol-role.edit.restrict' | translate}}
-        </button>
-        <button *ngIf="hasCustomGroup$ | async"
-             class="btn btn-danger delete"
-             (click)="delete()">
-          <i class="fas fa-trash" aria-hidden="true"></i> {{'comcol-role.edit.delete' | translate}}
-        </button>
+        @if (hasNoGroup$ | async) {
+          <button
+            class="btn btn-primary create"
+            (click)="create()">
+            <i class="fas fa-plus" aria-hidden="true"></i> {{'comcol-role.edit.create' | translate}}
+          </button>
+        }
+        @if (hasAnonymousGroup$ | async) {
+          <button
+            class="btn btn-primary restrict"
+            (click)="create()">
+            {{'comcol-role.edit.restrict' | translate}}
+          </button>
+        }
+        @if (hasCustomGroup$ | async) {
+          <button
+            class="btn btn-danger delete"
+            (click)="delete()">
+            <i class="fas fa-trash" aria-hidden="true"></i> {{'comcol-role.edit.delete' | translate}}
+          </button>
+        }
       </div>
 
     </div>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
index 22c4ed49f3..0dddb2a4dd 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -58,7 +55,6 @@ import { VarDirective } from '../../../../utils/var.directive';
     AlertComponent,
     AsyncPipe,
     TranslateModule,
-    NgIf,
     RouterLink,
     VarDirective,
     HasNoValuePipe,
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
index 7797ba13c9..b719f3080d 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html
@@ -5,34 +5,38 @@
         <h1>{{ type + '.edit.head' | translate }}</h1>
         <div class="my-auto">
           <a class="btn btn-danger"
-             [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'"
-             data-test="delete-button">
+            [routerLink]="((type === 'community') ? '/communities/' : '/collections/') + (dsoRD$ | async)?.payload.uuid + '/delete'"
+            data-test="delete-button">
             <i class="fas fa-trash" aria-hidden="true"></i> {{type + '.edit.delete' | translate}}</a>
-        </div>
-      </div>
-      <div class="pt-2">
-        <ul class="nav nav-tabs justify-content-start mb-2" role="tablist">
-          <li *ngFor="let page of pages" class="nav-item" role="presentation">
-            <a class="nav-link" role="tab"
-               [attr.aria-selected]="page === currentPage"
-               [ngClass]="{'active' : page === currentPage}"
-               [routerLink]="['./' + page]"
-               [attr.data-test]="page">
-              {{ type + '.edit.tabs.' + page + '.head' | translate}}
-            </a>
-          </li>
-        </ul>
-        <div class="tab-pane active">
-          <div class="mb-4">
-            <router-outlet></router-outlet>
           </div>
-          <div class="col-12 text-right">
-            <a *ngIf="!hideReturnButton" [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">
-              <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type + '.edit.return' | translate }}
-            </a>
+        </div>
+        <div class="pt-2">
+          <ul class="nav nav-tabs justify-content-start mb-2" role="tablist">
+            @for (page of pages; track page) {
+              <li class="nav-item" role="presentation">
+                <a class="nav-link" role="tab"
+                  [attr.aria-selected]="page === currentPage"
+                  [ngClass]="{'active' : page === currentPage}"
+                  [routerLink]="['./' + page]"
+                  [attr.data-test]="page">
+                  {{ type + '.edit.tabs.' + page + '.head' | translate}}
+                </a>
+              </li>
+            }
+          </ul>
+          <div class="tab-pane active">
+            <div class="mb-4">
+              <router-outlet></router-outlet>
+            </div>
+            <div class="col-12 text-end custom-alignment">
+              @if (!hideReturnButton) {
+                <a [routerLink]="getPageUrl((dsoRD$ | async)?.payload)" class="btn btn-outline-secondary">
+                  <i class="fas fa-arrow-left" aria-hidden="true"></i> {{ type + '.edit.return' | translate }}
+                </a>
+              }
+            </div>
           </div>
         </div>
       </div>
     </div>
   </div>
-</div>
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
index b0d72f4a72..c88bb16afc 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -1,30 +1,34 @@
 <h2 class="comcol-browse-label">{{'browse.comcol.head' | translate}}</h2>
-<nav *ngIf="(allOptions$ | async) as allOptions" class="comcol-browse mb-4" aria-label="Browse Community or Collection">
-  <div class="d-none d-sm-block">
-
-    <div class="list-group list-group-horizontal" role="tablist">
-      <a *ngFor="let option of allOptions"
-         [attr.aria-current]="(currentOption$ | async)?.id === option.id"
-         class="list-group-item"
-         role="tab"
-         [routerLink]="option.routerLink"
-         [queryParams]="option.params"
-         [class.active]="(currentOption$ | async)?.id === option.id">
-        {{ option.label | translate }}
-      </a>
+@if ((allOptions$ | async); as allOptions) {
+  <nav class="comcol-browse mb-4" aria-label="Browse Community or Collection">
+    <div class="d-none d-sm-block">
+      <div class="list-group list-group-horizontal" role="tablist">
+        @for (option of allOptions; track option) {
+          <a
+            [attr.aria-current]="(currentOption$ | async)?.id === option.id"
+            class="list-group-item"
+            role="tab"
+            [routerLink]="option.routerLink"
+            [queryParams]="option.params"
+            [class.active]="(currentOption$ | async)?.id === option.id">
+            {{ option.label | translate }}
+          </a>
+        }
+      </div>
     </div>
-  </div>
-
-  <div class="d-block d-sm-none">
-    <select name="browse-type"
-            class="form-control"
-            aria-label="Browse Community or Collection"
-            (change)="onSelectChange($event)">
-      <option *ngFor="let option of allOptions"
-              [value]="option.id"
-              [attr.selected]="(currentOption$ | async)?.id === option.id ? 'selected' : null">
-        {{ option.label | translate }}
-      </option>
-    </select>
-  </div>
-</nav>
+    <div class="d-block d-sm-none">
+      <select name="browse-type"
+        class="form-select"
+        aria-label="Browse Community or Collection"
+        (change)="onSelectChange($event)">
+        @for (option of allOptions; track option) {
+          <option
+            [value]="option.id"
+            [attr.selected]="(currentOption$ | async)?.id === option.id ? 'selected' : null">
+            {{ option.label | translate }}
+          </option>
+        }
+      </select>
+    </div>
+  </nav>
+}
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
index a7730ee7dd..33b6d91e22 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -59,12 +55,10 @@ export interface ComColPageNavOption {
   templateUrl: './comcol-page-browse-by.component.html',
   imports: [
     FormsModule,
-    NgForOf,
     RouterLink,
     RouterLinkActive,
     TranslateModule,
     AsyncPipe,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.html b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.html
index 16b20cde20..062fc4c242 100644
--- a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.html
+++ b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.html
@@ -1,5 +1,13 @@
-<div *ngIf="content" class="content-with-optional-title mb-2">
-    <h2 *ngIf="title">{{ title | translate }}</h2>
-    <div *ngIf="hasInnerHtml" [innerHtml]="content"></div>
-    <div *ngIf="!hasInnerHtml">{{content}}</div>
-</div>
+@if (content) {
+  <div class="content-with-optional-title mb-2">
+    @if (title) {
+      <h2>{{ title | translate }}</h2>
+    }
+    @if (hasInnerHtml) {
+      <div [innerHtml]="content"></div>
+    }
+    @if (!hasInnerHtml) {
+      <div>{{content}}</div>
+    }
+  </div>
+}
diff --git a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
index 636b311165..2f60bdf97c 100644
--- a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
+++ b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -17,7 +17,6 @@ import { TranslateModule } from '@ngx-translate/core';
   templateUrl: './comcol-page-content.component.html',
   imports: [
     TranslateModule,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
index 01a71ab142..64f3c3c96b 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html
@@ -1,4 +1,8 @@
-<p *ngIf="content" class="d-flex flex-wrap gapx-2 text-break">
-  <span class="mb-0" *ngIf="title">{{ title | translate }}</span>
-  <a [href]="getHandle()">{{getHandle()}}</a>
-</p>
+@if (content) {
+  <p class="d-flex flex-wrap gapx-2 text-break">
+    @if (title) {
+      <span class="mb-0">{{ title | translate }}</span>
+    }
+    <a [href]="getHandle()">{{getHandle()}}</a>
+  </p>
+}
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
index 538ed51a32..115717a714 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -14,7 +14,6 @@ import { TranslateModule } from '@ngx-translate/core';
   styleUrls: ['./comcol-page-handle.component.scss'],
   templateUrl: './comcol-page-handle.component.html',
   imports: [
-    NgIf,
     TranslateModule,
   ],
   standalone: true,
diff --git a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.html b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.html
index 21f1f65331..ee685e393e 100644
--- a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.html
+++ b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.html
@@ -1 +1 @@
-<h1 *ngIf="name">{{ name }}</h1>
\ No newline at end of file
+@if (name) {<h1>{{ name }}</h1>}
\ No newline at end of file
diff --git a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
index f409e991ec..62227f2317 100644
--- a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
+++ b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -8,9 +8,7 @@ import {
   selector: 'ds-comcol-page-header',
   styleUrls: ['./comcol-page-header.component.scss'],
   templateUrl: './comcol-page-header.component.html',
-  imports: [
-    NgIf,
-  ],
+  imports: [],
   standalone: true,
 })
 export class ComcolPageHeaderComponent {
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
index cb3feecbe5..59ed2fae17 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html
@@ -1,3 +1,5 @@
-<div *ngIf="logo" class="dso-logo mb-3">
+@if (logo) {
+  <div class="dso-logo mb-3">
     <img [src]="logo._links.content.href" class="w-100 img-fluid" [attr.alt]="alternateText ? alternateText : null" (error)="errorHandler($event)"/>
-</div>
+  </div>
+}
diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
index 589f54d45c..4cb3539616 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -10,7 +10,7 @@ import { Bitstream } from '../../../core/shared/bitstream.model';
   selector: 'ds-comcol-page-logo',
   styleUrls: ['./comcol-page-logo.component.scss'],
   templateUrl: './comcol-page-logo.component.html',
-  imports: [NgIf],
+  imports: [],
   standalone: true,
 })
 export class ComcolPageLogoComponent {
diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
index 35d292c5f7..67fc9ae792 100644
--- a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
@@ -26,7 +26,7 @@ import { BrowseDefinition } from '../../../../core/shared/browse-definition.mode
 })
 export class ComcolBrowseByComponent implements OnInit {
 
-  browseByType$: Observable<BrowseByDataType>;
+  browseByType$: Observable<{type: BrowseByDataType }>;
 
   scope$: Observable<string>;
 
@@ -40,7 +40,7 @@ export class ComcolBrowseByComponent implements OnInit {
    */
   ngOnInit(): void {
     this.browseByType$ = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+      map((data: { browseDefinition: BrowseDefinition }) => ({ type: data.browseDefinition.getRenderType() })),
     );
     this.scope$ = this.route.data.pipe(
       map((data: Data) => data.scope),
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.html b/src/app/shared/confirmation-modal/confirmation-modal.component.html
index ff82f5bc83..12789691ea 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.html
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header">{{ headerLabel | translate:{ dsoName: name } }}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
@@ -12,7 +11,9 @@
       <i class="fas fa-times"></i> {{ cancelLabel | translate:{ dsoName: name } }}
     </button>
     <button type="button" class="confirm btn btn-{{brandColor}}" (click)="confirmPressed()" aria-label="Confirm" ngbAutofocus>
-      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{ dsoName: name } }}
-    </button>
+      @if (confirmIcon) {
+        <i class="{{confirmIcon}}"></i>
+        } {{ confirmLabel | translate:{ dsoName: name } }}
+      </button>
+    </div>
   </div>
-</div>
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
index af589716de..e08bf8d54e 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
@@ -82,7 +82,7 @@ describe('ConfirmationModalComponent', () => {
   describe('when the click method emits on close button', () => {
     beforeEach(fakeAsync(() => {
       spyOn(component, 'close');
-      debugElement.query(By.css('button.close')).triggerEventHandler('click', {
+      debugElement.query(By.css('button.btn-close')).triggerEventHandler('click', {
         preventDefault: () => {/**/
         },
       });
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
index 7618706ab4..aa05c09c24 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.ts
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -12,7 +12,7 @@ import { TranslateModule } from '@ngx-translate/core';
   selector: 'ds-confirmation-modal',
   templateUrl: 'confirmation-modal.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 export class ConfirmationModalComponent {
   @Input() headerLabel: string;
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
index 083b8163ff..bb17493c52 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
@@ -1,25 +1,26 @@
 <ng-template #help>
-    <div class="preserve-line-breaks ds-context-help-content">
-        <ng-container *ngFor="let elem of (parsedContent$ | async)">
-            <ng-container *ngIf="elem.href">
-                <a href="{{elem.href}}" target="_blank" rel="noopener noreferrer">{{elem.text}}</a>
-            </ng-container>
-            <ng-container *ngIf="elem.href === undefined">
-                {{ elem }}
-            </ng-container>
-        </ng-container>
-    </div>
+  <div class="preserve-line-breaks ds-context-help-content">
+    @for (elem of (parsedContent$ | async); track elem) {
+      @if (elem.href) {
+        <a href="{{elem.href}}" target="_blank" rel="noopener noreferrer">{{elem.text}}</a>
+      } @else {
+        {{ elem.text }}
+      }
+    }
+  </div>
 </ng-template>
-<i *ngIf="shouldShowIcon$ | async"
+@if (shouldShowIcon$ | async) {
+  <i
    [ngClass]="{'ds-context-help-icon fas fa-question-circle shadow-sm': true,
               'ds-context-help-icon-right': iconPlacement !== 'left',
               'ds-context-help-icon-left': iconPlacement === 'left'}"
-   [ngbTooltip]="help"
-   [placement]="tooltipPlacement"
-   autoClose="outside"
-   triggers="manual"
-   container="body"
-   #tooltip="ngbTooltip"
-   (click)="onClick()">
-</i>
+    [ngbTooltip]="help"
+    [placement]="tooltipPlacement"
+    autoClose="outside"
+    triggers="manual"
+    container="body"
+    #tooltip="ngbTooltip"
+    (click)="onClick()">
+  </i>
+}
 <ng-container *ngTemplateOutlet="templateRef"></ng-container>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
index f889366dfe..57fcb888cb 100644
--- a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -36,7 +34,7 @@ import { ContextHelpService } from '../context-help.service';
 import { hasValueOperator } from '../empty.util';
 import { PlacementDir } from './placement-dir.model';
 
-type ParsedContent = (string | {href: string, text: string})[];
+type ParsedContent = ({href?: string, text: string})[];
 
 /**
  * This component renders an info icon next to the wrapped element which
@@ -47,7 +45,7 @@ type ParsedContent = (string | {href: string, text: string})[];
   templateUrl: './context-help-wrapper.component.html',
   styleUrls: ['./context-help-wrapper.component.scss'],
   standalone: true,
-  imports: [NgFor, NgIf, NgClass, NgbTooltipModule, NgTemplateOutlet, AsyncPipe],
+  imports: [NgClass, NgbTooltipModule, NgTemplateOutlet, AsyncPipe],
 })
 export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
   /**
@@ -86,7 +84,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
   @Input() set content(translateKey: string) {
     this.content$.next(translateKey);
   }
-  private content$: BehaviorSubject<string | undefined> = new BehaviorSubject(undefined);
+  private content$: BehaviorSubject<string> = new BehaviorSubject(null);
 
   parsedContent$: Observable<ParsedContent>;
 
@@ -102,8 +100,8 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
       this.content$.pipe(distinctUntilChanged(), mergeMap(translateKey => this.translateService.get(translateKey))),
       this.dontParseLinks$.pipe(distinctUntilChanged()),
     ]).pipe(
-      map(([text, dontParseLinks]) =>
-        dontParseLinks ? [text] : this.parseLinks(text)),
+      map(([text, dontParseLinks]: [string, boolean]) =>
+        dontParseLinks ? [{ text }] : this.parseLinks(text)),
     );
     this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
   }
@@ -181,7 +179,7 @@ export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
     return text.match(splitRegexp).map((substring: string) => {
       const match = substring.match(parseRegexp);
       return match === null
-        ? substring
+        ? { text: substring }
         : ({ href: match[2], text: match[1] });
     });
   }
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
index b1056cdf18..7b299e8a37 100644
--- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
+++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
@@ -1,55 +1,59 @@
-<div *ngIf="(this.submitted$ | async) !== true; else waiting">
-  <div *ngIf="this.canWithdraw; else reinstateHeader" class="modal-header">
-    {{ 'item.qa.withdrawn.modal.header' | translate }}
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-      <span aria-hidden="true">×</span>
-    </button>
-  </div>
-  <div class="modal-body">
-    <div class="form-group">
-      <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary.label' | translate)
-                                              : ('qa-reinstate.create.modal.form.summary.label' | translate) }}</label>
-      <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary2.label' | translate)
-                                              : ('qa-reinstate.create.modal.form.summary2.label' | translate) }}</label>
-      <textarea class="form-control" id="reason"
-                rows="6"
-                [(ngModel)]="reason"
+@if ((this.submitted$ | async) !== true) {
+  <div>
+    @if (this.canWithdraw) {
+      <div class="modal-header">
+        {{ 'item.qa.withdrawn.modal.header' | translate }}
+        <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
+          <span aria-hidden="true">×</span>
+        </button>
+      </div>
+    } @else {
+      @if (!this.canWithdraw) {
+        <div class="modal-header">
+          {{'item.qa.reinstate.modal.header' | translate}}
+          <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
+            <span aria-hidden="true">×</span>
+          </button>
+        </div>
+      }
+    }
+    <div class="modal-body">
+      <div class="form-group">
+        <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary.label' | translate)
+        : ('qa-reinstate.create.modal.form.summary.label' | translate) }}</label>
+        <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary2.label' | translate)
+        : ('qa-reinstate.create.modal.form.summary2.label' | translate) }}</label>
+        <textarea class="form-control" id="reason"
+          rows="6"
+          [(ngModel)]="reason"
                 placeholder="{{ this.canWithdraw ? ('qa-withdrown.modal.form.summary.placeholder' | translate)
                                                  : ('qa-reinstate.modal.form.summary.placeholder' | translate) }}"
-                name="message"></textarea>
+        name="message"></textarea>
+      </div>
+    </div>
+    <div class="modal-footer space-children-mr">
+      <button class="btn btn-outline-secondary btn-sm ms-0"
+        type="button"
+        (click)="onModalClose()"
+        title="{{'item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip' | translate}}">
+        <i class="fas fa-times fa-fw"></i> {{'item.qa.withdrawn-reinstate.create.modal.button.cancel' | translate}}
+      </button>
+      <button class="btn btn-success btn-sm ms-0"
+        type="submit"
+        (click)="onModalSubmit()"
+        title="{{'item.qa.withdrawn-reinstate.modal.button.confirm.tooltip' | translate}}">
+        <i class="fas fa-check fa-fw"></i> {{ this.canWithdraw ? ('qa-withdrown.create.modal.button.confirm' | translate)
+        : ('qa-reinstate.create.modal.button.confirm' | translate) }}
+      </button>
     </div>
   </div>
-  <div class="modal-footer space-children-mr">
-    <button class="btn btn-outline-secondary btn-sm ml-0"
-            type="button"
-            (click)="onModalClose()"
-            title="{{'item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip' | translate}}">
-      <i class="fas fa-times fa-fw"></i> {{'item.qa.withdrawn-reinstate.create.modal.button.cancel' | translate}}
-    </button>
-    <button class="btn btn-success btn-sm ml-0"
-            type="submit"
-            (click)="onModalSubmit()"
-            title="{{'item.qa.withdrawn-reinstate.modal.button.confirm.tooltip' | translate}}">
-      <i class="fas fa-check fa-fw"></i> {{ this.canWithdraw ? ('qa-withdrown.create.modal.button.confirm' | translate)
-                                                             : ('qa-reinstate.create.modal.button.confirm' | translate) }}
-    </button>
-  </div>
-</div>
-
-<ng-template #waiting>
+} @else {
   <div class="modal-header">{{'item.qa.withdrawn.modal.submitted.header' | translate}}</div>
   <div class="modal-body">
     <div class="d-flex justify-content-center">
       <ds-loading [showMessage]="false"></ds-loading>
     </div>
   </div>
-</ng-template>
+}
+
 
-<ng-template #reinstateHeader>
-  <div *ngIf="!this.canWithdraw" class="modal-header">
-    {{'item.qa.reinstate.modal.header' | translate}}
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-      <span aria-hidden="true">×</span>
-    </button>
-  </div>
-</ng-template>
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts
index decd7c8d38..bdf76bfa20 100644
--- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts
+++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -21,7 +18,6 @@ import { ThemedLoadingComponent } from '../loading/themed-loading.component';
   templateUrl: './item-withdrawn-reinstate-modal.component.html',
   styleUrls: ['./item-withdrawn-reinstate-modal.component.scss'],
   imports: [
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     FormsModule,
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
new file mode 100644
index 0000000000..96f760fc46
--- /dev/null
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -0,0 +1,105 @@
+import {
+  Component,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+
+import { BtnDisabledDirective } from './btn-disabled.directive';
+
+@Component({
+  template: `
+    <button [dsBtnDisabled]="isDisabled">Test Button</button>
+  `,
+})
+class TestComponent {
+  isDisabled = false;
+}
+
+describe('DisabledDirective', () => {
+  let component: TestComponent;
+  let fixture: ComponentFixture<TestComponent>;
+  let button: DebugElement;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [BtnDisabledDirective],
+      declarations: [TestComponent],
+    });
+    fixture = TestBed.createComponent(TestComponent);
+    component = fixture.componentInstance;
+    button = fixture.debugElement.query(By.css('button'));
+    fixture.detectChanges();
+  });
+
+  it('should bind aria-disabled to false initially', () => {
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+    expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+  });
+
+  it('should bind aria-disabled to true and add disabled class when isDisabled is true', () => {
+    component.isDisabled = true;
+    fixture.detectChanges();
+
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('true');
+    expect(button.nativeElement.classList.contains('disabled')).toBeTrue();
+  });
+
+  it('should bind aria-disabled to false and not have disabled class when isDisabled is false', () => {
+    component.isDisabled = false;
+    fixture.detectChanges();
+
+    expect(button.nativeElement.getAttribute('aria-disabled')).toBe('false');
+    expect(button.nativeElement.classList.contains('disabled')).toBeFalse();
+  });
+
+  it('should prevent click events when disabled', () => {
+    component.isDisabled = true;
+    fixture.detectChanges();
+
+    let clickHandled = false;
+    button.nativeElement.addEventListener('click', () => clickHandled = true);
+
+    button.nativeElement.click();
+
+    expect(clickHandled).toBeFalse();
+  });
+
+  it('should prevent Enter or Space keydown events when disabled', () => {
+    component.isDisabled = true;
+    fixture.detectChanges();
+
+    let keydownHandled = false;
+    button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+
+    const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+    const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+
+    button.nativeElement.dispatchEvent(enterEvent);
+    button.nativeElement.dispatchEvent(spaceEvent);
+
+    expect(keydownHandled).toBeFalse();
+  });
+
+  it('should allow click and keydown events when not disabled', () => {
+    let clickHandled = false;
+    let keydownHandled = false;
+
+    button.nativeElement.addEventListener('click', () => clickHandled = true);
+    button.nativeElement.addEventListener('keydown', () => keydownHandled = true);
+
+    button.nativeElement.click();
+
+    const enterEvent = new KeyboardEvent('keydown', { key: 'Enter' });
+    const spaceEvent = new KeyboardEvent('keydown', { key: 'Space' });
+
+    button.nativeElement.dispatchEvent(enterEvent);
+    button.nativeElement.dispatchEvent(spaceEvent);
+
+    expect(clickHandled).toBeTrue();
+    expect(keydownHandled).toBeTrue();
+  });
+});
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index c12ea61347..c5fa369ceb 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -2,26 +2,26 @@
 
   <div ngbDropdown class="btn-group" (openChange)="toggled.emit($event)">
 
-    <div class="input-group-prepend" *ngIf="label">
-      <span id="dsSelectMenuLabel" class="input-group-text">
+    @if (label) {
+      <span  id="dsSelectMenuLabel" class="input-group-text">
         {{ label | translate }}
       </span>
-    </div>
+    }
 
     <button aria-describedby="dsSelectMenuLabel"
-            id="dsSelectMenuButton"
-            class="btn btn-outline-primary selection"
-            (blur)="close.emit($event)"
-            (click)="close.emit($event)"
-            [disabled]="disabled"
-            ngbDropdownToggle>
+      id="dsSelectMenuButton"
+      class="btn btn-outline-primary selection"
+      (blur)="close.emit($event)"
+      (click)="close.emit($event)"
+      [dsBtnDisabled]="disabled"
+      ngbDropdownToggle>
       <ng-content select=".selection"></ng-content>
     </button>
 
     <div ngbDropdownMenu
-         class="dropdown-menu"
-         id="dsSelectDropdownMenu"
-         aria-labelledby="dsSelectMenuButton">
+      class="dropdown-menu"
+      id="dsSelectDropdownMenu"
+      aria-labelledby="dsSelectMenuButton">
       <div>
         <ng-content select=".menu"></ng-content>
       </div>
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
index d82378d4e5..7ee3ab5d87 100644
--- a/src/app/shared/ds-select/ds-select.component.ts
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -8,6 +8,8 @@ import {
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { BtnDisabledDirective } from '../btn-disabled.directive';
+
 /**
  * Component which represent a DSpace dropdown selector.
  */
@@ -16,7 +18,7 @@ import { TranslateModule } from '@ngx-translate/core';
   templateUrl: './ds-select.component.html',
   styleUrls: ['./ds-select.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgIf, TranslateModule],
+  imports: [NgbDropdownModule, TranslateModule, BtnDisabledDirective],
 })
 export class DsSelectComponent {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts b/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts
index e6bbeac619..8c4fd15b7e 100644
--- a/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts
+++ b/src/app/shared/dso-page/dso-edit-menu-resolver.service.ts
@@ -155,7 +155,7 @@ export class DSOEditMenuResolverService  {
         this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'),
         this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self),
         this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self),
-        this.correctionTypeDataService.findByItem(dso.uuid, false).pipe(
+        this.correctionTypeDataService.findByItem(dso.uuid, true).pipe(
           getFirstCompletedRemoteData(),
           getRemoteDataPayload()),
       ]).pipe(
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 6e427400ee..bbec6da207 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -1,21 +1,28 @@
 <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
-    <div class="d-flex flex-row flex-nowrap"
-         [ngbTooltip]="itemModel.text | translate" container="body">
-        <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [disabled]="section.model?.disabled">
-            <i class="fas fa-{{section.icon}} fa-fw"></i>
-        </button>
-        <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
-            <li class="nav-item nav-link d-flex flex-row" *ngFor="let subSection of (subSections$ | async)">
-                <div *ngIf="renderIcons$ | async" class="mr-2">
-                    <i *ngIf="subSection.icon; else spacer" class="fas fa-{{subSection.icon}} fa-fw"></i>
-                    <ng-template #spacer><i class="fas fa-fw"></i></ng-template>
-                </div>
-                <ng-container
-                        *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;">
-                </ng-container>
-            </li>
-        </ul>
-    </div>
+  <div class="d-flex flex-row flex-nowrap"
+    [ngbTooltip]="itemModel.text | translate" container="body">
+    <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsBtnDisabled]="section.model?.disabled">
+      <i class="fas fa-{{section.icon}} fa-fw"></i>
+    </button>
+    <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
+      @for (subSection of (subSections$ | async); track subSection) {
+        <li class="nav-item nav-link d-flex flex-row">
+          @if (renderIcons$ | async) {
+            <div class="me-2">
+              @if (subSection.icon) {
+                <i class="fas fa-{{subSection.icon}} fa-fw"></i>
+              } @else {
+                <i class="fas fa-fw"></i>
+              }
+            </div>
+          }
+          <ng-container
+            *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;">
+          </ng-container>
+        </li>
+      }
+    </ul>
+  </div>
 </div>
 
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
index 94d0ddd260..a2f0af6dd4 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -22,6 +20,7 @@ import { MenuID } from 'src/app/shared/menu/menu-id.model';
 import { MenuSection } from 'src/app/shared/menu/menu-section.model';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { hasValue } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 
@@ -33,7 +32,7 @@ import { MenuService } from '../../../menu/menu.service';
   templateUrl: './dso-edit-menu-expandable-section.component.html',
   styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
   standalone: true,
-  imports: [NgbDropdownModule, NgbTooltipModule, NgFor, NgIf, NgComponentOutlet, TranslateModule, AsyncPipe],
+  imports: [NgbDropdownModule, NgbTooltipModule, NgComponentOutlet, TranslateModule, AsyncPipe, BtnDisabledDirective],
 })
 export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index bbc388a601..b2c8ca84ce 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -1,21 +1,29 @@
-<div *ngIf="!canActivate" class="dso-button-menu mb-1"
-     [ngbTooltip]="itemModel.text | translate">
-    <a *ngIf="!section.model.disabled" class="btn btn-dark btn-sm"
-       [routerLink]="itemModel.link">
+@if (!canActivate) {
+  <div class="dso-button-menu mb-1"
+    [ngbTooltip]="itemModel.text | translate">
+    @if (!section.model.disabled) {
+      <a class="btn btn-dark btn-sm"
+        [routerLink]="itemModel.link">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
-    </a>
-    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [disabled]="true">
+      </a>
+    }
+    @if (section.model.disabled) {
+      <button class="btn btn-dark btn-sm" [dsBtnDisabled]="true">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
-    </button>
-</div>
+      </button>
+    }
+  </div>
+}
 
-<div *ngIf="canActivate" class="dso-button-menu mb-1"
-     [ngbTooltip]="itemModel.text | translate">
-    <button class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
-            (click)="activate($event)">
-        <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
-        <span class="sr-only">{{itemModel.text | translate}}</span>
+@if (canActivate) {
+  <div class="dso-button-menu mb-1"
+    [ngbTooltip]="itemModel.text | translate">
+    <button class="btn btn-dark btn-sm" [dsBtnDisabled]="section.model.disabled"
+      (click)="activate($event)">
+      <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
+      <span class="sr-only">{{itemModel.text | translate}}</span>
     </button>
-</div>
+  </div>
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
index 5c8a1b65d6..a3f39eadd9 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -10,6 +10,7 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
 
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { isNotEmpty } from '../../../empty.util';
 import { MenuService } from '../../../menu/menu.service';
 import { MenuID } from '../../../menu/menu-id.model';
@@ -23,7 +24,7 @@ import { MenuSection } from '../../../menu/menu-section.model';
   templateUrl: './dso-edit-menu-section.component.html',
   styleUrls: ['./dso-edit-menu-section.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, RouterLink, TranslateModule],
+  imports: [NgbTooltipModule, RouterLink, TranslateModule, BtnDisabledDirective],
 })
 export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit {
 
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
index 000da1678e..590d7945ec 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
@@ -1,6 +1,8 @@
 <div class="dso-edit-menu d-flex">
-    <div *ngFor="let section of (sections | async)" class="ml-1">
-        <ng-container
-                *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+  @for (section of (sections | async); track section) {
+    <div class="ms-1">
+      <ng-container
+      *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
     </div>
+  }
 </div>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
index a4b8b728f9..fa3d07ae5d 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgComponentOutlet,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -23,7 +22,7 @@ import { ThemeService } from '../../theme-support/theme.service';
   styleUrls: ['./dso-edit-menu.component.scss'],
   templateUrl: './dso-edit-menu.component.html',
   standalone: true,
-  imports: [NgFor, NgComponentOutlet, AsyncPipe],
+  imports: [NgComponentOutlet, AsyncPipe],
 })
 export class DsoEditMenuComponent extends MenuComponent {
   /**
diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
index 7e8019a54b..7f5bf3664b 100644
--- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -47,7 +45,7 @@ import { DSOSelectorComponent } from '../dso-selector.component';
   styleUrls: ['../dso-selector.component.scss'],
   templateUrl: '../dso-selector.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgIf, NgFor, HoverClassDirective, NgClass, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, HoverClassDirective, NgClass, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component rendering a list of collections to select from
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index 24f579cbba..cfe8da849f 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -1,10 +1,10 @@
-<div class="form-group w-100 pr-2 pl-2">
-    <input type="search"
-           class="form-control"
-           (click)="$event.stopPropagation();"
-           [attr.aria-label]="'dso-selector.placeholder' | translate: { type: typesString }"
-           placeholder="{{'dso-selector.placeholder' | translate: { type: typesString } }}"
-           [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
+<div class="mb-3 w-100 pe-2 ps-2">
+  <input type="search"
+    class="form-control"
+    (click)="$event.stopPropagation();"
+    [attr.aria-label]="'dso-selector.placeholder' | translate: { type: typesString }"
+    placeholder="{{'dso-selector.placeholder' | translate: { type: typesString } }}"
+    [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
 </div>
 <div class="dropdown-divider"></div>
 <div id="scrollable-menu-dso-selector-{{randomSeed}}" class="scrollable-menu list-group">
@@ -15,25 +15,31 @@
     [infiniteScrollContainer]="'#scrollable-menu-dso-selector-' + randomSeed"
     [fromRoot]="true"
     (scrolled)="onScrollDown()">
-    <ng-container *ngIf="listEntries$ | async">
-      <button class="list-group-item list-group-item-action border-0 disabled"
-              *ngIf="(listEntries$ | async).length === 0">
-        {{'dso-selector.no-results' | translate: { type: typesString } }}
+    @if (listEntries$ | async) {
+      @if ((listEntries$ | async).length === 0) {
+        <button class="list-group-item list-group-item-action border-0 disabled"
+          >
+          {{'dso-selector.no-results' | translate: { type: typesString } }}
+        </button>
+      }
+      @for (listEntry of (listEntries$ | async); track listEntry) {
+        <button
+          class="list-group-item list-group-item-action border-0 list-entry"
+          [ngClass]="{'bg-primary': listEntry['id'] === currentDSOId}"
+          title="{{ getName(listEntry) }}"
+          dsHoverClass="ds-hover"
+          (click)="onClick(listEntry)" #listEntryElement>
+          <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
+          [linkType]=linkTypes.None [context]="getContext(listEntry['id'])"></ds-listable-object-component-loader>
+        </button>
+      }
+    }
+    @if (loading) {
+      <button
+        title="{{'loading.default' | translate}}"
+        class="list-group-item list-group-item-action border-0 list-entry">
+        <ds-loading [showMessage]="false"></ds-loading>
       </button>
-      <button *ngFor="let listEntry of (listEntries$ | async)"
-              class="list-group-item list-group-item-action border-0 list-entry"
-              [ngClass]="{'bg-primary': listEntry['id'] === currentDSOId}"
-              title="{{ getName(listEntry) }}"
-              dsHoverClass="ds-hover"
-              (click)="onClick(listEntry)" #listEntryElement>
-        <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
-                                             [linkType]=linkTypes.None [context]="getContext(listEntry['id'])"></ds-listable-object-component-loader>
-      </button>
-    </ng-container>
-    <button *ngIf="loading"
-            title="{{'loading.default' | translate}}"
-            class="list-group-item list-group-item-action border-0 list-entry">
-      <ds-loading [showMessage]="false"></ds-loading>
-    </button>
+    }
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
index d16bbcd91f..52436e3975 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -79,7 +77,7 @@ import { SearchResult } from '../../search/models/search-result.model';
   styleUrls: ['./dso-selector.component.scss'],
   templateUrl: './dso-selector.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgIf, NgFor, HoverClassDirective, NgClass, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, InfiniteScrollModule, HoverClassDirective, NgClass, ListableObjectComponentLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 
 /**
@@ -91,6 +89,12 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    * The view mode of the listed objects
    */
   viewMode = ViewMode.ListElement;
+
+  /**
+   * The current context
+   */
+  @Input() context: Context;
+
   /**
    * The initially selected DSO's uuid
    */
@@ -307,7 +311,14 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
   /**
    * Get the context for element with the given id
    */
-  getContext(id: string) {
+  getContext(id: string): Context {
+    if (this.context === Context.ScopeSelectorModal) {
+      if (id === this.currentDSOId) {
+        return Context.ScopeSelectorModalCurrent;
+      } else {
+        return Context.ScopeSelectorModal;
+      }
+    }
     if (id === this.currentDSOId) {
       return Context.SideBarSearchModalCurrent;
     } else {
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 05efb987a3..52dad5a9a4 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   OnInit,
@@ -36,7 +36,7 @@ import {
   selector: 'ds-base-create-collection-parent-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COLLECTION;
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index a8ec02239d..8a7a4af89b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -1,20 +1,22 @@
 <div>
-    <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-        <button type="button" class="close" (click)="close()" aria-label="Close">
-            <span aria-hidden="true">×</span>
-        </button>
-    </div>
-    <div class="modal-body">
-      <div data-test="admin-div" *ngIf="(isAdmin$ | async)">
-        <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
-        <div class="h3 position-relative py-1 my-3 font-weight-normal">
-            <hr>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+    </button>
+  </div>
+  <div class="modal-body">
+    @if ((isAdmin$ | async)) {
+      <div data-test="admin-div">
+        <button class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
+        <div class="h3 position-relative py-1 my-3 fw-normal">
+          <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
-                <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
+              <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
             </div>
+          </div>
         </div>
-      </div>
-        <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
+      }
+      <span class="h5 px-2">{{'dso-selector.create.community.sub-level' | translate}}</span>
+      <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
-</div>
+  </div>
+
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index d4e9b31245..f86e9a2b08 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -47,7 +44,11 @@ import {
   styleUrls: ['./create-community-parent-selector.component.scss'],
   templateUrl: './create-community-parent-selector.component.html',
   standalone: true,
-  imports: [DSOSelectorComponent, TranslateModule, NgIf, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    DSOSelectorComponent,
+    TranslateModule,
+  ],
 })
 export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COMMUNITY;
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
index 5288f08e02..30cc1d1070 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -1,14 +1,15 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
-    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
+    @if (header) {
+      <span class="h5 px-2">{{header | translate}}</span>
+    }
     <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid"
-                                       [entityType]="entityType"
-                                       [types]="selectorTypes"
-                                       (onSelect)="selectObject($event)"></ds-authorized-collection-selector>
+      [entityType]="entityType"
+      [types]="selectorTypes"
+    (onSelect)="selectObject($event)"></ds-authorized-collection-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index ede3cc3609..efc79596b0 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -36,7 +36,7 @@ import {
   // templateUrl: '../dso-selector-modal-wrapper.component.html',
   templateUrl: './create-item-parent-selector.component.html',
   standalone: true,
-  imports: [NgIf, AuthorizedCollectionSelectorComponent, TranslateModule],
+  imports: [AuthorizedCollectionSelectorComponent, TranslateModule],
 })
 export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
index 6d3d45cb3d..2d139a3f53 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html
@@ -1,11 +1,12 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
-    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
+    @if (header) {
+      <span class="h5 px-2">{{header | translate}}</span>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
index 80ec88f02f..91dc1598af 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   DebugElement,
@@ -137,7 +136,7 @@ describe('DSOSelectorModalWrapperComponent', () => {
   describe('when the click method emits on close button', () => {
     beforeEach(() => {
       spyOn(component, 'close');
-      debugElement.query(By.css('button.close')).triggerEventHandler('click', {});
+      debugElement.query(By.css('button.btn-close')).triggerEventHandler('click', {});
       fixture.detectChanges();
     });
     it('should call the close method on the component', () => {
@@ -164,7 +163,6 @@ describe('DSOSelectorModalWrapperComponent', () => {
   templateUrl: './dso-selector-modal-wrapper.component.html',
   imports: [
     DSOSelectorComponent,
-    NgIf,
     TranslateModule,
   ],
   standalone: true,
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index 611a4f13de..107e250b48 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -33,7 +32,7 @@ import {
   selector: 'ds-base-edit-collection-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [ DSOSelectorComponent, TranslateModule],
 })
 export class EditCollectionSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.COLLECTION;
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index 3f7ede0de0..e2e498f3a4 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -33,7 +32,7 @@ import {
   selector: 'ds-base-edit-community-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 
 export class EditCommunitySelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 999a96e730..210f6a6d20 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -1,11 +1,12 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
-    <span *ngIf="header" class="h5 px-2">{{header | translate}}</span>
+    @if (header) {
+      <span class="h5 px-2">{{header | translate}}</span>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index 903f432734..d5ac19c392 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   OnInit,
@@ -29,7 +29,7 @@ import {
   selector: 'ds-base-edit-item-selector',
   templateUrl: 'edit-item-selector.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class EditItemSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
index 0fb80e769b..627baaba1f 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -57,7 +56,7 @@ import {
   selector: 'ds-export-batch-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [ DSOSelectorComponent, TranslateModule],
 })
 export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.DSPACEOBJECT;
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
index 6907ee0d58..d2afb176fe 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -58,7 +57,7 @@ import {
   selector: 'ds-export-metadata-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.DSPACEOBJECT;
diff --git a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
index 2b3785c0f9..bf68cb87a3 100644
--- a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -30,7 +29,7 @@ import {
   selector: 'ds-import-batch-selector',
   templateUrl: '../dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [ DSOSelectorComponent, TranslateModule],
 })
 export class ImportBatchSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.DSPACEOBJECT;
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index 049f5c81be..4f09f88352 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.html
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html
@@ -1,30 +1,38 @@
 <ul class="scrollable-menu list-unstyled mb-0"
-    role="menu"
-    (scroll)="onScroll($event)"
-    infiniteScroll
-    [infiniteScrollDistance]="5"
-    [infiniteScrollThrottle]="300"
-    [infiniteScrollUpDistance]="1.5"
-    [fromRoot]="true"
-    [scrollWindow]="false"
-    (scrolled)="onScrollDown()">
-  <li *ngIf="searchListEntity?.length === 0 && (isLoadingList | async) !== true">
-    <button class="dropdown-item disabled" role="menuitem">
-      {{'submission.sections.general.no-entity' | translate}}
-    </button>
-  </li>
-  <li *ngFor="let listItem of searchListEntity" class="entity-item text-primary">
-    <button class="dropdown-item"
-            role="menuitem"
-            title="{{ listItem.label }}"
-            (click)="onSelect(listItem)">
-      <span class="text-truncate font-weight-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</span>
-    </button>
-  </li>
-  <li *ngIf="(isLoadingList | async)">
-    <button class="dropdown-item disabled" role="menuitem">
-      <ds-loading message="{{'loading.default' | translate}}">
-      </ds-loading>
-    </button>
-  </li>
+  role="menu"
+  (scroll)="onScroll($event)"
+  infiniteScroll
+  [infiniteScrollDistance]="5"
+  [infiniteScrollThrottle]="300"
+  [infiniteScrollUpDistance]="1.5"
+  [fromRoot]="true"
+  [scrollWindow]="false"
+  (scrolled)="onScrollDown()">
+  @if (searchListEntity?.length === 0 && (isLoadingList | async) !== true) {
+    <li>
+      <button class="dropdown-item disabled" role="menuitem">
+        {{'submission.sections.general.no-entity' | translate}}
+      </button>
+    </li>
+  }
+  @for (listItem of searchListEntity; track listItem) {
+    <li class="entity-item text-primary">
+      <button class="dropdown-item"
+        role="menuitem"
+        title="{{ listItem.label }}"
+        (click)="onSelect(listItem)">
+        <ul class="list-unstyled mb-0">
+          <li class="list-item text-truncate text-primary fw-bold">{{ listItem.label.toLowerCase() + '.listelement.badge' | translate }}</li>
+        </ul>
+      </button>
+    </li>
+  }
+  @if ((isLoadingList | async)) {
+    <li>
+      <button class="dropdown-item disabled" role="menuitem">
+        <ds-loading message="{{'loading.default' | translate}}">
+        </ds-loading>
+      </button>
+    </li>
+  }
 </ul>
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
index 61bfd853ca..37d5a40155 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -41,7 +37,7 @@ import { ThemedLoadingComponent } from '../loading/themed-loading.component';
   templateUrl: './entity-dropdown.component.html',
   styleUrls: ['./entity-dropdown.component.scss'],
   standalone: true,
-  imports: [InfiniteScrollModule, NgIf, NgFor, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [InfiniteScrollModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class EntityDropdownComponent implements OnInit, OnDestroy {
   /**
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.html b/src/app/shared/eperson-group-list/eperson-group-list.component.html
index 6ee5aad943..1b1d2d5115 100644
--- a/src/app/shared/eperson-group-list/eperson-group-list.component.html
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.html
@@ -1,36 +1,42 @@
 <div class="mt-3" @fadeInOut>
-  <ds-eperson-search-box *ngIf="isListOfEPerson" (search)="onSearch($event)"></ds-eperson-search-box>
-  <ds-group-search-box *ngIf="!isListOfEPerson" (search)="onSearch($event)"></ds-group-search-box>
+  @if (isListOfEPerson) {
+    <ds-eperson-search-box (search)="onSearch($event)"></ds-eperson-search-box>
+  }
+  @if (!isListOfEPerson) {
+    <ds-group-search-box (search)="onSearch($event)"></ds-group-search-box>
+  }
 
-  <ds-pagination *ngIf="(getList() | async)?.payload?.totalElements > 0"
-                 [paginationOptions]="paginationOptions"
-                 [collectionSize]="(getList() | async)?.payload?.totalElements"
-                 [retainScrollPosition]="true"
-                 [hideGear]="true">
-
-    <div class="table-responsive">
-      <table id="groups" class="table table-sm table-striped table-hover table-bordered">
-        <thead>
-        <tr class="text-center">
-          <th>{{'resource-policies.form.eperson-group-list.table.headers.id' | translate}}</th>
-          <th>{{'resource-policies.form.eperson-group-list.table.headers.name' | translate}}</th>
-          <th>{{'resource-policies.form.eperson-group-list.table.headers.action' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let entry of (getList() | async)?.payload?.page"
-            [class.table-primary]="isSelected(entry) | async">
-          <td>{{entry.id}}</td>
-          <td>{{dsoNameService.getName(entry)}}</td>
-          <td class="text-center">
-            <button class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)">
-              {{'resource-policies.form.eperson-group-list.select.btn' | translate}}
-            </button>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-
-  </ds-pagination>
+  @if ((getList() | async)?.payload?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="paginationOptions"
+      [collectionSize]="(getList() | async)?.payload?.totalElements"
+      [retainScrollPosition]="true"
+      [hideGear]="true">
+      <div class="table-responsive">
+        <table id="groups" class="table table-sm table-striped table-hover table-bordered">
+          <thead>
+            <tr class="text-center">
+              <th>{{'resource-policies.form.eperson-group-list.table.headers.id' | translate}}</th>
+              <th>{{'resource-policies.form.eperson-group-list.table.headers.name' | translate}}</th>
+              <th>{{'resource-policies.form.eperson-group-list.table.headers.action' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (entry of (getList() | async)?.payload?.page; track entry) {
+              <tr
+                [class.table-primary]="isSelected(entry) | async">
+                <td>{{entry.id}}</td>
+                <td>{{dsoNameService.getName(entry)}}</td>
+                <td class="text-center">
+                  <button class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)">
+                    {{'resource-policies.form.eperson-group-list.select.btn' | translate}}
+                  </button>
+                </td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
 </div>
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.ts
index a600e479c4..60feb186ba 100644
--- a/src/app/shared/eperson-group-list/eperson-group-list.component.ts
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -58,7 +54,7 @@ import { GroupSearchBoxComponent } from './group-search-box/group-search-box.com
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, EpersonSearchBoxComponent, GroupSearchBoxComponent, PaginationComponent, NgFor, AsyncPipe, TranslateModule],
+  imports: [EpersonSearchBoxComponent, GroupSearchBoxComponent, PaginationComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component that shows a list of eperson or group
diff --git a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html
index fb330a536a..214f90cf27 100644
--- a/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html
+++ b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html
@@ -2,20 +2,18 @@
       [formGroup]="searchForm"
       (ngSubmit)="submit(searchForm.value); $event.stopImmediatePropagation();" >
   <div>
-    <select name="scope" id="scope" formControlName="scope" class="form-control" aria-label="Search scope">
+    <select name="scope" id="scope" formControlName="scope" class="form-select" aria-label="Search scope">
       <option value="metadata">{{labelPrefix + 'search.scope.metadata' | translate}}</option>
       <option value="email">{{labelPrefix + 'search.scope.email' | translate}}</option>
     </select>
   </div>
-  <div class="flex-grow-1 mr-3 ml-3">
-    <div class="form-group input-group">
+  <div class="flex-grow-1 me-3 ms-3">
+    <div class="mb-3 input-group">
       <input type="text" name="query" id="query" formControlName="query"
              class="form-control" aria-label="Search input">
-      <span class="input-group-append">
-        <button type="submit" class="search-button btn btn-primary">
-          <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
-        </button>
-      </span>
+    <button type="submit" class="search-button btn btn-primary">
+      <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
+    </button>
     </div>
   </div>
   <div>
diff --git a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html
index e5a3e1a876..efb0162591 100644
--- a/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html
+++ b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html
@@ -1,15 +1,13 @@
 <form class="d-flex justify-content-between"
       [formGroup]="searchForm"
       (ngSubmit)="submit(searchForm.value); $event.stopImmediatePropagation();" >
-  <div class="flex-grow-1 mr-3">
-    <div class="form-group input-group">
+  <div class="flex-grow-1 me-3">
+    <div class="mb-3 input-group">
       <input type="text" name="query" id="query" formControlName="query"
              class="form-control" aria-label="Search input">
-      <span class="input-group-append">
         <button type="submit" class="search-button btn btn-primary">
           <i class="fas fa-search"></i> {{ labelPrefix + 'search.button' | translate }}
         </button>
-      </span>
     </div>
   </div>
   <div>
diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index d649c0ad4e..e305d2a82b 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -1,5 +1,11 @@
-<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out" [queryParams]="(bitstreamPath$| async)?.queryParams" [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses">
-  <span role="img" *ngIf="(canDownload$ |async) !== true" [attr.aria-label]="'file-download-link.restricted' | translate" class="pr-1"><i class="fas fa-lock"></i></span>
+<a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out"
+  [queryParams]="(bitstreamPath$| async)?.queryParams"
+  [target]="isBlank ? '_blank': '_self'"
+  [ngClass]="cssClasses"
+  [attr.aria-label]="('file-download-link.download' | translate) + dsoNameService.getName(bitstream)">
+  @if ((canDownload$ |async) !== true) {
+    <span role="img" [attr.aria-label]="'file-download-link.restricted' | translate" class="pe-1"><i class="fas fa-lock"></i></span>
+  }
   <ng-container *ngTemplateOutlet="content"></ng-container>
 </a>
 
diff --git a/src/app/shared/file-download-link/file-download-link.component.ts b/src/app/shared/file-download-link/file-download-link.component.ts
index 9b01cd799d..a8475ee841 100644
--- a/src/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/app/shared/file-download-link/file-download-link.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -22,6 +21,7 @@ import {
   getBitstreamDownloadRoute,
   getBitstreamRequestACopyRoute,
 } from '../../app-routing-paths';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Bitstream } from '../../core/shared/bitstream.model';
@@ -36,7 +36,7 @@ import {
   templateUrl: './file-download-link.component.html',
   styleUrls: ['./file-download-link.component.scss'],
   standalone: true,
-  imports: [RouterLink, NgClass, NgIf, NgTemplateOutlet, AsyncPipe, TranslateModule],
+  imports: [RouterLink, NgClass, NgTemplateOutlet, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a download link
@@ -73,6 +73,7 @@ export class FileDownloadLinkComponent implements OnInit {
 
   constructor(
     private authorizationService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
   ) {
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
index 7224f1843d..606fee1a7e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
@@ -1,84 +1,105 @@
-<div [class.form-group]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('form-group')"
-     [class.d-none]="model.hidden"
-     [formGroup]="group"
-     [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
-  <label *ngIf="!isCheckbox && hasLabel"
-         [id]="'label_' + model.id"
-         [for]="id"
-         [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
-         [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
+<div [class.mb-3]="(model.type !== 'GROUP' && asBootstrapFormGroup) || getClass('element', 'container').includes('mb-3')"
+  [class.d-none]="model.hidden"
+  [formGroup]="group"
+  [ngClass]="[getClass('element', 'container'), getClass('grid', 'container')]">
+  @if (!isCheckbox && hasLabel) {
+    <label
+      [id]="'label_' + model.id"
+      [for]="id"
+      class="form-label"
+      [innerHTML]="(model.required && model.label) ? (model.label | translate) + ' *' : (model.label | translate)"
+    [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></label>
+  }
   <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: { $implicit: model };"></ng-container>
   <!--    Should be *ngIf instead of class d-none, but that breaks the #componentViewContainer reference-->
-  <div [ngClass]="{'form-row': model.hasLanguages || isRelationship,
+  <div [ngClass]="{'row': model.hasLanguages || isRelationship,
                       'd-none': this.metadataService.isVirtual(value) && (model.hasSelectableMetadata || context?.index > 0)}">
     <div [ngClass]="getClass('grid', 'control')">
       <div>
         <ng-container #componentViewContainer></ng-container>
       </div>
 
-      <small *ngIf="hasHint && (formBuilderService.hasArrayGroupValue(model) || (!model.repeatable && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)"
+      @if (hasHint && (formBuilderService.hasArrayGroupValue(model) || (!model.repeatable && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)) {
+<small
              class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
+      }
       <!-- In case of repeatable fields show empty space for all elements except the first -->
-      <div *ngIf="context?.index !== null
-              && (!showErrorMessages || errorMessages.length === 0)" class="clearfix w-100 mb-2"></div>
+      @if (context?.index !== null
+        && (!showErrorMessages || errorMessages.length === 0)) {
+        <div class="clearfix w-100 mb-2"></div>
+      }
 
-      <div *ngIf="!model.hideErrorMessages && showErrorMessages" [id]="id + '_errors'"
-           [ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]">
-        <small *ngFor="let message of errorMessages" class="invalid-feedback d-block">{{ message | translate: model.validators }}</small>
+      @if (!model.hideErrorMessages && showErrorMessages) {
+        <div [id]="id + '_errors'"
+          [ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]">
+          @for (message of errorMessages; track message) {
+            <small class="invalid-feedback d-block">{{ message | translate: model.validators }}</small>
+          }
+        </div>
+      }
+
+    </div>
+    @if (model.languageCodes && model.languageCodes.length > 0) {
+      <div class="col-xs-2" >
+        <select
+          #language="ngModel"
+          [disabled]="model.readOnly"
+          [(ngModel)]="model.language"
+          class="form-select"
+          (blur)="onBlur($event)"
+          (change)="onChangeLanguage($event)"
+          [ngModelOptions]="{standalone: true}"
+          required>
+          @for (lang of model.languageCodes; track lang) {
+            <option [value]="lang.code">{{lang.display}}</option>
+          }
+        </select>
       </div>
-
-    </div>
-    <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2" >
-      <select
-        #language="ngModel"
-        [disabled]="model.readOnly"
-        [(ngModel)]="model.language"
-        class="form-control"
-        (blur)="onBlur($event)"
-        (change)="onChangeLanguage($event)"
-        [ngModelOptions]="{standalone: true}"
-        required>
-        <option *ngFor="let lang of model.languageCodes" [value]="lang.code">{{lang.display}}</option>
-      </select>
-    </div>
-    <div *ngIf="isRelationship" class="col-auto text-center">
-      <button class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.lookup-help' | translate}}"
-              [attr.aria-label]="'form.lookup-help' | translate"
-              placement="top"
-              data-test="lookup-button"
-              (click)="openLookup(); $event.stopPropagation();"><i class="fa fa-search"></i>
-      </button>
-    </div>
+    }
+    @if (isRelationship) {
+      <div class="col-auto text-center">
+        <button class="btn btn-secondary"
+          type="button"
+          ngbTooltip="{{'form.lookup-help' | translate}}"
+          [attr.aria-label]="'form.lookup-help' | translate"
+          placement="top"
+          data-test="lookup-button"
+          (click)="openLookup(); $event.stopPropagation();"><i class="fa fa-search"></i>
+        </button>
+      </div>
+    }
   </div>
   <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: model"></ng-container>
-  <ng-container *ngIf="this.metadataService.isVirtual(value)">
-    <ds-existing-metadata-list-element
-      *ngIf="model.hasSelectableMetadata"
-      [reoRel]="relationshipValue$ | async"
-      [submissionItem]="item$ | async"
-      [listId]="listId"
-      [metadataFields]="model.metadataFields"
-      [submissionId]="model.submissionId"
-      [relationshipOptions]="model.relationship"
-      (remove)="onRemove()"
-    >
-    </ds-existing-metadata-list-element>
-    <ds-existing-relation-list-element
-      *ngIf="!model.hasSelectableMetadata"
-      [ngClass]="{'d-block pb-2 pt-2': !context?.index}"
-      [reoRel]="relationshipValue$ | async"
-      [submissionItem]="item$ | async"
-      [listId]="listId"
-      [metadataFields]="model.metadataFields"
-      [submissionId]="model.submissionId"
-      [relationshipOptions]="model.relationship"
-    >
-    </ds-existing-relation-list-element>
-    <small *ngIf="hasHint && (model.repeatable === false || context?.index === context?.context?.groups?.length - 1) && (!showErrorMessages || errorMessages.length === 0)"
-           class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
+  @if (this.metadataService.isVirtual(value)) {
+    @if (model.hasSelectableMetadata) {
+      <ds-existing-metadata-list-element
+        [reoRel]="relationshipValue$ | async"
+        [submissionItem]="item$ | async"
+        [listId]="listId"
+        [metadataFields]="model.metadataFields"
+        [submissionId]="model.submissionId"
+        [relationshipOptions]="model.relationship"
+        (remove)="onRemove()"
+        >
+      </ds-existing-metadata-list-element>
+    }
+    @if (!model.hasSelectableMetadata) {
+      <ds-existing-relation-list-element
+        [ngClass]="{'d-block pb-2 pt-2': !context?.index}"
+        [reoRel]="relationshipValue$ | async"
+        [submissionItem]="item$ | async"
+        [listId]="listId"
+        [metadataFields]="model.metadataFields"
+        [submissionId]="model.submissionId"
+        [relationshipOptions]="model.relationship"
+        >
+      </ds-existing-relation-list-element>
+    }
+    @if (hasHint && (model.repeatable === false || context?.index === context?.context?.groups?.length - 1) && (!showErrorMessages || errorMessages.length === 0)) {
+      <small
+      class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
+    }
     <div class="clearfix w-100 mb-2"></div>
-  </ng-container>
+  }
   <ng-content></ng-content>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss
index 4e58759f4e..92aee1c159 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.scss
@@ -14,3 +14,22 @@
   -moz-appearance: none;
   appearance: none;
 }
+
+
+:host ::ng-deep .btn-group-toggle > .btn input[type="radio"] {
+  position: absolute;
+  clip: rect(0,0,0,0);
+  pointer-events: none;
+}
+
+:host ::ng-deep dynamic-ng-bootstrap-radio-group {
+  display: block;
+  width: 100%;
+  > .btn-group.btn-group-toggle {
+    width: 100%;
+  }
+}
+
+:host ::ng-deep .custom-control-input.is-invalid ~ .custom-control-label {
+  color: var(--bs-form-invalid-color);
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
index 7d89f64e5c..957fab2b1e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -101,6 +99,7 @@ import { SubmissionObject } from '../../../../core/submission/models/submission-
 import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils';
 import { SubmissionService } from '../../../../submission/submission.service';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import {
   hasNoValue,
   hasValue,
@@ -132,16 +131,15 @@ import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/d
   changeDetection: ChangeDetectionStrategy.Default,
   imports: [
     ExistingMetadataListElementComponent,
-    NgIf,
     NgClass,
     AsyncPipe,
     TranslateModule,
     ReactiveFormsModule,
-    NgForOf,
     FormsModule,
     NgbTooltipModule,
     NgTemplateOutlet,
     ExistingRelationListElementComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
index 4c1ea2dd96..9b2a67a96d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
@@ -1,14 +1,16 @@
-<ds-dynamic-form-control-container *ngFor="let model of formModel; trackBy: trackByFn"
-                                   [formId]="formId"
-                                   [group]="formGroup"
-                                   [hasErrorMessaging]="model.hasErrorMessages"
-                                   [hidden]="model.hidden"
-                                   [class.d-none]="model.hidden"
-                                   [layout]="formLayout"
-                                   [model]="model"
-                                   [templates]="templates"
-                                   [asBootstrapFormGroup]="true"
-                                   (dfBlur)="onCustomEvent($event, blur)"
-                                   (dfChange)="onCustomEvent($event, change)"
-                                   (dfFocus)="onCustomEvent($event, focus)"
-                                   (ngbEvent)="onCustomEvent($event, ngbEvent)"></ds-dynamic-form-control-container>
+@for (model of formModel; track trackByFn($index, model)) {
+  <ds-dynamic-form-control-container
+    [formId]="formId"
+    [group]="formGroup"
+    [hasErrorMessaging]="model.hasErrorMessages"
+    [hidden]="model.hidden"
+    [class.d-none]="model.hidden"
+    [layout]="formLayout"
+    [model]="model"
+    [templates]="templates"
+    [asBootstrapFormGroup]="true"
+    (dfBlur)="onCustomEvent($event, blur)"
+    (dfChange)="onCustomEvent($event, change)"
+    (dfFocus)="onCustomEvent($event, focus)"
+  (ngbEvent)="onCustomEvent($event, ngbEvent)"></ds-dynamic-form-control-container>
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
index 4146fc8e4d..49dea60998 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
@@ -1,4 +1,4 @@
-import { NgForOf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -28,7 +28,6 @@ import { DsDynamicFormControlContainerComponent } from './ds-dynamic-form-contro
   templateUrl: './ds-dynamic-form.component.html',
   imports: [
     forwardRef(() => DsDynamicFormControlContainerComponent),
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index 944e4650ab..be92b7f74c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,15 +1,15 @@
 <div class="d-flex">
-    <span class="mr-auto text-contents">
-        <ng-container *ngIf="(metadataRepresentation$ | async) === undefined">
-            <ds-loading [showMessage]="false"></ds-loading>
-        </ng-container>
-        <ng-container *ngIf="(metadataRepresentation$ | async)">
-            <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation$ | async"></ds-metadata-representation-loader>
-        </ng-container>
-    </span>
-    <button type="button" class="btn btn-secondary"
-            title="{{'form.remove' | translate}}"
-            (click)="removeSelection()">
-        <i class="fas fa-trash" aria-hidden="true"></i>
-    </button>
+  <span class="me-auto text-contents">
+    @if ((metadataRepresentation$ | async) === undefined) {
+      <ds-loading [showMessage]="false"></ds-loading>
+    }
+    @if ((metadataRepresentation$ | async)) {
+      <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation$ | async"></ds-metadata-representation-loader>
+    }
+  </span>
+  <button type="button" class="btn btn-secondary"
+    title="{{'form.remove' | translate}}"
+    (click)="removeSelection()">
+    <i class="fas fa-trash" aria-hidden="true"></i>
+  </button>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
index f3ca411853..9f0ecf91cc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
@@ -1,8 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -166,7 +163,6 @@ export class ReorderableRelationship extends Reorderable {
   templateUrl: './existing-metadata-list-element.component.html',
   styleUrls: ['./existing-metadata-list-element.component.scss'],
   imports: [
-    NgIf,
     ThemedLoadingComponent,
     AsyncPipe,
     MetadataRepresentationLoaderComponent,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
index 08efff4219..a308fc2385 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
@@ -1,14 +1,14 @@
 <div class="d-flex">
-    <div class="flex-grow-1 mr-auto">
-        <ng-container *ngIf="(relatedItem$ | async) === undefined">
-            <ds-loading [showMessage]="false"></ds-loading>
-        </ng-container>
-        <ng-container *ngIf="(relatedItem$ | async)">
-            <ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-listable-object-component-loader>
-        </ng-container>
-    </div>
-    <button type="button" class="btn btn-secondary"
-            (click)="removeSelection()">
-        <i class="fas fa-trash" aria-hidden="true"></i>
-    </button>
+  <div class="flex-grow-1 me-auto">
+    @if ((relatedItem$ | async) === undefined) {
+      <ds-loading [showMessage]="false"></ds-loading>
+    }
+    @if ((relatedItem$ | async)) {
+      <ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-listable-object-component-loader>
+    }
+  </div>
+  <button type="button" class="btn btn-secondary"
+    (click)="removeSelection()">
+    <i class="fas fa-trash" aria-hidden="true"></i>
+  </button>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
index 7523bafb00..ffbaef8664 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
@@ -1,8 +1,5 @@
 /* eslint-disable max-classes-per-file */
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -83,7 +80,6 @@ export abstract class Reorderable {
     ThemedLoadingComponent,
     AsyncPipe,
     ListableObjectComponentLoaderComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
index dd19e6158d..5c6d50d6ab 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
@@ -1,45 +1,56 @@
 <ng-container [formGroup]="group">
-    <div [id]="id"
-         [formArrayName]="model.id"
-         [class.d-none]="model.hidden"
-         [ngClass]="getClass('element', 'control')">
+  <div [id]="id"
+    [formArrayName]="model.id"
+    [class.d-none]="model.hidden"
+    [ngClass]="getClass('element', 'control')">
 
-      <!-- Draggable Container -->
-      <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
-        <!-- Draggable Items -->
-        <div *ngFor="let groupModel of model.groups; let idx = index"
-             role="group"
-             [formGroupName]="idx"
-             [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
-             cdkDrag
-             [cdkDragDisabled]="dragDisabled"
-             [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
-             [class.grey-background]="model.isInlineGroupArray">
+    <!-- Draggable Container -->
+    <div role="listbox" [attr.aria-label]="'dynamic-form-array.sortable-list.label' | translate" #dropList cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
+      <!-- Draggable Items -->
+      @for (groupModel of model.groups; track groupModel; let idx = $index; let length = $count) {
+        <div #sortableElement
+          class="drag-item-container"
+          role="group"
+          [formGroupName]="groupModel.index"
+          [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
+          cdkDrag
+          [cdkDragDisabled]="dragDisabled"
+          [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
+          [class.grey-background]="model.isInlineGroupArray">
           <!-- Item content -->
-          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle>
+          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle
+            (focus)="addInstructionMessageToLiveRegion(sortableElement)"
+            (keydown.space)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+            (keydown.enter)="toggleKeyboardDragAndDrop($event, sortableElement, idx, length)"
+            (keydown.tab)="stopKeyboardDragAndDrop(sortableElement, idx, length)"
+            (keydown.escape)="cancelKeyboardDragAndDrop(sortableElement, idx, length)"
+            (keydown.arrowUp)="handleArrowPress($event, dropList, length, idx, 'up')"
+            (keydown.arrowDown)="handleArrowPress($event, dropList, length, idx, 'down')">
             <i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
           </div>
           <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
-          <ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
-                                             [bindId]="false"
-                                             [formGroup]="group"
-                                             [formModel]="formModel"
-                                             [context]="groupModel"
-                                             [group]="control.get([idx])"
-                                             [hidden]="_model.hidden"
-                                             [class.d-none]="_model.hidden"
-                                             [layout]="formLayout"
-                                             [model]="_model"
-                                             [templates]="templates"
-                                             [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
-                                             (dfBlur)="onBlur($event)"
-                                             (dfChange)="onChange($event)"
-                                             (dfFocus)="onFocus($event)"
-                                             (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
-
+          @for (_model of groupModel.group; track _model) {
+            <ds-dynamic-form-control-container
+              [bindId]="false"
+              [formGroup]="group"
+              [formModel]="formModel"
+              [context]="groupModel"
+              [group]="getControlOfGroup(groupModel)"
+              [hidden]="_model.hidden"
+              [class.d-none]="_model.hidden"
+              [layout]="formLayout"
+              [model]="_model"
+              [templates]="templates"
+              [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
+              (dfBlur)="onBlur($event)"
+              (dfChange)="onChange($event)"
+              (dfFocus)="onFocus($event)"
+            (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
+          }
           <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: groupModel"></ng-container>
         </div>
-      </div>
+      }
     </div>
+  </div>
 
 </ng-container>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
index ce4a89226a..0005f20dfc 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.scss
@@ -1,65 +1,82 @@
 @import './../../../../../../../styles/variables';
 
 :host {
-  display: block;
+    display: block;
 }
-.drag-disable {
-  visibility: hidden !important;
-  &:hover, &:focus {
-    cursor: default;
-    .drag-icon {
-      visibility: hidden !important;
-    }
-  }
-}
-.cdk-drag {
-  margin-left: calc(-2.3 * var(--bs-spacer));
-  margin-right: calc(-0.5 * var(--bs-spacer));
-  padding-right: calc(0.5 * var(--bs-spacer));
-  .drag-icon {
-    visibility: hidden;
-    width: calc(2 * var(--bs-spacer));
-    color: var(--bs-gray-600);
-    margin: var(--bs-btn-padding-y) 0;
-    line-height: var(--bs-btn-line-height);
-    text-indent: calc(0.5 * var(--bs-spacer))
-  }
 
-  &:hover, &:focus {
-    cursor: grab;
-    .drag-icon {
-      visibility: visible;
+.drag-disable {
+    visibility: hidden !important;
+
+    &:hover, &:focus {
+        cursor: default;
+
+        .drag-icon {
+            visibility: hidden !important;
+        }
+    }
+}
+
+.cdk-drag {
+    margin-left: calc(-2.3 * var(--bs-spacer));
+    margin-right: calc(-0.5 * var(--bs-spacer));
+    padding-right: calc(0.5 * var(--bs-spacer));
+    > .col {
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+    .cdk-drag-handle {
+        width: calc(2 * var(--bs-spacer));
+    }
+
+    .drag-icon {
+        visibility: hidden;
+        width: calc(2 * var(--bs-spacer));
+        color: var(--bs-gray-600);
+        margin: var(--bs-btn-padding-y) 0;
+        line-height: var(--bs-btn-line-height);
+        text-indent: calc(0.5 * var(--bs-spacer))
+    }
+
+    &:hover, &:focus {
+        cursor: grab;
+
+        .drag-icon {
+            visibility: visible;
+        }
     }
-  }
 
 }
 
 .drag-handle {
-  &:hover {
-    cursor: move;
-  }
-
-  &:focus {
-    .drag-icon {
-      visibility: visible;
+    &:hover {
+        cursor: move;
+    }
+
+    &:focus {
     }
-  }
 }
 
 .cdk-drop-list-dragging {
-  .drag-handle {
-    cursor: grabbing;
-    .drag-icon {
-      visibility: hidden;
+    .drag-handle {
+        cursor: grabbing;
+
+        .drag-icon {
+            visibility: hidden;
+        }
     }
-  }
 }
 
 .cdk-drag-preview {
-  margin: 0;
-  padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 .cdk-drag-placeholder {
-  opacity: 0;
+    opacity: 0;
+}
+
+::ng-deep {
+  .sorting-with-keyboard input {
+    background-color: var(--bs-gray-400);
+  }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
new file mode 100644
index 0000000000..0d9ed6ae74
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.spec.ts
@@ -0,0 +1,159 @@
+import { HttpClient } from '@angular/common/http';
+import { EventEmitter } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  DYNAMIC_FORM_CONTROL_MAP_FN,
+  DynamicFormLayoutService,
+  DynamicFormService,
+  DynamicFormValidationService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { NgxMaskModule } from 'ngx-mask';
+import { of } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  APP_DATA_SERVICES_MAP,
+} from '../../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../../environments/environment.test';
+import { SubmissionService } from '../../../../../../submission/submission.service';
+import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component';
+import { dsDynamicFormControlMapFn } from '../../ds-dynamic-form-control-map-fn';
+import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
+import { DsDynamicFormArrayComponent } from './dynamic-form-array.component';
+
+describe('DsDynamicFormArrayComponent', () => {
+  const translateServiceStub = {
+    get: () => of('translated-text'),
+    instant: () => 'translated-text',
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  let component: DsDynamicFormArrayComponent;
+  let fixture: ComponentFixture<DsDynamicFormArrayComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        ReactiveFormsModule,
+        DsDynamicFormArrayComponent,
+        NgxMaskModule.forRoot(),
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        DynamicFormLayoutService,
+        DynamicFormValidationService,
+        provideMockStore(),
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
+        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: HttpClient, useValue: {} },
+        { provide: SubmissionService, useValue: {} },
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: DYNAMIC_FORM_CONTROL_MAP_FN, useValue: dsDynamicFormControlMapFn },
+      ],
+    }).overrideComponent(DsDynamicFormArrayComponent, {
+      remove: {
+        imports: [DsDynamicFormControlContainerComponent],
+      },
+    })
+      .compileComponents();
+  });
+
+  beforeEach(inject([DynamicFormService], (service: DynamicFormService) => {
+    const formModel = [
+      new DynamicRowArrayModel({
+        id: 'testFormRowArray',
+        initialCount: 5,
+        notRepeatable: false,
+        relationshipConfig: undefined,
+        submissionId: '1234',
+        isDraggable: true,
+        groupFactory: () => {
+          return [
+            new DynamicInputModel({ id: 'testFormRowArrayGroupInput' }),
+          ];
+        },
+        required: false,
+        metadataKey: 'dc.contributor.author',
+        metadataFields: ['dc.contributor.author'],
+        hasSelectableMetadata: true,
+        showButtons: true,
+        typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{ id: 'dc.type', value: 'Book' }] }],
+      }),
+    ];
+
+    fixture = TestBed.createComponent(DsDynamicFormArrayComponent);
+    component = fixture.componentInstance;
+    component.model = formModel[0] as DynamicRowArrayModel;
+
+    component.group = service.createFormGroup(formModel);
+
+    fixture.detectChanges();
+  }));
+
+  it('should move element up and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 1, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should move element down and maintain focus', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving up from the first element', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowUp' }), dropList, 3, 0, 'up');
+    fixture.detectChanges();
+    expect(component.model.groups[2]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should wrap around when moving down from the last element', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 2, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[0]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[0]);
+  });
+
+  it('should not move element if keyboard drag is not active', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.elementBeingSorted = null;
+    component.handleArrowPress(new KeyboardEvent('keydown', { key: 'ArrowDown' }), dropList, 3, 1, 'down');
+    fixture.detectChanges();
+    expect(component.model.groups[1]).toBeDefined();
+    expect(document.activeElement).toBe(dropList.querySelectorAll('[cdkDragHandle]')[2]);
+  });
+
+  it('should cancel keyboard drag and drop', () => {
+    const dropList = fixture.debugElement.query(By.css('.cdk-drop-list')).nativeElement;
+    component.elementBeingSortedStartingIndex = 2;
+    component.elementBeingSorted = dropList.querySelectorAll('[cdkDragHandle]')[2];
+    component.model.moveGroup(2, 1);
+    fixture.detectChanges();
+    component.cancelKeyboardDragAndDrop(dropList, 1, 3);
+    fixture.detectChanges();
+    expect(component.elementBeingSorted).toBeNull();
+    expect(component.elementBeingSortedStartingIndex).toBeNull();
+  });
+});
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
index 4c45393c92..1385859b94 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
@@ -6,7 +6,6 @@ import {
 } from '@angular/cdk/drag-drop';
 import {
   NgClass,
-  NgForOf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -32,9 +31,14 @@ import {
   DynamicFormValidationService,
   DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
 import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
 import { hasValue } from '../../../../../empty.util';
+import { LiveRegionService } from '../../../../../live-region/live-region.service';
 import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-control-container.component';
 import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
 
@@ -46,11 +50,11 @@ import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
     ReactiveFormsModule,
     CdkDropList,
     NgClass,
-    NgForOf,
     CdkDrag,
     CdkDragHandle,
     forwardRef(() => DsDynamicFormControlContainerComponent),
     NgTemplateOutlet,
+    TranslateModule,
   ],
   standalone: true,
 })
@@ -64,6 +68,9 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   @Input() model: DynamicRowArrayModel;// DynamicRow?
   @Input() templates: QueryList<DynamicTemplateDirective> | undefined;
 
+  elementBeingSorted: HTMLElement;
+  elementBeingSortedStartingIndex: number;
+
   /* eslint-disable @angular-eslint/no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('dfChange') change: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
@@ -74,6 +81,8 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
 
   constructor(protected layoutService: DynamicFormLayoutService,
               protected validationService: DynamicFormValidationService,
+              protected liveRegionService: LiveRegionService,
+              protected translateService: TranslateService,
   ) {
     super(layoutService, validationService);
   }
@@ -114,4 +123,162 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
   get dragDisabled(): boolean {
     return this.model.groups.length === 1 || !this.model.isDraggable;
   }
+
+  /**
+   * Gets the control of the specified group model. It adds the startingIndex property to the group model if it does not
+   * already have it. This ensures that the controls are always linked to the correct group model.
+   * @param groupModel The group model to get the control for.
+   * @returns The form control of the specified group model.
+   */
+  getControlOfGroup(groupModel: any) {
+    if (!groupModel.hasOwnProperty('startingIndex')) {
+      groupModel.startingIndex = groupModel.index;
+    }
+    return this.control.get([groupModel.startingIndex]);
+  }
+
+  /**
+   * Toggles the keyboard drag and drop feature for the given sortable element.
+   * @param event
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  toggleKeyboardDragAndDrop(event: KeyboardEvent, sortableElement: HTMLDivElement, index: number, length: number) {
+    event.preventDefault();
+    if (this.elementBeingSorted) {
+      this.stopKeyboardDragAndDrop(sortableElement, index, length);
+    } else {
+      sortableElement.classList.add('sorting-with-keyboard');
+      this.elementBeingSorted = sortableElement;
+      this.elementBeingSortedStartingIndex = index;
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.status', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Stops the keyboard drag and drop feature.
+   * @param sortableElement
+   * @param index
+   * @param length
+   */
+  stopKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.elementBeingSorted?.classList.remove('sorting-with-keyboard');
+    this.liveRegionService.clear();
+    if (this.elementBeingSorted) {
+      this.elementBeingSorted = null;
+      this.elementBeingSortedStartingIndex = null;
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.dropped', {
+        itemName: sortableElement.querySelector('input')?.value,
+        index: index + 1,
+        length,
+      }));
+    }
+  }
+
+  /**
+   * Handles the keyboard arrow press event to move the element up or down.
+   * @param event
+   * @param dropList
+   * @param length
+   * @param idx
+   * @param direction
+   */
+  handleArrowPress(event: KeyboardEvent, dropList: HTMLDivElement, length: number, idx: number, direction: 'up' | 'down') {
+    let newIndex = direction === 'up' ? idx - 1 : idx + 1;
+    if (newIndex < 0) {
+      newIndex = length - 1;
+    } else if (newIndex >= length) {
+      newIndex = 0;
+    }
+
+    if (this.elementBeingSorted) {
+      this.model.moveGroup(idx, newIndex - idx);
+      if (hasValue(this.model.groups[newIndex]) && hasValue((this.control as any).controls[newIndex])) {
+        this.onCustomEvent({
+          previousIndex: idx,
+          newIndex,
+          arrayModel: this.model,
+          model: this.model.groups[newIndex].group[0],
+          control: (this.control as any).controls[newIndex],
+        }, 'move');
+        this.liveRegionService.clear();
+        this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.moved', {
+          itemName: this.elementBeingSorted.querySelector('input')?.value,
+          index: newIndex + 1,
+          length,
+        }));
+      }
+      event.preventDefault();
+      // Set focus back to the moved element
+      setTimeout(() => {
+        this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+      });
+    } else {
+      event.preventDefault();
+      this.setFocusToDropListElementOfIndex(dropList, newIndex, direction);
+    }
+  }
+
+  cancelKeyboardDragAndDrop(sortableElement: HTMLDivElement, index: number, length: number) {
+    this.model.moveGroup(index, this.elementBeingSortedStartingIndex - index);
+    if (hasValue(this.model.groups[this.elementBeingSortedStartingIndex]) && hasValue((this.control as any).controls[this.elementBeingSortedStartingIndex])) {
+      this.onCustomEvent({
+        previousIndex: index,
+        newIndex: this.elementBeingSortedStartingIndex,
+        arrayModel: this.model,
+        model: this.model.groups[this.elementBeingSortedStartingIndex].group[0],
+        control: (this.control as any).controls[this.elementBeingSortedStartingIndex],
+      }, 'move');
+      this.stopKeyboardDragAndDrop(sortableElement, this.elementBeingSortedStartingIndex, length);
+    }
+  }
+
+  /**
+   * Sets focus to the drag handle of the drop list element of the given index.
+   * @param dropList
+   * @param index
+   * @param direction
+   */
+  setFocusToDropListElementOfIndex(dropList: HTMLDivElement, index: number, direction: 'up' | 'down') {
+    const newDragHandle = dropList.querySelectorAll(`[cdkDragHandle]`)[index] as HTMLElement;
+    if (newDragHandle) {
+      newDragHandle.focus();
+      if (!this.isElementInViewport(newDragHandle)) {
+        newDragHandle.scrollIntoView(direction === 'up');
+      }
+    }
+  }
+
+  /**
+   * checks if an element is in the viewport
+   * @param el
+   */
+  isElementInViewport(el: HTMLElement) {
+    const rect = el.getBoundingClientRect();
+    return (
+      rect.top >= 0 &&
+      rect.left >= 0 &&
+      rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+      rect.right <= (window.innerWidth || document.documentElement.clientWidth)
+    );
+  }
+
+  /**
+   * Adds an instruction message to the live region when the user might want to sort an element.
+   * @param sortableElement
+   */
+  addInstructionMessageToLiveRegion(sortableElement: HTMLDivElement) {
+    if (!this.elementBeingSorted) {
+      this.liveRegionService.clear();
+      this.liveRegionService.addMessage(this.translateService.instant('live-region.ordering.instructions', {
+        itemName: sortableElement.querySelector('input')?.value,
+      }));
+    }
+  }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
index 5beb8d52da..90e8ff3060 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
@@ -1,4 +1,4 @@
-<div [formGroup]="group" [ngClass]="getClass('element', 'container')" class="form-check custom-control custom-switch" [class.disabled]="model.disabled">
+<div [formGroup]="group" [ngClass]="getClass('element', 'container')" class="form-check custom-control form-switch" [class.disabled]="model.disabled">
   <input type="checkbox" class="form-check-input custom-control-input"
          [checked]="model.checked"
          [class.is-invalid]="showErrorMessages"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 656c350dbb..d8aea2d706 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -1,42 +1,44 @@
 <div [formGroup]="group" class="input-group">
 
-    <input ngbDatepicker class="form-control" #datepicker="ngbDatepicker"
-           [attr.aria-labelledby]="'label_' + model.id"
-           [class.is-invalid]="showErrorMessages"
-           [displayMonths]="model.getAdditional('displayMonths', config['displayMonths'])"
-           [id]="id"
-           [firstDayOfWeek]="model.getAdditional('firstDayOfWeek', config['firstDayOfWeek'])"
-           [formControlName]="model.id"
-           [maxDate]="model.max"
-           [minDate]="model.min"
-           [name]="model.name"
-           [navigation]="model.getAdditional('navigation', config['navigation'])"
-           [ngClass]="getClass('element', 'control')"
-           [outsideDays]="model.getAdditional('outsideDays', config['outsideDays'])"
-           [placeholder]="model.placeholder"
-           [placement]="model.getAdditional('placement', 'bottom-left')"
-           [weekdays]="model.getAdditional('showWeekdays', config['showWeekdays'])"
-           [showWeekNumbers]="model.getAdditional('showWeekNumbers', config['showWeekNumbers'])"
-           [startDate]="model.focusedDate"
-           (blur)="onBlur($event)"
-           (dateSelect)="onChange($event)"
-           (change)="onChange($event)"
-           (focus)="onFocus($event)">
+  <input ngbDatepicker class="form-control" #datepicker="ngbDatepicker"
+    [attr.aria-labelledby]="'label_' + model.id"
+    [class.is-invalid]="showErrorMessages"
+    [displayMonths]="model.getAdditional('displayMonths', config['displayMonths'])"
+    [id]="id"
+    [firstDayOfWeek]="model.getAdditional('firstDayOfWeek', config['firstDayOfWeek'])"
+    [formControlName]="model.id"
+    [maxDate]="model.max"
+    [minDate]="model.min"
+    [name]="model.name"
+    [navigation]="model.getAdditional('navigation', config['navigation'])"
+    [ngClass]="getClass('element', 'control')"
+    [outsideDays]="model.getAdditional('outsideDays', config['outsideDays'])"
+    [placeholder]="model.placeholder"
+    [placement]="model.getAdditional('placement', 'bottom-left')"
+    [weekdays]="model.getAdditional('showWeekdays', config['showWeekdays'])"
+    [showWeekNumbers]="model.getAdditional('showWeekNumbers', config['showWeekNumbers'])"
+    [startDate]="model.focusedDate"
+    (blur)="onBlur($event)"
+    (dateSelect)="onChange($event)"
+    (change)="onChange($event)"
+    (focus)="onFocus($event)">
 
-    <div class="input-group-append">
 
-        <button class="btn btn-outline-secondary"
-                type="button"
-                [attr.aria-labelledby]="'label_' + model.id"
-                [class.disabled]="model.disabled"
-                [disabled]="model.disabled"
-                (click)="datepicker.toggle()">
+  <button class="btn btn-outline-secondary"
+    type="button"
+    [attr.aria-labelledby]="'label_' + model.id"
+    [class.disabled]="model.disabled"
+    [dsBtnDisabled]="model.disabled"
+    (click)="datepicker.toggle()">
 
-            <i *ngIf="model.toggleIcon" class="{{model.toggleIcon}}" aria-hidden="true"></i>
-            <span *ngIf="model.toggleLabel">{{ model.toggleLabel }}</span>
+    @if (model.toggleIcon) {
+      <i class="{{model.toggleIcon}}" aria-hidden="true"></i>
+    }
+    @if (model.toggleLabel) {
+      <span>{{ model.toggleLabel }}</span>
+    }
 
-        </button>
+  </button>
 
-    </div>
 
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index 62c86f1bad..0cecc8e676 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -26,6 +23,8 @@ import {
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
 
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
+
 @Component({
   selector: 'ds-dynamic-date-picker-inline',
   templateUrl: './dynamic-date-picker-inline.component.html',
@@ -33,7 +32,7 @@ import {
     NgClass,
     NgbDatepickerModule,
     ReactiveFormsModule,
-    NgIf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
index 3bf02c4abd..5faf188165 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.html
@@ -1,57 +1,61 @@
 <div>
   <fieldset class="d-flex">
-    <legend *ngIf="!model.repeatable" [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
-      {{model.placeholder}} <span *ngIf="model.required">*</span>
+    @if (!model.repeatable) {
+      <legend [id]="'legend_' + model.id" [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]">
+        {{model.placeholder}} @if (model.required) {
+        <span>*</span>
+      }
     </legend>
-    <ds-number-picker
-      tabindex="0"
-      [id]="model.id + '_year'"
-      [disabled]="model.disabled"
-      [min]="minYear"
-      [max]="maxYear"
-      [name]="'year'"
-      [size]="4"
-      [(ngModel)]="initialYear"
-      [value]="year"
-      [invalid]="showErrorMessages"
-      [placeholder]='yearPlaceholder'
-      (blur)="onBlur($event)"
-      (change)="onChange($event)"
-      (focus)="onFocus($event)"
-    ></ds-number-picker>
+  }
+  <ds-number-picker
+    tabindex="0"
+    [id]="model.id + '_year'"
+    [disabled]="model.disabled"
+    [min]="minYear"
+    [max]="maxYear"
+    [name]="'year'"
+    [size]="4"
+    [(ngModel)]="initialYear"
+    [value]="year"
+    [invalid]="showErrorMessages"
+    [placeholder]="'form.date-picker.placeholder.year' | translate"
+    (blur)="onBlur($event)"
+    (change)="onChange($event)"
+    (focus)="onFocus($event)"
+  ></ds-number-picker>
 
-    <ds-number-picker
-      tabindex="0"
-      [id]="model.id + '_month'"
-      [min]="minMonth"
-      [max]="maxMonth"
-      [name]="'month'"
-      [size]="6"
-      [(ngModel)]="initialMonth"
-      [value]="month"
-      [placeholder]="monthPlaceholder"
-      [disabled]="!year || model.disabled"
-      (blur)="onBlur($event)"
-      (change)="onChange($event)"
-      (focus)="onFocus($event)"
-    ></ds-number-picker>
+  <ds-number-picker
+    tabindex="0"
+    [id]="model.id + '_month'"
+    [min]="minMonth"
+    [max]="maxMonth"
+    [name]="'month'"
+    [size]="6"
+    [(ngModel)]="initialMonth"
+    [value]="month"
+    [placeholder]="'form.date-picker.placeholder.month' | translate"
+    [disabled]="!year || model.disabled"
+    (blur)="onBlur($event)"
+    (change)="onChange($event)"
+    (focus)="onFocus($event)"
+  ></ds-number-picker>
 
-    <ds-number-picker
-      tabindex="0"
-      [id]="model.id + '_day'"
-      [min]="minDay"
-      [max]="maxDay"
-      [name]="'day'"
-      [size]="2"
-      [(ngModel)]="initialDay"
-      [value]="day"
-      [placeholder]="dayPlaceholder"
-      [disabled]="!month || model.disabled"
-      (blur)="onBlur($event)"
-      (change)="onChange($event)"
-      (focus)="onFocus($event)"
-    ></ds-number-picker>
-  </fieldset>
+  <ds-number-picker
+    tabindex="0"
+    [id]="model.id + '_day'"
+    [min]="minDay"
+    [max]="maxDay"
+    [name]="'day'"
+    [size]="2"
+    [(ngModel)]="initialDay"
+    [value]="day"
+    [placeholder]="'form.date-picker.placeholder.day' | translate"
+    [disabled]="!month || model.disabled"
+    (blur)="onBlur($event)"
+    (change)="onChange($event)"
+    (focus)="onFocus($event)"
+  ></ds-number-picker>
+</fieldset>
 </div>
 
 <div class="clearfix"></div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.scss
index 97698b2102..e8a63ce135 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.scss
@@ -4,4 +4,7 @@
 
 legend {
   font-size: initial;
+
+  /* Changed from Bootstrap 5's legend to ensure that the date issues label is on a different line as it's input */
+  float: none;
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
index a6cf7a29f2..54bec75f0f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.spec.ts
@@ -24,7 +24,10 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
 import {
@@ -80,6 +83,7 @@ describe('DsDatePickerComponent test suite', () => {
         NgbModule,
         DsDatePickerComponent,
         TestComponent,
+        TranslateModule.forRoot(),
       ],
       providers: [
         ChangeDetectorRef,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
index 62a6b8044f..e246cf0c7e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.component.ts
@@ -1,7 +1,6 @@
 import {
   DOCUMENT,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -22,8 +21,10 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
 import isEqual from 'lodash/isEqual';
 
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import { hasValue } from '../../../../../empty.util';
 import { NumberPickerComponent } from '../../../../number-picker/number-picker.component';
 import { DynamicDsDatePickerModel } from './date-picker.model';
@@ -38,9 +39,10 @@ export const DS_DATE_PICKER_SEPARATOR = '-';
   templateUrl: './date-picker.component.html',
   imports: [
     NgClass,
-    NgIf,
     NumberPickerComponent,
     FormsModule,
+    TranslateModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
@@ -72,10 +74,6 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
   minDay = 1;
   maxDay = 31;
 
-  yearPlaceholder = 'year';
-  monthPlaceholder = 'month';
-  dayPlaceholder = 'day';
-
   disabledMonth = true;
   disabledDay = true;
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
index 5b58352214..5ba40f64ec 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
@@ -1,5 +1,5 @@
 <div>
-    <div class="form-row align-items-center">
+    <div class="row align-items-center">
         <div class="col">
           <input class="form-control"
                  [class.is-invalid]="showErrorMessages"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
index 1d8a152df5..cb429dd7e4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
@@ -12,6 +12,7 @@ import {
 } from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import { DynamicDisabledModel } from './dynamic-disabled.model';
 
 /**
@@ -22,6 +23,7 @@ import { DynamicDisabledModel } from './dynamic-disabled.model';
   templateUrl: './dynamic-disabled.component.html',
   imports: [
     TranslateModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
index 8e1645633e..f778d976da 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.html
@@ -1,25 +1,27 @@
 <div style="width: 100%">
-<ng-container [formGroup]="group">
+  <ng-container [formGroup]="group">
 
-  <div role="group" [formGroupName]="model.id"
-                    [id]="id"
-                    [class.d-none]="model.hidden"
-                    [ngClass]="getClass('element','control')">
-     <ds-dynamic-form-control-container *ngFor="let _model of model.group"
-                                       [formGroup]="group"
-                                       [formModel]="formModel"
-                                       [group]="control"
-                                       [hasErrorMessaging]="model.hasErrorMessages"
-                                       [hidden]="_model.hidden"
-                                        [class.d-none]="_model.hidden"
-                                       [layout]="formLayout"
-                                       [model]="_model"
-                                       [templates]="templates"
-                                       [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
-                                       (dfBlur)="onBlur($event)"
-                                       (dfChange)="onChange($event)"
-                                       (dfFocus)="onFocus($event)"
-                                       (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
-  </div>
-</ng-container>
+    <div role="group" [formGroupName]="model.id"
+      [id]="id"
+      [class.d-none]="model.hidden"
+      [ngClass]="getClass('element','control')">
+      @for (_model of model.group; track _model) {
+        <ds-dynamic-form-control-container
+          [formGroup]="group"
+          [formModel]="formModel"
+          [group]="control"
+          [hasErrorMessaging]="model.hasErrorMessages"
+          [hidden]="_model.hidden"
+          [class.d-none]="_model.hidden"
+          [layout]="formLayout"
+          [model]="_model"
+          [templates]="templates"
+          [ngClass]="[getClass('element', 'host', _model), getClass('grid', 'host', _model)]"
+          (dfBlur)="onBlur($event)"
+          (dfChange)="onChange($event)"
+          (dfFocus)="onFocus($event)"
+        (ngbEvent)="onCustomEvent($event, null, true)"></ds-dynamic-form-control-container>
+      }
+    </div>
+  </ng-container>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
index dee7df289b..828824df54 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgForOf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -37,7 +34,6 @@ import { DsDynamicFormControlContainerComponent } from '../../ds-dynamic-form-co
   imports: [
     ReactiveFormsModule,
     NgClass,
-    NgForOf,
     forwardRef(() => DsDynamicFormControlContainerComponent),
   ],
   standalone: true,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
index 728c59aa46..c4aade2ed7 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.html
@@ -1,67 +1,75 @@
 <div [formGroup]="group">
-  <div *ngIf="model.repeatable"
-       class="form-row"
-       [attr.tabindex]="model.tabIndex"
-       [id]="id"
-       [formGroupName]="model.id"
-       [ngClass]="model.layout.element?.control">
-
-    <div *ngFor="let columnItems of items" class="col-sm ml-3">
-
-      <div  *ngFor="let item of columnItems" class="custom-control custom-checkbox">
-
-          <input type="checkbox" class="custom-control-input"
-                 [attr.aria-labelledby]="'label_' + model.id"
-                 [attr.tabindex]="item.index"
-                 [checked]="item.value"
-                 [id]="item.id"
-                 [formControlName]="item.id"
-                 [name]="model.name"
-                 [value]="item.value"
-                 (blur)="onBlur($event)"
-                 (change)="onChange($event)"
-                 (focus)="onFocus($event)"/>
-        <label class="custom-control-label"
-               [class.disabled]="model.disabled"
-               [ngClass]="model.layout.element?.control"
-               [for]="item.id">
-          <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
-        </label>
-      </div>
-      <br>
-    </div>
-
-  </div>
-
-  <div *ngIf="!model.repeatable"
-       class="form-row"
-       ngbRadioGroup
-       [attr.tabindex]="model.tabIndex"
-       [id]="id"
-       [ngClass]="model.layout.element?.control"
-       (change)="onChange($event)">
-
-    <div *ngFor="let columnItems of items" class="col-sm ml-3">
-
-      <div  *ngFor="let item of columnItems" class="custom-control custom-radio">
-        <input type="radio" class="custom-control-input"
-               [checked]="item.value"
-               [id]="item.id"
-               [name]="model.id"
-               [required]="model.required"
-               [value]="item.index"
-               (blur)="onBlur($event)"
-               (focus)="onFocus($event)"/>
-        <label class="custom-control-label"
-               [class.disabled]="model.disabled"
-               [ngClass]="model.layout.element?.control"
+  @if (model.repeatable) {
+    <div
+      class="row"
+      [attr.tabindex]="model.tabIndex"
+      [id]="id"
+      [formGroupName]="model.id"
+      [ngClass]="model.layout.element?.control">
+      @for (columnItems of items; track columnItems) {
+        <div class="col-sm ms-3">
+          @for (item of columnItems; track item) {
+            <div  class="custom-control custom-checkbox">
+              <input type="checkbox" class="custom-control-input"
+                [attr.aria-labelledby]="'label_' + model.id"
+                [attr.tabindex]="item.index"
+                [checked]="item.value"
+                [id]="item.id"
+                [formControlName]="item.id"
+                [name]="model.name"
+                [value]="item.value"
+                (blur)="onBlur($event)"
+                (change)="onChange($event)"
+                (focus)="onFocus($event)"/>
+              <label class="custom-control-label"
+                [class.disabled]="model.disabled"
+                [ngClass]="model.layout.element?.control"
                 [for]="item.id">
-
-          <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
-        </label>
-      </div>
-      <br>
+                <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
+              </label>
+            </div>
+          }
+        </div>
+      }
     </div>
+  }
+
+  @if (!model.repeatable) {
+    <div
+      class="row"
+      ngbRadioGroup
+      [attr.tabindex]="model.tabIndex"
+      [id]="id"
+      [ngClass]="model.layout.element?.control"
+      (change)="onChange($event)">
+      @for (columnItems of items; track columnItems) {
+        <div class="col-sm ms-3">
+          @for (item of columnItems; track item) {
+            <div  class="custom-control custom-radio">
+              <input type="radio" class="custom-control-input"
+                [checked]="item.value"
+                [id]="item.id"
+                [name]="model.id"
+                [required]="model.required"
+                [value]="item.index"
+                (blur)="onBlur($event)"
+                (focus)="onFocus($event)"/>
+              <label class="custom-control-label"
+                [class.disabled]="model.disabled"
+                [ngClass]="model.layout.element?.control"
+                [for]="item.id">
+                <span [ngClass]="model.layout.element?.label" [innerHTML]="item.label"></span>
+              </label>
+            </div>
+          }
+        </div>
+      }
+    </div>
+  }
+  @if ((isLoading$ | async)) {
+    <div class="d-flex justify-content-center">
+      <ds-loading></ds-loading>
+    </div>
+  }
 
-  </div>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
index 8dc19267e8..11db7e75de 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.ts
@@ -1,13 +1,13 @@
 import {
+  AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
   EventEmitter,
   Input,
+  OnDestroy,
   OnInit,
   Output,
 } from '@angular/core';
@@ -25,7 +25,16 @@ import {
   DynamicFormLayoutService,
   DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
 import findKey from 'lodash/findKey';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  tap,
+} from 'rxjs/operators';
 
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
@@ -36,6 +45,7 @@ import {
   hasValue,
   isNotEmpty,
 } from '../../../../../empty.util';
+import { ThemedLoadingComponent } from '../../../../../loading/themed-loading.component';
 import { FormBuilderService } from '../../../form-builder.service';
 import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
 import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
@@ -56,14 +66,15 @@ export interface ListItem {
   templateUrl: './dynamic-list.component.html',
   imports: [
     NgClass,
-    NgIf,
     NgbButtonsModule,
-    NgForOf,
     ReactiveFormsModule,
+    AsyncPipe,
+    TranslateModule,
+    ThemedLoadingComponent,
   ],
   standalone: true,
 })
-export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit {
+export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit, OnDestroy {
 
   @Input() group: UntypedFormGroup;
   @Input() model: any;
@@ -73,7 +84,10 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
   public items: ListItem[][] = [];
-  protected optionsList: VocabularyEntry[];
+  public isLoading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+  protected optionsList: VocabularyEntry[] = [];
+  private nextPageInfo: PageInfo;
+  private subs: Subscription[] = [];
 
   constructor(private vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
@@ -89,7 +103,13 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
    */
   ngOnInit() {
     if (this.model.vocabularyOptions && hasValue(this.model.vocabularyOptions.name)) {
-      this.setOptionsFromVocabulary();
+      this.initOptionsFromVocabulary();
+    }
+  }
+
+  ngOnDestroy() {
+    if (this.subs.length > 0) {
+      this.subs.forEach(sub => sub.unsubscribe());
     }
   }
 
@@ -136,34 +156,76 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
   /**
    * Setting up the field options from vocabulary
    */
-  protected setOptionsFromVocabulary() {
+  protected initOptionsFromVocabulary() {
     if (this.model.vocabularyOptions.name && this.model.vocabularyOptions.name.length > 0) {
       const listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
       if (this.model.repeatable && this.model.required) {
         listGroup.addValidators(this.hasAtLeastOneVocabularyEntry());
       }
-      const pageInfo: PageInfo = new PageInfo({
-        elementsPerPage: 9999, currentPage: 1,
+
+      this.nextPageInfo = new PageInfo({
+        elementsPerPage: 20, currentPage: 1,
       } as PageInfo);
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, pageInfo).pipe(
+
+      this.loadEntries(listGroup);
+    }
+  }
+
+  /**
+   * Checks if at least one {@link VocabularyEntry} has been selected.
+   */
+  hasAtLeastOneVocabularyEntry(): ValidatorFn {
+    return (control: AbstractControl): ValidationErrors | null => {
+      return control && control.value && Object.values(control.value).find((checked: boolean) => checked === true) ? null : this.model.errorMessages;
+    };
+  }
+
+  /**
+   * Update current page state to keep track of which one to load next
+   * @param response
+   */
+  setPaginationInfo(response: PaginatedList<VocabularyEntry>) {
+    if (response.pageInfo.currentPage < response.pageInfo.totalPages) {
+      this.nextPageInfo = Object.assign(new PageInfo(), response.pageInfo,  { currentPage: response.currentPage + 1 });
+      this.isLoading$.next(true);
+    } else {
+      this.isLoading$.next(false);
+    }
+  }
+
+  /**
+   * Load entries page
+   *
+   * @param listGroup
+   */
+  loadEntries(listGroup?: UntypedFormGroup) {
+    if (!hasValue(listGroup)) {
+      listGroup = this.group.controls[this.model.id] as UntypedFormGroup;
+    }
+
+    this.subs.push(
+      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.nextPageInfo).pipe(
         getFirstSucceededRemoteDataPayload(),
-      ).subscribe((entries: PaginatedList<VocabularyEntry>) => {
-        let groupCounter = 0;
+        tap((response) => this.setPaginationInfo(response)),
+        map(entries => entries.page),
+      ).subscribe((allEntries: VocabularyEntry[]) => {
+        this.optionsList = [...this.optionsList, ...allEntries];
+        let groupCounter = this.items.length;
         let itemsPerGroup = 0;
         let tempList: ListItem[] = [];
-        this.optionsList = entries.page;
+
         // Make a list of available options (checkbox/radio) and split in groups of 'model.groupLength'
-        entries.page.forEach((option: VocabularyEntry, key: number) => {
+        allEntries.forEach((option: VocabularyEntry) => {
           const value = option.authority || option.value;
           const checked: boolean = isNotEmpty(findKey(
             this.model.value,
-            (v) => v.value === option.value));
+            (v) => v?.value === option.value));
 
           const item: ListItem = {
             id: `${this.model.id}_${value}`,
             label: option.display,
             value: checked,
-            index: key,
+            index: this.optionsList.indexOf(option),
           };
           if (this.model.repeatable) {
             this.formBuilderService.addFormGroupControl(listGroup, (this.model as DynamicListCheckboxGroupModel), new DynamicCheckboxModel(item));
@@ -183,18 +245,11 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
           }
         });
         this.cdr.markForCheck();
-      });
-
-    }
+        // If the paginated request did not reach the end keep loading the entries in the background
+        if (this.isLoading$.value) {
+          this.loadEntries();
+        }
+      }),
+    );
   }
-
-  /**
-   * Checks if at least one {@link VocabularyEntry} has been selected.
-   */
-  hasAtLeastOneVocabularyEntry(): ValidatorFn {
-    return (control: AbstractControl): ValidationErrors | null => {
-      return control && control.value && Object.values(control.value).find((checked: boolean) => checked === true) ? null : this.model.errorMessages;
-    };
-  }
-
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
index 89e7af9aa6..99e757ed1d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.html
@@ -1,128 +1,143 @@
 <div ngbDropdown #sdRef="ngbDropdown"
-     (click)="$event.stopPropagation();"
-     (openChange)="openChange($event);">
+  (click)="$event.stopPropagation();"
+  (openChange)="openChange($event);">
 
-  <div class="form-row align-items-center">
+  <div class="row align-items-center">
     <!--Simple lookup, first field -->
     <div class="col right-addon">
       <i dsAuthorityConfidenceState
-         class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0 pr-2"
-         aria-hidden="true"
-         [authorityValue]="model.value"
-         (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted(sdRef, $event)"></i>
+        class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0 pe-2"
+        aria-hidden="true"
+        [authorityValue]="model.value"
+      (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted(sdRef, $event)"></i>
       <input class="form-control"
-             [attr.aria-labelledby]="'label_' + model.id"
-             [attr.autoComplete]="model.autoComplete"
-             [class.is-invalid]="showErrorMessages"
-             [id]="model.id"
-             [name]="model.name"
-             [type]="model.inputType"
-             [(ngModel)]="firstInputValue"
-             [disabled]="isInputDisabled()"
-             [placeholder]="model.placeholder | translate"
-             [readonly]="model.readOnly"
-             (change)="onChange($event)"
-             (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
-             (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
-             (click)="$event.stopPropagation(); $event.stopPropagation(); sdRef.close();">
+        [attr.aria-labelledby]="'label_' + model.id"
+        [attr.autoComplete]="model.autoComplete"
+        [class.is-invalid]="showErrorMessages"
+        [id]="model.id"
+        [name]="model.name"
+        [type]="model.inputType"
+        [(ngModel)]="firstInputValue"
+        [disabled]="isInputDisabled()"
+        [placeholder]="model.placeholder | translate"
+        [readonly]="model.readOnly"
+        (change)="onChange($event)"
+        (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
+        (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
+        (click)="$event.stopPropagation(); $event.stopPropagation(); sdRef.close();">
     </div>
 
     <!--Lookup-name, second field-->
-    <div *ngIf="isLookupName()" class="col" >
-      <input  class="form-control"
-              [ngClass]="{}"
-              [attr.aria-labelledby]="'label_' + model.id"
-              [attr.autoComplete]="model.autoComplete"
-              [class.is-invalid]="showErrorMessages"
-              [id]="id"
-              [name]="model.name + '_2'"
-              [type]="model.inputType"
-              [(ngModel)]="secondInputValue"
-              [disabled]="firstInputValue.length === 0 || isInputDisabled()"
-              [placeholder]="model.secondPlaceholder | translate"
-              [readonly]="model.readOnly"
-              (change)="onChange($event)"
-              (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
-              (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
-              (click)="$event.stopPropagation(); sdRef.close();">
-    </div>
+    @if (isLookupName()) {
+      <div class="col" >
+        <input  class="form-control"
+          [ngClass]="{}"
+          [attr.aria-labelledby]="'label_' + model.id"
+          [attr.autoComplete]="model.autoComplete"
+          [class.is-invalid]="showErrorMessages"
+          [id]="id"
+          [name]="model.name + '_2'"
+          [type]="model.inputType"
+          [(ngModel)]="secondInputValue"
+          [disabled]="firstInputValue.length === 0 || isInputDisabled()"
+          [placeholder]="model.secondPlaceholder | translate"
+          [readonly]="model.readOnly"
+          (change)="onChange($event)"
+          (blur)="onBlur($event); $event.stopPropagation(); sdRef.close();"
+          (focus)="onFocus($event); $event.stopPropagation(); sdRef.close();"
+          (click)="$event.stopPropagation(); sdRef.close();">
+      </div>
+    }
     <div class="col-auto text-center">
       <button ngbDropdownAnchor
-              class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.search-help' | translate}}"
-              placement="top"
-              [disabled]="model.readOnly || isSearchDisabled()"
-              [hidden]="isInputDisabled()"
-              (click)="sdRef.open(); search(); $event.stopPropagation();">{{'form.search' | translate}}
-      </button>
-      <button *ngIf="isInputDisabled()" class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.clear-help' | translate}}"
-              placement="top"
-              [disabled]="model.readOnly"
-              (click)="remove()">{{'form.clear' | translate}}
+        class="btn btn-secondary"
+        type="button"
+        ngbTooltip="{{'form.search-help' | translate}}"
+        placement="top"
+        [dsBtnDisabled]="model.readOnly || isSearchDisabled()"
+        [hidden]="isInputDisabled()"
+        (click)="sdRef.open(); search(); $event.stopPropagation();">{{'form.search' | translate}}
       </button>
+      @if (isInputDisabled()) {
+        <button class="btn btn-secondary"
+          type="button"
+          ngbTooltip="{{'form.clear-help' | translate}}"
+          placement="top"
+          [dsBtnDisabled]="model.readOnly"
+          (click)="remove()">{{'form.clear' | translate}}
+        </button>
+      }
     </div>
     <div class="col-auto text-center">
-      <button *ngIf="!editMode" class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.edit-help' | translate}}"
-              placement="top"
-              [disabled]="isEditDisabled()"
-              (click)="switchEditMode()">{{'form.edit' | translate}}
-      </button>
-      <button *ngIf="editMode" class="btn btn-secondary"
-              type="button"
-              ngbTooltip="{{'form.save-help' | translate}}"
-              placement="top"
-              [disabled]="!hasEmptyValue()"
-              (click)="saveChanges()">{{'form.save' | translate}}
-      </button>
+      @if (!editMode) {
+        <button class="btn btn-secondary"
+          type="button"
+          ngbTooltip="{{'form.edit-help' | translate}}"
+          placement="top"
+          [dsBtnDisabled]="isEditDisabled()"
+          (click)="switchEditMode()">{{'form.edit' | translate}}
+        </button>
+      }
+      @if (editMode) {
+        <button class="btn btn-secondary"
+          type="button"
+          ngbTooltip="{{'form.save-help' | translate}}"
+          placement="top"
+          [dsBtnDisabled]="!hasEmptyValue()"
+          (click)="saveChanges()">{{'form.save' | translate}}
+        </button>
+      }
     </div>
   </div>
 
   <div ngbDropdownMenu
-       class="dropdown-menu scrollable-dropdown-menu w-100"
-       aria-haspopup="true"
-       aria-expanded="false"
-       [attr.aria-labelledby]="'label_' + model.id">
+    class="dropdown-menu scrollable-dropdown-menu w-100"
+    aria-haspopup="true"
+    aria-expanded="false"
+    [attr.aria-labelledby]="'label_' + model.id">
     <div class="scrollable-menu"
-         infiniteScroll
-         [infiniteScrollDistance]="2"
-         [infiniteScrollThrottle]="50"
-         (scrolled)="onScroll()"
-         [scrollWindow]="false">
+      infiniteScroll
+      [infiniteScrollDistance]="2"
+      [infiniteScrollThrottle]="50"
+      (scrolled)="onScroll()"
+      [scrollWindow]="false">
 
-      <button class="dropdown-item disabled"
-              *ngIf="optionsList && optionsList.length === 0"
-              (click)="$event.stopPropagation(); clearFields(); sdRef.close();">{{'form.no-results' | translate}}
-      </button>
-      <button class="dropdown-item lookup-item"
-              *ngFor="let listEntry of optionsList"
-              (click)="$event.stopPropagation(); onSelect(listEntry); sdRef.close();"
-              title="{{ listEntry.display }}">
-        <ng-container
-          [ngTemplateOutlet]="(listEntry.hasOtherInformation()) ? hasInfo : noInfo"
-          [ngTemplateOutletContext]="{entry: listEntry}">
-        </ng-container>
-      </button>
-      <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
+      @if (optionsList && optionsList.length === 0) {
+        <button class="dropdown-item disabled" type="button"
+          (click)="$event.stopPropagation(); clearFields(); sdRef.close();">
+          {{ 'form.no-results' | translate }}
+        </button>
+      }
+      @for (listEntry of optionsList; track listEntry) {
+        <button class="dropdown-item lookup-item" type="button"
+          (click)="$event.stopPropagation(); onSelect(listEntry); sdRef.close();"
+          title="{{ listEntry.display }}">
+          <ng-container
+            [ngTemplateOutlet]="(listEntry.hasOtherInformation()) ? hasInfo : noInfo"
+            [ngTemplateOutletContext]="{entry: listEntry}">
+          </ng-container>
+        </button>
+      }
+      @if (loading) {
+        <div class="scrollable-dropdown-loading text-center"><p>{{'form.loading' | translate}}</p></div>
+      }
     </div>
   </div>
 </div>
 
 <ng-template #hasInfo let-entry="entry">
   <ul class="list-unstyled mb-0" [attr.aria-labelledby]="'label_' + model.id">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
-    <li class="list-item text-truncate text-secondary" *ngFor="let item of entry.otherInformation | dsObjNgFor" >
-      {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
-    </li>
+    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
+    @for (item of entry.otherInformation | dsObjNgFor; track item) {
+      <li class="list-item text-truncate text-secondary" >
+        {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
+      </li>
+    }
   </ul>
 </ng-template>
 
 <ng-template #noInfo let-entry="entry">
   <ul class="list-unstyled mb-0" [attr.aria-labelledby]="'label_' + model.id">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
   </ul>
 </ng-template>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss
index dee03647de..10907e4cca 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.scss
@@ -25,3 +25,12 @@ div {
 .lookup-item {
   border-bottom: var(--bs-dropdown-border-width) solid var(--bs-dropdown-border-color);
 }
+
+div.col {
+  position: relative;
+}
+
+.row > div {
+  padding-right: 5px;
+  padding-left: 5px;
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
index 24122373df..493c56e29d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.spec.ts
@@ -33,6 +33,7 @@ import { of as observableOf } from 'rxjs';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   mockDynamicFormLayoutService,
   mockDynamicFormValidationService,
@@ -174,6 +175,7 @@ describe('Dynamic Lookup component', () => {
         TestComponent,
         AuthorityConfidenceStateDirective,
         ObjNgFor,
+        BtnDisabledDirective,
       ],
       providers: [
         ChangeDetectorRef,
@@ -255,8 +257,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const editBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(editBtnEl.disabled).toBe(true);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(editBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(editBtnEl.classList.contains('disabled')).toBeTrue();
           expect(editBtnEl.textContent.trim()).toBe('form.edit');
         });
 
@@ -354,8 +358,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
@@ -395,8 +401,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
@@ -427,8 +435,10 @@ describe('Dynamic Lookup component', () => {
           const editBtnEl = deBtn[1].nativeElement;
 
           expect(de.length).toBe(2);
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(editBtnEl.disabled).toBe(true);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(editBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(editBtnEl.classList.contains('disabled')).toBeTrue();
           expect(editBtnEl.textContent.trim()).toBe('form.edit');
         });
 
@@ -524,8 +534,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
@@ -567,8 +579,10 @@ describe('Dynamic Lookup component', () => {
           const de = lookupFixture.debugElement.queryAll(By.css('button'));
           const searchBtnEl = de[0].nativeElement;
           const saveBtnEl = de[1].nativeElement;
-          expect(searchBtnEl.disabled).toBe(true);
-          expect(saveBtnEl.disabled).toBe(false);
+          expect(searchBtnEl.getAttribute('aria-disabled')).toBe('true');
+          expect(searchBtnEl.classList.contains('disabled')).toBeTrue();
+          expect(saveBtnEl.getAttribute('aria-disabled')).not.toBe('true');
+          expect(saveBtnEl.classList.contains('disabled')).toBeFalse();
           expect(saveBtnEl.textContent.trim()).toBe('form.save');
 
         });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index 7e4bc3a002..7ca4dbedb5 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -1,7 +1,5 @@
 import {
   NgClass,
-  NgForOf,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -46,6 +44,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -70,12 +69,11 @@ import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
     NgbDropdownModule,
     AuthorityConfidenceStateDirective,
     FormsModule,
-    NgIf,
     NgClass,
     InfiniteScrollModule,
-    NgForOf,
     NgTemplateOutlet,
     ObjNgFor,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index 5463b06827..43fdf7733e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -7,72 +7,83 @@
 
 <ng-template #hasInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
-    <li class="list-item text-truncate text-secondary" *ngFor="let item of entry.otherInformation | dsObjNgFor" >
-      {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
-    </li>
+    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
+    @for (item of entry.otherInformation | dsObjNgFor; track item) {
+      <li class="list-item text-truncate text-secondary" >
+        {{ 'form.other-information.' + item.key | translate }} : {{item.value}}
+      </li>
+    }
   </ul>
 </ng-template>
 
 <ng-template #noInfo let-entry="entry">
   <ul class="list-unstyled mb-0">
-    <li class="list-item text-truncate text-primary font-weight-bold">{{entry.value}}</li>
+    <li class="list-item text-truncate text-primary fw-bold">{{entry.value}}</li>
   </ul>
 </ng-template>
 
-<div *ngIf="(isHierarchicalVocabulary() | async) !== true" class="position-relative right-addon">
-  <i *ngIf="searching || loadingInitialValue" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
-  <i *ngIf="!searching && !loadingInitialValue"
-     dsAuthorityConfidenceState
-     class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0"
-     aria-hidden="true"
-     [authorityValue]="currentValue"
-     (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
-  <input #instance="ngbTypeahead"
-         class="form-control"
-         [attr.aria-labelledby]="'label_' + model.id"
-         [attr.autoComplete]="model.autoComplete"
-         [attr.aria-label]="model.label | translate"
-         [class.is-invalid]="showErrorMessages"
-         [id]="model.id"
-         [inputFormatter]="formatter"
-         [name]="model.name"
-         [ngbTypeahead]="search"
-         [placeholder]="model.placeholder"
-         [readonly]="model.readOnly"
-         [disabled]="model.readOnly"
-         [resultTemplate]="rt"
-         [type]="model.inputType"
-         [(ngModel)]="currentValue"
-         (blur)="onBlur($event)"
-         (focus)="onFocus($event)"
-         (change)="onChange($event)"
-         (input)="onInput($event)"
-         (selectItem)="onSelectItem($event)">
+@if ((isHierarchicalVocabulary() | async) !== true) {
+  <div class="position-relative right-addon">
+    @if (searching || loadingInitialValue) {
+      <i class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
+    }
+    @if (!searching && !loadingInitialValue) {
+      <i
+        dsAuthorityConfidenceState
+        class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0"
+        aria-hidden="true"
+        [authorityValue]="currentValue"
+      (whenClickOnConfidenceNotAccepted)="whenClickOnConfidenceNotAccepted($event)"></i>
+    }
+    <input #instance="ngbTypeahead"
+      class="form-control"
+      [attr.aria-labelledby]="'label_' + model.id"
+      [attr.autoComplete]="model.autoComplete"
+      [attr.aria-label]="model.label | translate"
+      [class.is-invalid]="showErrorMessages"
+      [id]="model.id"
+      [inputFormatter]="formatter"
+      [name]="model.name"
+      [ngbTypeahead]="search"
+      [placeholder]="model.placeholder"
+      [readonly]="model.readOnly"
+      [disabled]="model.readOnly"
+      [resultTemplate]="rt"
+      [type]="model.inputType"
+      [(ngModel)]="currentValue"
+      (blur)="onBlur($event)"
+      (focus)="onFocus($event)"
+      (change)="onChange($event)"
+      (input)="onInput($event)"
+      (selectItem)="onSelectItem($event)">
+    @if (searchFailed) {
+      <div class="invalid-feedback">Sorry, suggestions could not be loaded.</div>
+    }
+  </div>
+}
 
-  <div class="invalid-feedback" *ngIf="searchFailed">Sorry, suggestions could not be loaded.</div>
-</div>
-
-<div *ngIf="(isHierarchicalVocabulary() | async)" class="position-relative right-addon">
-  <i class="dropdown-toggle position-absolute tree-toggle" (click)="openTree($event)"
-     aria-hidden="true"></i>
-  <input class="form-control"
-         [attr.aria-labelledby]="'label_' + model.id"
-         [attr.autoComplete]="model.autoComplete"
-         [attr.aria-label]="model.label | translate"
-         [class.is-invalid]="showErrorMessages"
-         [class.tree-input]="!model.readOnly"
-         [id]="id"
-         [name]="model.name"
-         [placeholder]="model.placeholder"
-         [readonly]="true"
-         [disabled]="model.readOnly"
-         [type]="model.inputType"
-         [value]="currentValue?.display"
-         (focus)="onFocus($event)"
-         (change)="onChange($event)"
-         (click)="openTree($event)"
-         (keydown)="$event.preventDefault()"
-         (keypress)="$event.preventDefault()"
-         (keyup)="$event.preventDefault()">
-</div>
+@if ((isHierarchicalVocabulary() | async)) {
+  <div class="position-relative right-addon">
+    <i class="dropdown-toggle position-absolute tree-toggle" (click)="openTree($event)"
+    aria-hidden="true"></i>
+    <input class="form-control"
+      [attr.aria-labelledby]="'label_' + model.id"
+      [attr.autoComplete]="model.autoComplete"
+      [attr.aria-label]="model.label | translate"
+      [class.is-invalid]="showErrorMessages"
+      [class.tree-input]="!model.readOnly"
+      [id]="id"
+      [name]="model.name"
+      [placeholder]="model.placeholder"
+      [readonly]="true"
+      [disabled]="model.readOnly"
+      [type]="model.inputType"
+      [value]="currentValue?.display"
+      (focus)="onFocus($event)"
+      (change)="onChange($event)"
+      (click)="openTree($event)"
+      (keydown)="$event.preventDefault()"
+      (keypress)="$event.preventDefault()"
+      (keyup)="$event.preventDefault()">
+  </div>
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index 22f8dce244..93f6e80f32 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -1,7 +1,5 @@
 import {
   AsyncPipe,
-  NgForOf,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -59,6 +57,7 @@ import { Vocabulary } from '../../../../../../core/submission/vocabularies/model
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -82,14 +81,13 @@ import { DynamicOneboxModel } from './dynamic-onebox.model';
   templateUrl: './dynamic-onebox.component.html',
   imports: [
     NgbTypeaheadModule,
-    NgIf,
     AsyncPipe,
     AuthorityConfidenceStateDirective,
     NgTemplateOutlet,
     TranslateModule,
     ObjNgFor,
-    NgForOf,
     FormsModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
index 38f15a5ed1..68afbaf19b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.html
@@ -1,75 +1,84 @@
-<a *ngIf="(formCollapsed | async) !== true"
-   class="close position-relative"
-   ngbTooltip="{{'form.group-collapse-help' | translate}}"
-   placement="left">
-  <span class="fas fa-angle-up fa-fw fa-2x"
-        aria-hidden="true"
-        (click)="collapseForm()"></span>
-</a>
-<a *ngIf="(formCollapsed | async)"
-   class="close position-relative"
-   ngbTooltip="{{'form.group-expand-help' | translate}}"
-   placement="left">
-  <span class="fas fa-angle-down fa-fw fa-2x"
-        aria-hidden="true"
-        (click)="expandForm()"></span>
-</a>
+@if ((formCollapsed | async) !== true) {
+  <a
+    class="close position-relative"
+    ngbTooltip="{{'form.group-collapse-help' | translate}}"
+    placement="left">
+    <span class="fas fa-angle-up fa-fw fa-2x"
+      aria-hidden="true"
+    (click)="collapseForm()"></span>
+  </a>
+}
+@if ((formCollapsed | async)) {
+  <a
+    class="close position-relative"
+    ngbTooltip="{{'form.group-expand-help' | translate}}"
+    placement="left">
+    <span class="fas fa-angle-down fa-fw fa-2x"
+      aria-hidden="true"
+    (click)="expandForm()"></span>
+  </a>
+}
 
 <div class="pt-2" [ngClass]="{'border-top': !showErrorMessages, 'border border-danger': showErrorMessages}">
-  <div *ngIf="(formCollapsed | async) !== true" class="pl-2 row"  @shrinkInOut>
-    <ds-form #formRef="formComponent"
-             class="col-sm-12 col-md-8 col-lg-9 col-xl-10 pl-0"
-             [formId]="formId"
-             [formModel]="formModel"
-             [displaySubmit]="false"
-             [displayCancel]="false"
-             [emitChange]="false"
-             (dfBlur)="onBlur($event)"
-             (dfFocus)="onFocus($event)"></ds-form>
-
-
-    <div *ngIf="(formCollapsed | async) !== true" class="col p-0 m-0 d-flex justify-content-center align-items-center">
-
-        <button type="button"
-                class="btn btn-link"
-                [disabled]="isMandatoryFieldEmpty()"
-                (click)="save()">
-          <i class="fas fa-save text-primary fa-2x"
-             aria-hidden="true"></i>
-        </button>
-        <button type="button"
-                class="btn btn-link"
-                [disabled]="!editMode"
-                (click)="delete()">
-          <i class="fas fa-trash text-danger fa-2x"
-             aria-hidden="true"></i>
-        </button>
-        <button type="button"
-                class="btn btn-link"
-                [disabled]="isMandatoryFieldEmpty()"
-                (click)="clear()">
-          <i class="fas fa-undo fa-2x"
-             aria-hidden="true"></i>
-        </button>
-
+  @if ((formCollapsed | async) !== true) {
+    <div class="ps-2 row"  @shrinkInOut>
+      <ds-form #formRef="formComponent"
+        class="col-sm-12 col-md-8 col-lg-9 col-xl-10 ps-0"
+        [formId]="formId"
+        [formModel]="formModel"
+        [displaySubmit]="false"
+        [displayCancel]="false"
+        [emitChange]="false"
+        (dfBlur)="onBlur($event)"
+      (dfFocus)="onFocus($event)"></ds-form>
+      @if ((formCollapsed | async) !== true) {
+        <div class="col p-0 m-0 d-flex justify-content-center align-items-center">
+          <button type="button"
+            class="btn btn-link"
+            [dsBtnDisabled]="isMandatoryFieldEmpty()"
+            (click)="save()">
+            <i class="fas fa-save link-primary fa-2x"
+            aria-hidden="true"></i>
+          </button>
+          <button type="button"
+            class="btn btn-link"
+            [dsBtnDisabled]="!editMode"
+            (click)="delete()">
+            <i class="fas fa-trash link-danger fa-2x"
+            aria-hidden="true"></i>
+          </button>
+          <button type="button"
+            class="btn btn-link"
+            [dsBtnDisabled]="isMandatoryFieldEmpty()"
+            (click)="clear()">
+            <i class="fas fa-undo fa-2x"
+            aria-hidden="true"></i>
+          </button>
+        </div>
+      }
+      <div class="clearfix"></div>
     </div>
-    <div class="clearfix"></div>
-  </div>
+  }
 
   <div class="d-flex">
-    <ds-loading *ngIf="!chips" [showMessage]="false"></ds-loading>
-    <div *ngIf="chips && !chips.hasItems()">
-      <input type="text"
-             class="border-0 form-control-plaintext tag-input mt-1 mb-1 pl-2 text-muted"
-             readonly
-             tabindex="-1"
-             value="{{'form.no-value' | translate}}">
-    </div>
-    <ds-chips
-      *ngIf="chips && chips.hasItems()"
-      [chips]="chips"
-      [editable]="true"
-      [showIcons]="true"
+    @if (!chips) {
+      <ds-loading [showMessage]="false"></ds-loading>
+    }
+    @if (chips && !chips.hasItems()) {
+      <div>
+        <input type="text"
+          class="border-0 form-control-plaintext tag-input mt-1 mb-1 ps-2 text-muted"
+          readonly
+          tabindex="-1"
+          value="{{'form.no-value' | translate}}">
+      </div>
+    }
+    @if (chips && chips.hasItems()) {
+      <ds-chips
+        [chips]="chips"
+        [editable]="true"
+        [showIcons]="true"
       (selected)="onChipSelected($event)"></ds-chips>
+    }
   </div>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
index 05da3cc583..faecacd12d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.component.spec.ts
@@ -2,7 +2,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -374,7 +373,6 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
   standalone: true,
   imports: [
     DsDynamicRelationGroupComponent,
-    NgIf,
     AsyncPipe,
     NgbTooltipModule,
     TranslateModule,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index e6f5e41888..096f1b7004 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -46,6 +45,7 @@ import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/share
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import { shrinkInOut } from '../../../../../animations/shrink';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -73,7 +73,6 @@ import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
   templateUrl: './dynamic-relation-group.component.html',
   animations: [shrinkInOut],
   imports: [
-    NgIf,
     AsyncPipe,
     NgbTooltipModule,
     TranslateModule,
@@ -81,6 +80,7 @@ import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
     ThemedLoadingComponent,
     ChipsComponent,
     forwardRef(() => FormComponent),
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
index b4e6ac2c44..e48eea8052 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.html
@@ -1,60 +1,72 @@
 <div #sdRef="ngbDropdown" ngbDropdown display="dynamic" placement="bottom-right" class="w-100">
   <div class="position-relative right-addon"
-       role="combobox"
-       [attr.aria-label]="model.label"
-       [attr.aria-owns]="'combobox_' + id + '_listbox'"
-       [attr.aria-expanded]="sdRef.isOpen()"
-       [attr.aria-activedescendant]="(currentValue | async) ? 'combobox_' + id + '_selected' : null">
-       <i *ngIf="!model.readOnly" ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
-          aria-hidden="true"></i>
-       <i *ngIf="model.readOnly" class="dropdown-toggle position-absolute toggle-icon"
-          aria-hidden="true"></i>
+    role="combobox"
+    [attr.aria-label]="model.label"
+    [attr.aria-owns]="'combobox_' + id + '_listbox'"
+    [attr.aria-expanded]="sdRef.isOpen()"
+    [attr.aria-activedescendant]="(currentValue | async) ? 'combobox_' + id + '_selected' : null">
+    @if (!model.readOnly) {
+      <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
+      aria-hidden="true"></i>
+    }
+    @if (model.readOnly) {
+      <i class="dropdown-toggle position-absolute toggle-icon"
+      aria-hidden="true"></i>
+    }
     <input class="form-control"
-           [attr.aria-controls]="'combobox_' + id + '_listbox'"
-           [attr.aria-label]="model.placeholder"
-           [attr.autoComplete]="model.autoComplete"
-           [class.is-invalid]="showErrorMessages"
-           [class.scrollable-dropdown-input]="!model.readOnly"
-           [id]="id"
-           [name]="model.name"
-           [readonly]="true"
-           [disabled]="model.readOnly"
-           [type]="model.inputType"
-           [value]="(currentValue | async)"
-           (blur)="onBlur($event)"
-           (click)="$event.stopPropagation(); openDropdown(sdRef);"
-           (focus)="onFocus($event)"
-           (keydown)="selectOnKeyDown($event, sdRef)">
+      [attr.aria-controls]="'combobox_' + id + '_listbox'"
+      [attr.aria-label]="model.placeholder"
+      [attr.autoComplete]="model.autoComplete"
+      [class.is-invalid]="showErrorMessages"
+      [class.scrollable-dropdown-input]="!model.readOnly"
+      [id]="id"
+      [name]="model.name"
+      [readonly]="true"
+      [disabled]="model.readOnly"
+      [type]="model.inputType"
+      [value]="(currentValue | async)"
+      (blur)="onBlur($event)"
+      (click)="$event.stopPropagation(); openDropdown(sdRef);"
+      (focus)="onFocus($event)"
+      (keydown)="selectOnKeyDown($event, sdRef)">
   </div>
 
   <div #dropdownMenu ngbDropdownMenu
-       class="dropdown-menu scrollable-dropdown-menu w-100"
-       [attr.aria-label]="model.placeholder">
+    class="dropdown-menu scrollable-dropdown-menu w-100"
+    [attr.aria-label]="model.placeholder">
     <div class="scrollable-menu"
-         role="listbox"
-         [id]="'combobox_' + id + '_listbox'"
-         [attr.aria-label]="model.placeholder"
-         infiniteScroll
-         [infiniteScrollDistance]="2"
-         [infiniteScrollThrottle]="50"
-         (scrolled)="onScroll()"
-         [scrollWindow]="false">
+      role="listbox"
+      [id]="'combobox_' + id + '_listbox'"
+      [attr.aria-label]="model.placeholder"
+      infiniteScroll
+      [infiniteScrollDistance]="2"
+      [infiniteScrollThrottle]="50"
+      (scrolled)="onScroll()"
+      [scrollWindow]="false">
 
-      <button class="dropdown-item disabled" *ngIf="optionsList && optionsList.length === 0">{{'form.no-results' | translate}}</button>
+      @if (optionsList && optionsList.length === 0) {
+        <button class="dropdown-item disabled" type="button">
+          {{ 'form.no-results' | translate }}
+        </button>
+      }
       <button class="dropdown-item collection-item text-truncate"
-              (click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
-              title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
-      >
+        (click)="onSelect(undefined); sdRef.close()" (mousedown)="onSelect(undefined); sdRef.close()"
+        title="{{ 'dropdown.clear.tooltip' | translate }}" role="option"
+        type="button">
         <i>{{ 'dropdown.clear' | translate }}</i>
       </button>
-      <button class="dropdown-item collection-item text-truncate" *ngFor="let listEntry of optionsList; let i = index"
-              [class.active]="i === selectedIndex"
-              (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
-              title="{{ listEntry.display }}" role="option"
-              [attr.id]="listEntry.display === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
-        {{inputFormatter(listEntry)}}
-      </button>
-      <div class="scrollable-dropdown-loading text-center" *ngIf="loading"><p>{{'form.loading' | translate}}</p></div>
+      @for (listEntry of optionsList; track listEntry; let i = $index) {
+        <button class="dropdown-item collection-item text-truncate"
+          [class.active]="i === selectedIndex"
+          (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
+          title="{{ inputFormatter(listEntry) }}" role="option" type="button"
+          [attr.id]="inputFormatter(listEntry) === (currentValue|async) ? ('combobox_' + id + '_selected') : null">
+          {{inputFormatter(listEntry)}}
+        </button>
+      }
+      @if (loading) {
+        <div class="scrollable-dropdown-loading text-center"><p>{{'form.loading' | translate}}</p></div>
+      }
     </div>
 
   </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
index 539c1608a1..b7e974ce69 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.spec.ts
@@ -3,6 +3,7 @@ import {
   ChangeDetectorRef,
   Component,
   CUSTOM_ELEMENTS_SCHEMA,
+  Injector,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -29,6 +30,7 @@ import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstr
 import { TranslateModule } from '@ngx-translate/core';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 
+import { APP_DATA_SERVICES_MAP } from '../../../../../../../config/app-config.interface';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
@@ -96,11 +98,13 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         TestComponent,
       ],
       providers: [
+        Injector,
         ChangeDetectorRef,
         DsDynamicScrollableDropdownComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
         { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
+        { provide: APP_DATA_SERVICES_MAP, useValue: {} },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
index 051bb3f225..f3cbf8fb20 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.ts
@@ -1,13 +1,11 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
   ElementRef,
   EventEmitter,
+  Inject,
+  Injector,
   Input,
   OnInit,
   Output,
@@ -27,23 +25,36 @@ import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
   Observable,
   of as observableOf,
+  of,
 } from 'rxjs';
 import {
   catchError,
   distinctUntilChanged,
   map,
+  take,
   tap,
 } from 'rxjs/operators';
+import {
+  APP_DATA_SERVICES_MAP,
+  LazyDataServicesMap,
+} from 'src/config/app-config.interface';
 
+import { CacheableObject } from '../../../../../../core/cache/cacheable-object.model';
+import { FindAllDataImpl } from '../../../../../../core/data/base/find-all-data';
 import {
   buildPaginatedList,
   PaginatedList,
 } from '../../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../../core/data/remote-data';
+import { lazyDataService } from '../../../../../../core/lazy-data-service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { isEmpty } from '../../../../../empty.util';
+import { BtnDisabledDirective } from '../../../../../btn-disabled.directive';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
@@ -57,11 +68,10 @@ import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.mo
   templateUrl: './dynamic-scrollable-dropdown.component.html',
   imports: [
     NgbDropdownModule,
-    NgIf,
     AsyncPipe,
     InfiniteScrollModule,
-    NgForOf,
     TranslateModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
@@ -84,10 +94,28 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   public selectedIndex = 0;
   public acceptableKeys = ['Space', 'NumpadMultiply', 'NumpadAdd', 'NumpadSubtract', 'NumpadDecimal', 'Semicolon', 'Equal', 'Comma', 'Minus', 'Period', 'Quote', 'Backquote'];
 
-  constructor(protected vocabularyService: VocabularyService,
-              protected cdr: ChangeDetectorRef,
-              protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService,
+  /**
+   * If true the component can rely on the findAll method for data loading.
+   * This is a behaviour activated by dependency injection through the dropdown config.
+   * If a service that implements findAll is not provided in the config the component falls back on the standard vocabulary service.
+   *
+   * @private
+   */
+  private useFindAllService: boolean;
+  /**
+   * A service that implements FindAllData.
+   * If is provided in the config will be used for data loading in stead of the VocabularyService
+   * @private
+   */
+  private findAllService: FindAllDataImpl<CacheableObject>;
+
+  constructor(
+    protected vocabularyService: VocabularyService,
+    protected cdr: ChangeDetectorRef,
+    protected layoutService: DynamicFormLayoutService,
+    protected validationService: DynamicFormValidationService,
+    protected parentInjector: Injector,
+    @Inject(APP_DATA_SERVICES_MAP) private dataServiceMap: LazyDataServicesMap,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -96,21 +124,41 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    * Initialize the component, setting up the init form value
    */
   ngOnInit() {
-    this.updatePageInfo(this.model.maxOptions, 1);
-    this.loadOptions(true);
+    const lazyProvider$: Observable<Cache> = hasValue(this.model.resourceType) ?
+      lazyDataService(this.dataServiceMap, this.model.resourceType.value, this.parentInjector) : of(null);
+
+    lazyProvider$.pipe(take(1)).subscribe((dataService) => {
+      this.findAllService = dataService as unknown as FindAllDataImpl<CacheableObject>;
+      this.useFindAllService = hasValue(this.findAllService?.findAll) && typeof this.findAllService.findAll === 'function';
+      this.updatePageInfo(this.model.maxOptions, 1);
+      this.loadOptions(true);
+    });
+
+
     this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
       .subscribe((value) => {
         this.setCurrentValue(value);
       });
   }
 
+  /**
+   * Get service and method to use to retrieve dropdown options
+   */
+  getDataFromService(): Observable<RemoteData<PaginatedList<CacheableObject>>> {
+    if (this.useFindAllService) {
+      return this.findAllService.findAll({ elementsPerPage: this.pageInfo.elementsPerPage, currentPage: this.pageInfo.currentPage });
+    } else {
+      return this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo);
+    }
+  }
+
   loadOptions(fromInit: boolean) {
     this.loading = true;
-    this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+    this.getDataFromService().pipe(
       getFirstSucceededRemoteDataPayload(),
       catchError(() => observableOf(buildPaginatedList(new PageInfo(), []))),
       tap(() => this.loading = false),
-    ).subscribe((list: PaginatedList<VocabularyEntry>) => {
+    ).subscribe((list: PaginatedList<CacheableObject>) => {
       this.optionsList = list.page;
       if (fromInit && this.model.value) {
         this.setCurrentValue(this.model.value, true);
@@ -130,7 +178,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   /**
    * Converts an item from the result list to a `string` to display in the `<input>` field.
    */
-  inputFormatter = (x: VocabularyEntry): string => x.display || x.value;
+  inputFormatter = (x: any): string => (this.model.formatFunction ? this.model.formatFunction(x) : (x.display || x.value));
 
   /**
    * Opens dropdown menu
@@ -233,7 +281,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         this.pageInfo.totalElements,
         this.pageInfo.totalPages,
       );
-      this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+      this.getDataFromService().pipe(
         getFirstSucceededRemoteDataPayload(),
         catchError(() => observableOf(buildPaginatedList(
           new PageInfo(),
@@ -241,7 +289,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         )),
         ),
         tap(() => this.loading = false))
-        .subscribe((list: PaginatedList<VocabularyEntry>) => {
+        .subscribe((list: PaginatedList<any>) => {
           this.optionsList = this.optionsList.concat(list.page);
           this.updatePageInfo(
             list.pageInfo.elementsPerPage,
@@ -272,7 +320,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
   setCurrentValue(value: any, init = false): void {
     let result: Observable<string>;
 
-    if (init) {
+    if (init && !this.useFindAllService) {
       result = this.getInitValueFromModel().pipe(
         map((formValue: FormFieldMetadataValueObject) => formValue.display),
       );
@@ -281,6 +329,8 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         result = observableOf('');
       } else if (typeof value === 'string') {
         result = observableOf(value);
+      } else if (this.useFindAllService) {
+        result = observableOf(value[this.model.displayKey]);
       } else {
         result = observableOf(value.display);
       }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
index 870cd12cf6..8454186801 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model.ts
@@ -4,6 +4,7 @@ import {
   serializable,
 } from '@ng-dynamic-forms/core';
 
+import { ResourceType } from '../../../../../../core/shared/resource-type';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import {
   DsDynamicInputModel,
@@ -13,15 +14,27 @@ import {
 export const DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN = 'SCROLLABLE_DROPDOWN';
 
 export interface DynamicScrollableDropdownModelConfig extends DsDynamicInputModelConfig {
-  vocabularyOptions: VocabularyOptions;
+  vocabularyOptions?: VocabularyOptions;
   maxOptions?: number;
   value?: any;
+  displayKey?: string;
+  formatFunction?: (value: any) => string;
+  resourceType?: ResourceType;
 }
 
 export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
 
   @serializable() maxOptions: number;
   @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN;
+  @serializable() displayKey: string;
+  /**
+   * Configurable function for display value formatting in input
+   */
+  formatFunction: (value: any) => string;
+  /**
+   * Resource type to match data service
+   */
+  resourceType: ResourceType;
 
   constructor(config: DynamicScrollableDropdownModelConfig, layout?: DynamicFormControlLayout) {
 
@@ -30,6 +43,9 @@ export class DynamicScrollableDropdownModel extends DsDynamicInputModel {
     this.autoComplete = AUTOCOMPLETE_OFF;
     this.vocabularyOptions = config.vocabularyOptions;
     this.maxOptions = config.maxOptions || 10;
+    this.displayKey = config.displayKey || 'display';
+    this.formatFunction = config.formatFunction;
+    this.resourceType = config.resourceType;
   }
 
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
index 0cbd518595..f94fedc58d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
@@ -3,50 +3,56 @@
 </ng-template>
 
 
-  <ds-chips [chips]="chips"
-            [editable]="false"
-            [showIcons]="model.hasAuthority"
-            [wrapperClass]="'border-bottom border-light'">
+<ds-chips [chips]="chips"
+  [editable]="false"
+  [showIcons]="model.hasAuthority"
+  [wrapperClass]="'border-bottom border-light'">
 
-  <input *ngIf="!model.hasAuthority"
-         class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
-         type="text"
-         role="textbox"
-         [class.pl-3]="chips.hasItems()"
-         [placeholder]="model.placeholder"
-         [readonly]="model.readOnly"
-         [(ngModel)]="currentValue"
-         (blur)="onBlur($event)"
-         (keypress)="preventEventsPropagation($event)"
-         (keydown)="preventEventsPropagation($event)"
-         (keyup)="onKeyUp($event)" />
+  @if (!model.hasAuthority) {
+    <input
+      class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
+      type="text"
+      role="textbox"
+      [class.ps-3]="chips.hasItems()"
+      [placeholder]="model.placeholder"
+      [readonly]="model.readOnly"
+      [(ngModel)]="currentValue"
+      (blur)="onBlur($event)"
+      (keypress)="preventEventsPropagation($event)"
+      (keydown)="preventEventsPropagation($event)"
+      (keyup)="onKeyUp($event)" />
+  }
 
-  <div *ngIf="model.hasAuthority" class="position-relative right-addon">
-    <i *ngIf="searching" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
-    <input class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
-           type="text"
-           [attr.aria-labelledby]="'label_' + model.id"
-           [(ngModel)]="currentValue"
-           [attr.autoComplete]="model.autoComplete"
-           [class.is-invalid]="showErrorMessages"
-           [class.pl-3]="chips.hasItems()"
-           [id]="id"
-           [inputFormatter]="formatter"
-           [name]="model.name"
-           [ngbTypeahead]="search"
-           [placeholder]="model.placeholder"
-           [readonly]="model.readOnly"
-           [resultTemplate]="rt"
-           [type]="model.inputType"
-           (blur)="onBlur($event)"
-           (focus)="onFocus($event)"
-           (change)="$event.stopPropagation()"
-           (input)="onInput($event)"
-           (selectItem)="onSelectItem($event)"
-           (keypress)="preventEventsPropagation($event)"
-           (keydown)="preventEventsPropagation($event)"
-           (keyup)="onKeyUp($event)"
-           #instance="ngbTypeahead"/>
+  @if (model.hasAuthority) {
+    <div class="position-relative right-addon">
+      @if (searching) {
+        <i class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
+      }
+      <input class="border-0 form-control-plaintext tag-input flex-grow-1 mt-1 mb-1"
+        type="text"
+        [attr.aria-labelledby]="'label_' + model.id"
+        [(ngModel)]="currentValue"
+        [attr.autoComplete]="model.autoComplete"
+        [class.is-invalid]="showErrorMessages"
+        [class.ps-3]="chips.hasItems()"
+        [id]="id"
+        [inputFormatter]="formatter"
+        [name]="model.name"
+        [ngbTypeahead]="search"
+        [placeholder]="model.placeholder"
+        [readonly]="model.readOnly"
+        [resultTemplate]="rt"
+        [type]="model.inputType"
+        (blur)="onBlur($event)"
+        (focus)="onFocus($event)"
+        (change)="$event.stopPropagation()"
+        (input)="onInput($event)"
+        (selectItem)="onSelectItem($event)"
+        (keypress)="preventEventsPropagation($event)"
+        (keydown)="preventEventsPropagation($event)"
+        (keyup)="onKeyUp($event)"
+        #instance="ngbTypeahead"/>
     </div>
-  </ds-chips>
+  }
+</ds-chips>
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
index d8f12197d2..7b133ded9b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -64,7 +64,6 @@ import { DynamicTagModel } from './dynamic-tag.model';
   imports: [
     NgbTypeaheadModule,
     FormsModule,
-    NgIf,
     ChipsComponent,
   ],
   standalone: true,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index cef8516b84..9e2a8fe513 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -1,96 +1,105 @@
 <div class="modal-header">
-    <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
-    <button type="button" [disabled]="isPending" class="close" aria-label="Close button" aria-describedby="modal-title"
-            (click)="close()">
-        <span aria-hidden="true">&times;</span>
-    </button>
+  <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + relationshipOptions.relationshipType) | translate }}</h4>
+  <button type="button" [dsBtnDisabled]="isPending" class="btn-close" aria-label="Close button" aria-describedby="modal-title"
+    (click)="close()">
+  </button>
 </div>
 <div class="modal-body">
-    <ds-loading *ngIf="!item || !collection"></ds-loading>
-    <ng-container *ngIf="item && collection">
-        <ul ngbNav #nav="ngbNav" class="nav-tabs">
-            <li ngbNavItem role="presentation">
-                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate  : { count: (totalInternal$ | async)} }}</a>
-                <ng-template ngbNavContent>
-                    <ds-dynamic-lookup-relation-search-tab
-                            [selection$]="selection$"
-                            [listId]="listId"
-                            [relationship]="relationshipOptions"
-                            [repeatable]="repeatable"
-                            [context]="context"
-                            [query]="query"
-                            [hiddenQuery]="hiddenQuery"
-                            [relationshipType]="relationshipType"
-                            [isLeft]="isLeft"
-                            [item]="item"
-                            [isEditRelationship]="isEditRelationship"
-                            [toRemove]="toRemove"
-                            (selectObject)="select($event)"
-                            (deselectObject)="deselect($event)"
-                            (resultFound)="setTotalInternals($event.pageInfo.totalElements)"
-                            class="d-block pt-3">
-                    </ds-dynamic-lookup-relation-search-tab>
-                </ng-template>
-            </li>
-            <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index" role="presentation">
-                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)?.[idx] } }}</a>
-                <ng-template ngbNavContent>
-                    <ds-dynamic-lookup-relation-external-source-tab
-                            [label]="label"
-                            [listId]="listId"
-                            [repeatable]="repeatable"
-                            [item]="item"
-                            [collection]="collection"
-                            [relationship]="relationshipOptions"
-                            [context]="context"
-                            [query]="query"
-                            [externalSource]="source"
-                            (importedObject)="imported($event)"
-                            class="d-block pt-3">
-                    </ds-dynamic-lookup-relation-external-source-tab>
-                </ng-template>
-            </li>
-            <li ngbNavItem *ngIf="!isEditRelationship" role="presentation">
-                <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.selection-tab.tab-title' | translate : { count: (selection$ | async)?.length } }}</a>
-                <ng-template ngbNavContent>
-                    <ds-dynamic-lookup-relation-selection-tab
-                            [selection$]="selection$"
-                            [listId]="listId"
-                            [relationshipType]="relationshipOptions.relationshipType"
-                            [repeatable]="repeatable"
-                            [context]="context"
-                            (selectObject)="select($event)"
-                            (deselectObject)="deselect($event)"
-                            class="d-block pt-3">
-                    </ds-dynamic-lookup-relation-selection-tab>
-                </ng-template>
-            </li>
-        </ul>
-        <div [ngbNavOutlet]="nav"></div>
-    </ng-container>
+  @if (!item || !collection) {
+    <ds-loading></ds-loading>
+  }
+  @if (item && collection) {
+    <ul ngbNav #nav="ngbNav" class="nav-tabs">
+      <li ngbNavItem role="presentation">
+        <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + relationshipOptions.relationshipType | translate  : { count: (totalInternal$ | async)} }}</a>
+        <ng-template ngbNavContent>
+          <ds-dynamic-lookup-relation-search-tab
+            [selection$]="selection$"
+            [listId]="listId"
+            [relationship]="relationshipOptions"
+            [repeatable]="repeatable"
+            [context]="context"
+            [query]="query"
+            [hiddenQuery]="hiddenQuery"
+            [relationshipType]="relationshipType"
+            [isLeft]="isLeft"
+            [item]="item"
+            [isEditRelationship]="isEditRelationship"
+            [toRemove]="toRemove"
+            (selectObject)="select($event)"
+            (deselectObject)="deselect($event)"
+            (resultFound)="setTotalInternals($event.pageInfo.totalElements)"
+            class="d-block pt-3">
+          </ds-dynamic-lookup-relation-search-tab>
+        </ng-template>
+      </li>
+      @for (source of (externalSourcesRD$ | async); track source; let idx = $index) {
+        <li ngbNavItem role="presentation">
+          <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : { count: (totalExternal$ | async)?.[idx] } }}</a>
+          <ng-template ngbNavContent>
+            <ds-dynamic-lookup-relation-external-source-tab
+              [label]="label"
+              [listId]="listId"
+              [repeatable]="repeatable"
+              [item]="item"
+              [collection]="collection"
+              [relationship]="relationshipOptions"
+              [context]="context"
+              [query]="query"
+              [externalSource]="source"
+              (importedObject)="imported($event)"
+              class="d-block pt-3">
+            </ds-dynamic-lookup-relation-external-source-tab>
+          </ng-template>
+        </li>
+      }
+      @if (!isEditRelationship) {
+        <li ngbNavItem role="presentation">
+          <a ngbNavLink>{{'submission.sections.describe.relationship-lookup.selection-tab.tab-title' | translate : { count: (selection$ | async)?.length } }}</a>
+          <ng-template ngbNavContent>
+            <ds-dynamic-lookup-relation-selection-tab
+              [selection$]="selection$"
+              [listId]="listId"
+              [relationshipType]="relationshipOptions.relationshipType"
+              [repeatable]="repeatable"
+              [context]="context"
+              (selectObject)="select($event)"
+              (deselectObject)="deselect($event)"
+              class="d-block pt-3">
+            </ds-dynamic-lookup-relation-selection-tab>
+          </ng-template>
+        </li>
+      }
+    </ul>
+    <div [ngbNavOutlet]="nav"></div>
+  }
 </div>
 <div class="modal-footer">
   <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate: {size: (selection$ | async)?.length || 0}) }}</small>
-  <div class="d-flex float-right space-children-mr">
+  <div class="d-flex float-end space-children-mr">
     <div class="close-button">
-        <button type="button" [disabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
-            {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
+      <button type="button" [dsBtnDisabled]="isPending" class="btn btn-outline-secondary" (click)="close()">
+      {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
-    <ng-container *ngIf="isEditRelationship">
+    @if (isEditRelationship) {
       <button class="btn btn-danger discard"
-              [disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
-              (click)="discardEv()">
-              <i class="fas fa-times"></i>
+        [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+        (click)="discardEv()">
+        <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
       <button class="btn btn-primary submit"
-            [disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
-              (click)="submitEv()">
-              <span *ngIf="isPending" class="spinner-border spinner-border-sm mr-1" role="status"
-                              aria-hidden="true"></span>
-              <i *ngIf="!isPending" class="fas fa-save"></i>
+        [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
+        (click)="submitEv()">
+        @if (isPending) {
+          <span class="spinner-border spinner-border-sm me-1" role="status"
+          aria-hidden="true"></span>
+        }
+        @if (!isPending) {
+          <i class="fas fa-save"></i>
+        }
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
       </button>
-    </ng-container>
+    }
   </div>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
index 4f7c7be5c2..2660675211 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -33,6 +33,7 @@ import { Item } from '../../../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
 import { XSRFService } from '../../../../../core/xsrf/xsrf.service';
+import { BtnDisabledDirective } from '../../../../btn-disabled.directive';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
@@ -123,7 +124,7 @@ describe('DsDynamicLookupRelationModalComponent', () => {
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule, DsDynamicLookupRelationModalComponent],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule, DsDynamicLookupRelationModalComponent, BtnDisabledDirective],
       providers: [
         {
           provide: SearchConfigurationService, useValue: {
@@ -223,10 +224,12 @@ describe('DsDynamicLookupRelationModalComponent', () => {
 
   describe('when initialized and is relationship show the list of buttons', () => {
     it('submit button should be disabled', () => {
-      expect(debugElement.query(By.css('.submit')).nativeElement?.disabled).toBeTrue();
+      expect(debugElement.query(By.css('.submit')).nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.submit')).nativeElement.classList.contains('disabled')).toBeTrue();
     });
     it('discard button should be disabled', () => {
-      expect(debugElement.query(By.css('.discard')).nativeElement?.disabled).toBeTrue();
+      expect(debugElement.query(By.css('.discard')).nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.discard')).nativeElement.classList.contains('disabled')).toBeTrue();
     });
   });
 
@@ -264,9 +267,12 @@ describe('DsDynamicLookupRelationModalComponent', () => {
 
     it('there should show 1 spinner and disable all 3 buttons', () => {
       expect(debugElement.queryAll(By.css('.spinner-border')).length).toEqual(1);
-      expect(debugElement.query(By.css('.submit')).nativeElement?.disabled).toBeTrue();
-      expect(debugElement.query(By.css('.discard')).nativeElement?.disabled).toBeTrue();
-      expect(debugElement.query(By.css('.close')).nativeElement?.disabled).toBeTrue();
+      expect(debugElement.query(By.css('.submit')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.submit')).nativeElement?.classList.contains('disabled')).toBeTrue();
+      expect(debugElement.query(By.css('.discard')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.discard')).nativeElement?.classList.contains('disabled')).toBeTrue();
+      expect(debugElement.query(By.css('.btn-close')).nativeElement?.getAttribute('aria-disabled')).toBe('true');
+      expect(debugElement.query(By.css('.btn-close')).nativeElement?.classList.contains('disabled')).toBeTrue();
     });
 
   });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
index 6033fa1b61..cec976267f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -50,6 +46,7 @@ import {
 } from '../../../../../core/shared/operators';
 import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-configuration.service';
+import { BtnDisabledDirective } from '../../../../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -85,12 +82,11 @@ import { DsDynamicLookupRelationSelectionTabComponent } from './selection-tab/dy
     ThemedDynamicLookupRelationExternalSourceTabComponent,
     TranslateModule,
     ThemedLoadingComponent,
-    NgIf,
     NgbNavModule,
     ThemedDynamicLookupRelationSearchTabComponent,
     AsyncPipe,
-    NgForOf,
     DsDynamicLookupRelationSelectionTabComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
index 4282eb5888..d3c26224b9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
@@ -5,29 +5,37 @@
   </div>
   <div class="col-8">
     <ds-search-form [query]="(searchConfigService.paginatedSearchOptions | async)?.query"
-                    [inPlaceSearch]="true"
-                    [searchPlaceholder]="'submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder' | translate">
+      [inPlaceSearch]="true"
+      [searchPlaceholder]="'submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder' | translate">
     </ds-search-form>
     <div>
       <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + externalSource.id | translate}}</h3>
       <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
-        <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && !entriesRD?.isLoading && entriesRD?.payload?.page?.length > 0" @fadeIn
-                                [objects]="entriesRD"
-                                [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-                                [config]="(currentPagination$ |async)"
-                                [hideGear]="true"
-                                [context]="context"
-                                [importable]="true"
-                                [importConfig]="importConfig"
-                                (importObject)="import($event)">
-        </ds-viewable-collection>
-        <ds-loading *ngIf="!entriesRD || entriesRD?.isLoading"
-                    message="{{'loading.search-results' | translate}}"></ds-loading>
-        <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode !== 400)"
-                    message="{{'error.search-results' | translate}}"></ds-error>
-        <div *ngIf="entriesRD?.payload?.page?.length === 0 || entriesRD?.statusCode === 400" id="empty-external-entry-list">
-          {{ 'search.results.empty' | translate }}
-        </div>
+        @if (entriesRD?.hasSucceeded && !entriesRD?.isLoading && entriesRD?.payload?.page?.length > 0) {
+          <ds-viewable-collection @fadeIn
+            [objects]="entriesRD"
+            [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+            [config]="(currentPagination$ |async)"
+            [hideGear]="true"
+            [context]="context"
+            [importable]="true"
+            [importConfig]="importConfig"
+            (importObject)="import($event)">
+          </ds-viewable-collection>
+        }
+        @if (!entriesRD || entriesRD?.isLoading) {
+          <ds-loading
+          message="{{'loading.search-results' | translate}}"></ds-loading>
+        }
+        @if (entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode !== 400)) {
+          <ds-error
+          message="{{'error.search-results' | translate}}"></ds-error>
+        }
+        @if (entriesRD?.payload?.page?.length === 0 || entriesRD?.statusCode === 400) {
+          <div id="empty-external-entry-list">
+            {{ 'search.results.empty' | translate }}
+          </div>
+        }
       </ng-container>
     </div>
   </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index 5a1f13544f..c27acf337e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ComponentRef,
@@ -84,7 +81,6 @@ import { ThemedExternalSourceEntryImportModalComponent } from './external-source
     AsyncPipe,
     TranslateModule,
     ErrorComponent,
-    NgIf,
     ThemedLoadingComponent,
   ],
   standalone: true,
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
index 44f21fb4b4..dc818311c9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.html
@@ -1,54 +1,58 @@
 <div class="modal-header">
   <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | translate }}</h4>
-  <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
-          (click)="modal.dismiss()">
-    <span aria-hidden="true">&times;</span>
+  <button type="button" class="btn-close" aria-label="Close button" aria-describedby="modal-title"
+    (click)="modal.dismiss()">
   </button>
 </div>
 <div class="modal-body">
   <h4>{{ (labelPrefix + 'head.' + externalSourceEntry.externalSource | translate) }}</h4>
   <div id="external-source-entry-information" class="mb-3">
     <div><span>{{externalSourceEntry.display}}</span></div>
-    <div *ngIf="uri"><a href="{{uri.value}}">{{uri.value}}</a></div>
+    @if (uri) {
+      <div><a href="{{uri.value}}">{{uri.value}}</a></div>
+    }
   </div>
 
   <h4>{{ (labelPrefix + 'select' | translate) }}</h4>
 
   <div id="external-source-entry-entities" class="mb-3">
-    <h5 class="font-weight-bold">{{ (labelPrefix + 'entities' | translate) }}</h5>
+    <h5 class="fw-bold">{{ (labelPrefix + 'entities' | translate) }}</h5>
 
-    <ds-search-results *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length > 0"
-                       [searchResults]="(localEntitiesRD$ | async)"
-                       [sortConfig]="this.lookupRelationService.searchConfig?.sort"
-                       [searchConfig]="this.lookupRelationService.searchConfig"
-                       [selectable]="true"
-                       [disableHeader]="true"
-                       [hidePaginationDetail]="true"
-                       [selectionConfig]="{ repeatable: false, listId: entityListId }"
-                       [linkType]="linkTypes.ExternalLink"
-                       [context]="context"
-                       (deselectObject)="deselectEntity()"
-                       (selectObject)="selectEntity($event)">
-    </ds-search-results>
-    <div class="ml-4">
+    @if ((localEntitiesRD$ | async)?.payload?.page?.length > 0) {
+      <ds-search-results
+        [searchResults]="(localEntitiesRD$ | async)"
+        [sortConfig]="this.lookupRelationService.searchConfig?.sort"
+        [searchConfig]="this.lookupRelationService.searchConfig"
+        [selectable]="true"
+        [disableHeader]="true"
+        [hidePaginationDetail]="true"
+        [selectionConfig]="{ repeatable: false, listId: entityListId }"
+        [linkType]="linkTypes.ExternalLink"
+        [context]="context"
+        (deselectObject)="deselectEntity()"
+        (selectObject)="selectEntity($event)">
+      </ds-search-results>
+    }
+    <div class="ms-4 form-check">
       <input class="form-check-input" type="radio" name="new-entity" id="new-entity" value="new-entity" (click)="selectNewEntity()" [checked]="selectedImportType === importType.NewEntity" />
       <label class="form-check-label" for="new-entity">{{ (labelPrefix + 'entities.new' | translate) }}</label>
     </div>
   </div>
-  <div id="external-source-entry-authority" *ngIf="authorityEnabled">
-    <h5 class="font-weight-bold">{{ (labelPrefix + 'authority' | translate) }}</h5>
-
-    <div class="ml-4">
-      <input class="form-check-input" type="radio" name="new-authority" id="new-authority" value="new-authority" (click)="selectNewAuthority()" [checked]="selectedImportType === importType.NewAuthority" />
-      <label class="form-check-label" for="new-authority">{{ (labelPrefix + 'authority.new' | translate) }}</label>
+  @if (authorityEnabled) {
+    <div id="external-source-entry-authority">
+      <h5 class="fw-bold">{{ (labelPrefix + 'authority' | translate) }}</h5>
+      <div class="ms-4 form-check">
+        <input class="form-check-input" type="radio" name="new-authority" id="new-authority" value="new-authority" (click)="selectNewAuthority()" [checked]="selectedImportType === importType.NewAuthority" />
+        <label class="form-check-label" for="new-authority">{{ (labelPrefix + 'authority.new' | translate) }}</label>
+      </div>
     </div>
-  </div>
+  }
 </div>
 <div class="modal-footer">
   <div>
     <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + 'cancel' | translate) }}</button>
   </div>
   <div>
-    <button type="button" class="btn btn-primary" [disabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="selectedImportType === importType.None" (click)="import()">{{ (labelPrefix + 'import' | translate) }}</button>
   </div>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
index c2516ca9a8..edfd0f9b3d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -37,6 +34,7 @@ import {
   getRemoteDataPayload,
 } from '../../../../../../../core/shared/operators';
 import { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component';
+import { BtnDisabledDirective } from '../../../../../../btn-disabled.directive';
 import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
 import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
@@ -67,8 +65,8 @@ export enum ImportType {
   imports: [
     TranslateModule,
     ThemedSearchResultsComponent,
-    NgIf,
     AsyncPipe,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 02dec72baa..b99c2f93da 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -1,44 +1,49 @@
-<ds-search *ngIf="this.relationship.searchConfiguration && context"
-           [configuration]="this.relationship.searchConfiguration"
-           [context]="context"
-           [fixedFilterQuery]="this.relationship.filter"
-           [hiddenQuery]="hiddenQuery"
-           [inPlaceSearch]="true"
-           [linkType]="linkTypes.ExternalLink"
-           [searchFormPlaceholder]="'submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder'"
-           [selectable]="true"
-           [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-           [showScopeSelector]="false"
-           [showViewModes]="false"
-           [query]="query"
-           (resultFound)="onResultFound($event)"
-           (deselectObject)="deselectObject.emit($event)"
-           (selectObject)="selectObject.emit($event)">
-  <div additionalSearchOptions *ngIf="repeatable" class="position-absolute">
-    <div class="input-group mb-3">
-      <div ngbDropdown class="input-group dropdown-button">
-        <button *ngIf="selectAllLoading" type="button"
-                class="btn btn-outline-secondary rounded-right">
-                            <span class="spinner-border spinner-border-sm" role="status"
-                                  aria-hidden="true"></span>
-          <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.search-tab.loading' | translate) }}</span>
-        </button>
-        <button id="resultdropdown" type="button"
-                ngbDropdownToggle
-                class="btn btn-outline-secondary dropdown-toggle-split"
-                data-toggle="dropdown" aria-haspopup="true"
-                aria-expanded="false"
-                [hidden]="selectAllLoading">
-          <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.toggle-dropdown' | translate) }}</span>
-        </button>
-        <div ngbDropdownMenu aria-labelledby="resultdropdown" *ngVar="(resultsRD$ | async) as resultsRD">
-          <button class="dropdown-item"
-                  (click)="selectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.select-page' | translate) }}</button>
-          <button class="dropdown-item"
-                  (click)="deselectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.deselect-page' | translate) }}</button>
+@if (this.relationship.searchConfiguration && context) {
+  <ds-search
+    [configuration]="this.relationship.searchConfiguration"
+    [context]="context"
+    [fixedFilterQuery]="this.relationship.filter"
+    [hiddenQuery]="hiddenQuery"
+    [inPlaceSearch]="true"
+    [linkType]="linkTypes.ExternalLink"
+    [searchFormPlaceholder]="'submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder'"
+    [selectable]="true"
+    [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+    [showScopeSelector]="false"
+    [showViewModes]="false"
+    [query]="query"
+    (resultFound)="onResultFound($event)"
+    (deselectObject)="deselectObject.emit($event)"
+    (selectObject)="selectObject.emit($event)">
+    @if (repeatable) {
+      <div additionalSearchOptions class="position-absolute">
+        <div class="input-group mb-3">
+          <div ngbDropdown class="input-group dropdown-button">
+            @if (selectAllLoading) {
+              <button type="button"
+                class="btn btn-outline-secondary rounded-end">
+                <span class="spinner-border spinner-border-sm" role="status"
+                aria-hidden="true"></span>
+                <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.search-tab.loading' | translate) }}</span>
+              </button>
+            }
+            <button id="resultdropdown" type="button"
+              ngbDropdownToggle
+              class="btn btn-outline-secondary dropdown-toggle-split"
+              data-toggle="dropdown" aria-haspopup="true"
+              aria-expanded="false"
+              [hidden]="selectAllLoading">
+              <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.toggle-dropdown' | translate) }}</span>
+            </button>
+            <div ngbDropdownMenu aria-labelledby="resultdropdown" *ngVar="(resultsRD$ | async) as resultsRD">
+              <button class="dropdown-item"
+              (click)="selectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.select-page' | translate) }}</button>
+              <button class="dropdown-item"
+              (click)="deselectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.deselect-page' | translate) }}</button>
+            </div>
+          </div>
         </div>
       </div>
-    </div>
-  </div>
-
-</ds-search>
+    }
+  </ds-search>
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
index fdc1f6de01..e21f8328d2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -164,18 +164,6 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
     });
   });
 
-  describe('selectAll', () => {
-    beforeEach(() => {
-      spyOn(component.selectObject, 'emit');
-      component.selectAll();
-    });
-
-    it('should emit the page filtered from already selected objects and call select on the service for all objects', () => {
-      expect(component.selectObject.emit).toHaveBeenCalledWith(searchResult3);
-      expect(selectableListService.select).toHaveBeenCalledWith(listID, [searchResult1, searchResult2, searchResult3]);
-    });
-  });
-
   describe('deselectAll', () => {
     beforeEach(() => {
       spyOn(component.deselectObject, 'emit');
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index b72fbf40a8..d3903fbc54 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -16,13 +13,7 @@ import {
   BehaviorSubject,
   Observable,
 } from 'rxjs';
-import {
-  map,
-  mapTo,
-  switchMap,
-  take,
-  tap,
-} from 'rxjs/operators';
+import { take } from 'rxjs/operators';
 
 import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
@@ -44,7 +35,6 @@ import { hasValue } from '../../../../../empty.util';
 import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
 import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
 import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
 import { SearchObjects } from '../../../../../search/models/search-objects.model';
 import { SearchResult } from '../../../../../search/models/search-result.model';
 import { ThemedSearchComponent } from '../../../../../search/themed-search.component';
@@ -67,7 +57,6 @@ import { RelationshipOptions } from '../../../models/relationship-options.model'
     VarDirective,
     TranslateModule,
     NgbDropdownModule,
-    NgIf,
     ThemedSearchComponent,
   ],
   standalone: true,
@@ -240,35 +229,6 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.selectableListService.deselect(this.listId, page);
   }
 
-  /**
-   * Select all items that were found using the current search query
-   */
-  selectAll() {
-    this.allSelected = true;
-    this.selectAllLoading = true;
-    const fullPagination = Object.assign(new PaginationComponentOptions(), {
-      currentPage: 1,
-      pageSize: 9999,
-    });
-    const fullSearchConfig = Object.assign(this.lookupRelationService.searchConfig, { pagination: fullPagination });
-    const results$ = this.searchService.search<Item>(fullSearchConfig);
-    results$.pipe(
-      getFirstSucceededRemoteData(),
-      map((resultsRD) => resultsRD.payload.page),
-      tap(() => this.selectAllLoading = false),
-      switchMap((results) => this.selection$.pipe(
-        take(1),
-        tap((selection: SearchResult<Item>[]) => {
-          const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
-          this.selectObject.emit(...filteredResults);
-        }),
-        mapTo(results),
-      )),
-    ).subscribe((results) => {
-      this.selectableListService.select(this.listId, results);
-    });
-  }
-
   /**
    * setSelectedIds select all the items from the results that have relationship
    * @param idOfItems the uuid of items that are being checked
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
index 8d0053a1df..ee5940031d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
@@ -1,23 +1,27 @@
 <div class="row">
-    <div class="col-4">
-        <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.settings' | translate}}</h3>
-        <ds-page-size-selector></ds-page-size-selector>
-    </div>
-    <div class="col-8">
-        <div *ngIf="(selectionRD$ | async)?.payload.page < 1">
-            {{'submission.sections.describe.relationship-lookup.selection-tab.no-selection' | translate}}
-        </div>
-        <div *ngIf="(selectionRD$ | async)?.payload.page.length >= 1">
-            <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + relationshipType | translate}}</h3>
-            <ds-viewable-collection [objects]="selectionRD$ | async"
-                                    [selectable]="true"
-                                    [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-                                    [config]="(currentPagination$ |async)"
-                                    [hideGear]="true"
-                                    [context]="context"
-                                    (deselectObject)="deselectObject.emit($event)"
-                                    (selectObject)="selectObject.emit($event)"
-            ></ds-viewable-collection>
-        </div>
-    </div>
+  <div class="col-4">
+    <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.settings' | translate}}</h3>
+    <ds-page-size-selector></ds-page-size-selector>
+  </div>
+  <div class="col-8">
+    @if ((selectionRD$ | async)?.payload.page < 1) {
+      <div>
+        {{'submission.sections.describe.relationship-lookup.selection-tab.no-selection' | translate}}
+      </div>
+    }
+    @if ((selectionRD$ | async)?.payload.page.length >= 1) {
+      <div>
+        <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + relationshipType | translate}}</h3>
+        <ds-viewable-collection [objects]="selectionRD$ | async"
+          [selectable]="true"
+          [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+          [config]="(currentPagination$ |async)"
+          [hideGear]="true"
+          [context]="context"
+          (deselectObject)="deselectObject.emit($event)"
+          (selectObject)="selectObject.emit($event)"
+        ></ds-viewable-collection>
+      </div>
+    }
+  </div>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
index ace5e9bdc7..a92720fc7c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -51,7 +48,6 @@ import { SearchResult } from '../../../../../search/models/search-result.model';
     PageSizeSelectorComponent,
     ObjectCollectionComponent,
     AsyncPipe,
-    NgIf,
     TranslateModule,
   ],
   standalone: true,
diff --git a/src/app/shared/form/builder/parsers/concat-field-parser.ts b/src/app/shared/form/builder/parsers/concat-field-parser.ts
index 40711c188d..751128446b 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -113,7 +113,7 @@ export class ConcatFieldParser extends FieldParser {
 
     const clsGroup = {
       element: {
-        control: 'form-row',
+        control: 'row',
       },
     };
     const concatModel = new DynamicConcatModel(concatGroup, clsGroup);
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index 590d5f564e..c634c7d876 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -127,7 +127,7 @@ export abstract class FieldParser {
 
       const layout: DynamicFormControlLayout = {
         grid: {
-          group: 'form-row',
+          group: 'row',
         },
       };
 
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
index 9c5ef7423e..50fc585abf 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
@@ -29,7 +29,7 @@ export class OneboxFieldParser extends FieldParser {
       // Case Qualdrop Model
       const clsGroup = {
         element: {
-          control: 'form-row',
+          control: 'row',
           hint: 'ds-form-qualdrop-hint',
         },
       };
@@ -39,7 +39,7 @@ export class OneboxFieldParser extends FieldParser {
           control: 'ds-form-input-addon custom-select',
         },
         grid: {
-          host: 'col-sm-4 pr-0',
+          host: 'col-sm-4 pe-0',
         },
       };
 
@@ -48,7 +48,7 @@ export class OneboxFieldParser extends FieldParser {
           control: 'ds-form-input-value',
         },
         grid: {
-          host: 'col-sm-8 pl-0',
+          host: 'col-sm-8 ps-0',
         },
       };
 
diff --git a/src/app/shared/form/builder/parsers/row-parser.ts b/src/app/shared/form/builder/parsers/row-parser.ts
index b4febfc47f..5de43bb918 100644
--- a/src/app/shared/form/builder/parsers/row-parser.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.ts
@@ -122,7 +122,7 @@ export class RowParser {
     if (config && !isEmpty(config.group)) {
       const clsGroup = {
         element: {
-          control: 'form-row',
+          control: 'row',
         },
       };
       const groupModel = new DynamicRowGroupModel(config, clsGroup);
diff --git a/src/app/shared/form/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html
index 927ca426ef..fa9a655d23 100644
--- a/src/app/shared/form/chips/chips.component.html
+++ b/src/app/shared/form/chips/chips.component.html
@@ -1,44 +1,51 @@
-<div [className]="'float-left w-100 ' + wrapperClass">
+<div [className]="'float-start w-100 ' + wrapperClass">
   <div role="list" class="nav nav-pills d-flex flex-column flex-sm-row" cdkDropList cdkDropListOrientation="horizontal" (cdkDropListDropped)="onDrop($event)">
     <ng-template #tipContent>
-      <p class="text-left p-0 m-0" *ngFor="let tip of tipText">
-        {{tip}}
-      </p>
+      @for (tip of tipText; track tip) {
+        <p class="text-start p-0 m-0">
+          {{tip}}
+        </p>
+      }
     </ng-template>
-    <div role="listitem" class="nav-item mr-2 mb-1"
-           *ngFor="let c of chips.getChips(); let i = index"
-           #t="ngbTooltip"
-           triggers="manual"
-           [ngbTooltip]="tipContent"
-           (mouseover)="showTooltip(t, i)"
-           (mouseout)="t.close()">
+    @for (c of chips.getChips(); track c; let i = $index) {
+      <div role="listitem" class="nav-item me-2 mb-1"
+        #t="ngbTooltip"
+        triggers="manual"
+        [ngbTooltip]="tipContent"
+        (mouseover)="showTooltip(t, i)"
+        (mouseout)="t.close()">
         <a class="flex-sm-fill text-sm-center nav-link active bg-info"
-           cdkDrag
-           (cdkDragStarted)="onDrag(i)"
-           href="javascript:void(0);"
-           [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged === i}"
-           (click)="chipsSelected($event, i);">
+          cdkDrag
+          (cdkDragStarted)="onDrag(i)"
+          href="javascript:void(0);"
+          [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged === i}"
+          (click)="chipsSelected($event, i);">
           <span>
-            <i *ngIf="showIcons && !c.isNestedItem()" dsAuthorityConfidenceState [authorityValue]="c.item" class="far fa-circle" aria-hidden="true">&nbsp;</i>
-            <ng-container *ngIf="showIcons && c.hasVisibleIcons()">
-              <i *ngFor="let icon of c.icons; let l = last"
-                 [ngbTooltip]="tipContent"
-                 triggers="manual"
-                 #t="ngbTooltip"
-                 class="{{icon.style}}"
-                 [class.mr-1]="!l"
-                 [class.mr-2]="l"
-                 dsAuthorityConfidenceState
-                 [authorityValue]="c.item[icon.metadata] || c.item"
-                 [visibleWhenAuthorityEmpty]="icon.visibleWhenAuthorityEmpty"
-                 aria-hidden="true"
-                 (mouseover)="showTooltip(t, i, icon.metadata)"
-                 (mouseout)="t.close()"></i>
-            </ng-container>
-            <p class="chip-label text-truncate d-table-cell">{{c.display}}</p><i class="fas fa-times ml-2" (click)="removeChips($event, i)" [title]="'chips.remove' | translate"></i>
+            @if (showIcons && !c.isNestedItem()) {
+              <i dsAuthorityConfidenceState [authorityValue]="c.item" class="far fa-circle" aria-hidden="true">&nbsp;</i>
+            }
+            @if (showIcons && c.hasVisibleIcons()) {
+              @for (icon of c.icons; track icon; let l = $last) {
+                <i
+                  [ngbTooltip]="tipContent"
+                  triggers="manual"
+                  #t="ngbTooltip"
+                  class="{{icon.style}}"
+                  [class.me-1]="!l"
+                  [class.me-2]="l"
+                  dsAuthorityConfidenceState
+                  [authorityValue]="c.item[icon.metadata] || c.item"
+                  [visibleWhenAuthorityEmpty]="icon.visibleWhenAuthorityEmpty"
+                  aria-hidden="true"
+                  (mouseover)="showTooltip(t, i, icon.metadata)"
+                (mouseout)="t.close()"></i>
+              }
+            }
+            <p class="chip-label text-truncate d-table-cell">{{c.display}}</p><i class="fas fa-times ms-2" (click)="removeChips($event, i)" [title]="'chips.remove' | translate"></i>
           </span>
         </a>
       </div>
+    }
     <div [class.chips-sort-ignore]="(isDragging | async)" class="flex-grow-1">
       <ng-content ></ng-content>
     </div>
diff --git a/src/app/shared/form/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts
index d53d173d0b..7d4ba95345 100644
--- a/src/app/shared/form/chips/chips.component.spec.ts
+++ b/src/app/shared/form/chips/chips.component.spec.ts
@@ -1,8 +1,5 @@
 // Load the implementations that should be tested
-import {
-  CommonModule,
-  NgIf,
-} from '@angular/common';
+import { CommonModule } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -62,11 +59,12 @@ describe('ChipsComponent test suite', () => {
     // synchronous beforeEach
     beforeEach(() => {
       html = `
-      <ds-chips
-        *ngIf="chips.hasItems()"
-        [chips]="chips"
-        [editable]="editable"
-        (selected)="onChipSelected($event)"></ds-chips>`;
+        @if(chips.hasItems()) {
+          <ds-chips
+            [chips]="chips"
+            [editable]="editable"
+            (selected)="onChipSelected($event)"></ds-chips>
+        }`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
       testComp = testFixture.componentInstance;
@@ -193,7 +191,7 @@ describe('ChipsComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [NgbModule, NgIf],
+  imports: [NgbModule],
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts
index ff05e6d2b7..c7d607cbf9 100644
--- a/src/app/shared/form/chips/chips.component.ts
+++ b/src/app/shared/form/chips/chips.component.ts
@@ -7,8 +7,6 @@ import {
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -41,10 +39,8 @@ import { ChipsItem } from './models/chips-item.model';
   imports: [
     NgbTooltipModule,
     NgClass,
-    NgForOf,
     AsyncPipe,
     AuthorityConfidenceStateDirective,
-    NgIf,
     TranslateModule,
     CdkDrag,
     CdkDropList,
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index ef75f34b9b..47fca83642 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -13,63 +13,77 @@
       (ngbEvent)="onCustomEvent($event)">
       <ng-template modelType="ARRAY" let-group let-index="index" let-context="context">
         <!--Array with repeatable items-->
-        <div *ngIf="(!context.notRepeatable) && !isVirtual(context, index) && group.context.groups.length !== 1 && !isItemReadOnly(context, index)"
-             class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
+        @if ((!context.notRepeatable) && !isVirtual(context, index) && group.context.groups.length !== 1 && !isItemReadOnly(context, index)) {
+          <div
+            class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
             <button type="button" class="btn btn-secondary" role="button"
-                    title="{{'form.remove' | translate}}"
-                    [attr.aria-label]="'form.remove' | translate"
-                    (click)="removeItem($event, context, index)">
+              title="{{'form.remove' | translate}}"
+              [attr.aria-label]="'form.remove' | translate"
+              (click)="removeItem($event, context, index)">
               <span><i class="fas fa-trash" aria-hidden="true"></i></span>
             </button>
-        </div>
-        <div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1) && !isItemReadOnly(context, index)" class="clearfix pl-4 w-100">
-          <div class="btn-group" role="group">
-            <button type="button" role="button" class="ds-form-add-more btn btn-link"
-                    title="{{'form.add' | translate}}"
-                    attr.aria-label="{{'form.add' | translate}}"
-                    (click)="insertItem($event, group.context, group.context.groups.length)">
-              <span><i class="fas fa-plus"></i> {{'form.add' | translate}}</span>
-            </button>
           </div>
-        </div>
+        }
+        @if ((!context.notRepeatable) && index === (group.context.groups.length - 1) && !isItemReadOnly(context, index)) {
+          <div class="clearfix ps-4 w-100">
+            <div class="btn-group" role="group">
+              <button type="button" role="button" class="ds-form-add-more btn btn-link"
+                title="{{'form.add' | translate}}"
+                attr.aria-label="{{'form.add' | translate}}"
+                (click)="insertItem($event, group.context, group.context.groups.length)">
+                <span><i class="fas fa-plus"></i> {{'form.add' | translate}}</span>
+              </button>
+            </div>
+          </div>
+        }
 
         <!--Array with non repeatable items - Only discard button-->
-        <div *ngIf="context.notRepeatable && context.showButtons && group.context.groups.length > 1"
-             class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="button">
-            <button type="button" class="btn btn-secondary"
-                    title="{{'form.discard' | translate}}"
-                    attr.aria-label="{{'form.discard' | translate}}"
-                    (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
-              <span>{{'form.discard' | translate}}</span>
-            </button>
+        @if (context.notRepeatable && context.showButtons && group.context.groups.length > 1) {
+          <div
+            class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
+            <div class="btn-group" role="button">
+              <button type="button" class="btn btn-secondary"
+                title="{{'form.discard' | translate}}"
+                attr.aria-label="{{'form.discard' | translate}}"
+                (click)="removeItem($event, context, index)"
+                [dsBtnDisabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                <span>{{'form.discard' | translate}}</span>
+              </button>
+            </div>
           </div>
-        </div>
+        }
       </ng-template>
 
     </ds-dynamic-form>
-        <ng-content select="[additional]"></ng-content>
-        <ng-content *ngIf="!displaySubmit && !displayCancel"></ng-content>
+    <ng-content select="[additional]"></ng-content>
+    @if (!displaySubmit && !displayCancel) {
+      <ng-content></ng-content>
+    }
 
-    <div *ngIf="displaySubmit || displayCancel">
-      <hr>
-      <div class="form-group row">
-        <div class="col text-right space-children-mr">
-          <ng-content select="[before]"></ng-content>
-            <button *ngIf="displayCancel" type="reset" class="btn btn-outline-secondary" (click)="reset()">
-              <i class="fa fa-times" aria-hidden="true"></i> {{cancelLabel | translate}}
-            </button>
-            <ng-content select="[between]"></ng-content>
-            <button *ngIf="displaySubmit" type="submit" class="btn btn-primary" (click)="onSubmit()"
-                    [disabled]="(isValid() | async) !== true">
-              <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
-            </button>
-            <ng-content select="[after]"></ng-content>
+    @if (displaySubmit || displayCancel) {
+      <div>
+        <hr>
+          <div class="mb-3 row">
+            <div class="col text-end space-children-mr">
+              <ng-content select="[before]"></ng-content>
+              @if (displayCancel) {
+                <button type="reset" class="btn btn-outline-secondary" (click)="reset()">
+                  <i class="fa fa-times" aria-hidden="true"></i> {{cancelLabel | translate}}
+                </button>
+              }
+              <ng-content select="[between]"></ng-content>
+              @if (displaySubmit) {
+                <button type="submit" class="btn btn-primary" (click)="onSubmit()"
+                  [dsBtnDisabled]="(isValid() | async) !== true">
+                  <i class="fas fa-save" aria-hidden="true"></i> {{submitLabel | translate}}
+                </button>
+              }
+              <ng-content select="[after]"></ng-content>
+            </div>
+          </div>
         </div>
-      </div>
-    </div>
+      }
 
-  </form>
+    </form>
 
-</div>
+  </div>
diff --git a/src/app/shared/form/form.component.scss b/src/app/shared/form/form.component.scss
index f537e8d193..6483553b5a 100644
--- a/src/app/shared/form/form.component.scss
+++ b/src/app/shared/form/form.component.scss
@@ -47,3 +47,12 @@ button.ds-form-add-more:focus {
 .right-addon input {
   padding-right: calc(var(--bs-spacer) * 2.25);
 }
+
+select.form-control {
+  appearance: auto;
+}
+
+.col-sm-6, .col-sm-12 {
+  padding-left: 15px;
+  padding-right: 15px;
+}
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index 431ae3387f..b8933a64cc 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -195,11 +195,13 @@ describe('FormComponent test suite', () => {
     // synchronous beforeEach
     beforeEach(() => {
       html = `
-        <ds-form *ngIf="formModel" #formRef="formComponent"
+        @if('formModel') {
+            <ds-form #formRef="formComponent"
                  [formId]="formId"
                  [formModel]="formModel"
                  [displaySubmit]="displaySubmit"
-                 [displayCancel]="displayCancel"></ds-form>`;
+                 [displayCancel]="displayCancel"></ds-form>
+        }`;
 
       testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
       testComp = testFixture.componentInstance;
@@ -471,13 +473,13 @@ describe('FormComponent test suite', () => {
   template: ``,
   standalone: true,
   imports: [
-    CommonModule,
     FormComponent,
     DsDynamicFormComponent,
     FormsModule,
     ReactiveFormsModule,
     NgbModule,
-    DynamicFormsCoreModule],
+    DynamicFormsCoreModule,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index e1d47da7bd..0e0c80dd9a 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -39,6 +36,7 @@ import {
   map,
 } from 'rxjs/operators';
 
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -67,8 +65,8 @@ import { FormService } from './form.service';
     ReactiveFormsModule,
     TranslateModule,
     DynamicFormsCoreModule,
-    NgIf,
     AsyncPipe,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/form.service.ts b/src/app/shared/form/form.service.ts
index 1ca844d690..11fe5c54de 100644
--- a/src/app/shared/form/form.service.ts
+++ b/src/app/shared/form/form.service.ts
@@ -153,6 +153,9 @@ export class FormService {
   }
 
   public addControlErrors(field: AbstractControl, formId: string, fieldId: string, fieldIndex: number) {
+    if (field.errors === null) {
+      return;
+    }
     const errors: string[] = Object.keys(field.errors)
       .filter((errorKey) => field.errors[errorKey] === true)
       .map((errorKey) => `error.validation.${errorKey}`);
diff --git a/src/app/shared/form/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
index 12e29fa70e..6d8aeb7b9d 100644
--- a/src/app/shared/form/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -1,9 +1,9 @@
-<div class="d-flex flex-column align-items-center justify-content-around mr-3">
+<div class="d-flex flex-column align-items-center justify-content-around me-3">
     <button
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [disabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleUp()">
       <span class="chevron"></span>
       <span class="sr-only">{{'form.number-picker.increment' | translate: {field: name} }}</span>
@@ -30,7 +30,7 @@
       class="btn btn-link-focus"
       type="button"
       tabindex="0"
-      [disabled]="disabled"
+      [dsBtnDisabled]="disabled"
       (click)="toggleDown()">
       <span class="chevron bottom"></span>
       <span class="sr-only">{{'form.number-picker.decrement' | translate: {field: name} }}</span>
diff --git a/src/app/shared/form/number-picker/number-picker.component.scss b/src/app/shared/form/number-picker/number-picker.component.scss
index 94f7f38ef0..0b4e7ac569 100644
--- a/src/app/shared/form/number-picker/number-picker.component.scss
+++ b/src/app/shared/form/number-picker/number-picker.component.scss
@@ -27,15 +27,17 @@ input {
 .btn-link-focus {
   // behave as btn-link but does not override box-shadow of btn-link:focus
   font-weight: $font-weight-normal;
-  color: $link-color;
+  color: #1f7293;
   text-decoration: $link-decoration;
-  @include hover {
+  box-shadow: none;
+  &:hover {
     color: $link-hover-color;
     text-decoration: $link-hover-decoration;
   }
   &:disabled,
   &.disabled {
     color: $btn-link-disabled-color;
+    border: transparent;
     pointer-events: none;
   }
 
diff --git a/src/app/shared/form/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
index b097236659..ef35e1ee79 100644
--- a/src/app/shared/form/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -20,6 +20,7 @@ import {
   TranslateService,
 } from '@ngx-translate/core';
 
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isEmpty } from '../../empty.util';
 
 @Component({
@@ -33,6 +34,7 @@ import { isEmpty } from '../../empty.util';
     NgClass,
     FormsModule,
     TranslateModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html
index 851ccaf880..62ea1e445e 100644
--- a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html
+++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html
@@ -1,7 +1,6 @@
 <div class="modal-header">
   <h4 class="modal-title">{{'vocabulary-treeview.header' | translate}}</h4>
-  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
-    <span aria-hidden="true">&times;</span>
+  <button type="button" class="btn-close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
   </button>
 </div>
 <div class="modal-body">
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 758d1426e0..1aa293ed77 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -1,21 +1,29 @@
-<ds-alert *ngIf="description" [content]="description" [type]="AlertType.Info"></ds-alert>
+@if (description) {
+  <ds-alert [content]="description" [type]="AlertType.Info"></ds-alert>
+}
 <div class="treeview-header row mb-1">
   <div class="col-12">
     <div class="input-group">
-      <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
-             [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
-             [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
+      <input #searchInput type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()"
+        [attr.aria-label]="'vocabulary-treeview.search.form.search-placeholder' | translate"
+        [placeholder]="'vocabulary-treeview.search.form.search-placeholder' | translate">
       <div class="input-group-append" id="button-addon4">
-        <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
+        <button class="btn btn-outline-primary" type="button" (click)="search()" [dsBtnDisabled]="!isSearchEnabled()"
+          [attr.aria-label]="'vocabulary-treeview.search.form.search' | translate">
           {{'vocabulary-treeview.search.form.search' | translate}}
         </button>
-        <button class="btn btn-outline-secondary" type="button" (click)="reset()">
+        <button class="btn btn-outline-secondary" type="button" (click)="reset()"
+          [attr.aria-label]="'vocabulary-treeview.search.form.reset' | translate">
           {{'vocabulary-treeview.search.form.reset' | translate}}
         </button>
-        <button *ngIf="showAdd && this.vocabularyOptions.closed" class="btn btn-outline-primary" type="button" (click)="add()">
-          {{'vocabulary-treeview.search.form.add' | translate}}
-        </button>
-        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed">
+        @if (showAdd && this.vocabularyOptions.closed) {
+          <button class="btn btn-outline-primary" type="button" (click)="add()"
+            [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
+            {{'vocabulary-treeview.search.form.add' | translate}}
+          </button>
+        }
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [dsBtnDisabled]="this.vocabularyOptions.closed"
+          [attr.aria-label]="'vocabulary-treeview.search.form.add' | translate">
           {{'vocabulary-treeview.search.form.add' | translate}}
         </button>
       </div>
@@ -23,81 +31,97 @@
   </div>
 </div>
 <div class="treeview-container">
-  <ds-loading *ngIf="loading | async" [showMessage]="false"></ds-loading>
-  <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
-    <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
-  </h2>
+  @if (loading | async) {
+    <ds-loading [showMessage]="false"></ds-loading>
+  }
+  <div aria-live="polite">
+    @if ((loading | async) !== true && dataSource.data.length === 0) {
+      <h2 class="h4 text-center text-muted mt-4" >
+        <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
+      </h2>
+    }
+  </div>
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
-      <span aria-hidden="true" type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle>
+      <span aria-hidden="true" type="button" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle>
         <i class="fas fa-fw fa-angle-right invisible"></i>
       </span>
-          <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
-                 [class.text-success]="node.isSelected"
-                 [ngbTooltip]="node.item?.otherInformation?.note"
-                 [openDelay]="500"
-                 container="body"
+      @if (multiSelect) {
+        <label class="form-label d-flex align-items-center m-0 p-0 form-check"
+          [class.text-success]="node.isSelected"
+          [ngbTooltip]="node.item?.otherInformation?.note"
+          [openDelay]="500"
+          container="body"
           >
-            <input class="mr-2" type="checkbox"
-                   [disabled]="!node.item?.selectable"
-                   [(ngModel)]="node.isSelected"
-                   [checked]="node.isSelected"
-                   (change)="onSelect(node.item)"
+          <input class="me-2" type="checkbox"
+            [disabled]="!node.item?.selectable"
+            [(ngModel)]="node.isSelected"
+            [checked]="node.isSelected"
+            (change)="onSelect(node.item)"
             >
-            <span>{{node.item.display}}</span>
-          </label>
-          <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
-                  [class.text-success]="node.isSelected"
-                  [disabled]="!node.item?.selectable"
-                  [ngbTooltip]="node.item?.otherInformation?.note"
-                  [openDelay]="500"
-                  container="body"
-                  (click)="onSelect(node.item)">
+          <span>{{node.item.display}}</span>
+        </label>
+      }
+      @if (!multiSelect) {
+        <button class="btn btn-outline-link btn-sm text-start"
+          [class.text-success]="node.isSelected"
+          [dsBtnDisabled]="!node.item?.selectable"
+          [ngbTooltip]="node.item?.otherInformation?.note"
+          [openDelay]="500"
+          container="body"
+          (click)="onSelect(node.item)">
           <span>{{node.item.display}}</span>
         </button>
+      }
     </cdk-tree-node>
 
     <!-- expandable node -->
     <cdk-tree-node *cdkTreeNodeDef="let node; when: hasChildren" cdkTreeNodePadding class="d-flex">
-        <button type="button" class="btn btn-default px-2 mr-1" cdkTreeNodeToggle
-                [attr.aria-label]="'toggle ' + node.name"
-                (click)="loadChildren(node)">
-          <i class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"></i>
-        </button>
+      <button type="button" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle
+        [attr.aria-label]="'toggle ' + node.name"
+        (click)="loadChildren(node)">
+        <i class="fas fa-fw {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}}"></i>
+      </button>
 
-          <label *ngIf="multiSelect" class="d-flex align-items-center m-0 p-0 form-check"
-                [class.text-success]="node.isSelected"
-                [ngbTooltip]="node.item?.otherInformation?.note"
-                [openDelay]="500"
-                container="body">
-            <input class="mr-2" type="checkbox"
-                   [disabled]="!node.item?.selectable"
-                   [(ngModel)]="node.isSelected"
-                   [checked]="node.isSelected"
-                   (change)="onSelect(node.item)"
+      @if (multiSelect) {
+        <label class="form-label d-flex align-items-center m-0 p-0 form-check"
+          [class.text-success]="node.isSelected"
+          [ngbTooltip]="node.item?.otherInformation?.note"
+          [openDelay]="500"
+          container="body">
+          <input class="me-2" type="checkbox"
+            [disabled]="!node.item?.selectable"
+            [(ngModel)]="node.isSelected"
+            [checked]="node.isSelected"
+            (change)="onSelect(node.item)"
             >
-            <span>{{node.item.display}}</span>
-          </label>
-          <button *ngIf="!multiSelect" class="btn btn-outline-link btn-sm text-left"
-                  [class.text-success]="node.isSelected"
-                  [disabled]="!node.item?.selectable"
-                  [ngbTooltip]="node.item?.otherInformation?.note"
-                  [openDelay]="500"
-                  container="body"
-                  (click)="onSelect(node.item)">
-            <span>{{node.item.display}}</span>
-          </button>
+          <span>{{node.item.display}}</span>
+        </label>
+      }
+      @if (!multiSelect) {
+        <button class="btn btn-outline-link btn-sm text-start"
+          [class.text-success]="node.isSelected"
+          [dsBtnDisabled]="!node.item?.selectable"
+          [ngbTooltip]="node.item?.otherInformation?.note"
+          [openDelay]="500"
+          container="body"
+          (click)="onSelect(node.item)">
+          <span>{{node.item.display}}</span>
+        </button>
+      }
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMore" cdkTreeNodePadding>
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)"
+        [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMoreRoot">
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)">
+      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)"
+        [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
index 3d32acac5b..43b4db2ddf 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
@@ -5,3 +5,17 @@
 label {
   cursor: pointer;
 }
+
+.input-group > .input-group-append > .btn {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.input-group-append .btn + .btn {
+  margin-left: -1px;
+}
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
index cd836a4a47..fcbc8413b9 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -2,12 +2,10 @@ import {
   CdkTreeModule,
   FlatTreeControl,
 } from '@angular/cdk/tree';
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
+  ElementRef,
   EventEmitter,
   Input,
   OnChanges,
@@ -15,6 +13,7 @@ import {
   OnInit,
   Output,
   SimpleChanges,
+  ViewChild,
 } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
@@ -30,6 +29,7 @@ import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/mod
 import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { AlertComponent } from '../../alert/alert.component';
 import { AlertType } from '../../alert/alert-type';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -59,17 +59,22 @@ export type VocabularyTreeItemType = FormFieldMetadataValueObject | VocabularyEn
   imports: [
     FormsModule,
     NgbTooltipModule,
-    NgIf,
     CdkTreeModule,
     TranslateModule,
     AsyncPipe,
     ThemedLoadingComponent,
     AlertComponent,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
 export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges {
 
+  /**
+   * Implemented to manage focus on input
+   */
+  @ViewChild('searchInput') searchInput!: ElementRef;
+
   /**
    * The {@link VocabularyOptions} object
    */
@@ -332,6 +337,9 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges
       this.storedNodeMap = new Map<string, TreeviewFlatNode>();
       this.vocabularyTreeviewService.restoreNodes();
     }
+    if (this.searchInput) {
+      this.searchInput.nativeElement.focus();
+    }
   }
 
   add() {
diff --git a/src/app/shared/host-window.reducer.spec.ts b/src/app/shared/host-window.reducer.spec.ts
index 7e1fe3761b..50725663bb 100644
--- a/src/app/shared/host-window.reducer.spec.ts
+++ b/src/app/shared/host-window.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { HostWindowResizeAction } from './host-window.actions';
 import { hostWindowReducer } from './search/host-window.reducer';
diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts
index 7b3723c1a0..3801a4ef06 100644
--- a/src/app/shared/host-window.service.ts
+++ b/src/app/shared/host-window.service.ts
@@ -43,10 +43,10 @@ export class HostWindowService {
     /* See _exposed_variables.scss */
     variableService.getAllVariables()
       .subscribe((variables) => {
-        this.breakPoints.XL_MIN = parseInt(variables['--bs-xl-min'], 10);
-        this.breakPoints.LG_MIN = parseInt(variables['--bs-lg-min'], 10);
-        this.breakPoints.MD_MIN = parseInt(variables['--bs-md-min'], 10);
-        this.breakPoints.SM_MIN = parseInt(variables['--bs-sm-min'], 10);
+        this.breakPoints.XL_MIN = parseInt(variables['--bs-xl'], 10);
+        this.breakPoints.LG_MIN = parseInt(variables['--bs-lg'], 10);
+        this.breakPoints.MD_MIN = parseInt(variables['--bs-md'], 10);
+        this.breakPoints.SM_MIN = parseInt(variables['--bs-sm'], 10);
       });
   }
 
diff --git a/src/app/shared/idle-modal/idle-modal.component.html b/src/app/shared/idle-modal/idle-modal.component.html
index a69c4d7e76..91ca7cd67b 100644
--- a/src/app/shared/idle-modal/idle-modal.component.html
+++ b/src/app/shared/idle-modal/idle-modal.component.html
@@ -1,7 +1,6 @@
 <div>
   <div class="modal-header" id="idle-modal.header">{{ "idle-modal.header" | translate }}
-    <button type="button" class="close" (click)="closePressed()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="closePressed()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/shared/idle-modal/idle-modal.component.spec.ts b/src/app/shared/idle-modal/idle-modal.component.spec.ts
index 29c13cba5f..4180117576 100644
--- a/src/app/shared/idle-modal/idle-modal.component.spec.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.spec.ts
@@ -130,7 +130,7 @@ describe('IdleModalComponent', () => {
   describe('when the click method emits on close button', () => {
     beforeEach(fakeAsync(() => {
       spyOn(component, 'closePressed');
-      debugElement.query(By.css('.close')).triggerEventHandler('click', {
+      debugElement.query(By.css('.btn-close')).triggerEventHandler('click', {
         preventDefault: () => {/**/
         },
       });
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
index 9581ba8ea8..f751d60d75 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
@@ -1,7 +1,9 @@
-<ul class="navbar-nav" *ngIf="isImpersonating$ | async">
-  <li class="nav-item">
-    <button class="btn btn-sm btn-dark" ngbTooltip="{{'nav.stop-impersonating' | translate}}" (click)="stopImpersonating()">
-      <i class="fa fa-user-secret"></i>
-    </button>
-  </li>
-</ul>
+@if (isImpersonating$ | async) {
+  <ul class="navbar-nav">
+    <li class="nav-item">
+      <button class="btn btn-sm btn-dark" ngbTooltip="{{'nav.stop-impersonating' | translate}}" (click)="stopImpersonating()">
+        <i class="fa fa-user-secret"></i>
+      </button>
+    </li>
+  </ul>
+}
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
index a6510f8eb2..745d49a5cd 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -27,7 +24,7 @@ import { isAuthenticated } from '../../core/auth/selectors';
   selector: 'ds-impersonate-navbar',
   templateUrl: 'impersonate-navbar.component.html',
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 /**
  * Navbar component for actions to take concerning impersonating users
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
index 17e7197261..dfa3e241fd 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
@@ -1,25 +1,27 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(currentObject)"
-      [action]="action"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
-    <input #inputField type="text" [(ngModel)]="value" [name]="name"
-           class="form-control suggestion_input mb-2"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <button class="sr-only" type="submit">
-        {{'search.filters.search.submit' | translate}}
-    </button>
-    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
-        <div class="dropdown-list">
-            <div *ngFor="let suggestionOption of suggestions">
-                <button class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
-                    <ds-listable-object-component-loader [object]="suggestionOption" [viewMode]="viewMode" [linkType]="linkTypes.None"></ds-listable-object-component-loader>
-                </button>
-            </div>
+  [action]="action"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  <input #inputField type="text" [(ngModel)]="value" [name]="name"
+    class="form-control suggestion_input mb-2"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <button class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+            <ds-listable-object-component-loader [object]="suggestionOption" [viewMode]="viewMode" [linkType]="linkTypes.None"></ds-listable-object-component-loader>
+          </button>
         </div>
+      }
     </div>
+  </div>
 </form>
 
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
index af3b7cc010..5e9e1e58a1 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -38,7 +37,7 @@ import { InputSuggestionsComponent } from '../input-suggestions.component';
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, ListableObjectComponentLoaderComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, ListableObjectComponentLoaderComponent, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
index 633c7b3e45..45a21d73ac 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.html
@@ -1,35 +1,47 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
-  <div class="form-group mb-0">
-    <label *ngIf="label; else searchInput" class="mb-0 w-100">
-      <span class="font-weight-bold">
-        {{label}}
-      </span>
-      <ng-container *ngTemplateOutlet="searchInput"></ng-container>
-    </label>
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  <div class="mb-3 mb-0">
+    @if (label) {
+      <label class="form-label" class="mb-0 w-100">
+        <span class="fw-bold">
+          {{label}}
+        </span>
+        <ng-container *ngTemplateOutlet="searchInput"></ng-container>
+      </label>
+    } @else {
+      <input #inputField type="text" [(ngModel)]="value" [name]="name"
+        class="form-control suggestion_input"
+        [ngClass]="{'is-invalid': !valid}"
+        [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+        [placeholder]="placeholder"
+        [ngModelOptions]="{standalone: true}" autocomplete="off"
+        />
+    }
   </div>
   <ng-template #searchInput>
     <input #inputField type="text" [(ngModel)]="value" [name]="name"
-           class="form-control suggestion_input"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"
-    />
+      class="form-control suggestion_input"
+      [ngClass]="{'is-invalid': !valid}"
+      [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+      [placeholder]="placeholder"
+      [ngModelOptions]="{standalone: true}" autocomplete="off"
+      />
   </ng-template>
   <button class="sr-only" type="submit">
     {{'search.filters.search.submit' | translate}}
   </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
-      <div *ngFor="let suggestionOption of suggestions">
-        <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
-          <span [innerHTML]="suggestionOption.displayValue"></span>
-        </a>
-      </div>
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+            <span [innerHTML]="suggestionOption.displayValue"></span>
+          </a>
+        </div>
+      }
     </div>
   </div>
 </form>
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
index addc1999d1..bffbb966ea 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -35,7 +33,7 @@ import { InputSuggestion } from '../input-suggestions.model';
     },
   ],
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, NgIf, NgTemplateOutlet, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, NgTemplateOutlet, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.html b/src/app/shared/input-suggestions/input-suggestions.component.html
index 188dcbcb6a..35f95f7313 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/input-suggestions.component.html
@@ -1,24 +1,26 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="close();">
-    <input #inputField type="text" [(ngModel)]="value" [name]="name"
-           class="form-control suggestion_input"
-           [ngClass]="{'is-invalid': !valid}"
-           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-           [placeholder]="placeholder"
-           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
-    <button class="sr-only" type="submit">
-        {{'search.filters.search.submit' | translate}}
-    </button>
-    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
-        <div class="dropdown-list">
-            <div *ngFor="let suggestionOption of suggestions">
-                <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
-                    <span [innerHTML]="suggestionOption.displayValue"></span>
-                </a>
-            </div>
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="close();">
+  <input #inputField type="text" [(ngModel)]="value" [name]="name"
+    class="form-control suggestion_input"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+  <button class="sr-only" type="submit">
+    {{'search.filters.search.submit' | translate}}
+  </button>
+  <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+    <div class="dropdown-list">
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
+            <span [innerHTML]="suggestionOption.displayValue"></span>
+          </a>
         </div>
+      }
     </div>
+  </div>
 </form>
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index a0717a3259..ce17f00718 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -33,7 +32,7 @@ import { DebounceDirective } from '../utils/debounce.directive';
   selector: 'ds-input-suggestions',
   templateUrl: './input-suggestions.component.html',
   standalone: true,
-  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
@@ -182,11 +181,11 @@ export class InputSuggestionsComponent implements ControlValueAccessor, OnChange
   }
 
   /**
-   * When any key is pressed (except for the Enter button) the query input should move to the input field
+   * When any key is pressed (except for the Enter & Tab button) the query input should move to the input field
    * @param {KeyboardEvent} event The keyboard event
    */
   onKeydown(event: KeyboardEvent) {
-    if (event.key !== 'Enter') {
+    if (event.key !== 'Enter' && event.key !== 'Tab') {
       this.queryInput.nativeElement.focus();
     }
   }
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
index c5d71e33fd..f0867ad874 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.html
@@ -1,25 +1,27 @@
 <form [formGroup]="form" (ngSubmit)="onSubmit(value)"
-      [action]="action" (keydown)="onKeydown($event)"
-      (keydown.arrowdown)="shiftFocusDown($event)"
-      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
-      (dsClickOutside)="checkIfValidInput(form);close();">
+  [action]="action" (keydown)="onKeydown($event)"
+  (keydown.arrowdown)="shiftFocusDown($event)"
+  (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+  (dsClickOutside)="checkIfValidInput(form);close();">
   <input [readonly]="disable" #inputField type="text" formControlName="metadataNameField" attr.aria-labelledby="fieldName" [(ngModel)]="value" id="name" [name]="name"
-         class="form-control suggestion_input"
-         [ngClass]="{'is-invalid': !valid}"
-         [dsDebounce]="debounceTime" (onDebounce)="find($event)"
-         [placeholder]="placeholder"
-         ng-model-options="{standalone: true}"
-         autocomplete="off">
+    class="form-control suggestion_input"
+    [ngClass]="{'is-invalid': !valid}"
+    [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+    [placeholder]="placeholder"
+    ng-model-options="{standalone: true}"
+    autocomplete="off">
   <button class="sr-only" type="submit">
     {{'search.filters.search.submit' | translate}}
   </button>
   <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
     <div class="dropdown-list">
-      <div *ngFor="let suggestionOption of suggestions">
-        <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
-          <span [innerHTML]="suggestionOption.displayValue"></span>
-        </a>
-      </div>
+      @for (suggestionOption of suggestions; track suggestionOption) {
+        <div>
+          <a href="javascript:void(0);" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption.value)" #suggestion>
+            <span [innerHTML]="suggestionOption.displayValue"></span>
+          </a>
+        </div>
+      }
     </div>
   </div>
 </form>
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
index 6160b9ef09..bcfb4768fd 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -41,7 +40,7 @@ import { InputSuggestion } from '../input-suggestions.model';
     },
   ],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, ClickOutsideDirective, DebounceDirective, NgClass, NgFor, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, ClickOutsideDirective, DebounceDirective, NgClass, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 6d1727cfe7..b9b3aa5b7c 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -1,21 +1,25 @@
-<div ngbDropdown class="navbar-nav" *ngIf="moreThanOneLanguage" display="dynamic" placement="bottom-right">
-  <a href="javascript:void(0);" role="menuitem"
-     [attr.aria-label]="'nav.language' |translate"
-     aria-controls="language-menu-list"
-     aria-haspopup="menu"
-     [title]="'nav.language' | translate"
-     (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
-     data-test="lang-switch"
-     tabindex="0">
-    <i class="fas fa-globe-asia fa-lg fa-fw"></i>
-  </a>
-  <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list" role="menu">
-    <li class="dropdown-item" tabindex="0" #langSelect *ngFor="let lang of translate.getLangs()"
-        role="menuitem"
-            (keyup.enter)="useLang(lang)"
-            (click)="useLang(lang)"
-            [class.active]="lang === translate.currentLang">
-                {{ langLabel(lang) }}
-    </li>
-  </ul>
-</div>
+@if (moreThanOneLanguage) {
+  <div ngbDropdown class="navbar-nav" display="dynamic" placement="bottom-right">
+    <a href="javascript:void(0);" role="menuitem"
+      [attr.aria-label]="'nav.language' |translate"
+      aria-controls="language-menu-list"
+      aria-haspopup="menu"
+      [title]="'nav.language' | translate"
+      (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
+      data-test="lang-switch"
+      tabindex="0">
+      <i class="fas fa-globe-asia fa-lg fa-fw"></i>
+    </a>
+    <ul ngbDropdownMenu class="dropdown-menu" [attr.aria-label]="'nav.language' |translate" id="language-menu-list" role="menu">
+      @for (lang of translate.getLangs(); track lang) {
+        <li class="dropdown-item" tabindex="0" #langSelect
+          role="menuitem"
+          (keyup.enter)="useLang(lang)"
+          (click)="useLang(lang)"
+          [class.active]="lang === translate.currentLang">
+          {{ langLabel(lang) }}
+        </li>
+      }
+    </ul>
+  </div>
+}
diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts
index 2dce8302ce..80d9c83d91 100644
--- a/src/app/shared/lang-switch/lang-switch.component.spec.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts
@@ -1,6 +1,10 @@
 import {
-  HttpClientTestingModule,
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
+import {
   HttpTestingController,
+  provideHttpClientTesting,
 } from '@angular/common/http/testing';
 import {
   DebugElement,
@@ -83,13 +87,15 @@ describe('LangSwitchComponent', () => {
       };
 
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, TranslateModule.forRoot({
+        schemas: [NO_ERRORS_SCHEMA],
+        imports: [TranslateModule.forRoot({
           loader: { provide: TranslateLoader, useClass: CustomLoader },
         }), LangSwitchComponent],
-        schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
           { provide: LocaleService, useValue: getMockLocaleService() },
+          provideHttpClient(withInterceptorsFromDi()),
+          provideHttpClientTesting(),
         ],
       }).compileComponents()
         .then(() => {
@@ -166,13 +172,15 @@ describe('LangSwitchComponent', () => {
       };
 
       TestBed.configureTestingModule({
-        imports: [HttpClientTestingModule, TranslateModule.forRoot({
+        schemas: [NO_ERRORS_SCHEMA],
+        imports: [TranslateModule.forRoot({
           loader: { provide: TranslateLoader, useClass: CustomLoader },
         }), LangSwitchComponent],
-        schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
           { provide: LocaleService, useValue: getMockLocaleService() },
+          provideHttpClient(withInterceptorsFromDi()),
+          provideHttpClientTesting(),
         ],
       }).compileComponents();
       translate = TestBed.inject(TranslateService);
diff --git a/src/app/shared/lang-switch/lang-switch.component.ts b/src/app/shared/lang-switch/lang-switch.component.ts
index 3acb169419..c78ae18929 100644
--- a/src/app/shared/lang-switch/lang-switch.component.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   ElementRef,
@@ -22,7 +19,7 @@ import { LocaleService } from '../../core/locale/locale.service';
   styleUrls: ['lang-switch.component.scss'],
   templateUrl: 'lang-switch.component.html',
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, TranslateModule],
+  imports: [NgbDropdownModule, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/live-region/live-region.component.html b/src/app/shared/live-region/live-region.component.html
index a48f3ad52e..5f0d81c43f 100644
--- a/src/app/shared/live-region/live-region.component.html
+++ b/src/app/shared/live-region/live-region.component.html
@@ -1,3 +1,5 @@
 <div class="live-region" [ngClass]="{'visually-hidden': !isVisible }" aria-live="assertive" role="log" aria-relevant="additions" aria-atomic="true">
-  <div class="live-region-message" *ngFor="let message of (messages$ | async)">{{ message }}</div>
+  @for (message of (messages$ | async); track message) {
+    <div class="live-region-message">{{ message }}</div>
+  }
 </div>
diff --git a/src/app/shared/live-region/live-region.component.ts b/src/app/shared/live-region/live-region.component.ts
index 7fb4a8b52b..d62b0d6dd7 100644
--- a/src/app/shared/live-region/live-region.component.ts
+++ b/src/app/shared/live-region/live-region.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -22,7 +21,7 @@ import { LiveRegionService } from './live-region.service';
   templateUrl: './live-region.component.html',
   styleUrls: ['./live-region.component.scss'],
   standalone: true,
-  imports: [NgClass, NgFor, AsyncPipe],
+  imports: [NgClass, AsyncPipe],
 })
 export class LiveRegionComponent implements OnInit {
 
diff --git a/src/app/shared/live-region/live-region.service.stub.ts b/src/app/shared/live-region/live-region.service.stub.ts
new file mode 100644
index 0000000000..22ef672ae0
--- /dev/null
+++ b/src/app/shared/live-region/live-region.service.stub.ts
@@ -0,0 +1,31 @@
+import { of } from 'rxjs';
+
+import { LiveRegionService } from './live-region.service';
+
+export function getLiveRegionServiceStub(): LiveRegionService {
+  return new LiveRegionServiceStub() as unknown as LiveRegionService;
+}
+
+export class LiveRegionServiceStub {
+  getMessages = jasmine.createSpy('getMessages').and.returnValue(
+    ['Message One', 'Message Two'],
+  );
+
+  getMessages$ = jasmine.createSpy('getMessages$').and.returnValue(
+    of(['Message One', 'Message Two']),
+  );
+
+  addMessage = jasmine.createSpy('addMessage').and.returnValue('messageId');
+
+  clear = jasmine.createSpy('clear');
+
+  clearMessageByUUID = jasmine.createSpy('clearMessageByUUID');
+
+  getLiveRegionVisibility = jasmine.createSpy('getLiveRegionVisibility').and.returnValue(false);
+
+  setLiveRegionVisibility = jasmine.createSpy('setLiveRegionVisibility');
+
+  getMessageTimeOutMs = jasmine.createSpy('getMessageTimeOutMs').and.returnValue(30000);
+
+  setMessageTimeOutMs = jasmine.createSpy('setMessageTimeOutMs');
+}
diff --git a/src/app/shared/loading/loading.component.html b/src/app/shared/loading/loading.component.html
index e391cedbea..f47f569955 100644
--- a/src/app/shared/loading/loading.component.html
+++ b/src/app/shared/loading/loading.component.html
@@ -1,18 +1,24 @@
-<div *ngIf="!spinner">
-  <label *ngIf="showMessage && message" aria-live="polite">{{ message }}</label>
-  <div class="loader" aria-hidden="true">
-    <span class="l-1"></span>
-    <span class="l-2"></span>
-    <span class="l-3"></span>
-    <span class="l-4"></span>
-    <span class="l-5"></span>
-    <span class="l-6"></span>
-    <span class="l-7"></span>
-    <span class="l-8"></span>
-    <span class="l-9"></span>
-    <span class="l-10"></span>
+@if (!spinner) {
+  <div>
+    @if (showMessage && message) {
+      <label class="form-label" aria-live="polite">{{ message }}</label>
+    }
+    <div class="loader" aria-hidden="true">
+      <span class="l-1"></span>
+      <span class="l-2"></span>
+      <span class="l-3"></span>
+      <span class="l-4"></span>
+      <span class="l-5"></span>
+      <span class="l-6"></span>
+      <span class="l-7"></span>
+      <span class="l-8"></span>
+      <span class="l-9"></span>
+      <span class="l-10"></span>
+    </div>
   </div>
-</div>
-<div *ngIf='spinner' class="spinner spinner-border" role="status" aria-live="polite">
-  <span class="sr-only">{{ message }}</span>
-</div>
+}
+@if (spinner) {
+  <div class="spinner spinner-border" role="status" aria-live="polite">
+    <span class="sr-only">{{ message }}</span>
+  </div>
+}
diff --git a/src/app/shared/loading/loading.component.ts b/src/app/shared/loading/loading.component.ts
index b982af4208..6d9008deaf 100644
--- a/src/app/shared/loading/loading.component.ts
+++ b/src/app/shared/loading/loading.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -15,7 +15,7 @@ import { hasValue } from '../empty.util';
   styleUrls: ['./loading.component.scss'],
   templateUrl: './loading.component.html',
   standalone: true,
-  imports: [NgIf],
+  imports: [],
 })
 export class LoadingComponent implements OnDestroy, OnInit {
 
diff --git a/src/app/shared/log-in/log-in.component.html b/src/app/shared/log-in/log-in.component.html
index 309e226772..8fdd91b4fa 100644
--- a/src/app/shared/log-in/log-in.component.html
+++ b/src/app/shared/log-in/log-in.component.html
@@ -1,7 +1,13 @@
-<ds-loading *ngIf="(loading | async) || (isAuthenticated | async)" class="m-5"></ds-loading>
-<div *ngIf="(loading | async) !== true && (isAuthenticated | async) !== true" class="px-4 py-3 mx-auto login-container">
-  <ng-container *ngFor="let authMethod of (authMethods | async); let last = last">
-    <ds-log-in-container [authMethod]="authMethod" [isStandalonePage]="isStandalonePage"></ds-log-in-container>
-    <div *ngIf="!last" class="dropdown-divider my-2"></div>
-  </ng-container>
-</div>
+@if ((loading | async) || (isAuthenticated | async)) {
+  <ds-loading class="m-5"></ds-loading>
+}
+@if ((loading | async) !== true && (isAuthenticated | async) !== true) {
+  <div class="px-4 py-3 mx-auto login-container">
+    @for (authMethod of (authMethods | async); track authMethod; let last = $last) {
+      <ds-log-in-container [authMethod]="authMethod" [isStandalonePage]="isStandalonePage"></ds-log-in-container>
+      @if (!last) {
+        <div class="dropdown-divider my-2"></div>
+      }
+    }
+  </div>
+}
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index 3c7d829a48..be3f20c99f 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -38,7 +34,7 @@ import { rendersAuthMethodType } from './methods/log-in.methods-decorator';
   styleUrls: ['./log-in.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, NgFor, LogInContainerComponent, AsyncPipe],
+  imports: [ThemedLoadingComponent, LogInContainerComponent, AsyncPipe],
 })
 export class LogInComponent implements OnInit {
 
diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
index 378bb6ed67..a8d511a3f5 100644
--- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
@@ -1,3 +1,3 @@
-<button class="btn btn-lg btn-primary btn-block text-white" (click)="redirectToExternalProvider()">
+<button class="btn btn-lg btn-primary w-100 text-white" (click)="redirectToExternalProvider()">
   <i class="fas fa-sign-in-alt"></i> {{getButtonLabel() | translate}}
 </button>
diff --git a/src/app/shared/log-in/methods/log-in.methods-decorator.ts b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
index 79a53fcb8f..e714d03e3e 100644
--- a/src/app/shared/log-in/methods/log-in.methods-decorator.ts
+++ b/src/app/shared/log-in/methods/log-in.methods-decorator.ts
@@ -11,6 +11,7 @@ export const AUTH_METHOD_FOR_DECORATOR_MAP = new Map<AuthMethodType, AuthMethodT
   [AuthMethodType.Shibboleth, LogInExternalProviderComponent],
   [AuthMethodType.Oidc, LogInExternalProviderComponent],
   [AuthMethodType.Orcid, LogInExternalProviderComponent],
+  [AuthMethodType.Saml, LogInExternalProviderComponent],
 ]);
 
 /**
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.html b/src/app/shared/log-in/methods/password/log-in-password.component.html
index 567a05f544..52685c361c 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.html
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.html
@@ -1,37 +1,45 @@
 <form class="form-login"
-      (ngSubmit)="submit()"
-      [formGroup]="form" novalidate>
+  (ngSubmit)="submit()"
+  [formGroup]="form" novalidate>
   <input [attr.aria-label]="'login.form.email' |translate"
-         autocomplete="username"
-         autofocus
-         class="form-control form-control-lg position-relative"
-         formControlName="email"
-         placeholder="{{'login.form.email' | translate}}"
-         required
-         type="email"
-         [attr.data-test]="'email' | dsBrowserOnly">
+    autocomplete="username"
+    autofocus
+    class="form-control form-control-lg position-relative"
+    formControlName="email"
+    placeholder="{{'login.form.email' | translate}}"
+    required
+    type="email"
+    [attr.data-test]="'email' | dsBrowserOnly">
   <input [attr.aria-label]="'login.form.password' |translate"
-         autocomplete="current-password"
-         class="form-control form-control-lg position-relative mb-3"
-         placeholder="{{'login.form.password' | translate}}"
-         formControlName="password"
-         required
-         type="password"
-         [attr.data-test]="'password' | dsBrowserOnly">
-  <div *ngIf="(error | async) && hasError" class="alert alert-danger" role="alert"
-       @fadeOut>{{ (error | async) | translate }}</div>
-  <div *ngIf="(message | async) && hasMessage" class="alert alert-info" role="alert"
-       @fadeOut>{{ (message | async) | translate }}</div>
+    autocomplete="current-password"
+    class="form-control form-control-lg position-relative mb-3"
+    placeholder="{{'login.form.password' | translate}}"
+    formControlName="password"
+    required
+    type="password"
+    [attr.data-test]="'password' | dsBrowserOnly">
+  @if ((error | async) && hasError) {
+    <div class="alert alert-danger" role="alert"
+    @fadeOut>{{ (error | async) | translate }}</div>
+  }
+  @if ((message | async) && hasMessage) {
+    <div class="alert alert-info" role="alert"
+    @fadeOut>{{ (message | async) | translate }}</div>
+  }
 
-  <button class="btn btn-lg btn-primary btn-block mt-3" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
-          [disabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
-</form>
+  <button class="btn btn-lg btn-primary w-100" type="submit" [attr.data-test]="'login-button' | dsBrowserOnly"
+    [dsBtnDisabled]="!form.valid"><i class="fas fa-sign-in-alt"></i> {{"login.form.submit" | translate}}</button>
+  </form>
 
-<ng-container *ngIf="canShowDivider$ | async">
-  <div class="mt-2">
-    <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]"
-       [attr.data-test]="'register' | dsBrowserOnly" role="menuitem">{{"login.form.new-user" | translate}}</a>
-    <a class="dropdown-item" *ngIf="canForgot$ | async" [routerLink]="[getForgotRoute()]"
-       [attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem">{{"login.form.forgot-password" | translate}}</a>
-  </div>
-</ng-container>
+  @if (canShowDivider$ | async) {
+    <div class="mt-2">
+      @if (canRegister$ | async) {
+        <a class="dropdown-item" [routerLink]="[getRegisterRoute()]"
+        [attr.data-test]="'register' | dsBrowserOnly" role="menuitem">{{"login.form.new-user" | translate}}</a>
+      }
+      @if (canForgot$ | async) {
+        <a class="dropdown-item" [routerLink]="[getForgotRoute()]"
+        [attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem">{{"login.form.forgot-password" | translate}}</a>
+      }
+    </div>
+  }
diff --git a/src/app/shared/log-in/methods/password/log-in-password.component.ts b/src/app/shared/log-in/methods/password/log-in-password.component.ts
index bcc2048dee..d7d772633d 100644
--- a/src/app/shared/log-in/methods/password/log-in-password.component.ts
+++ b/src/app/shared/log-in/methods/password/log-in-password.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -49,6 +46,7 @@ import { AuthorizationDataService } from '../../../../core/data/feature-authoriz
 import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
 import { fadeOut } from '../../../animations/fade';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { isNotEmpty } from '../../../empty.util';
 import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
 
@@ -62,7 +60,7 @@ import { BrowserOnlyPipe } from '../../../utils/browser-only.pipe';
   styleUrls: ['./log-in-password.component.scss'],
   animations: [fadeOut],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [FormsModule, ReactiveFormsModule, RouterLink, AsyncPipe, TranslateModule, BrowserOnlyPipe, BtnDisabledDirective],
 })
 export class LogInPasswordComponent implements OnInit {
 
diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html
index 26f03b95a4..86dd33fcc5 100644
--- a/src/app/shared/log-out/log-out.component.html
+++ b/src/app/shared/log-out/log-out.component.html
@@ -1,6 +1,8 @@
 <div class="form-login px-4">
 
-  <div *ngIf="(error | async)" class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
+  @if ((error | async)) {
+    <div class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
+  }
 
-  <button role="menuitem" class="btn btn-lg btn-primary btn-block mt-3" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
+  <button role="menuitem" class="btn btn-lg btn-primary w-100" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
 </div>
diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts
index 73927a9be6..3c629e250b 100644
--- a/src/app/shared/log-out/log-out.component.ts
+++ b/src/app/shared/log-out/log-out.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -26,7 +23,7 @@ import { BrowserOnlyPipe } from '../utils/browser-only.pipe';
   styleUrls: ['./log-out.component.scss'],
   animations: [fadeOut],
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class LogOutComponent implements OnInit {
   /**
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.html b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
index b8ee6ebe17..cada06e1b3 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.html
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.html
@@ -1,11 +1,15 @@
-<a *ngIf="!item.disabled"
-   class="ds-menu-item" role="menuitem"
-   routerLinkActive="active"
-   href="javascript:void(0);"
-   [title]="item.text | translate"
-   (click)="activate($event)"
-   (keyup.space)="activate($event)"
-   (keyup.enter)="activate($event)"
-   [attr.data-test]="item.text"
->{{item.text | translate}}</a>
-<span *ngIf="item.disabled" [attr.data-test]="item.text" class="nav-item nav-link disabled">{{item.text | translate}}</span>
+@if (!item.disabled) {
+  <a
+    class="ds-menu-item" role="menuitem"
+    routerLinkActive="active"
+    href="javascript:void(0);"
+    [title]="item.text | translate"
+    (click)="activate($event)"
+    (keyup.space)="activate($event)"
+    (keyup.enter)="activate($event)"
+    [attr.data-test]="item.text"
+  >{{item.text | translate}}</a>
+}
+@if (item.disabled) {
+  <span [attr.data-test]="item.text" class="nav-item nav-link disabled">{{item.text | translate}}</span>
+}
diff --git a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
index 3073ecc470..79497a76df 100644
--- a/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
+++ b/src/app/shared/menu/menu-item/onclick-menu-item.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -16,7 +16,7 @@ import { OnClickMenuItemModel } from './models/onclick.model';
   styleUrls: ['./menu-item.component.scss', './onclick-menu-item.component.scss'],
   templateUrl: './onclick-menu-item.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule, RouterLinkActive],
+  imports: [TranslateModule, RouterLinkActive],
 })
 export class OnClickMenuItemComponent {
   item: OnClickMenuItemModel;
diff --git a/src/app/shared/menu/menu-section/menu-section.component.ts b/src/app/shared/menu/menu-section/menu-section.component.ts
index f59c0b5594..d14cfb143c 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -37,9 +37,9 @@ import { MenuSection } from '../menu-section.model';
 export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
-   * Observable that emits whether or not this section is currently active
+   * {@link BehaviorSubject} containing the current state to whether this section is currently active
    */
-  active: Observable<boolean>;
+  active$: BehaviorSubject<boolean> = new BehaviorSubject(false);
 
   /**
    * The ID of the menu this section resides in
@@ -72,7 +72,11 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    * Set initial values for instance variables
    */
   ngOnInit(): void {
-    this.active = this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged());
+    this.subs.push(this.menuService.isSectionActive(this.menuID, this.section.id).pipe(distinctUntilChanged()).subscribe((isActive: boolean) => {
+      if (this.active$.value !== isActive) {
+        this.active$.next(isActive);
+      }
+    }));
     this.initializeInjectorData();
   }
 
@@ -90,9 +94,12 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
   /**
    * Activate this section
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  activateSection(event: Event) {
-    event.preventDefault();
+  activateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     if (!this.section.model?.disabled) {
       this.menuService.activateSection(this.menuID, this.section.id);
     }
@@ -100,10 +107,14 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
 
   /**
    * Deactivate this section
+   *
    * @param {Event} event The user event that triggered this method
+   * @param skipEvent Weather the event should still be triggered after deactivating the section or not
    */
-  deactivateSection(event: Event) {
-    event.preventDefault();
+  deactivateSection(event: Event, skipEvent = true): void {
+    if (skipEvent) {
+      event.preventDefault();
+    }
     this.menuService.deactivateSection(this.menuID, this.section.id);
   }
 
diff --git a/src/app/shared/menu/menu.reducer.spec.ts b/src/app/shared/menu/menu.reducer.spec.ts
index da837f2062..a8f269b81f 100644
--- a/src/app/shared/menu/menu.reducer.spec.ts
+++ b/src/app/shared/menu/menu.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import { initialMenusState } from './initial-menus-state';
 import {
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
index 7748e385ca..47af6e1859 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
@@ -1,5 +1,7 @@
 <div class="simple-view-element" [class.d-none]="hideIfNoTextContent && content.textContent.trim().length === 0">
-  <h2 class="simple-view-element-header" *ngIf="label">{{ label }}</h2>
+  @if (label) {
+    <h2 class="simple-view-element-header">{{ label }}</h2>
+  }
   <div #content class="simple-view-element-body">
     <ng-content></ng-content>
   </div>
diff --git a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
index af139e78e6..c97ac07b4a 100644
--- a/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -13,7 +13,7 @@ import {
   styleUrls: ['./metadata-field-wrapper.component.scss'],
   templateUrl: './metadata-field-wrapper.component.html',
   standalone: true,
-  imports: [NgIf],
+  imports: [],
 })
 export class MetadataFieldWrapperComponent {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
index 9e364ac808..eab9a2671d 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.html
@@ -1,8 +1,12 @@
 <button type="button"
-        [className]="'btn btn-success'"
-        ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
-        [disabled]="processing$ | async"
-        (click)="submitTask()">
-  <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
+  [className]="'btn btn-success'"
+  ngbTooltip="{{'submission.workflow.tasks.claimed.approve_help' | translate}}"
+  [dsBtnDisabled]="processing$ | async"
+  (click)="submitTask()">
+  @if (processing$ | async) {
+    <span><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+  }
+  @if ((processing$ | async) !== true) {
+    <span><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
+  }
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
index 6de3df6e09..8d56f55cbd 100644
--- a/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -22,6 +19,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { WorkflowItemDataService } from '../../../../core/submission/workflowitem-data.service';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -33,7 +31,7 @@ export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
   styleUrls: ['./claimed-task-actions-approve.component.scss'],
   templateUrl: './claimed-task-actions-approve.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the approve action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
index 50e3b46dfe..b3eb6b2165 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
@@ -1,12 +1,14 @@
 <ng-container *ngVar="(actionRD$ | async)?.payload as workflowAction">
   <div class="mt-1 mb-3 space-children-mr">
-    <ds-claimed-task-actions-loader *ngFor="let option of workflowAction?.options"
-                                    [item]="item"
-                                    [option]="option"
-                                    [object]="object"
-                                    [workflowitem]="workflowitem"
-                                    (processCompleted)="this.processCompleted.emit($event)">
-    </ds-claimed-task-actions-loader>
+    @for (option of workflowAction?.options; track option) {
+      <ds-claimed-task-actions-loader
+        [item]="item"
+        [option]="option"
+        [object]="object"
+        [workflowitem]="workflowitem"
+        (processCompleted)="this.processCompleted.emit($event)">
+      </ds-claimed-task-actions-loader>
+    }
 
     <button class="btn btn-primary workflow-view" ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
       [routerLink]="[getWorkflowItemViewRoute(workflowitem)]">
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
index b18d2bebc9..2cc71bfc74 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -42,7 +39,7 @@ import { ClaimedTaskActionsLoaderComponent } from './switcher/claimed-task-actio
   styleUrls: ['./claimed-task-actions.component.scss'],
   templateUrl: './claimed-task-actions.component.html',
   standalone: true,
-  imports: [VarDirective, NgFor, ClaimedTaskActionsLoaderComponent, NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ClaimedTaskActionsLoaderComponent, NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
 })
 export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent<ClaimedTask, ClaimedTaskDataService> implements OnInit {
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
index 2b95b02df4..4787e3dd69 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
@@ -1,12 +1,16 @@
 <button (click)="submitTask()"
-        [disabled]="processing$ | async"
-        class="declineTaskAction btn btn-warning"
-        ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
-        type="button">
-  <span *ngIf="processing$ | async">
-    <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
-  </span>
-  <span *ngIf="(processing$ | async) !== true">
-    <i class="fa fa-ban"></i> {{'submission.workflow.tasks.claimed.decline' | translate}}
-  </span>
+  [dsBtnDisabled]="processing$ | async"
+  class="declineTaskAction btn btn-warning"
+  ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
+  type="button">
+  @if (processing$ | async) {
+    <span>
+      <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+    </span>
+  }
+  @if ((processing$ | async) !== true) {
+    <span>
+      <i class="fa fa-ban"></i> {{'submission.workflow.tasks.claimed.decline' | translate}}
+    </span>
+  }
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
index 74df54e9e0..8e8d1ebc50 100644
--- a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -21,6 +18,7 @@ import { RemoteData } from 'src/app/core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -32,7 +30,7 @@ export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
   templateUrl: './claimed-task-actions-decline-task.component.html',
   styleUrls: ['./claimed-task-actions-decline-task.component.scss'],
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the decline task action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.html b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.html
index 3f3670e17f..c8a8837fa8 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.html
@@ -1,7 +1,9 @@
-<a *ngIf="object"
-   class="btn btn-primary"
-   ngbTooltip="{{'submission.workflow.tasks.claimed.edit_help' | translate}}"
-   [routerLink]="['/workflowitems/' + (object.workflowitem | async)?.payload?.id + '/edit']"
-   role="button">
-  <i class="fa fa-edit"></i> {{'submission.workflow.tasks.claimed.edit' | translate}}
-</a>
+@if (object) {
+  <a
+    class="btn btn-primary"
+    ngbTooltip="{{'submission.workflow.tasks.claimed.edit_help' | translate}}"
+    [routerLink]="['/workflowitems/' + (object.workflowitem | async)?.payload?.id + '/edit']"
+    role="button">
+    <i class="fa fa-edit"></i> {{'submission.workflow.tasks.claimed.edit' | translate}}
+  </a>
+}
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
index ec9ef2cc51..5d2a80830a 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -28,7 +25,7 @@ export const WORKFLOW_TASK_OPTION_EDIT_METADATA = 'submit_edit_metadata';
   styleUrls: ['./claimed-task-actions-edit-metadata.component.scss'],
   templateUrl: './claimed-task-actions-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * Component for displaying the edit metadata action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index 2f96c16f08..82721fb828 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -1,20 +1,23 @@
 <ng-template #rejectTipContent><p [innerHTML]="'submission.workflow.tasks.claimed.reject_help' | translate"></p></ng-template>
 <button [className]="'btn btn-danger'"
-        [ngbTooltip]="rejectTipContent"
-        [disabled]="processing$ | async"
-        (click)="openRejectModal(rejectModal)" >
-  <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
+  [ngbTooltip]="rejectTipContent"
+  [dsBtnDisabled]="processing$ | async"
+  (click)="openRejectModal(rejectModal)" >
+  @if (processing$ | async) {
+    <span><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+  }
+  @if ((processing$ | async) !== true) {
+    <span><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
+  }
 </button>
 
 <ng-template #rejectModal let-c="close" let-d="dismiss">
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.workflow.tasks.claimed.reject.reason.title' | translate}}</h4>
     <button type="button"
-            class="close"
-            aria-label="Close"
-            (click)="d('Cross click')">
-      <span aria-hidden="true">&times;</span>
+      class="btn-close"
+      aria-label="Close"
+      (click)="d('Cross click')">
     </button>
   </div>
   <div class="modal-body">
@@ -23,15 +26,19 @@
     </div>
     <form (ngSubmit)="submitTask();" [formGroup]="rejectForm" >
       <textarea style="width: 100%"
-                formControlName="reason"
-                rows="4"
-                placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
+        formControlName="reason"
+        rows="4"
+      placeholder="{{'submission.workflow.tasks.claimed.reject.reason.placeholder' | translate}}"></textarea>
       <button id="btn-chat"
-              class="btn btn-danger btn-lg btn-block mt-3"
-              [disabled]="!rejectForm.valid || (processing$ | async)"
-              type="submit">
-        <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-        <span *ngIf="(processing$ | async) !== true">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
+        class="btn btn-danger btn-lg btn-block w-100 mt-3"
+        [dsBtnDisabled]="!rejectForm.valid || (processing$ | async)"
+        type="submit">
+        @if (processing$ | async) {
+          <span><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+        }
+        @if ((processing$ | async) !== true) {
+          <span>{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
+        }
       </button>
     </form>
   </div>
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
index 9a8c98c66e..02e7d9e469 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -33,6 +30,7 @@ import { RemoteData } from '../../../../core/data/remote-data';
 import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
@@ -44,7 +42,7 @@ export const WORKFLOW_TASK_OPTION_REJECT = 'submit_reject';
   styleUrls: ['./claimed-task-actions-reject.component.scss'],
   templateUrl: './claimed-task-actions-reject.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, FormsModule, ReactiveFormsModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the reject action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
index e10dec2e6e..ad560757a2 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.html
@@ -1,8 +1,12 @@
 <button type="button"
-        [className]="'btn btn-secondary'"
-        ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
-        [disabled]="processing$ | async"
-        (click)="submitTask()">
-  <span *ngIf="processing$ | async"><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
+  [className]="'btn btn-secondary'"
+  ngbTooltip="{{'submission.workflow.tasks.claimed.return_help' | translate}}"
+  [dsBtnDisabled]="processing$ | async"
+  (click)="submitTask()">
+  @if (processing$ | async) {
+    <span><i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+  }
+  @if ((processing$ | async) !== true) {
+    <span><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
+  }
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
index ea93769b9d..40e75324de 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -20,6 +17,7 @@ import { RequestService } from '../../../../core/data/request.service';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { SearchService } from '../../../../core/shared/search/search.service';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { BtnDisabledDirective } from '../../../btn-disabled.directive';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 
@@ -30,7 +28,7 @@ export const WORKFLOW_TASK_OPTION_RETURN_TO_POOL = 'return_to_pool';
   styleUrls: ['./claimed-task-actions-return-to-pool.component.scss'],
   templateUrl: './claimed-task-actions-return-to-pool.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Component for displaying and processing the return to pool action on a workflow task item
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index 1d98934011..7df692c69f 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -1,12 +1,16 @@
 <button type="button" class="btn btn-info mt-1 mb-3"
-  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [disabled]="(processing$ | async)"
+  ngbTooltip="{{'submission.workflow.tasks.pool.claim_help' | translate}}" [dsBtnDisabled]="(processing$ | async)"
   (click)="claim()">
-  <span *ngIf="(processing$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
-    {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-  <span *ngIf="(processing$ | async) !== true"><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
-    translate}}</span>
+  @if ((processing$ | async)) {
+    <span><i class='fas fa-circle-notch fa-spin'></i>
+  {{'submission.workflow.tasks.generic.processing' | translate}}</span>
+}
+@if ((processing$ | async) !== true) {
+  <span><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
+translate}}</span>
+}
 </button>
-<button class="btn btn-primary workflow-view ml-1 mt-1 mb-3" data-test="view-btn"
+<button class="btn btn-primary workflow-view ms-1 mt-1 mb-3" data-test="view-btn"
   ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
   [routerLink]="[getWorkflowItemViewRoute(workflowitem)]">
   <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index 35b75b3aa1..18941b1a6c 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -34,6 +31,7 @@ import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
 
@@ -45,7 +43,7 @@ import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actio
   styleUrls: ['./pool-task-actions.component.scss'],
   templateUrl: './pool-task-actions.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, NgIf, RouterLink, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class PoolTaskActionsComponent extends MyDSpaceReloadableActionsComponent<PoolTask, PoolTaskDataService> implements OnDestroy {
 
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index daefc75fd3..21191ea032 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -7,32 +7,37 @@
     <i class="fa fa-info-circle"></i> {{"submission.workspace.generic.view" | translate}}
   </button>
 
-  <a class="btn btn-primary mt-1 mb-3 edit-btn" id="{{'edit_' + object.id}}"
-   *ngIf="(canEditItem$ | async)"
-    ngbTooltip="{{'submission.workflow.generic.edit-help' | translate}}"
-    [attr.aria-label]="'submission.workflow.generic.edit-help' | translate"
-    [routerLink]="['/workspaceitems/' + object.id + '/edit']" role="button">
-    <i class="fa fa-edit"></i> {{'submission.workflow.generic.edit' | translate}}
-  </a>
+  @if ((canEditItem$ | async)) {
+    <a class="btn btn-primary mt-1 mb-3 edit-btn" id="{{'edit_' + object.id}}"
+      ngbTooltip="{{'submission.workflow.generic.edit-help' | translate}}"
+      [attr.aria-label]="'submission.workflow.generic.edit-help' | translate"
+      [routerLink]="['/workspaceitems/' + object.id + '/edit']" role="button">
+      <i class="fa fa-edit"></i> {{'submission.workflow.generic.edit' | translate}}
+    </a>
+  }
 
-  <button type="button" id="{{'delete_' + object.id}}" class="btn btn-danger mt-1 mb-3"
-    *ngIf="(canEditItem$ | async)"
-    ngbTooltip="{{'submission.workflow.generic.delete-help' | translate}}"
-    [attr.aria-label]="'submission.workflow.generic.delete-help' | translate"
-    (click)="$event.preventDefault();confirmDiscard(content)">
-    <span *ngIf="(processingDelete$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
+  @if ((canEditItem$ | async)) {
+    <button type="button" id="{{'delete_' + object.id}}" class="btn btn-danger mt-1 mb-3"
+      ngbTooltip="{{'submission.workflow.generic.delete-help' | translate}}"
+      [attr.aria-label]="'submission.workflow.generic.delete-help' | translate"
+      (click)="$event.preventDefault();confirmDiscard(content)">
+      @if ((processingDelete$ | async)) {
+        <span><i class='fas fa-circle-notch fa-spin'></i>
       {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-    <span *ngIf="(processingDelete$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' |
-      translate}}</span>
-  </button>
+    }
+    @if ((processingDelete$ | async) !== true) {
+      <span><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' |
+    translate}}</span>
+  }
+</button>
+}
 </div>
 
 
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
     <div class="modal-title text-danger h4">{{'submission.general.discard.confirm.title' | translate}}</div>
-    <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" id="delete_close" class="btn-close" aria-label="Close" (click)="d('cancel')">
     </button>
   </div>
   <div class="modal-body">
@@ -40,8 +45,8 @@
   </div>
   <div class="modal-footer">
     <button type="button" id="delete_cancel" class="btn btn-secondary"
-      (click)="c('cancel')">{{'submission.general.discard.confirm.cancel' | translate}}</button>
+    (click)="c('cancel')">{{'submission.general.discard.confirm.cancel' | translate}}</button>
     <button type="button" id="delete_confirm" class="btn btn-danger"
-      (click)="c('ok')">{{'submission.general.discard.confirm.submit' | translate}}</button>
+    (click)="c('ok')">{{'submission.general.discard.confirm.submit' | translate}}</button>
   </div>
 </ng-template>
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
index 64dfd9f7aa..68f66b4986 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Injector,
@@ -52,7 +49,7 @@ import { MyDSpaceActionsComponent } from '../mydspace-actions';
   styleUrls: ['./workspaceitem-actions.component.scss'],
   templateUrl: './workspaceitem-actions.component.html',
   standalone: true,
-  imports: [NgbTooltipModule, RouterLink, NgIf, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, RouterLink, AsyncPipe, TranslateModule],
 })
 export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<WorkspaceItem, WorkspaceitemDataService> implements OnInit {
 
diff --git a/src/app/shared/notification-box/notification-box.component.html b/src/app/shared/notification-box/notification-box.component.html
index 29be1f475e..c10e5c6649 100644
--- a/src/app/shared/notification-box/notification-box.component.html
+++ b/src/app/shared/notification-box/notification-box.component.html
@@ -1,12 +1,14 @@
-<div role="button" *ngIf="boxConfig"
-     class="w-100 h-100 pt-4 pb-3 px-2 box-container"
-     [ngStyle]="{'background-color': boxConfig.color}"
-     [dsHoverClass]="'shadow-lg'"
-     (click)="onClick(boxConfig)"
-     [title]="boxConfig.description | translate"
->
-  <div [ngStyle]="{'color': boxConfig.textColor}" class="d-flex flex-column justify-content-center align-items-center">
-    <div class="mb-3 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
-    <div class="font-weight-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
+@if (boxConfig) {
+  <div role="button"
+    class="w-100 h-100 pt-4 pb-3 px-2 box-container"
+    [ngStyle]="{'background-color': boxConfig.color}"
+    [dsHoverClass]="'shadow-lg'"
+    (click)="onClick(boxConfig)"
+    [title]="boxConfig.description | translate"
+    >
+    <div [ngStyle]="{'color': boxConfig.textColor}" class="d-flex flex-column justify-content-center align-items-center">
+      <div class="mb-3 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
+      <div class="font-weight-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
+    </div>
   </div>
-</div>
+}
diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts
index 51736b22ff..56a63c44a5 100644
--- a/src/app/shared/notification-box/notification-box.component.ts
+++ b/src/app/shared/notification-box/notification-box.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgIf,
-  NgStyle,
-} from '@angular/common';
+import { NgStyle } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -26,7 +23,6 @@ import { listableObjectComponent } from '../object-collection/shared/listable-ob
     NgStyle,
     HoverClassDirective,
     TranslateModule,
-    NgIf,
   ],
 })
 /**
diff --git a/src/app/shared/notifications/models/notification-options.model.ts b/src/app/shared/notifications/models/notification-options.model.ts
index 12bd25a201..c891781d9d 100644
--- a/src/app/shared/notifications/models/notification-options.model.ts
+++ b/src/app/shared/notifications/models/notification-options.model.ts
@@ -4,19 +4,25 @@ export interface INotificationOptions {
   timeOut: number;
   clickToClose: boolean;
   animate: NotificationAnimationsType | string;
+  announceContentInLiveRegion: boolean;
 }
 
 export class NotificationOptions implements INotificationOptions {
   public timeOut: number;
   public clickToClose: boolean;
   public animate: any;
+  public announceContentInLiveRegion: boolean;
 
-  constructor(timeOut = 5000,
+
+  constructor(
+    timeOut = 5000,
     clickToClose = true,
-    animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale) {
-
+    animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale,
+    announceContentInLiveRegion: boolean = true,
+  ) {
     this.timeOut = timeOut;
     this.clickToClose = clickToClose;
     this.animate = animate;
+    this.announceContentInLiveRegion = announceContentInLiveRegion;
   }
 }
diff --git a/src/app/shared/notifications/notification/notification.component.html b/src/app/shared/notifications/notification/notification.component.html
index dae0207493..dac3e03f7a 100644
--- a/src/app/shared/notifications/notification/notification.component.html
+++ b/src/app/shared/notifications/notification/notification.component.html
@@ -1,15 +1,18 @@
 <div class="notification alert {{notification.type}} alert-dismissible m-3 shadow" role="alert"
-     [@enterLeave]="animate">
+  [@enterLeave]="animate">
 
-  <div class="notification-progress-loader position-absolute w-100" *ngIf="showProgressBar">
-    <span [ngStyle]="{'width': progressWidth + '%'}" class="h-100 float-left"></span>
-  </div>
+  @if (showProgressBar) {
+    <div class="notification-progress-loader position-absolute w-100">
+      <span [ngStyle]="{'width': progressWidth + '%'}" class="h-100 float-start"></span>
+    </div>
+  }
 
-    <button *ngIf="notification.options.clickToClose"
-            (click)="remove()"
-            type="button" class="close pt-0 pr-1 pl-0 pb-0" data-dismiss="alert" aria-label="Close">
-      <span aria-hidden="true">&times;</span>
+  @if (notification.options.clickToClose) {
+    <button
+      (click)="remove()"
+      type="button" class="btn-close pt-0 pe-1 ps-0 pb-0 mt-1 me-1" data-dismiss="alert" aria-label="Close">
     </button>
+  }
 
 
   <div class="d-flex flex-row">
@@ -23,34 +26,43 @@
       }"></i></div>
     </div>
     <div class="d-flex flex-column justify-content-center align-content-stretch">
-      <div class="p-2 mr-3"  *ngIf="title">
-        <strong>
-          <div class="notification-title pl-1" *ngIf="titleIsTemplate; else regularTitle">
-            <ng-container *ngTemplateOutlet="title"></ng-container>
-          </div>
-          <ng-template #regularTitle>
-            <div class="notification-title pl-1">{{(title | async)}}</div>
-          </ng-template>
-        </strong>
-      </div>
-
-      <div class="p-2 mr-3"  *ngIf="content && !html">
-        <div class="notification-content pl-1" *ngIf="contentIsTemplate; else regularContent">
-          <ng-container *ngTemplateOutlet="content"></ng-container>
+      @if (title) {
+        <div class="p-2 me-3" >
+          <strong>
+            @if (titleIsTemplate) {
+              <div class="notification-title ps-1">
+                <ng-container *ngTemplateOutlet="title"></ng-container>
+              </div>
+            } @else {
+              <div class="notification-title ps-1">{{(title | async)}}</div>
+            }
+          </strong>
         </div>
-        <ng-template #regularContent>
-          <div class="notification-content pl-1">{{(content | async)}}</div>
-        </ng-template>
-      </div>
+      }
 
-      <div class="p-2 mr-3" *ngIf="content && html">
-        <div class="notification-html pl-1" *ngIf="contentIsTemplate; else regularHtml">
-          <ng-container *ngTemplateOutlet="content"></ng-container>
+      @if (content && !html) {
+        <div class="p-2 me-3" >
+          @if (contentIsTemplate) {
+            <div class="notification-content ps-1">
+              <ng-container *ngTemplateOutlet="content"></ng-container>
+            </div>
+          } @else {
+            <div class="notification-content ps-1">{{(content | async)}}</div>
+          }
         </div>
-        <ng-template #regularHtml>
-          <div class="notification-html pl-1" [innerHTML]="content"></div>
-        </ng-template>
-      </div>
+      }
+
+      @if (content && html) {
+        <div class="p-2 me-3">
+          @if (contentIsTemplate) {
+            <div class="notification-html ps-1">
+              <ng-container *ngTemplateOutlet="content"></ng-container>
+            </div>
+          } @else {
+            <div class="notification-html ps-1" [innerHTML]="content"></div>
+          }
+        </div>
+      }
     </div>
   </div>
 
diff --git a/src/app/shared/notifications/notification/notification.component.scss b/src/app/shared/notifications/notification/notification.component.scss
index ecfc25fee0..e6beffb94e 100644
--- a/src/app/shared/notifications/notification/notification.component.scss
+++ b/src/app/shared/notifications/notification/notification.component.scss
@@ -4,7 +4,7 @@
   text-align: left;
 }
 
-.close {
+.btn-close {
   outline: none !important;
   opacity: 0.8;
 }
diff --git a/src/app/shared/notifications/notification/notification.component.ts b/src/app/shared/notifications/notification/notification.component.ts
index 7e71fa3996..c56345534f 100644
--- a/src/app/shared/notifications/notification/notification.component.ts
+++ b/src/app/shared/notifications/notification/notification.component.ts
@@ -2,7 +2,6 @@ import { trigger } from '@angular/animations';
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
   NgStyle,
   NgTemplateOutlet,
 } from '@angular/common';
@@ -92,7 +91,7 @@ import { NotificationsService } from '../notifications.service';
   styleUrls: ['./notification.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIf, NgStyle, NgClass, NgTemplateOutlet, AsyncPipe],
+  imports: [NgStyle, NgClass, NgTemplateOutlet, AsyncPipe],
 })
 
 export class NotificationComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.html b/src/app/shared/notifications/notifications-board/notifications-board.component.html
index 854842f30d..8272ec69a6 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.html
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.html
@@ -1,10 +1,11 @@
 <div class="notifications-wrapper position-fixed"
-     [ngClass]="position"
-     (mouseenter)="this.isPaused$.next(true);"
-     (mouseleave)="this.isPaused$.next(false);">
-  <ds-notification
-    class="notification"
-    *ngFor="let a of notifications; let i = index"
-    [notification]="a" [isPaused$]="isPaused$">
-  </ds-notification>
+  [ngClass]="position"
+  (mouseenter)="this.isPaused$.next(true);"
+  (mouseleave)="this.isPaused$.next(false);">
+  @for (a of notifications; track a; let i = $index) {
+    <ds-notification
+      class="notification"
+      [notification]="a" [isPaused$]="isPaused$">
+    </ds-notification>
+  }
 </div>
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
index 8a4ea204ac..ed02327da9 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.spec.ts
@@ -1,6 +1,8 @@
 import { ChangeDetectorRef } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
+  flush,
   inject,
   TestBed,
   waitForAsync,
@@ -19,8 +21,11 @@ import uniqueId from 'lodash/uniqueId';
 
 import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import { AppState } from '../../../app.reducer';
+import { LiveRegionService } from '../../live-region/live-region.service';
+import { LiveRegionServiceStub } from '../../live-region/live-region.service.stub';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { Notification } from '../models/notification.model';
+import { NotificationOptions } from '../models/notification-options.model';
 import { NotificationType } from '../models/notification-type';
 import { NotificationComponent } from '../notification/notification.component';
 import { notificationsReducer } from '../notifications.reducers';
@@ -32,8 +37,11 @@ export const bools = { f: false, t: true };
 describe('NotificationsBoardComponent', () => {
   let comp: NotificationsBoardComponent;
   let fixture: ComponentFixture<NotificationsBoardComponent>;
+  let liveRegionService: LiveRegionServiceStub;
 
   beforeEach(waitForAsync(() => {
+    liveRegionService = new LiveRegionServiceStub();
+
     TestBed.configureTestingModule({
       imports: [
         BrowserModule,
@@ -48,6 +56,7 @@ describe('NotificationsBoardComponent', () => {
       ],
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: LiveRegionService, useValue: liveRegionService },
         ChangeDetectorRef,
       ],
     }).compileComponents();  // compile template and css
@@ -119,5 +128,42 @@ describe('NotificationsBoardComponent', () => {
     });
   });
 
+  describe('add', () => {
+    beforeEach(() => {
+      liveRegionService.addMessage.calls.reset();
+    });
+
+    it('should announce content to the live region', fakeAsync(() => {
+      const notification = new Notification('id', NotificationType.Info, 'title', 'content');
+      comp.add(notification);
+
+      flush();
+
+      expect(liveRegionService.addMessage).toHaveBeenCalledWith('content');
+    }));
+
+    it('should not announce anything if there is no content', fakeAsync(() => {
+      const notification = new Notification('id', NotificationType.Info, 'title');
+      comp.add(notification);
+
+      flush();
+
+      expect(liveRegionService.addMessage).not.toHaveBeenCalled();
+    }));
+
+    it('should not announce the content if disabled', fakeAsync(() => {
+      const options = new NotificationOptions();
+      options.announceContentInLiveRegion = false;
+
+      const notification = new Notification('id', NotificationType.Info, 'title', 'content');
+      notification.options = options;
+      comp.add(notification);
+
+      flush();
+
+      expect(liveRegionService.addMessage).not.toHaveBeenCalled();
+    }));
+  });
+
 })
 ;
diff --git a/src/app/shared/notifications/notifications-board/notifications-board.component.ts b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
index 51d60368ab..e4c55e1e28 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgFor,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -18,11 +15,18 @@ import {
 import difference from 'lodash/difference';
 import {
   BehaviorSubject,
+  of as observableOf,
   Subscription,
 } from 'rxjs';
+import { take } from 'rxjs/operators';
 
 import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import { AppState } from '../../../app.reducer';
+import {
+  hasNoValue,
+  isNotEmptyOperator,
+} from '../../empty.util';
+import { LiveRegionService } from '../../live-region/live-region.service';
 import { INotification } from '../models/notification.model';
 import { NotificationComponent } from '../notification/notification.component';
 import { NotificationsState } from '../notifications.reducers';
@@ -36,7 +40,7 @@ import { notificationsStateSelector } from '../selectors';
   styleUrls: ['./notifications-board.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgClass, NgFor, NotificationComponent],
+  imports: [NgClass, NotificationComponent],
 })
 export class NotificationsBoardComponent implements OnInit, OnDestroy {
 
@@ -61,9 +65,12 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
    */
   public isPaused$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
-  constructor(private service: NotificationsService,
-              private store: Store<AppState>,
-              private cdr: ChangeDetectorRef) {
+  constructor(
+    private service: NotificationsService,
+    private store: Store<AppState>,
+    private cdr: ChangeDetectorRef,
+    protected liveRegionService: LiveRegionService,
+  ) {
   }
 
   ngOnInit(): void {
@@ -97,6 +104,7 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
         this.notifications.splice(this.notifications.length - 1, 1);
       }
       this.notifications.splice(0, 0, item);
+      this.addContentToLiveRegion(item);
     } else {
       // Remove the notification from the store
       // This notification was in the store, but not in this.notifications
@@ -105,29 +113,44 @@ export class NotificationsBoardComponent implements OnInit, OnDestroy {
     }
   }
 
+  /**
+   * Adds the content of the notification (if any) to the live region, so it can be announced by screen readers.
+   */
+  private addContentToLiveRegion(item: INotification) {
+    let content = item.content;
+
+    if (!item.options.announceContentInLiveRegion || hasNoValue(content)) {
+      return;
+    }
+
+    if (typeof content === 'string') {
+      content = observableOf(content);
+    }
+
+    content.pipe(
+      isNotEmptyOperator(),
+      take(1),
+    ).subscribe(contentStr => this.liveRegionService.addMessage(contentStr));
+  }
+
+  /**
+   * Whether to block the provided item because a duplicate notification with the exact same information already
+   * exists within the notifications array.
+   * @param item The item to check
+   * @return true if the notifications array already contains a notification with the exact same information as the
+   * provided item. false otherwise.
+   * @private
+   */
   private block(item: INotification): boolean {
     const toCheck = item.html ? this.checkHtml : this.checkStandard;
+
     this.notifications.forEach((notification) => {
       if (toCheck(notification, item)) {
         return true;
       }
     });
 
-    if (this.notifications.length > 0) {
-      this.notifications.forEach((notification) => {
-        if (toCheck(notification, item)) {
-          return true;
-        }
-      });
-    }
-
-    let comp: INotification;
-    if (this.notifications.length > 0) {
-      comp = this.notifications[0];
-    } else {
-      return false;
-    }
-    return toCheck(comp, item);
+    return false;
   }
 
   private checkStandard(checker: INotification, item: INotification): boolean {
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 9d7851428d..efed2d968b 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -1,76 +1,84 @@
-<ds-object-list [ngClass]="placeholderFontClass"
-                [config]="config"
-                [sortConfig]="sortConfig"
-                [objects]="objects"
-                [hasBorder]="hasBorder"
-                [hideGear]="hideGear"
-                [linkType]="linkType"
-                [context]="context"
-                [hidePaginationDetail]="hidePaginationDetail"
-                [showPaginator]="showPaginator"
-                [showThumbnails]="showThumbnails"
-                (paginationChange)="onPaginationChange($event)"
-                (pageChange)="onPageChange($event)"
-                (pageSizeChange)="onPageSizeChange($event)"
-                (sortDirectionChange)="onSortDirectionChange($event)"
-                (deselectObject)="deselectObject.emit($event)"
-                (selectObject)="selectObject.emit($event)"
-                (sortFieldChange)="onSortFieldChange($event)"
-                [selectable]="selectable"
-                [selectionConfig]="selectionConfig"
-                [importable]="importable"
-                [importConfig]="importConfig"
-                (importObject)="importObject.emit($event)"
-                (contentChange)="contentChange.emit($event)"
-                (prev)="goPrev()"
-                (next)="goNext()"
-                *ngIf="(currentMode$ | async) === viewModeEnum.ListElement">
-</ds-object-list>
+@if ((currentMode$ | async) === viewModeEnum.ListElement) {
+  <ds-object-list [ngClass]="placeholderFontClass"
+    [config]="config"
+    [sortConfig]="sortConfig"
+    [objects]="objects"
+    [hasBorder]="hasBorder"
+    [hideGear]="hideGear"
+    [linkType]="linkType"
+    [context]="context"
+    [hidePaginationDetail]="hidePaginationDetail"
+    [showPaginator]="showPaginator"
+    [showThumbnails]="showThumbnails"
+    (paginationChange)="onPaginationChange($event)"
+    (pageChange)="onPageChange($event)"
+    (pageSizeChange)="onPageSizeChange($event)"
+    (sortDirectionChange)="onSortDirectionChange($event)"
+    (deselectObject)="deselectObject.emit($event)"
+    (selectObject)="selectObject.emit($event)"
+    (sortFieldChange)="onSortFieldChange($event)"
+    [selectable]="selectable"
+    [selectionConfig]="selectionConfig"
+    [importable]="importable"
+    [importConfig]="importConfig"
+    (importObject)="importObject.emit($event)"
+    (contentChange)="contentChange.emit($event)"
+    (prev)="goPrev()"
+    (next)="goNext()"
+    >
+  </ds-object-list>
+}
 
-<ds-object-grid [config]="config"
-                [sortConfig]="sortConfig"
-                [objects]="objects"
-                [hideGear]="hideGear"
-                [linkType]="linkType"
-                [context]="context"
-                [hidePaginationDetail]="hidePaginationDetail"
-                [showPaginator]="showPaginator"
-                [showThumbnails]="showThumbnails"
-                (paginationChange)="onPaginationChange($event)"
-                (pageChange)="onPageChange($event)"
-                (pageSizeChange)="onPageSizeChange($event)"
-                (sortDirectionChange)="onSortDirectionChange($event)"
-                (sortFieldChange)="onSortFieldChange($event)"
-                *ngIf="(currentMode$ | async) === viewModeEnum.GridElement">
-</ds-object-grid>
+@if ((currentMode$ | async) === viewModeEnum.GridElement) {
+  <ds-object-grid [config]="config"
+    [sortConfig]="sortConfig"
+    [objects]="objects"
+    [hideGear]="hideGear"
+    [linkType]="linkType"
+    [context]="context"
+    [hidePaginationDetail]="hidePaginationDetail"
+    [showPaginator]="showPaginator"
+    [showThumbnails]="showThumbnails"
+    (paginationChange)="onPaginationChange($event)"
+    (pageChange)="onPageChange($event)"
+    (pageSizeChange)="onPageSizeChange($event)"
+    (sortDirectionChange)="onSortDirectionChange($event)"
+    (sortFieldChange)="onSortFieldChange($event)"
+    >
+  </ds-object-grid>
+}
 
-<ds-object-detail [config]="config"
-                  [sortConfig]="sortConfig"
-                  [objects]="objects"
-                  [hideGear]="hideGear"
-                  [linkType]="linkType"
-                  [context]="context"
-                  [hidePaginationDetail]="hidePaginationDetail"
-                  [showPaginator]="showPaginator"
-                  [showThumbnails]="showThumbnails"
-                  (contentChange)="contentChange.emit($event)"
-                  *ngIf="(currentMode$ | async) === viewModeEnum.DetailedListElement">
-</ds-object-detail>
+@if ((currentMode$ | async) === viewModeEnum.DetailedListElement) {
+  <ds-object-detail [config]="config"
+    [sortConfig]="sortConfig"
+    [objects]="objects"
+    [hideGear]="hideGear"
+    [linkType]="linkType"
+    [context]="context"
+    [hidePaginationDetail]="hidePaginationDetail"
+    [showPaginator]="showPaginator"
+    [showThumbnails]="showThumbnails"
+    (contentChange)="contentChange.emit($event)"
+    >
+  </ds-object-detail>
+}
 
 
-<ds-object-table  [config]="config"
-                  [sortConfig]="sortConfig"
-                  [objects]="objects"
-                  [hideGear]="hideGear"
-                  [linkType]="linkType"
-                  [context]="context"
-                  [hidePaginationDetail]="hidePaginationDetail"
-                  [showPaginator]="showPaginator"
-                  [showThumbnails]="showThumbnails"
-                  (paginationChange)="onPaginationChange($event)"
-                  (pageChange)="onPageChange($event)"
-                  (pageSizeChange)="onPageSizeChange($event)"
-                  (sortDirectionChange)="onSortDirectionChange($event)"
-                  (sortFieldChange)="onSortFieldChange($event)"
-                  *ngIf="(currentMode$ | async) === viewModeEnum.Table">
-</ds-object-table>
+@if ((currentMode$ | async) === viewModeEnum.Table) {
+  <ds-object-table  [config]="config"
+    [sortConfig]="sortConfig"
+    [objects]="objects"
+    [hideGear]="hideGear"
+    [linkType]="linkType"
+    [context]="context"
+    [hidePaginationDetail]="hidePaginationDetail"
+    [showPaginator]="showPaginator"
+    [showThumbnails]="showThumbnails"
+    (paginationChange)="onPaginationChange($event)"
+    (pageChange)="onPageChange($event)"
+    (pageSizeChange)="onPageSizeChange($event)"
+    (sortDirectionChange)="onSortDirectionChange($event)"
+    (sortFieldChange)="onSortFieldChange($event)"
+    >
+  </ds-object-table>
+}
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index bae371cd73..00cf58155f 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -2,7 +2,6 @@ import {
   AsyncPipe,
   isPlatformBrowser,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -52,7 +51,7 @@ import { ListableObject } from './shared/listable-object.model';
   styleUrls: ['./object-collection.component.scss'],
   templateUrl: './object-collection.component.html',
   standalone: true,
-  imports: [NgIf, ThemedObjectListComponent, NgClass, ObjectGridComponent, ObjectDetailComponent, AsyncPipe, ObjectTableComponent],
+  imports: [ThemedObjectListComponent, NgClass, ObjectGridComponent, ObjectDetailComponent, AsyncPipe, ObjectTableComponent],
 })
 export class ObjectCollectionComponent implements OnInit {
   /**
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
index 5b20860684..16d1bfde58 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
@@ -1,5 +1,7 @@
-<ng-container *ngIf="showAccessStatus">
-  <span *ngIf="accessStatus$ | async as accessStatus">
-    <span [class]="'badge badge-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus | translate }}</span>
-  </span>
-</ng-container>
+@if (showAccessStatus) {
+  @if (accessStatus$ | async; as accessStatus) {
+    <span>
+      <span [class]="'badge bg-secondary access-status-list-element-badge ' + accessStatusClass">{{ accessStatus | translate }}</span>
+    </span>
+  }
+}
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
index 0b86b782f6..5fafb5db77 100644
--- a/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -32,7 +29,7 @@ import { AccessStatusObject } from './access-status.model';
   templateUrl: './access-status-badge.component.html',
   styleUrls: ['./access-status-badge.component.scss'],
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 /**
  * Component rendering the access status of an item as a badge
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.html b/src/app/shared/object-collection/shared/badges/badges.component.html
index aade4503a4..5c35ff680b 100644
--- a/src/app/shared/object-collection/shared/badges/badges.component.html
+++ b/src/app/shared/object-collection/shared/badges/badges.component.html
@@ -1,10 +1,10 @@
 <ds-status-badge [object]="object"></ds-status-badge>
-<ng-container *ngIf="isMyDSpaceStatus">
-    <ds-my-dspace-status-badge [context]="context"></ds-my-dspace-status-badge>
-</ng-container>
+@if (isMyDSpaceStatus) {
+  <ds-my-dspace-status-badge [context]="context"></ds-my-dspace-status-badge>
+}
 <div>
-    <ds-type-badge class="pr-1" [object]="object"></ds-type-badge>
-    <ng-container *ngIf="showAccessStatus">
-        <ds-access-status-badge [object]="object"></ds-access-status-badge>
-    </ng-container>
+  <ds-type-badge class="pe-1" [object]="object"></ds-type-badge>
+  @if (showAccessStatus) {
+    <ds-access-status-badge [object]="object"></ds-access-status-badge>
+  }
 </div>
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.ts b/src/app/shared/object-collection/shared/badges/badges.component.ts
index 923ef4af8f..df82dfe991 100644
--- a/src/app/shared/object-collection/shared/badges/badges.component.ts
+++ b/src/app/shared/object-collection/shared/badges/badges.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -32,7 +32,7 @@ const MY_DSPACE_STATUS_CONTEXTS = [
   templateUrl: './badges.component.html',
   styleUrls: ['./badges.component.scss'],
   standalone: true,
-  imports: [ThemedStatusBadgeComponent, NgIf, ThemedMyDSpaceStatusBadgeComponent, ThemedTypeBadgeComponent, ThemedAccessStatusBadgeComponent],
+  imports: [ThemedStatusBadgeComponent, ThemedMyDSpaceStatusBadgeComponent, ThemedTypeBadgeComponent, ThemedAccessStatusBadgeComponent],
 })
 export class BadgesComponent {
   /**
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
index c864f22afa..8eb3cc0bf3 100644
--- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
@@ -1,6 +1,10 @@
-<div *ngIf="privateBadge" class="private-badge">
-    <span class="badge badge-danger">{{ "item.badge.private" | translate }}</span>
-</div>
-<div *ngIf="withdrawnBadge" class="withdrawn-badge">
-    <span class="badge badge-warning">{{ "item.badge.withdrawn" | translate }}</span>
-</div>
+@if (privateBadge) {
+  <div class="private-badge">
+    <span class="badge bg-danger">{{ "item.badge.private" | translate }}</span>
+  </div>
+}
+@if (withdrawnBadge) {
+  <div class="withdrawn-badge">
+    <span class="badge bg-warning">{{ "item.badge.withdrawn" | translate }}</span>
+  </div>
+}
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
index 7ed015f13c..eb9c372831 100644
--- a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -13,7 +13,7 @@ import { hasValue } from '../../../../empty.util';
   selector: 'ds-base-status-badge',
   templateUrl: './status-badge.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 /**
  * Component rendering the status of an item as a badge
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
index 119702c375..78fc9ba832 100644
--- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
@@ -1,3 +1,5 @@
-<span *ngIf="typeMessage">
-  <span class="badge badge-info">{{ typeMessage | translate }}</span>
-</span>
+@if (typeMessage) {
+  <span>
+    <span class="badge bg-info">{{ typeMessage | translate }}</span>
+  </span>
+}
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
index 703263efb6..0cc00397a9 100644
--- a/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -16,7 +16,7 @@ import {
   selector: 'ds-base-type-badge',
   templateUrl: './type-badge.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 /**
  * Component rendering the type of an item as a badge
diff --git a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
index 921999b540..3d2ade646e 100644
--- a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
@@ -1,6 +1,6 @@
-<div class="mr-2">
+<div class="me-2">
   <button (click)="importObject.emit(object)"
-          class="btn btn-outline-primary btn-sm float-left"
+          class="btn btn-outline-primary btn-sm float-start"
           title="{{importConfig?.buttonLabel | translate}}">
     <i class="fas fa-cloud-download-alt fa-fw"></i>
   </button>
diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
index 513c132432..9f6ad28a87 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
+++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
@@ -1,7 +1,9 @@
-<div class="mt-2 mb-2" *ngIf="(collection$ | async)">
-  <span class="text-muted">{{'collection.listelement.badge' | translate}}:
-    <a [routerLink]="['/collections', (collection$ | async)?.id]">
-      {{ dsoNameService.getName(collection$ | async) }}
-    </a>
+@if ((collection$ | async)) {
+  <div class="mt-2 mb-2">
+    <span class="link-muted">{{'collection.listelement.badge' | translate}}:
+      <a [routerLink]="['/collections', (collection$ | async)?.id]">
+        {{ dsoNameService.getName(collection$ | async) }}
+      </a>
     </span>
-</div>
+  </div>
+}
diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
index 9836736b76..ef5a32f5fb 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -35,7 +32,7 @@ import { followLink } from '../../../utils/follow-link-config.model';
   styleUrls: ['./item-collection.component.scss'],
   templateUrl: './item-collection.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, TranslateModule],
+  imports: [RouterLink, AsyncPipe, TranslateModule],
 })
 export class ItemCollectionComponent implements OnInit {
 
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
index 0f9cdf846e..d7b5b71007 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
@@ -1,13 +1,12 @@
 <div class="mt-2 mb-2">
   <span class="text-muted">
     {{'submission.workflow.tasks.generic.submitter' | translate}}:
-    <span class="badge badge-info">
-      <ng-container *ngIf="submitter$ | async as submitter; else noSubmitter">
+    <span class="badge bg-info">
+      @if (submitter$ | async; as submitter) {
         {{ dsoNameService.getName(submitter) }}
-      </ng-container>
-      <ng-template #noSubmitter>
+      } @else {
         {{ 'submitter.empty' | translate }}
-      </ng-template>
+      }
     </span>
   </span>
 </div>
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
index 5f71640359..de44ce0ddb 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -34,7 +31,7 @@ import { followLink } from '../../../utils/follow-link-config.model';
   styleUrls: ['./item-submitter.component.scss'],
   templateUrl: './item-submitter.component.html',
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class ItemSubmitterComponent implements OnInit {
 
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
index a90f375c6a..07f9802df9 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
@@ -1,14 +1,20 @@
 <ng-container *ngVar="selectionService?.isObjectSelected(selectionConfig?.listId, object) | async as checked">
-    <input #selectListItemCheckbox *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
-           [attr.aria-label]="(selectListItemCheckbox.checked ? 'selectable-list-item-control.deselect' : 'selectable-list-item-control.select') | translate"
-           [name]="'checkbox' + index"
-           [id]="'object' + index"
-           [ngModel]="selected$ | async"
-           (ngModelChange)="selectCheckbox($event)">
-    <input *ngIf="!selectionConfig.repeatable" class="form-check-input mt-2" type="radio"
-           [attr.aria-label]="'selectable-list-item-control.select' | translate"
-           [name]="'radio' + index"
-           [id]="'object' + index"
-           [checked]="selected$ | async"
-           (click)="selectRadio(!checked)">
+  <span class="form-check">
+    @if (selectionConfig.repeatable) {
+      <input #selectListItemCheckbox class="form-check-input" type="checkbox"
+        [attr.aria-label]="(selectListItemCheckbox.checked ? 'selectable-list-item-control.deselect' : 'selectable-list-item-control.select') | translate"
+        [name]="'checkbox' + index"
+        [id]="'object' + index"
+        [ngModel]="selected$ | async"
+        (ngModelChange)="selectCheckbox($event)">
+    }
+    @if (!selectionConfig.repeatable) {
+      <input class="form-check-input mt-2" type="radio"
+        [attr.aria-label]="'selectable-list-item-control.select' | translate"
+        [name]="'radio' + index"
+        [id]="'object' + index"
+        [checked]="selected$ | async"
+        (click)="selectRadio(!checked)">
+    }
+  </span>
 </ng-container>
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
index 4a923f7e16..7466da5967 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -27,7 +24,7 @@ import { ListableObject } from '../listable-object.model';
   // styleUrls: ['./selectable-list-item-control.component.scss'],
   templateUrl: './selectable-list-item-control.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, FormsModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, FormsModule, AsyncPipe, TranslateModule],
 })
 /**
  * Component for rendering list item that has a control (checkbox or radio button) because it's selectable
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html
index 9a80421fbf..9a2260f29d 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html
@@ -1,12 +1,11 @@
-<ng-container *ngIf="(workflowitem$ | async) && (item$ | async)">
+@if ((workflowitem$ | async) && (item$ | async)) {
   <ds-item-detail-preview [item]="item$?.value"
-                          [object]="object"
-                          [showSubmitter]="showSubmitter"
-                          [badgeContext]="badgeContext">
+    [object]="object"
+    [showSubmitter]="showSubmitter"
+    [badgeContext]="badgeContext">
   </ds-item-detail-preview>
-
   <ds-claimed-task-actions [item]="item$.value"
-                           [object]="dso"
-                           [workflowitem]="workflowitem$.value"
-                           (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-claimed-task-actions>
-</ng-container>
+    [object]="dso"
+    [workflowitem]="workflowitem$.value"
+  (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-claimed-task-actions>
+}
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
index be3153fc13..482550c3f1 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -46,7 +43,7 @@ import { SearchResultDetailElementComponent } from '../search-result-detail-elem
   styleUrls: ['../search-result-detail-element.component.scss'],
   templateUrl: './claimed-task-search-result-detail-element.component.html',
   standalone: true,
-  imports: [NgIf, ItemDetailPreviewComponent, ClaimedTaskActionsComponent, AsyncPipe],
+  imports: [ItemDetailPreviewComponent, ClaimedTaskActionsComponent, AsyncPipe],
 })
 
 @listableObjectComponent(ClaimedTaskSearchResult, ViewMode.DetailedListElement)
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html
index 2b7e7f8f6e..0fa8da1f72 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.html
@@ -1,10 +1,14 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-  <ng-container *ngIf="item.hasMetadata(metadata)">
-    <span *ngFor="let mdValue of allMetadataValues(metadata); let last=last;">
-      {{mdValue}}<span *ngIf="!last" [innerHTML]="separator"></span>
+  @if (item.hasMetadata(metadata)) {
+    @for (mdValue of allMetadataValues(metadata); track mdValue; let last = $last) {
+      <span>
+        {{mdValue}}@if (!last) {
+        <span [innerHTML]="separator"></span>
+      }
     </span>
-  </ng-container>
-  <ng-container *ngIf="!item.hasMetadata(metadata)">
-    <span class="text-muted">{{(placeholder | translate)}}</span>
-  </ng-container>
+  }
+}
+@if (!item.hasMetadata(metadata)) {
+  <span class="text-muted">{{(placeholder | translate)}}</span>
+}
 </ds-metadata-field-wrapper>
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
index 5bcda37837..2f78f778f8 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -22,8 +19,6 @@ import { SearchResult } from '../../../../search/models/search-result.model';
   standalone: true,
   imports: [
     MetadataFieldWrapperComponent,
-    NgFor,
-    NgIf,
     TranslateModule,
   ],
 })
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
index 781b0387b9..0325b55cda 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -1,58 +1,70 @@
-<div *ngIf="item" class="item-page" @fadeInOut>
-  <ds-badges [object]="item" [context]="badgeContext"></ds-badges>
-  <div *ngIf="item">
-    <ds-item-page-title-field [item]="item">
-    </ds-item-page-title-field>
-    <div class="row mb-1">
-      <div class="col-xs-12 col-md-4">
-        <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-          <ds-thumbnail [thumbnail]="item?.thumbnail | async"></ds-thumbnail>
-        </ds-metadata-field-wrapper>
-        <ng-container *ngVar="(getFiles() | async) as bitstreams">
-          <ds-metadata-field-wrapper [label]="('item.page.files' | translate)">
-            <div *ngIf="bitstreams?.length > 0" class="file-section">
-              <button class="btn btn-link" *ngFor="let file of bitstreams; let last=last;" (click)="downloadBitstreamFile(file?.uuid)">
-                <span>{{ dsoNameService.getName(file) }}</span>
-                <span>({{(file?.sizeBytes) | dsFileSize }})</span>
-                <span *ngIf="!last" innerHTML="{{separator}}"></span>
-              </button>
+@if (item) {
+  <div class="item-page" @fadeInOut>
+    <ds-badges [object]="item" [context]="badgeContext"></ds-badges>
+    @if (item) {
+      <div>
+        <ds-item-page-title-field [item]="item">
+        </ds-item-page-title-field>
+        <div class="row mb-1">
+          <div class="col-xs-12 col-md-4">
+            <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
+              <ds-thumbnail [thumbnail]="item?.thumbnail | async"></ds-thumbnail>
+            </ds-metadata-field-wrapper>
+            @if ((bitstreams$ | async); as bitstreams) {
+              <ds-metadata-field-wrapper [label]="('item.page.files' | translate)">
+                @if (bitstreams?.length > 0) {
+                  <div class="file-section">
+                    @for (file of bitstreams; track file; let last = $last) {
+                      <button class="btn btn-link" (click)="downloadBitstreamFile(file?.uuid)">
+                        <span>{{ dsoNameService.getName(file) }}</span>
+                        <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+                        @if (!last) {
+                          <span innerHTML="{{separator}}"></span>
+                        }
+                      </button>
+                    }
+                  </div>
+                }
+                @if (bitstreams?.length === 0) {
+                  <span class="text-muted">{{('mydspace.results.no-files' | translate)}}</span>
+                }
+              </ds-metadata-field-wrapper>
+            }
+            <ds-item-detail-preview-field [item]="item"
+              [object]="object"
+              [label]="('item.page.date' | translate)"
+              [metadata]="'dc.date.issued'"
+              [separator]="separator"
+            [placeholder]="('mydspace.results.no-date' | translate)"></ds-item-detail-preview-field>
+            <ds-item-detail-preview-field [item]="item"
+              [object]="object"
+              [label]="('item.page.author' | translate)"
+              [metadata]="['dc.contributor', 'dc.creator', 'dc.contributor.*']"
+              [separator]="separator"
+            [placeholder]="('mydspace.results.no-authors' | translate)"></ds-item-detail-preview-field>
+          </div>
+          <div class="col-xs-12 col-md-6">
+            <ds-item-detail-preview-field [item]="item"
+              [object]="object"
+              [label]="('item.page.abstract' | translate)"
+              [metadata]="'dc.description.abstract'"
+              [separator]="separator"
+            [placeholder]="('mydspace.results.no-abstract' | translate)"></ds-item-detail-preview-field>
+            <ds-item-detail-preview-field [item]="item"
+              [object]="object"
+              [label]="('item.page.uri' | translate)"
+              [metadata]="'dc.identifier.uri'"
+              [separator]="separator"
+            [placeholder]="('mydspace.results.no-uri' | translate)"></ds-item-detail-preview-field>
+            <div>
+              <ng-content></ng-content>
             </div>
-            <ng-container *ngIf="bitstreams?.length === 0">
-              <span class="text-muted">{{('mydspace.results.no-files' | translate)}}</span>
-            </ng-container>
-          </ds-metadata-field-wrapper>
-        </ng-container>
-        <ds-item-detail-preview-field [item]="item"
-                                      [object]="object"
-                                      [label]="('item.page.date' | translate)"
-                                      [metadata]="'dc.date.issued'"
-                                      [separator]="separator"
-                                      [placeholder]="('mydspace.results.no-date' | translate)"></ds-item-detail-preview-field>
-        <ds-item-detail-preview-field [item]="item"
-                                      [object]="object"
-                                      [label]="('item.page.author' | translate)"
-                                      [metadata]="['dc.contributor', 'dc.creator', 'dc.contributor.*']"
-                                      [separator]="separator"
-                                      [placeholder]="('mydspace.results.no-authors' | translate)"></ds-item-detail-preview-field>
-      </div>
-      <div class="col-xs-12 col-md-6">
-        <ds-item-detail-preview-field [item]="item"
-                                      [object]="object"
-                                      [label]="('item.page.abstract' | translate)"
-                                      [metadata]="'dc.description.abstract'"
-                                      [separator]="separator"
-                                      [placeholder]="('mydspace.results.no-abstract' | translate)"></ds-item-detail-preview-field>
-        <ds-item-detail-preview-field [item]="item"
-                                      [object]="object"
-                                      [label]="('item.page.uri' | translate)"
-                                      [metadata]="'dc.identifier.uri'"
-                                      [separator]="separator"
-                                      [placeholder]="('mydspace.results.no-uri' | translate)"></ds-item-detail-preview-field>
-        <div>
-          <ng-content></ng-content>
+          </div>
         </div>
       </div>
-    </div>
+    }
   </div>
-</div>
-<ds-item-submitter *ngIf="showSubmitter" [object]="object.indexableObject"></ds-item-submitter>
+}
+@if (showSubmitter) {
+  <ds-item-submitter [object]="object.indexableObject"></ds-item-submitter>
+}
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
index c828fdcdb2..cead47a179 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.ts
@@ -1,11 +1,9 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
+  OnChanges,
+  SimpleChanges,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -22,6 +20,7 @@ import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/oper
 import { ThemedItemPageTitleFieldComponent } from '../../../../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
 import { ThemedThumbnailComponent } from '../../../../thumbnail/themed-thumbnail.component';
 import { fadeInOut } from '../../../animations/fade';
+import { hasValue } from '../../../empty.util';
 import { MetadataFieldWrapperComponent } from '../../../metadata-field-wrapper/metadata-field-wrapper.component';
 import { ThemedBadgesComponent } from '../../../object-collection/shared/badges/themed-badges.component';
 import { ItemSubmitterComponent } from '../../../object-collection/shared/mydspace-item-submitter/item-submitter.component';
@@ -39,9 +38,9 @@ import { ThemedItemDetailPreviewFieldComponent } from './item-detail-preview-fie
   templateUrl: './item-detail-preview.component.html',
   animations: [fadeInOut],
   standalone: true,
-  imports: [NgIf, ThemedBadgesComponent, ThemedItemPageTitleFieldComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, VarDirective, NgFor, ThemedItemDetailPreviewFieldComponent, ItemSubmitterComponent, AsyncPipe, FileSizePipe, TranslateModule],
+  imports: [ThemedBadgesComponent, ThemedItemPageTitleFieldComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, VarDirective, ThemedItemDetailPreviewFieldComponent, ItemSubmitterComponent, AsyncPipe, FileSizePipe, TranslateModule],
 })
-export class ItemDetailPreviewComponent {
+export class ItemDetailPreviewComponent implements OnChanges {
   /**
    * The item to display
    */
@@ -80,6 +79,12 @@ export class ItemDetailPreviewComponent {
   ) {
   }
 
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasValue(changes.item)) {
+      this.bitstreams$ = this.getFiles();
+    }
+  }
+
   /**
    * Perform bitstream download
    */
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html
index d2a15b016f..9d5baec37c 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html
@@ -1,12 +1,11 @@
-<ng-container *ngIf="(workflowitem$ | async) && (item$ | async)">
+@if ((workflowitem$ | async) && (item$ | async)) {
   <ds-item-detail-preview [item]="item$?.value"
-                          [object]="object"
-                          [showSubmitter]="showSubmitter"
-                          [badgeContext]="badgeContext"></ds-item-detail-preview>
-
+    [object]="object"
+    [showSubmitter]="showSubmitter"
+  [badgeContext]="badgeContext"></ds-item-detail-preview>
   <ds-pool-task-actions [item]="item$.value"
-                        [object]="dso"
-                        [workflowitem]="workflowitem$.value"
-                        (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
-</ng-container>
+    [object]="dso"
+    [workflowitem]="workflowitem$.value"
+  (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
+}
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
index 80341b5137..7b0884f2ce 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -46,7 +43,7 @@ import { SearchResultDetailElementComponent } from '../search-result-detail-elem
   styleUrls: ['../search-result-detail-element.component.scss'],
   templateUrl: './pool-search-result-detail-element.component.html',
   standalone: true,
-  imports: [NgIf, ItemDetailPreviewComponent, PoolTaskActionsComponent, AsyncPipe],
+  imports: [ItemDetailPreviewComponent, PoolTaskActionsComponent, AsyncPipe],
 })
 
 @listableObjectComponent(PoolTaskSearchResult, ViewMode.DetailedListElement)
diff --git a/src/app/shared/object-detail/object-detail.component.html b/src/app/shared/object-detail/object-detail.component.html
index c57d5344cd..ad9f0bce0e 100644
--- a/src/app/shared/object-detail/object-detail.component.html
+++ b/src/app/shared/object-detail/object-detail.component.html
@@ -14,16 +14,24 @@
   (paginationChange)="onPaginationChange($event)"
   (prev)="goPrev()"
   (next)="goNext()">
-    <div class="row mt-2" *ngIf="objects?.hasSucceeded" @fadeIn>
-      <div class="col"
-           *ngFor="let object of objects?.payload?.page">
-        <ds-listable-object-component-loader [object]="object"
-                                             [viewMode]="viewMode"
-                                             [context]="context"
-                                             [showThumbnails]="showThumbnails"
-                                             (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
-      </div>
+  @if (objects?.hasSucceeded) {
+    <div class="row mt-2" @fadeIn>
+      @for (object of objects?.payload?.page; track object) {
+        <div class="col"
+          >
+          <ds-listable-object-component-loader [object]="object"
+            [viewMode]="viewMode"
+            [context]="context"
+            [showThumbnails]="showThumbnails"
+          (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
+        </div>
+      }
     </div>
-  <ds-error *ngIf="objects.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
-  <ds-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-loading>
+  }
+  @if (objects.hasFailed) {
+    <ds-error message="{{'error.objects' | translate}}"></ds-error>
+  }
+  @if (objects.isLoading) {
+    <ds-loading message="{{'loading.objects' | translate}}"></ds-loading>
+  }
 </ds-pagination>
diff --git a/src/app/shared/object-detail/object-detail.component.ts b/src/app/shared/object-detail/object-detail.component.ts
index 0c3098e941..01e1795fcb 100644
--- a/src/app/shared/object-detail/object-detail.component.ts
+++ b/src/app/shared/object-detail/object-detail.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   ChangeDetectionStrategy,
   Component,
@@ -40,7 +37,7 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
   templateUrl: './object-detail.component.html',
   animations: [fadeIn],
   standalone: true,
-  imports: [PaginationComponent, NgIf, NgFor, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, TranslateModule],
+  imports: [PaginationComponent, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, TranslateModule],
 })
 export class ObjectDetailComponent {
   /**
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
index 6b5cb23252..e039584583 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
@@ -1,17 +1,25 @@
 <div class="card">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+      <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top">
+      <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </span>
+  }
   <div class="card-body">
     <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
-    <p *ngIf="object.shortDescription" class="card-text">{{object.shortDescription}}</p>
-    <div *ngIf="linkType !== linkTypes.None" class="text-center">
-      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-    </div>
+    @if (object.shortDescription) {
+      <p class="card-text">{{object.shortDescription}}</p>
+    }
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
   </div>
 </div>
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
index 178c1bd5b9..92df8ae9af 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -30,7 +27,7 @@ import { followLink } from '../../utils/follow-link-config.model';
   styleUrls: ['./collection-grid-element.component.scss'],
   templateUrl: './collection-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, AsyncPipe, TranslateModule],
 })
 @listableObjectComponent(Collection, ViewMode.GridElement)
 export class CollectionGridElementComponent extends AbstractListableElementComponent<
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
index c00c26d3fe..53928cbed4 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
@@ -1,17 +1,25 @@
 <div class="card">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+      <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top">
+      <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </span>
+  }
   <div class="card-body">
     <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
-    <p *ngIf="object.shortDescription" class="card-text">{{object.shortDescription}}</p>
-    <div *ngIf="linkType !== linkTypes.None" class="text-center">
-      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-    </div>
+    @if (object.shortDescription) {
+      <p class="card-text">{{object.shortDescription}}</p>
+    }
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
   </div>
 </div>
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
index c134af774e..2b4a028dc3 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -30,7 +27,7 @@ import { followLink } from '../../utils/follow-link-config.model';
   styleUrls: ['./community-grid-element.component.scss'],
   templateUrl: './community-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, AsyncPipe, TranslateModule],
 })
 
 @listableObjectComponent(Community, ViewMode.GridElement)
diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html
index 014d31fb90..1d6727ff4b 100644
--- a/src/app/shared/object-grid/object-grid.component.html
+++ b/src/app/shared/object-grid/object-grid.component.html
@@ -15,19 +15,29 @@
   (prev)="goPrev()"
   (next)="goNext()"
   >
-    <div class="card-columns row" *ngIf="objects?.hasSucceeded">
-      <div class="card-column col col-sm-6 col-lg-4" *ngFor="let column of (columns$ | async)" @fadeIn>
-        <div class="card-element" *ngFor="let object of column" [attr.data-test]="'grid-object' | dsBrowserOnly">
-          <ds-listable-object-component-loader [object]="object"
-                                               [viewMode]="viewMode"
-                                               [context]="context"
-                                               [showThumbnails]="showThumbnails"
-                                               [linkType]="linkType"></ds-listable-object-component-loader>
+  @if (objects?.hasSucceeded) {
+    <div class="card-columns row">
+      @for (column of (columns$ | async); track column) {
+        <div class="card-column col col-sm-6 col-lg-4" @fadeIn>
+          @for (object of column; track object) {
+            <div class="card-element" [attr.data-test]="'grid-object' | dsBrowserOnly">
+              <ds-listable-object-component-loader [object]="object"
+                [viewMode]="viewMode"
+                [context]="context"
+                [showThumbnails]="showThumbnails"
+              [linkType]="linkType"></ds-listable-object-component-loader>
+            </div>
+          }
         </div>
-      </div>
+      }
     </div>
-  <ds-error *ngIf="objects.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
-  <ds-loading *ngIf="objects.isLoading" message="{{'loading.objects' | translate}}"></ds-loading>
+  }
+  @if (objects.hasFailed) {
+    <ds-error message="{{'error.objects' | translate}}"></ds-error>
+  }
+  @if (objects.isLoading) {
+    <ds-loading message="{{'loading.objects' | translate}}"></ds-loading>
+  }
 </ds-pagination>
 
 
diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts
index f4b23340e8..25e42d5231 100644
--- a/src/app/shared/object-grid/object-grid.component.ts
+++ b/src/app/shared/object-grid/object-grid.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -58,7 +54,7 @@ import { BrowserOnlyPipe } from '../utils/browser-only.pipe';
   templateUrl: './object-grid.component.html',
   animations: [fadeIn],
   standalone: true,
-  imports: [PaginationComponent, NgIf, NgFor, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [PaginationComponent, ListableObjectComponentLoaderComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 
 export class ObjectGridComponent implements OnInit {
@@ -184,7 +180,7 @@ export class ObjectGridComponent implements OnInit {
   @Output() next = new EventEmitter<boolean>();
 
   data: any = {};
-  columns$: Observable<ListableObject[]>;
+  columns$: Observable<ListableObject[][]>;
 
   constructor(private hostWindow: HostWindowService) {
     this._objects$ = new BehaviorSubject(undefined);
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
index 4a097b46dc..cb24748133 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
@@ -1,19 +1,29 @@
 <div class="card">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+      <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top">
+      <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </span>
+  }
   <div class="card-body">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
     <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
-    <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
-    <div *ngIf="linkType !== linkTypes.None" class="text-center">
-      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-    </div>
+    @if (dso.shortDescription) {
+      <p class="card-text">{{dso.shortDescription}}</p>
+    }
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
   </div>
   <ng-content></ng-content>
 </div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
index 8700541a6c..0e797175ba 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -31,7 +28,7 @@ import { SearchResultGridElementComponent } from '../search-result-grid-element.
   styleUrls: ['../search-result-grid-element.component.scss', 'collection-search-result-grid-element.component.scss'],
   templateUrl: 'collection-search-result-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component representing a grid element for a collection search result
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
index 63b6139613..d98b8a6052 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
@@ -1,19 +1,29 @@
 <div class="card">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-        <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-        </ds-thumbnail>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+      <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
     </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
-  </span>
-    <div class="card-body">
-        <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-        <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
-        <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
-        <div *ngIf="linkType !== linkTypes.None" class="text-center">
-            <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-        </div>
-    </div>
-    <ng-content></ng-content>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top">
+      <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+      </ds-thumbnail>
+    </span>
+  }
+  <div class="card-body">
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
+    <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
+    @if (dso.shortDescription) {
+      <p class="card-text">{{dso.shortDescription}}</p>
+    }
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
+  </div>
+  <ng-content></ng-content>
 </div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
index e83182b33a..9845ec10d5 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -34,7 +31,7 @@ import { SearchResultGridElementComponent } from '../search-result-grid-element.
   ],
   templateUrl: 'community-search-result-grid-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, AsyncPipe, TranslateModule],
 })
 /**
  * Component representing a grid element for a community search result
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index 8d42c8536a..ca001c348c 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -1,44 +1,60 @@
-  <div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
-    <div class="position-absolute ml-1">
-        <ng-content></ng-content>
-    </div>
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-        class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
-        <div>
-              <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-              </ds-thumbnail>
-        </div>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
-        <div>
-              <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-              </ds-thumbnail>
-        </div>
-    </span>
-    <div class="card-body">
-        <ds-badges *ngIf="showLabel" [object]="dso" [context]="context" [showAccessStatus]="true"></ds-badges>
-        <ds-truncatable [id]="dso.id">
-            <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
-                <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
-            </ds-truncatable-part>
-            <ds-truncatable-part [id]="dso.id" [minLines]="1" *ngIf="dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])">
-                <p class="item-authors card-text text-muted">
-                    <span *ngIf="dso.hasMetadata('dc.date.issued')" class="item-date">{{firstMetadataValue('dc.date.issued')}}</span>
-                    <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);">,
-                        <span [innerHTML]="author"></span>
-                    </span>
-                </p>
-            </ds-truncatable-part>
-            <ds-truncatable-part *ngIf="dso.hasMetadata('dc.description.abstract')" [id]="dso.id" [minLines]="3">
-                <p class="item-abstract card-text">
-                    <span [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
-                </p>
-            </ds-truncatable-part>
-        </ds-truncatable>
-        <div *ngIf="linkType !== linkTypes.None" class="text-center">
-            <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
-                class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
-        </div>
-    </div>
+<div class="card" [@focusShadow]="(isCollapsed$ | async)?'blur':'focus'">
+  <div class="position-absolute ms-1">
     <ng-content></ng-content>
   </div>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+      class="card-img-top full-width" [attr.title]="'search.results.view-result' | translate">
+      <div>
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-thumbnail>
+      </div>
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="card-img-top full-width">
+      <div>
+        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-thumbnail>
+      </div>
+    </span>
+  }
+  <div class="card-body">
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context" [showAccessStatus]="true"></ds-badges>
+    }
+    <ds-truncatable [id]="dso.id">
+      <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
+        <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
+      </ds-truncatable-part>
+      @if (dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])) {
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <p class="item-authors card-text text-muted">
+            @if (dso.hasMetadata('dc.date.issued')) {
+              <span class="item-date">{{firstMetadataValue('dc.date.issued')}}</span>
+            }
+            @for (author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); track author) {
+              <span>,
+                <span [innerHTML]="author"></span>
+              </span>
+            }
+          </p>
+        </ds-truncatable-part>
+      }
+      @if (dso.hasMetadata('dc.description.abstract')) {
+        <ds-truncatable-part [id]="dso.id" [minLines]="3">
+          <p class="item-abstract card-text">
+            <span [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
+          </p>
+        </ds-truncatable-part>
+      }
+    </ds-truncatable>
+    @if (linkType !== linkTypes.None) {
+      <div class="text-center">
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[itemPageRoute]"
+        class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+      </div>
+    }
+  </div>
+  <ng-content></ng-content>
+</div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index a0c8ec84ce..02b48d7e78 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -33,7 +29,7 @@ import { SearchResultGridElementComponent } from '../../search-result-grid-eleme
   templateUrl: './item-search-result-grid-element.component.html',
   animations: [focusShadow],
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe, TranslateModule],
+  imports: [RouterLink, ThemedThumbnailComponent, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Publication
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
index 757135d809..e0bae4ec57 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html
@@ -1,10 +1,14 @@
 <div class="d-flex flex-row">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[]" [queryParams]="queryParams$ | async" [queryParamsHandling]="'merge'" class="lead">
-        {{object.value}}
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="[]" [queryParams]="queryParams$ | async" [queryParamsHandling]="'merge'" class="lead">
+      {{object.value}}
     </a>
-    <span *ngIf="linkType === linkTypes.None" class="lead">
-        {{object.value}}
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="lead">
+      {{object.value}}
     </span>
-    <span class="pr-2">&nbsp;</span>
-    <span class="badge badge-pill badge-secondary align-self-center">{{object.count}}</span>
+  }
+  <span class="pe-2">&nbsp;</span>
+  <span class="badge rounded-pill bg-secondary align-self-center ps-2 pe-2">{{object.count}}</span>
 </div>
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
index 6a5a3bebb5..d3379aedc2 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -27,7 +24,7 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
   styleUrls: ['./browse-entry-list-element.component.scss'],
   templateUrl: './browse-entry-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe],
+  imports: [RouterLink, AsyncPipe],
 })
 
 /**
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
index 1c4f68fbcc..74f77225c1 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.html
@@ -1,13 +1,21 @@
 <div class="d-flex flex-row">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + object.id]" class="lead">
-    {{ dsoNameService.getName(object) }}
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="lead">
-    {{ dsoNameService.getName(object) }}
-  </span>
-  <span class="pr-2">&nbsp;</span>
-  <span *ngIf="object.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-self-center archived-items-lead">{{object.archivedItemsCount}}</span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + object.id]" class="lead">
+      {{ dsoNameService.getName(object) }}
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="lead">
+      {{ dsoNameService.getName(object) }}
+    </span>
+  }
+  <span class="pe-2">&nbsp;</span>
+  @if (object.archivedItemsCount >= 0) {
+    <span class="badge rounded-pill bg-secondary align-self-center archived-items-lead ps-2 pe-2">{{object.archivedItemsCount}}</span>
+  }
 </div>
-<div *ngIf="object.shortDescription" class="text-muted abstract-text">
+@if (object.shortDescription) {
+  <div class="text-muted abstract-text">
     {{object.shortDescription}}
-</div>
+  </div>
+}
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index c03598d954..edfecd2dda 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -12,7 +12,7 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
   styleUrls: ['./collection-list-element.component.scss'],
   templateUrl: './collection-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [RouterLink],
 })
 /**
  * Component representing list element for a collection
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.html b/src/app/shared/object-list/community-list-element/community-list-element.component.html
index d63abd9672..3c7faf3dab 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.html
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.html
@@ -1,13 +1,21 @@
 <div class="d-flex flex-row">
-  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/' + object.id]" class="lead">
-    {{ dsoNameService.getName(object) }}
-  </a>
-  <span *ngIf="linkType === linkTypes.None" class="lead">
-    {{ dsoNameService.getName(object) }}
-  </span>
-  <span class="pr-2">&nbsp;</span>
-  <span *ngIf="object.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-self-center archived-items-lead">{{object.archivedItemsCount}}</span>
+  @if (linkType !== linkTypes.None) {
+    <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/' + object.id]" class="lead">
+      {{ dsoNameService.getName(object) }}
+    </a>
+  }
+  @if (linkType === linkTypes.None) {
+    <span class="lead">
+      {{ dsoNameService.getName(object) }}
+    </span>
+  }
+  <span class="pe-2">&nbsp;</span>
+  @if (object.archivedItemsCount >= 0) {
+    <span class="badge rounded-pill bg-secondary align-self-center archived-items-lead ps-2 pe-2">{{object.archivedItemsCount}}</span>
+  }
 </div>
-<div *ngIf="object.shortDescription" class="text-muted abstract-text">
+@if (object.shortDescription) {
+  <div class="text-muted abstract-text">
     {{object.shortDescription}}
-</div>
+  </div>
+}
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
index adde4420ec..c4ff30e268 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -13,7 +13,7 @@ import { AbstractListableElementComponent } from '../../object-collection/shared
   styleUrls: ['./community-list-element.component.scss'],
   templateUrl: './community-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [RouterLink],
 })
 /**
  * Component representing a list element for a community
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.html b/src/app/shared/object-list/identifier-data/identifier-data.component.html
index ec1ac6d644..573b048b42 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.component.html
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.html
@@ -1,3 +1,5 @@
-<div *ngIf="identifiers$ | async as identifiers">
-  <span class="">{{ identifiers[0].value | translate }}</span>
-</div>
+@if (identifiers$ | async; as identifiers) {
+  <div>
+    <span class="">{{ identifiers[0].value | translate }}</span>
+  </div>
+}
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
index af658c6cf2..9c970c2934 100644
--- a/src/app/shared/object-list/identifier-data/identifier-data.component.ts
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -22,7 +19,6 @@ import { IdentifierData } from './identifier-data.model';
   imports: [
     TranslateModule,
     AsyncPipe,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
index bdf14463ad..7777f0d26f 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
@@ -1,9 +1,11 @@
 <div>
-  <a *ngIf="(mdRepresentation.representationType==='browse_link')"
-     target="_blank" class="dont-break-out"
-     [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
-     [queryParams]="getQueryParams()">
-    {{mdRepresentation.getValue()}}
-  </a>
+  @if ((mdRepresentation.representationType==='browse_link')) {
+    <a
+      target="_blank" class="dont-break-out"
+      [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
+      [queryParams]="getQueryParams()">
+      {{mdRepresentation.getValue()}}
+    </a>
+  }
   <b>(new browse link page)</b>
 </div>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
index 85013671fb..0c4b007bf0 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -9,7 +9,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-represen
   selector: 'ds-browse-link-metadata-list-element',
   templateUrl: './browse-link-metadata-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [RouterLink],
 })
 /**
  * A component for displaying MetadataRepresentation objects in the form of plain text
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
index f88347a8b7..ecaec7ff64 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
@@ -1,17 +1,25 @@
 <div>
   <!-- Because this template is used by default, we will additionally test for representation type and display accordingly -->
-  <span *ngIf="(mdRepresentation.representationType==='plain_text') && !isLink()" class="dont-break-out">
-    {{mdRepresentation.getValue()}}
-  </span>
-  <a *ngIf="(mdRepresentation.representationType==='plain_text') && isLink()" class="dont-break-out"
-  target="_blank" [href]="mdRepresentation.getValue()">
-    {{mdRepresentation.getValue()}}
-  </a>
-  <span *ngIf="(mdRepresentation.representationType==='authority_controlled')" class="dont-break-out">{{mdRepresentation.getValue()}}</span>
-  <a *ngIf="(mdRepresentation.representationType==='browse_link')"
-     class="dont-break-out ds-browse-link"
-     [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
-     [queryParams]="getQueryParams()">
-    {{mdRepresentation.getValue()}}
-  </a>
+  @if ((mdRepresentation.representationType==='plain_text') && !isLink()) {
+    <span class="dont-break-out">
+      {{mdRepresentation.getValue()}}
+    </span>
+  }
+  @if ((mdRepresentation.representationType==='plain_text') && isLink()) {
+    <a class="dont-break-out"
+      target="_blank" [href]="mdRepresentation.getValue()">
+      {{mdRepresentation.getValue()}}
+    </a>
+  }
+  @if ((mdRepresentation.representationType==='authority_controlled')) {
+    <span class="dont-break-out">{{mdRepresentation.getValue()}}</span>
+  }
+  @if ((mdRepresentation.representationType==='browse_link')) {
+    <a
+      class="dont-break-out ds-browse-link"
+      [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
+      [queryParams]="getQueryParams()">
+      {{mdRepresentation.getValue()}}
+    </a>
+  }
 </div>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
index 6eae7507e8..4976029573 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -9,7 +9,7 @@ import { MetadataRepresentationListElementComponent } from '../metadata-represen
   selector: 'ds-plain-text-metadata-list-element',
   templateUrl: './plain-text-metadata-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [RouterLink],
 })
 /**
  * A component for displaying MetadataRepresentation objects in the form of plain text
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html
index f71bc136a0..5acf7c7d3f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html
@@ -1,10 +1,12 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-success w-100" role="alert">
     <h4 class="alert-heading mb-0">{{ 'claimed-approved-search-result-list-element.title' | translate }}</h4>
-    <ds-item-list-preview *ngIf="workflowitem"
-                          [item]="(workflowitem?.item | async)?.payload"
-                          [object]="object"
-                          [badgeContext]="badgeContext"
-                          [showSubmitter]="showSubmitter"></ds-item-list-preview>
+    @if (workflowitem) {
+      <ds-item-list-preview
+        [item]="(workflowitem?.item | async)?.payload"
+        [object]="object"
+        [badgeContext]="badgeContext"
+      [showSubmitter]="showSubmitter"></ds-item-list-preview>
+    }
   </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
index f94effe2a4..b1d8afd365 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -38,7 +35,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './claimed-approved-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedApprovedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedApprovedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html
index 836df02354..e3501b0543 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html
@@ -1,10 +1,12 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-secondary w-100" role="alert">
     <h4 class="alert-heading mb-0">{{ 'claimed-declined-search-result-list-element.title' | translate }}</h4>
-    <ds-item-list-preview *ngIf="workflowitem"
-                          [item]="(workflowitem?.item | async)?.payload"
-                          [object]="object"
-                          [badgeContext]="badgeContext"
-                          [showSubmitter]="showSubmitter"></ds-item-list-preview>
+    @if (workflowitem) {
+      <ds-item-list-preview
+        [item]="(workflowitem?.item | async)?.payload"
+        [object]="object"
+        [badgeContext]="badgeContext"
+      [showSubmitter]="showSubmitter"></ds-item-list-preview>
+    }
   </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
index d69b9ecda0..6f2529b45f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -38,7 +35,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './claimed-declined-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedDeclinedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedDeclinedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
index a10f511135..ea877eaf9e 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
@@ -1,11 +1,13 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-warning w-100" role="alert">
     <h4 class="alert-heading mb-0">{{ 'claimed-declined-task-search-result-list-element.title' | translate }}</h4>
-    <ds-item-list-preview *ngIf="workflowitem"
-                                 [item]="(workflowitem?.item | async)?.payload"
-                                 [object]="object"
-                                 [badgeContext]="badgeContext"
-                                 [showSubmitter]="showSubmitter">
-    </ds-item-list-preview>
+    @if (workflowitem) {
+      <ds-item-list-preview
+        [item]="(workflowitem?.item | async)?.payload"
+        [object]="object"
+        [badgeContext]="badgeContext"
+        [showSubmitter]="showSubmitter">
+      </ds-item-list-preview>
+    }
   </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
index e7e72189f8..1d3b99c37f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -38,7 +35,7 @@ import { ThemedItemListPreviewComponent } from '../../item-list-preview/themed-i
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './claimed-declined-task-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedDeclinedTaskTaskSearchResult, ViewMode.ListElement)
 export class ClaimedDeclinedTaskSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
index 8f85b5491c..4a4889c31d 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
@@ -1,26 +1,28 @@
-<ng-container *ngIf="(workflowitem$ | async) && (item$ | async)">
+@if ((workflowitem$ | async) && (item$ | async)) {
   <ds-item-list-preview [item]="item$.value"
-                               [object]="object"
-                               [showSubmitter]="showSubmitter"
-                               [badgeContext]="badgeContext"
-                               [workflowItem]="workflowitem$.value"></ds-item-list-preview>
+    [object]="object"
+    [showSubmitter]="showSubmitter"
+    [badgeContext]="badgeContext"
+  [workflowItem]="workflowitem$.value"></ds-item-list-preview>
   <!-- Display duplicate alert, if feature enabled and duplicates detected -->
   <ng-container *ngVar="(duplicates$|async)?.length as duplicateCount">
-    <div [ngClass]="'row'" *ngIf="duplicateCount > 0">
-      <div [ngClass]="'col-2'"></div>
-      <div [ngClass]="'col-10'">
-        <div class="d-flex alert alert-warning w-100">
-          {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+    @if (duplicateCount > 0) {
+      <div [ngClass]="'row'">
+        <div [ngClass]="'col-2'"></div>
+        <div [ngClass]="'col-10'">
+          <div class="d-flex alert alert-warning w-100">
+            {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+          </div>
         </div>
       </div>
-    </div>
+    }
   </ng-container>
   <div class="row">
-    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
       <ds-claimed-task-actions [item]="item$.value"
-                               [object]="dso"
-                               [workflowitem]="workflowitem$.value"
-                               (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-claimed-task-actions>
+        [object]="dso"
+        [workflowitem]="workflowitem$.value"
+      (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-claimed-task-actions>
     </div>
   </div>
-</ng-container>
+}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
index 293ee040e3..d3adc9b3ab 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -59,7 +58,7 @@ import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './claimed-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, NgClass, ClaimedTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, NgClass, ClaimedTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 @listableObjectComponent(ClaimedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit, OnDestroy {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
index 035a7ff9f5..b005af46ec 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html
@@ -1,46 +1,59 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <ds-thumbnail [thumbnail]="item?.thumbnail | async" [limitWidth]="true">
-    </ds-thumbnail>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      <ds-thumbnail [thumbnail]="item?.thumbnail | async" [limitWidth]="true">
+      </ds-thumbnail>
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <div *ngIf="item" @fadeInOut>
-      <div class="d-flex">
-        <ds-badges [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-badges>
-      </div>
-      <ds-truncatable [id]="item.id">
-        <h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
-        <div>
-          <span class="text-muted">
-            <ds-truncatable-part [id]="item.id" [minLines]="1">
-              (<span *ngIf="item.hasMetadata('dc.publisher')" class="item-list-publisher"
+    @if (item) {
+      <div @fadeInOut>
+        <div class="d-flex">
+          <ds-badges [object]="item" [context]="badgeContext" [showAccessStatus]="true"></ds-badges>
+        </div>
+        <ds-truncatable [id]="item.id">
+          <h2 [innerHTML]="dsoTitle" [ngClass]="{'lead': true,'text-muted': !item.firstMetadataValue('dc.title')}"></h2>
+          <div>
+            <span class="text-muted">
+              <ds-truncatable-part [id]="item.id" [minLines]="1">
+                (@if (item.hasMetadata('dc.publisher')) {
+                <span class="item-list-publisher"
                 [innerHTML]="item.firstMetadataValue('dc.publisher') + ', '"></span>
+              }
               <span class="item-list-date"
-                [innerHTML]="item.firstMetadataValue('dc.date.issued') || ('mydspace.results.no-date' | translate)"></span>)
-              <span *ngIf="item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);"
-                class="item-list-authors">
+              [innerHTML]="item.firstMetadataValue('dc.date.issued') || ('mydspace.results.no-date' | translate)"></span>)
+              @if (item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);) {
                 <span
-                  *ngIf="item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length === 0">{{'mydspace.results.no-authors'
-                 | translate}}</span>
-                <span
-                  *ngFor="let author of item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
-                  <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
-                  <span *ngIf="!last">; </span>
+                  class="item-list-authors">
+                  @if (item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length === 0) {
+                    <span
+                      >{{'mydspace.results.no-authors'
+                    | translate}}</span>
+                  }
+                  @for (author of item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); track author; let last = $last) {
+                    <span
+                      >
+                      <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
+                      @if (!last) {
+                        <span>; </span>
+                      }
+                    </span>
+                  }
                 </span>
-              </span>
-
+              }
             </ds-truncatable-part>
           </span>
-
           <ds-truncatable-part [id]="item.id" [minLines]="1" class="item-list-abstract">
             <span [ngClass]="{'text-muted': !item.firstMetadataValue('dc.description.abstract')}"
-              [innerHTML]="(item.firstMetadataValue('dc.description.abstract')) || ('mydspace.results.no-abstract' | translate)"></span>
+            [innerHTML]="(item.firstMetadataValue('dc.description.abstract')) || ('mydspace.results.no-abstract' | translate)"></span>
           </ds-truncatable-part>
-
         </div>
       </ds-truncatable>
-      <ds-item-submitter *ngIf="showSubmitter" [object]="object.indexableObject"></ds-item-submitter>
+      @if (showSubmitter) {
+        <ds-item-submitter [object]="object.indexableObject"></ds-item-submitter>
+      }
       <ds-item-collection [object]="object.indexableObject"></ds-item-collection>
     </div>
-  </div>
+  }
+</div>
 </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 583b857063..9ffb1000b6 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -43,8 +41,6 @@ import { TruncatablePartComponent } from '../../../truncatable/truncatable-part/
     ItemCollectionComponent,
     ItemSubmitterComponent,
     NgClass,
-    NgFor,
-    NgIf,
     ThemedBadgesComponent,
     ThemedThumbnailComponent,
     TranslateModule,
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
index 5600ccd920..9d6070c287 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
@@ -3,7 +3,7 @@
                       [badgeContext]="badgeContext"></ds-item-list-preview>
 
 <div class="row">
-  <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
+  <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
     <ds-item-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-item-actions>
   </div>
 </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index d17bebe2d9..14c39dfa6c 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -1,29 +1,29 @@
-<ng-container *ngIf="(workflowitem$ | async) && (item$ | async)">
+@if ((workflowitem$ | async) && (item$ | async)) {
   <ds-item-list-preview [item]="item$.value"
-                               [object]="object"
-                               [showSubmitter]="showSubmitter"
-                               [badgeContext]="badgeContext"
-                               [workflowItem]="workflowitem$.value"></ds-item-list-preview>
-
+    [object]="object"
+    [showSubmitter]="showSubmitter"
+    [badgeContext]="badgeContext"
+  [workflowItem]="workflowitem$.value"></ds-item-list-preview>
   <!-- Display duplicate alert, if feature enabled and duplicates detected -->
   <ng-container *ngVar="(duplicates$|async)?.length as duplicateCount">
-    <div [ngClass]="'row'" *ngIf="duplicateCount > 0">
-      <div [ngClass]="'col-2'"></div>
-      <div [ngClass]="'col-10'">
-        <div class="d-flex alert alert-warning w-100">
-          {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+    @if (duplicateCount > 0) {
+      <div [ngClass]="'row'">
+        <div [ngClass]="'col-2'"></div>
+        <div [ngClass]="'col-10'">
+          <div class="d-flex alert alert-warning w-100">
+            {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+          </div>
         </div>
       </div>
-    </div>
+    }
   </ng-container>
-
   <div class="row">
-    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
       <ds-pool-task-actions id="actions"
-                            [item]="item$.value"
-                            [object]="dso"
-                            [workflowitem]="workflowitem$.value"
-                            (processCompleted)="this.reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
+        [item]="item$.value"
+        [object]="dso"
+        [workflowitem]="workflowitem$.value"
+      (processCompleted)="this.reloadedObject.emit($event.reloadedObject)"></ds-pool-task-actions>
     </div>
   </div>
-</ng-container>
+}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index 98e9129b68..e5327d9863 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -62,7 +61,7 @@ import { ThemedItemListPreviewComponent } from '../item-list-preview/themed-item
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './pool-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ThemedItemListPreviewComponent, NgClass, PoolTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective],
+  imports: [ThemedItemListPreviewComponent, NgClass, PoolTaskActionsComponent, AsyncPipe, TranslateModule, VarDirective],
 })
 
 @listableObjectComponent(PoolTaskSearchResult, ViewMode.ListElement)
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
index c2b030c734..d75b1ee685 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
@@ -1,15 +1,16 @@
-<ng-container *ngIf="derivedSearchResult$ | async">
-    <ds-listable-object-component-loader
-            [viewMode]="ViewModes.ListElement"
-            [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
-            [context]="badgeContext"></ds-listable-object-component-loader>
-    <div class="row">
-        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
-            <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
-        </div>
+@if (derivedSearchResult$ | async) {
+  <ds-listable-object-component-loader
+    [viewMode]="ViewModes.ListElement"
+    [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
+  [context]="badgeContext"></ds-listable-object-component-loader>
+  <div class="row">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  col-9 col-md-10 ps-3' : ''">
+      <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
     </div>
-</ng-container>
+  </div>
+}
 
-<ds-loading
-        *ngIf="(derivedSearchResult$ | async) === undefined"
-        [showMessage]="false"></ds-loading>
+@if ((derivedSearchResult$ | async) === undefined) {
+  <ds-loading
+  [showMessage]="false"></ds-loading>
+}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index d7f735e1ad..504d1d7168 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -40,7 +39,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'],
   templateUrl: './workflow-item-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, NgClass, WorkflowitemActionsComponent, ThemedLoadingComponent, AsyncPipe],
+  imports: [ListableObjectComponentLoaderComponent, NgClass, WorkflowitemActionsComponent, ThemedLoadingComponent, AsyncPipe],
 })
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.ListElement)
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
index 240706c91b..f081a4694f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
@@ -1,14 +1,15 @@
-<ng-container *ngIf="derivedSearchResult$ | async">
-    <ds-listable-object-component-loader
-            [viewMode]="ViewModes.ListElement"
-            [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
-            [context]="badgeContext"></ds-listable-object-component-loader>
-    <div class="row">
-        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
-            <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
-        </div>
+@if (derivedSearchResult$ | async) {
+  <ds-listable-object-component-loader
+    [viewMode]="ViewModes.ListElement"
+    [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
+  [context]="badgeContext"></ds-listable-object-component-loader>
+  <div class="row">
+    <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 col-9 col-md-10 ps-3' : ''">
+      <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
     </div>
-</ng-container>
-<ds-loading
-        *ngIf="(derivedSearchResult$ | async) === undefined"
-        [showMessage]="false"></ds-loading>
+  </div>
+}
+@if ((derivedSearchResult$ | async) === undefined) {
+  <ds-loading
+  [showMessage]="false"></ds-loading>
+}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index 4a8863d22f..2a71308c4b 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -40,7 +39,7 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss', './workspace-item-search-result-list-element.component.scss'],
   templateUrl: './workspace-item-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, ListableObjectComponentLoaderComponent, NgClass, WorkspaceitemActionsComponent, ThemedLoadingComponent, AsyncPipe],
+  imports: [ListableObjectComponentLoaderComponent, NgClass, WorkspaceitemActionsComponent, ThemedLoadingComponent, AsyncPipe],
 })
 
 @listableObjectComponent(WorkspaceItemSearchResult, ViewMode.ListElement)
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index 1b70b81242..3073623c2e 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -1,36 +1,44 @@
 <ds-pagination
-        [paginationOptions]="config"
-        [collectionSize]="objects?.payload?.totalElements"
-        [objects]="objects"
-        [sortOptions]="sortConfig"
-        [hideGear]="hideGear"
-        [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
-        [hidePaginationDetail]="hidePaginationDetail"
-        [showPaginator]="showPaginator"
-        (pageChange)="onPageChange($event)"
-        (pageSizeChange)="onPageSizeChange($event)"
-        (sortDirectionChange)="onSortDirectionChange($event)"
-        (sortFieldChange)="onSortFieldChange($event)"
-        (paginationChange)="onPaginationChange($event)"
-        (prev)="goPrev()"
-        (next)="goNext()">
-    <ul *ngIf="objects?.hasSucceeded" class="list-unstyled" [ngClass]="{'ml-4': selectable}" data-test="objects">
-        <li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last" [attr.data-test]="'list-object' | dsBrowserOnly">
-          <ds-selectable-list-item-control *ngIf="selectable" [index]="i"
-                                           [object]="object"
-                                           [selectionConfig]="selectionConfig"
-                                           (deselectObject)="deselectObject.emit($event)"
-                                           (selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
-          <ds-importable-list-item-control *ngIf="importable" [object]="object"
-                                           [importConfig]="importConfig"
-                                           (importObject)="importObject.emit($event)"></ds-importable-list-item-control>
+  [paginationOptions]="config"
+  [collectionSize]="objects?.payload?.totalElements"
+  [objects]="objects"
+  [sortOptions]="sortConfig"
+  [hideGear]="hideGear"
+  [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
+  [hidePaginationDetail]="hidePaginationDetail"
+  [showPaginator]="showPaginator"
+  (pageChange)="onPageChange($event)"
+  (pageSizeChange)="onPageSizeChange($event)"
+  (sortDirectionChange)="onSortDirectionChange($event)"
+  (sortFieldChange)="onSortFieldChange($event)"
+  (paginationChange)="onPaginationChange($event)"
+  (prev)="goPrev()"
+  (next)="goNext()">
+  @if (objects?.hasSucceeded) {
+    <ul class="list-unstyled" [ngClass]="{'ml-4': selectable}" data-test="objects">
+      @for (object of objects?.payload?.page; track object; let i = $index; let last = $last) {
+        <li class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last" [attr.data-test]="'list-object' | dsBrowserOnly">
+          @if (selectable) {
+            <ds-selectable-list-item-control [index]="i"
+              [object]="object"
+              [selectionConfig]="selectionConfig"
+              (deselectObject)="deselectObject.emit($event)"
+            (selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
+          }
+          @if (importable) {
+            <ds-importable-list-item-control [object]="object"
+              [importConfig]="importConfig"
+            (importObject)="importObject.emit($event)"></ds-importable-list-item-control>
+          }
           <ds-listable-object-component-loader [object]="object"
-                                               [viewMode]="viewMode"
-                                               [index]="i"
-                                               [context]="context"
-                                               [linkType]="linkType"
-                                               [listID]="selectionConfig?.listId"
-                                               (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
+            [viewMode]="viewMode"
+            [index]="i"
+            [context]="context"
+            [linkType]="linkType"
+            [listID]="selectionConfig?.listId"
+          (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
         </li>
+      }
     </ul>
+  }
 </ds-pagination>
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index 707792bec9..cf3e0164f6 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -39,7 +35,7 @@ import { SelectableListService } from './selectable-list/selectable-list.service
   templateUrl: './object-list.component.html',
   animations: [fadeIn],
   standalone: true,
-  imports: [PaginationComponent, NgIf, NgClass, NgFor, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
+  imports: [PaginationComponent, NgClass, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
 })
 export class ObjectListComponent {
   /**
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index 17b5d50d90..c506050ece 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -1,9 +1,16 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="offset-3 offset-md-2 "></div>
-  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
-    <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+  <div [ngClass]="showThumbnails ? 'col-9 offset-3 offset-md-2' : 'col-md-12'">
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
+    @if (linkType !== linkTypes.None) {
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="lead" [innerHTML]="dsoTitle"></span>
+    }
+    @if (dso.shortDescription) {
+      <div class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+    }
   </div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index 2641792b02..550f235180 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -20,7 +17,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
   styleUrls: ['../search-result-list-element.component.scss', 'collection-search-result-list-element.component.scss'],
   templateUrl: 'collection-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, NgClass, ThemedBadgesComponent, RouterLink],
+  imports: [NgClass, ThemedBadgesComponent, RouterLink],
 })
 /**
  * Component representing a collection search result in list view
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index f5d6803159..392a369efb 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,9 +1,16 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="offset-3 offset-md-2"></div>
-  <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-badges>
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
-    <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+  <div [ngClass]="showThumbnails ? 'col-9 offset-3 offset-md-2' : 'col-md-12'">
+    @if (showLabel) {
+      <ds-badges [object]="dso" [context]="context"></ds-badges>
+    }
+    @if (linkType !== linkTypes.None) {
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
+    }
+    @if (linkType === linkTypes.None) {
+      <span class="lead" [innerHTML]="dsoTitle"></span>
+    }
+    @if (dso.shortDescription) {
+      <div class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
+    }
   </div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index e8e3c57959..17e7631945 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -20,7 +17,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element.
   styleUrls: ['../search-result-list-element.component.scss', 'community-search-result-list-element.component.scss'],
   templateUrl: 'community-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, NgClass, ThemedBadgesComponent, RouterLink],
+  imports: [NgClass, ThemedBadgesComponent, RouterLink],
 })
 /**
  * Component representing a community search result in list view
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
index baebf5fe86..db647b6e74 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
@@ -1,46 +1,74 @@
 <div class="row">
-  <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-       [routerLink]="[itemPageRoute]" class="dont-break-out">
-    <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-    </ds-thumbnail>
-    </a>
-    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
-    <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
-    </ds-thumbnail>
-    </span>
-  </div>
+  @if (showThumbnails) {
+    <div class="col-3 col-md-2">
+      @if (linkType !== linkTypes.None) {
+        <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+          [routerLink]="[itemPageRoute]" class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </a>
+      }
+      @if (linkType === linkTypes.None) {
+        <span class="dont-break-out">
+          <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
+          </ds-thumbnail>
+        </span>
+      }
+    </div>
+  }
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <div class="d-flex">
-      <ds-badges *ngIf="showLabel" [object]="dso" [context]="context" [showAccessStatus]="true"></ds-badges>
+      @if (showLabel) {
+        <ds-badges [object]="dso" [context]="context" [showAccessStatus]="true"></ds-badges>
+      }
     </div>
 
-    <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
-      <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
-         [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
-         [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out"
-            [innerHTML]="dsoTitle"></span>
-      <span class="text-muted">
-        <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
-            (<span *ngIf="dso.firstMetadataValue('dc.publisher')" class="item-list-publisher" [innerHTML]="firstMetadataValue('dc.publisher')"></span>
-            <span *ngIf="dso.firstMetadataValue('dc.publisher') && dso.firstMetadataValue('dc.date.issued')">, </span>
-          <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
-          </ng-container>
-          <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
-            <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
-                <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
-                <span *ngIf="!last">; </span>
-            </span>
-          </span>
-        </ds-truncatable-part>
-      </span>
-      <div *ngIf="dso.firstMetadataValue('dc.description.abstract')" class="item-list-abstract">
-        <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
-          [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
-        </ds-truncatable-part>
-      </div>
+    @if (object !== undefined && object !== null) {
+      <ds-truncatable [id]="dso.id">
+        @if (linkType !== linkTypes.None) {
+          <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null"
+            [routerLink]="[itemPageRoute]" class="lead item-list-title dont-break-out"
+          [innerHTML]="dsoTitle"></a>
+        }
+        @if (linkType === linkTypes.None) {
+          <span class="lead item-list-title dont-break-out"
+          [innerHTML]="dsoTitle"></span>
+        }
+        <span class="text-muted">
+          <ds-truncatable-part [id]="dso.id" [minLines]="1">
+            @if (dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')) {
+              (@if (dso.firstMetadataValue('dc.publisher')) {
+              <span class="item-list-publisher" [innerHTML]="firstMetadataValue('dc.publisher')"></span>
+            }
+            @if (dso.firstMetadataValue('dc.publisher') && dso.firstMetadataValue('dc.date.issued')) {
+              <span>, </span>
+            }
+            @if (dso.firstMetadataValue('dc.date.issued')) {
+              <span class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>
+              })
+            }
+            @if (dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0) {
+              <span class="item-list-authors">
+                @for (author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); track author; let last = $last) {
+                  <span>
+                    <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
+                    @if (!last) {
+                      <span>; </span>
+                    }
+                  </span>
+                }
+              </span>
+            }
+          </ds-truncatable-part>
+        </span>
+        @if (dso.firstMetadataValue('dc.description.abstract')) {
+          <div class="item-list-abstract">
+            <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
+            [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
+          </ds-truncatable-part>
+        </div>
+      }
     </ds-truncatable>
-  </div>
+  }
+</div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 26a1d7e655..cf7fa597b3 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -28,7 +26,7 @@ import { SearchResultListElementComponent } from '../../../search-result-list-el
   styleUrls: ['./item-search-result-list-element.component.scss'],
   templateUrl: './item-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 })
 /**
  * The component for displaying a list element for an item search result of the type Publication
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
index 480ecb68bb..d446416ca8 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -16,11 +15,13 @@ import { SidebarSearchListElementComponent } from '../sidebar-search-list-elemen
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-collection-sidebar-search-list-element',
   templateUrl: '../sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link CollectionSearchResult} within the context of a sidebar search modal
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
index 85d3704202..e019217ace 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -16,11 +15,13 @@ import { SidebarSearchListElementComponent } from '../sidebar-search-list-elemen
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-community-sidebar-search-list-element',
   templateUrl: '../sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link CommunitySearchResult} within the context of a sidebar search modal
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
index 798d52426e..38240b59f8 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -16,13 +15,13 @@ import { SidebarSearchListElementComponent } from '../../sidebar-search-list-ele
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
-@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
-@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.ScopeSelectorModal)
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.ScopeSelectorModalCurrent)
 @Component({
   selector: 'ds-publication-sidebar-search-list-element',
   templateUrl: '../../sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Publication" within the context of
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
index 040f528768..55f8b6d4e9 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html
@@ -1,14 +1,16 @@
 <ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
   <div [ngClass]="isCurrent() ? 'text-light' : 'text-body'"
-       [innerHTML]="(parentTitle$ && parentTitle$ | async) ? (parentTitle$ | async) : ('home.breadcrumbs' | translate)"></div>
+  [innerHTML]="(parentTitle$ && parentTitle$ | async) ? (parentTitle$ | async) : ('home.breadcrumbs' | translate)"></div>
 </ds-truncatable-part>
 <ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
-  <div class="font-weight-bold"
-       [ngClass]="isCurrent() ? 'text-light' : 'text-primary'"
-       [innerHTML]="dsoTitle"></div>
-</ds-truncatable-part>
-<ds-truncatable-part *ngIf="description" [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
-  <div class="text-secondary"
-       [ngClass]="isCurrent() ? 'text-light' : 'text-secondary'"
-       [innerHTML]="description"></div>
+  <div class="fw-bold"
+    [ngClass]="isCurrent() ? 'text-light' : 'text-primary'"
+  [innerHTML]="dsoTitle"></div>
 </ds-truncatable-part>
+@if (description) {
+  <ds-truncatable-part [maxLines]="1" [background]="isCurrent() ? 'primary' : 'default'" [showToggle]="false">
+    <div class="text-secondary"
+      [ngClass]="isCurrent() ? 'text-light' : 'text-secondary'"
+    [innerHTML]="description"></div>
+  </ds-truncatable-part>
+}
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index e65883cd3e..396790debd 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -37,7 +36,7 @@ import { SearchResultListElementComponent } from '../search-result-list-element/
   selector: 'ds-sidebar-search-list-element',
   templateUrl: './sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 /**
  * Component displaying a list element for a {@link SearchResult} in the sidebar search modal
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index f5f8b9d1cc..93bff0f8e0 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -1,41 +1,50 @@
 <ng-container *ngVar="(dsoRD$ | async) as collectionsRD">
-  <ds-pagination
-    *ngIf="collectionsRD?.payload?.totalElements > 0 || collectionsRD?.payload?.page?.length > 0"
-    [paginationOptions]="paginationOptions"
-    [sortOptions]="sortOptions"
-    [collectionSize]="collectionsRD?.payload?.totalElements"
-    [hidePagerWhenSinglePage]="true"
-    [hideGear]="true">
-    <div class="table-responsive mt-2">
-      <table id="collection-select" class="table table-striped table-hover">
-        <thead>
-          <tr>
-            <th><span class="sr-only">{{'collection.select.table.selected' | translate}}</span></th>
-            <th scope="col">{{'collection.select.table.title' | translate}}</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr *ngFor="let selectCollection of selectCollections$ | async">
-            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
-            <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
-          </tr>
-        </tbody>
-      </table>
+  @if (collectionsRD?.payload?.totalElements > 0 || collectionsRD?.payload?.page?.length > 0) {
+    <ds-pagination
+      [paginationOptions]="paginationOptions"
+      [sortOptions]="sortOptions"
+      [collectionSize]="collectionsRD?.payload?.totalElements"
+      [hidePagerWhenSinglePage]="true"
+      [hideGear]="true">
+      <div class="table-responsive mt-2">
+        <table id="collection-select" class="table table-striped table-hover">
+          <thead>
+            <tr>
+              <th><span class="sr-only">{{'collection.select.table.selected' | translate}}</span></th>
+              <th scope="col">{{'collection.select.table.title' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (selectCollection of selectCollections$ | async; track selectCollection) {
+              <tr>
+                <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" [disabled]="(selectCollection.canSelect$ | async) === false" class="collection-checkbox" [ngModel]="selectCollection.selected$ | async" (change)="switch(selectCollection.dso.id)" type="checkbox" name="{{selectCollection.dso.id}}"></td>
+                <td><a [routerLink]="selectCollection.route">{{ dsoNameService.getName(selectCollection.dso) }}</a></td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
+  @if (collectionsRD?.payload?.totalElements === 0 || collectionsRD?.payload?.page?.length === 0) {
+    <div class="alert alert-info w-100" role="alert">
+      {{'collection.select.empty' | translate}}
     </div>
-  </ds-pagination>
-  <div *ngIf="collectionsRD?.payload?.totalElements === 0 || collectionsRD?.payload?.page?.length === 0" class="alert alert-info w-100" role="alert">
-    {{'collection.select.empty' | translate}}
-  </div>
-  <ds-error *ngIf="collectionsRD?.hasFailed" message="{{'error.collections' | translate}}"></ds-error>
-  <ds-loading *ngIf="!collectionsRD || collectionsRD?.isLoading" message="{{'loading.collections' | translate}}"></ds-loading>
-  <div class="space-children-mr float-right" *ngVar="(selectedIds$ | async) as selectedIds">
+  }
+  @if (collectionsRD?.hasFailed) {
+    <ds-error message="{{'error.collections' | translate}}"></ds-error>
+  }
+  @if (!collectionsRD || collectionsRD?.isLoading) {
+    <ds-loading message="{{'loading.collections' | translate}}"></ds-loading>
+  }
+  <div class="space-children-mr float-end" *ngVar="(selectedIds$ | async) as selectedIds">
     <button class="btn btn-outline-secondary collection-cancel" (click)="onCancel()">
       <i class="fas fa-times"></i> {{cancelButton | translate}}
     </button>
     <button class="btn collection-confirm"
-            [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [disabled]="selectedIds?.length === 0"
-            (click)="confirmSelected()">
+      [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
+      [dsBtnDisabled]="selectedIds?.length === 0"
+      (click)="confirmSelected()">
       <i class="fas fa-trash"></i> {{confirmButton | translate}}
     </button>
   </div>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.ts b/src/app/shared/object-select/collection-select/collection-select.component.ts
index a4fa227e6b..9b05e53e46 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -20,6 +18,7 @@ import { getCollectionPageRoute } from '../../../collection-page/collection-page
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -36,7 +35,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   templateUrl: './collection-select.component.html',
   styleUrls: ['./collection-select.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule],
+  imports: [VarDirective, PaginationComponent, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index e0e71fb939..5c3a908038 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -1,49 +1,66 @@
 <ng-container *ngVar="(dsoRD$ | async) as itemsRD">
-  <ds-pagination
-    *ngIf="itemsRD?.payload?.totalElements > 0"
-    [paginationOptions]="paginationOptions"
-    [sortOptions]="sortOptions"
-    [collectionSize]="itemsRD?.payload?.totalElements"
-    [hidePagerWhenSinglePage]="true"
-    [hideGear]="true">
-    <div class="table-responsive mt-2">
-      <table id="item-select" class="table table-striped table-hover">
-        <thead>
-        <tr>
-          <th><span class="sr-only">{{'item.select.table.selected' | translate}}</span></th>
-          <th *ngIf="!hideCollection" scope="col">{{'item.select.table.collection' | translate}}</th>
-          <th scope="col">{{'item.select.table.author' | translate}}</th>
-          <th scope="col">{{'item.select.table.title' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let selectItem of selectItems$ | async">
-          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
-          <td *ngIf="!hideCollection">
-            <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
-              <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">
-                {{ dsoNameService.getName(collection) }}
-              </a>
-            </span>
-          </td>
-          <td><span *ngIf="selectItem.dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])">{{selectItem.dso.firstMetadataValue(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])}}</span></td>
-          <td><a [routerLink]="selectItem.route">{{ dsoNameService.getName(selectItem.dso) }}</a></td>
-        </tr>
-        </tbody>
-      </table>
+  @if (itemsRD?.payload?.totalElements > 0) {
+    <ds-pagination
+      [paginationOptions]="paginationOptions"
+      [sortOptions]="sortOptions"
+      [collectionSize]="itemsRD?.payload?.totalElements"
+      [hidePagerWhenSinglePage]="true"
+      [hideGear]="true">
+      <div class="table-responsive mt-2">
+        <table id="item-select" class="table table-striped table-hover">
+          <thead>
+            <tr>
+              <th><span class="sr-only">{{'item.select.table.selected' | translate}}</span></th>
+              @if (!hideCollection) {
+                <th scope="col">{{'item.select.table.collection' | translate}}</th>
+              }
+              <th scope="col">{{'item.select.table.author' | translate}}</th>
+              <th scope="col">{{'item.select.table.title' | translate}}</th>
+            </tr>
+          </thead>
+          <tbody>
+            @for (selectItem of selectItems$ | async; track selectItem) {
+              <tr>
+                <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(selectItem.canSelect$ | async) === false" class="item-checkbox" [ngModel]="selectItem.selected$ | async" (change)="switch(selectItem.dso.id)" type="checkbox" name="{{selectItem.dso.id}}"></td>
+                @if (!hideCollection) {
+                  <td>
+                    <span *ngVar="(selectItem.dso.owningCollection | async)?.payload as collection">
+                      @if (collection) {
+                        <a [routerLink]="['/collections', collection?.id]">
+                          {{ dsoNameService.getName(collection) }}
+                        </a>
+                      }
+                    </span>
+                  </td>
+                }
+                <td>@if (selectItem.dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])) {
+                  <span>{{selectItem.dso.firstMetadataValue(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])}}</span>
+                }</td>
+                <td><a [routerLink]="selectItem.route">{{ dsoNameService.getName(selectItem.dso) }}</a></td>
+              </tr>
+            }
+          </tbody>
+        </table>
+      </div>
+    </ds-pagination>
+  }
+  @if (itemsRD?.payload?.totalElements === 0 || itemsRD?.payload?.page?.length === 0) {
+    <div class="alert alert-info w-100" role="alert">
+      {{'item.select.empty' | translate}}
     </div>
-  </ds-pagination>
-  <div *ngIf="itemsRD?.payload?.totalElements === 0 || itemsRD?.payload?.page?.length === 0" class="alert alert-info w-100" role="alert">
-    {{'item.select.empty' | translate}}
-  </div>
-  <ds-error *ngIf="itemsRD?.hasFailed" message="{{'error.items' | translate}}"></ds-error>
-  <ds-loading *ngIf="!itemsRD || itemsRD?.isLoading" message="{{'loading.items' | translate}}"></ds-loading>
+  }
+  @if (itemsRD?.hasFailed) {
+    <ds-error message="{{'error.items' | translate}}"></ds-error>
+  }
+  @if (!itemsRD || itemsRD?.isLoading) {
+    <ds-loading message="{{'loading.items' | translate}}"></ds-loading>
+  }
   <div *ngVar="(selectedIds$ | async) as selectedIds">
-    <button class="btn btn-outline-secondary item-cancel float-left" (click)="onCancel()">{{cancelButton | translate}}</button>
-    <button class="btn item-confirm float-right"
-            [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
-            [disabled]="selectedIds?.length === 0"
-            (click)="confirmSelected()">
+    <button class="btn btn-outline-secondary item-cancel float-start" (click)="onCancel()">{{cancelButton | translate}}</button>
+    <button class="btn item-confirm float-end"
+      [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
+      [dsBtnDisabled]="selectedIds?.length === 0"
+      (click)="confirmSelected()">
       {{confirmButton | translate}}
     </button>
   </div>
diff --git a/src/app/shared/object-select/item-select/item-select.component.spec.ts b/src/app/shared/object-select/item-select/item-select.component.spec.ts
index 86d4b5c8d4..656e0716e9 100644
--- a/src/app/shared/object-select/item-select/item-select.component.spec.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.spec.ts
@@ -18,6 +18,7 @@ import { LinkHeadService } from '../../../core/services/link-head.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { HostWindowService } from '../../host-window.service';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
@@ -101,7 +102,7 @@ describe('ItemSelectComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), BtnDisabledDirective],
       providers: [
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub([mockItemList[1].id]) },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
diff --git a/src/app/shared/object-select/item-select/item-select.component.ts b/src/app/shared/object-select/item-select/item-select.component.ts
index 285a790c2a..c9a46a5ba4 100644
--- a/src/app/shared/object-select/item-select/item-select.component.ts
+++ b/src/app/shared/object-select/item-select/item-select.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -19,6 +17,7 @@ import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Item } from '../../../core/shared/item.model';
 import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValueOperator,
   isNotEmpty,
@@ -34,7 +33,7 @@ import { ObjectSelectComponent } from '../object-select/object-select.component'
   selector: 'ds-item-select',
   templateUrl: './item-select.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, PaginationComponent, NgFor, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule],
+  imports: [VarDirective, PaginationComponent, FormsModule, RouterLink, ErrorComponent, ThemedLoadingComponent, NgClass, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/app/shared/object-table/object-table.component.html b/src/app/shared/object-table/object-table.component.html
index 2bb15aaf1c..8e76f3127a 100644
--- a/src/app/shared/object-table/object-table.component.html
+++ b/src/app/shared/object-table/object-table.component.html
@@ -15,18 +15,24 @@
   (prev)="goPrev()"
   (next)="goNext()"
   [retainScrollPosition]="true"
->
-  <div *ngIf="objects?.hasSucceeded">
-    <div @fadeIn>
-      <ds-tabulatable-objects-loader [objects]="objects.payload"
-                                     [context]="context"
-                                     [showThumbnails]="showThumbnails"
-                                     [linkType]="linkType">
-      </ds-tabulatable-objects-loader>
+  >
+  @if (objects?.hasSucceeded) {
+    <div>
+      <div @fadeIn>
+        <ds-tabulatable-objects-loader [objects]="objects.payload"
+          [context]="context"
+          [showThumbnails]="showThumbnails"
+          [linkType]="linkType">
+        </ds-tabulatable-objects-loader>
+      </div>
     </div>
-  </div>
-  <ds-error *ngIf="objects?.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
-  <ds-loading *ngIf="objects?.isLoading" message="{{'loading.objects' | translate}}"></ds-loading>
+  }
+  @if (objects?.hasFailed) {
+    <ds-error message="{{'error.objects' | translate}}"></ds-error>
+  }
+  @if (objects?.isLoading) {
+    <ds-loading message="{{'loading.objects' | translate}}"></ds-loading>
+  }
 </ds-pagination>
 
 
diff --git a/src/app/shared/object-table/object-table.component.ts b/src/app/shared/object-table/object-table.component.ts
index 438097e902..003534ddc1 100644
--- a/src/app/shared/object-table/object-table.component.ts
+++ b/src/app/shared/object-table/object-table.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectionStrategy,
   Component,
@@ -36,7 +36,6 @@ import { PaginationComponentOptions } from '../pagination/pagination-component-o
   animations: [fadeIn],
   imports: [
     PaginationComponent,
-    NgIf,
     ThemedLoadingComponent,
     ErrorComponent,
     TranslateModule,
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
new file mode 100644
index 0000000000..9f4821e780
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.html
@@ -0,0 +1,11 @@
+<img placement="top"
+     [ngbTooltip]="orcidTooltipTemplate"
+     class="orcid-icon"
+     [ngClass]="{'not-authenticated': !authenticatedTimestamp}"
+     alt="ORCID {{ orcidTooltip }}"
+     src="assets/images/orcid.logo.icon.svg"
+     data-test="orcidIcon"/>
+
+<ng-template #orcidTooltipTemplate>
+    <span class="text-muted">{{ orcidTooltip }}</span>
+</ng-template>
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
new file mode 100644
index 0000000000..6a1c259e18
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.scss
@@ -0,0 +1,11 @@
+:host {
+  display: inline-block;
+}
+
+.orcid-icon {
+  height: 1.2rem;
+
+  &.not-authenticated {
+    filter: grayscale(100%);
+  }
+}
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
new file mode 100644
index 0000000000..8ed97ddb37
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.spec.ts
@@ -0,0 +1,67 @@
+import { NgClass } from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { OrcidBadgeAndTooltipComponent } from './orcid-badge-and-tooltip.component';
+
+describe('OrcidBadgeAndTooltipComponent', () => {
+  let component: OrcidBadgeAndTooltipComponent;
+  let fixture: ComponentFixture<OrcidBadgeAndTooltipComponent>;
+  let translateService: TranslateService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        OrcidBadgeAndTooltipComponent,
+        NgbTooltipModule,
+        NgClass,
+      ],
+      providers: [
+        { provide: TranslateService, useValue: { instant: (key: string) => key } },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(OrcidBadgeAndTooltipComponent);
+    component = fixture.componentInstance;
+    translateService = TestBed.inject(TranslateService);
+
+    component.orcid = { value: '0000-0002-1825-0097' } as MetadataValue;
+    component.authenticatedTimestamp = { value: '2023-10-01' } as MetadataValue;
+
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is provided', () => {
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.authenticated');
+  });
+
+  it('should set orcidTooltip when authenticatedTimestamp is not provided', () => {
+    component.authenticatedTimestamp = null;
+    component.ngOnInit();
+    expect(component.orcidTooltip).toBe('person.orcid-tooltip.not-authenticated');
+  });
+
+  it('should display the ORCID icon', () => {
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon).toBeTruthy();
+  });
+
+  it('should display the ORCID icon in greyscale if there is no authenticated timestamp', () => {
+    component.authenticatedTimestamp = null;
+    fixture.detectChanges();
+    const badgeIcon = fixture.debugElement.query(By.css('img[data-test="orcidIcon"]'));
+    expect(badgeIcon.nativeElement.classList).toContain('not-authenticated');
+  });
+
+});
diff --git a/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
new file mode 100644
index 0000000000..677c752d4b
--- /dev/null
+++ b/src/app/shared/orcid-badge-and-tooltip/orcid-badge-and-tooltip.component.ts
@@ -0,0 +1,61 @@
+import { NgClass } from '@angular/common';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { MetadataValue } from '../../core/shared/metadata.models';
+
+/**
+ * Component to display an ORCID badge with a tooltip.
+ * The tooltip text changes based on whether the ORCID is authenticated.
+ */
+@Component({
+  selector: 'ds-orcid-badge-and-tooltip',
+  standalone: true,
+  imports: [
+    NgbTooltipModule,
+    NgClass,
+  ],
+  templateUrl: './orcid-badge-and-tooltip.component.html',
+  styleUrl: './orcid-badge-and-tooltip.component.scss',
+})
+export class OrcidBadgeAndTooltipComponent implements OnInit {
+
+  /**
+   * The ORCID value to be displayed.
+   */
+  @Input() orcid: MetadataValue;
+
+  /**
+   * The timestamp indicating when the ORCID was authenticated.
+   */
+  @Input() authenticatedTimestamp: MetadataValue;
+
+  /**
+   * The tooltip text to be displayed.
+   */
+  orcidTooltip: string;
+
+  /**
+   * Constructor to inject the TranslateService.
+   * @param translateService - Service for translation.
+   */
+  constructor(
+    private translateService: TranslateService,
+  ) { }
+
+  /**
+   * Initializes the component.
+   * Sets the tooltip text based on the presence of the authenticated timestamp.
+   */
+  ngOnInit() {
+    this.orcidTooltip = this.authenticatedTimestamp ?
+      this.translateService.instant('person.orcid-tooltip.authenticated', { orcid: this.orcid.value }) :
+      this.translateService.instant('person.orcid-tooltip.not-authenticated', { orcid: this.orcid.value });
+  }
+
+}
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.html b/src/app/shared/page-size-selector/page-size-selector.component.html
index de7cb34967..b52a0640fc 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.html
+++ b/src/app/shared/page-size-selector/page-size-selector.component.html
@@ -1,13 +1,15 @@
 <div class="page-size-settings">
-    <ds-sidebar-dropdown
-            [id]="'search-sidebar-rpp'"
-            [label]="'search.sidebar.settings.rpp'"
-            (changed)="reloadRPP($event)"
+  <ds-sidebar-dropdown
+    [id]="'search-sidebar-rpp'"
+    [label]="'search.sidebar.settings.rpp'"
+    (changed)="reloadRPP($event)"
     >
-        <option *ngFor="let pageSizeOption of (paginationOptions$ | async).pageSizeOptions"
-                [value]="pageSizeOption"
-                [selected]="pageSizeOption === +((paginationOptions$ | async).pageSize) ? 'selected': null">
-            {{pageSizeOption}}
-        </option>
-    </ds-sidebar-dropdown>
+    @for (pageSizeOption of (paginationOptions$ | async).pageSizeOptions; track pageSizeOption) {
+      <option
+        [value]="pageSizeOption"
+        [selected]="pageSizeOption === +((paginationOptions$ | async).pageSize) ? 'selected': null">
+        {{pageSizeOption}}
+      </option>
+    }
+  </ds-sidebar-dropdown>
 </div>
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts
index 80a612aacb..02e9327911 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.ts
+++ b/src/app/shared/page-size-selector/page-size-selector.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -30,7 +27,7 @@ import { SidebarDropdownComponent } from '../sidebar/sidebar-dropdown.component'
   styleUrls: ['./page-size-selector.component.scss'],
   templateUrl: './page-size-selector.component.html',
   standalone: true,
-  imports: [SidebarDropdownComponent, NgFor, FormsModule, AsyncPipe],
+  imports: [SidebarDropdownComponent, FormsModule, AsyncPipe],
 })
 
 /**
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
deleted file mode 100644
index dc8a413f1f..0000000000
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.spec.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import {
-  Component,
-  ElementRef,
-} from '@angular/core';
-import {
-  BehaviorSubject,
-  Observable,
-  of as observableOf,
-} from 'rxjs';
-import { take } from 'rxjs/operators';
-
-import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { PaginationComponent } from '../pagination/pagination.component';
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { createPaginatedList } from '../testing/utils.test';
-import { ObjectValuesPipe } from '../utils/object-values-pipe';
-import { AbstractPaginatedDragAndDropListComponent } from './abstract-paginated-drag-and-drop-list.component';
-
-@Component({
-  selector: 'ds-mock-paginated-drag-drop-abstract',
-  template: '',
-})
-class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDragAndDropListComponent<DSpaceObject> {
-
-  constructor(protected objectUpdatesService: ObjectUpdatesService,
-              protected elRef: ElementRef,
-              protected objectValuesPipe: ObjectValuesPipe,
-              protected mockUrl: string,
-              protected paginationService: PaginationService,
-  protected mockObjectsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>) {
-    super(objectUpdatesService, elRef, objectValuesPipe, paginationService);
-  }
-
-  initializeObjectsRD(): void {
-    this.objectsRD$ = this.mockObjectsRD$;
-  }
-
-  initializeURL(): void {
-    this.url = this.mockUrl;
-  }
-}
-
-describe('AbstractPaginatedDragAndDropListComponent', () => {
-  let component: MockAbstractPaginatedDragAndDropListComponent;
-  let objectUpdatesService: ObjectUpdatesService;
-  let elRef: ElementRef;
-  let objectValuesPipe: ObjectValuesPipe;
-
-  const url = 'mock-abstract-paginated-drag-and-drop-list-component';
-
-
-  const object1 = Object.assign(new DSpaceObject(), { uuid: 'object-1' });
-  const object2 = Object.assign(new DSpaceObject(), { uuid: 'object-2' });
-  const objectsRD = createSuccessfulRemoteDataObject(createPaginatedList([object1, object2]));
-  let objectsRD$: BehaviorSubject<RemoteData<PaginatedList<DSpaceObject>>>;
-  let paginationService;
-
-  const updates = {
-    [object1.uuid]: { field: object1, changeType: undefined },
-    [object2.uuid]: { field: object2, changeType: undefined },
-  } as FieldUpdates;
-
-  let paginationComponent: PaginationComponent;
-
-  beforeEach(() => {
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
-      initialize: {},
-      getFieldUpdatesExclusive: observableOf(updates),
-    });
-    elRef = {
-      nativeElement: jasmine.createSpyObj('nativeElement', {
-        querySelector: {},
-      }),
-    };
-    objectValuesPipe = new ObjectValuesPipe();
-    paginationComponent = jasmine.createSpyObj('paginationComponent', {
-      doPageChange: {},
-    });
-    paginationService = new PaginationServiceStub();
-    objectsRD$ = new BehaviorSubject(objectsRD);
-    component = new MockAbstractPaginatedDragAndDropListComponent(objectUpdatesService, elRef, objectValuesPipe, url, paginationService, objectsRD$);
-    component.paginationComponent = paginationComponent;
-    component.ngOnInit();
-  });
-
-  it('should call initialize to initialize the objects in the store', () => {
-    expect(objectUpdatesService.initialize).toHaveBeenCalled();
-  });
-
-  it('should initialize the updates correctly', (done) => {
-    component.updates$.pipe(take(1)).subscribe((fieldUpdates) => {
-      expect(fieldUpdates).toEqual(updates);
-      done();
-    });
-  });
-
-  describe('drop', () => {
-    const event = {
-      previousIndex: 0,
-      currentIndex: 1,
-      item: { element: { nativeElement: { id: object1.uuid } } },
-    } as any;
-
-    describe('when the user is hovering over a new page', () => {
-      const hoverPage = 3;
-      const hoverElement = { textContent: '' + hoverPage };
-
-      beforeEach(() => {
-        elRef.nativeElement.querySelector.and.returnValue(hoverElement);
-        spyOn(component.dropObject, 'emit');
-        component.drop(event);
-      });
-
-      it('should send out a dropObject event with the expected processed paginated indexes', () => {
-        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
-          fromIndex: ((component.currentPage$.value.currentPage - 1) * component.pageSize) + event.previousIndex,
-          toIndex: ((hoverPage - 1) * component.pageSize),
-          finish: jasmine.anything(),
-        }));
-      });
-    });
-
-    describe('when the user is not hovering over a new page', () => {
-      beforeEach(() => {
-        spyOn(component.dropObject, 'emit');
-        component.drop(event);
-      });
-
-      it('should send out a dropObject event with the expected properties', () => {
-        expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
-          fromIndex: event.previousIndex,
-          toIndex: event.currentIndex,
-          finish: jasmine.anything(),
-        }));
-      });
-    });
-  });
-});
diff --git a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts b/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
deleted file mode 100644
index 444e7bc14c..0000000000
--- a/src/app/shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-import {
-  CdkDragDrop,
-  moveItemInArray,
-} from '@angular/cdk/drag-drop';
-import {
-  Component,
-  ElementRef,
-  EventEmitter,
-  OnDestroy,
-  OnInit,
-  Output,
-  ViewChild,
-} from '@angular/core';
-import {
-  BehaviorSubject,
-  Observable,
-  Subscription,
-} from 'rxjs';
-import {
-  distinctUntilChanged,
-  map,
-  switchMap,
-} from 'rxjs/operators';
-
-import { FieldUpdate } from '../../core/data/object-updates/field-update.model';
-import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import {
-  getAllSucceededRemoteData,
-  getFirstSucceededRemoteData,
-  paginatedListToArray,
-} from '../../core/shared/operators';
-import { compareArraysUsing } from '../../item-page/simple/item-types/shared/item-relationships-utils';
-import { hasValue } from '../empty.util';
-import { PaginationComponent } from '../pagination/pagination.component';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { ObjectValuesPipe } from '../utils/object-values-pipe';
-
-/**
- * Operator used for comparing {@link FieldUpdate}s by their field's UUID
- */
-export const compareArraysUsingFieldUuids = () =>
-  compareArraysUsing((fieldUpdate: FieldUpdate) => (hasValue(fieldUpdate) && hasValue(fieldUpdate.field)) ? fieldUpdate.field.uuid : undefined);
-
-/**
- * An abstract component containing general methods and logic to be able to drag and drop objects within a paginated
- * list. This implementation supports being able to drag and drop objects between pages.
- * Dragging an object on top of a page number will automatically detect the page it's being dropped on and send a
- * dropObject event to the parent component containing detailed information about the indexes the object was dropped from
- * and to.
- *
- * To extend this component, it is important to make sure to:
- * - Initialize objectsRD$ within the initializeObjectsRD() method
- * - Initialize a unique URL for this component/page within the initializeURL() method
- * - Add (cdkDropListDropped)="drop($event)" to the cdkDropList element in your template
- * - Add (pageChange)="switchPage($event)" to the ds-pagination element in your template
- * - Use the updates$ observable for building your list of cdkDrag elements in your template
- *
- * An example component extending from this abstract component: PaginatedDragAndDropBitstreamListComponent
- */
-@Component({
-  selector: 'ds-paginated-drag-drop-abstract',
-  template: '',
-})
-export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnInit, OnDestroy {
-  /**
-   * A view on the child pagination component
-   */
-  @ViewChild(PaginationComponent) paginationComponent: PaginationComponent;
-
-  /**
-   * Send an event when the user drops an object on the pagination
-   * The event contains details about the index the object came from and is dropped to (across the entirety of the list,
-   * not just within a single page)
-   */
-  @Output() dropObject: EventEmitter<any> = new EventEmitter<any>();
-
-  /**
-   * The URL to use for accessing the object updates from this list
-   */
-  url: string;
-
-  /**
-   * The objects to retrieve data for and transform into field updates
-   */
-  objectsRD$: Observable<RemoteData<PaginatedList<T>>>;
-
-  /**
-   * The updates to the current list
-   */
-  updates$: Observable<FieldUpdates>;
-
-  /**
-   * A list of object UUIDs
-   * This is the order the objects will be displayed in
-   */
-  customOrder: string[];
-
-  /**
-   * The amount of objects to display per page
-   */
-  pageSize = 10;
-
-  /**
-   * The page options to use for fetching the objects
-   * Start at page 1 and always use the set page size
-   */
-  options = Object.assign(new PaginationComponentOptions(),{
-    id: 'dad',
-    currentPage: 1,
-    pageSize: this.pageSize,
-  });
-
-  /**
-   * The current page being displayed
-   */
-  currentPage$ = new BehaviorSubject<PaginationComponentOptions>(this.options);
-
-  /**
-   * Whether or not we should display a loading animation
-   * This is used to display a loading page when the user drops a bitstream onto a new page. The loading animation
-   * should stop once the bitstream has moved to the new page and the new page's response has loaded and contains the
-   * dropped object on top (see this.stopLoadingWhenFirstIs below)
-   */
-  loading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-
-  /**
-   * List of subscriptions
-   */
-  subs: Subscription[] = [];
-
-  protected constructor(protected objectUpdatesService: ObjectUpdatesService,
-                        protected elRef: ElementRef,
-                        protected objectValuesPipe: ObjectValuesPipe,
-                        protected paginationService: PaginationService,
-  ) {
-  }
-
-  /**
-   * Initialize the observables
-   */
-  ngOnInit(): void {
-    this.initializeObjectsRD();
-    this.initializeURL();
-    this.initializeUpdates();
-    this.initializePagination();
-  }
-
-  /**
-   * Overwrite this method to define how the list of objects is initialized and updated
-   */
-  abstract initializeObjectsRD(): void;
-
-  /**
-   * Overwrite this method to define how the URL is set
-   */
-  abstract initializeURL(): void;
-
-  /**
-   * Initialize the current pagination retrieval from the paginationService and push to the currentPage$
-   */
-  initializePagination() {
-    this.paginationService.getCurrentPagination(this.options.id, this.options).subscribe((currentPagination) => {
-      this.currentPage$.next(currentPagination);
-    });
-  }
-
-  /**
-   * Initialize the field-updates in the store
-   */
-  initializeUpdates(): void {
-    this.objectsRD$.pipe(
-      getFirstSucceededRemoteData(),
-      paginatedListToArray(),
-    ).subscribe((objects: T[]) => {
-      this.objectUpdatesService.initialize(this.url, objects, new Date());
-    });
-    this.updates$ = this.objectsRD$.pipe(
-      getAllSucceededRemoteData(),
-      paginatedListToArray(),
-      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, objects)),
-    );
-    this.subs.push(
-      this.updates$.pipe(
-        map((fieldUpdates) => this.objectValuesPipe.transform(fieldUpdates)),
-        distinctUntilChanged(compareArraysUsingFieldUuids()),
-      ).subscribe((updateValues) => {
-        this.customOrder = updateValues.map((fieldUpdate) => fieldUpdate.field.uuid);
-        // We received new values, stop displaying a loading indicator if it's present
-        this.loading$.next(false);
-      }),
-      // Disable the pagination when objects are loading
-      this.loading$.subscribe((loading) => this.options.disabled = loading),
-    );
-  }
-
-  /**
-   * An object was moved, send updates to the dropObject EventEmitter
-   * When the object is dropped on a page within the pagination of this component, the object moves to the top of that
-   * page and the pagination automatically loads and switches the view to that page (this is done by calling the event's
-   * finish() method after sending patch requests to the REST API)
-   * @param event
-   */
-  drop(event: CdkDragDrop<any>) {
-    const dragIndex = event.previousIndex;
-    let dropIndex = event.currentIndex;
-    const dragPage = this.currentPage$.value.currentPage - 1;
-    let dropPage = this.currentPage$.value.currentPage - 1;
-
-    // Check if the user is hovering over any of the pagination's pages at the time of dropping the object
-    const droppedOnElement = this.elRef.nativeElement.querySelector('.page-item:hover');
-    if (hasValue(droppedOnElement) && hasValue(droppedOnElement.textContent)) {
-      // The user is hovering over a page, fetch the page's number from the element
-      const droppedPage = Number(droppedOnElement.textContent);
-      if (hasValue(droppedPage) && !Number.isNaN(droppedPage)) {
-        dropPage = droppedPage - 1;
-        dropIndex = 0;
-      }
-    }
-
-    const isNewPage = dragPage !== dropPage;
-    // Move the object in the custom order array if the drop happened within the same page
-    // This allows us to instantly display a change in the order, instead of waiting for the REST API's response first
-    if (!isNewPage && dragIndex !== dropIndex) {
-      moveItemInArray(this.customOrder, dragIndex, dropIndex);
-    }
-
-    const redirectPage = dropPage + 1;
-    const fromIndex = (dragPage * this.pageSize) + dragIndex;
-    const toIndex = (dropPage * this.pageSize) + dropIndex;
-    // Send out a drop event (and navigate to the new page) when the "from" and "to" indexes are different from each other
-    if (fromIndex !== toIndex) {
-      if (isNewPage) {
-        this.loading$.next(true);
-      }
-      this.dropObject.emit(Object.assign({
-        fromIndex,
-        toIndex,
-        finish: () => {
-          if (isNewPage) {
-            this.paginationComponent.doPageChange(redirectPage);
-          }
-        },
-      }));
-    }
-  }
-
-  /**
-   * unsub all subscriptions
-   */
-  ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
-    this.paginationService.clearPagination(this.options.id);
-  }
-}
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 87d312f9ec..21d8909800 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -1,71 +1,89 @@
-<div *ngIf="currentPageState === undefined || currentPageState === (currentPage$|async)" [id]="'p-' + id">
-  <div *ngIf="(!hidePaginationDetail && collectionSize > 0) || !hideGear" class="pagination-masked clearfix top">
-    <div class="row">
-      <div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info">
-          <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>
-          <span class="align-middle">{{ 'pagination.showing.detail' | translate:(showingDetails$ | async)}}</span>
-      </div>
-      <div class="col">
-        <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">
-          <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false"><i class="fas fa-cog" aria-hidden="true"></i></button>
-          <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
-            <li role="menuitem">
-              <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
-              <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
-                <li *ngFor="let item of pageSizeOptions" role="option" [attr.aria-selected]="item === (pageSize$ | async)">
-                  <button (click)="doPageSizeChange(item)" class="dropdown-item">
-                    <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
-                  </button>
-                </li>
-              </ul>
-            </li>
-            <li *ngIf="hideSortOptions === false" role="menuitem">
-              <span class="dropdown-header" id="pagination-control_sort-direction" role="heading">{{ 'pagination.sort-direction' | translate}}</span>
-              <ul aria-labelledby="pagination-control_sort-direction" class="list-unstyled" role="listbox">
-                <li *ngFor="let direction of (sortDirections | dsKeys)" [attr.aria-selected]="direction.value === (sortDirection$ | async)" role="option">
-                  <button class="dropdown-item" (click)="doSortDirectionChange(direction.value)">
-                    <i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}}
-                  </button>
-                </li>
-              </ul>
-            </li>
-          </ul>
+@if (currentPageState === undefined || currentPageState === (currentPage$|async)) {
+  <div [id]="'p-' + id">
+    @if ((!hidePaginationDetail && collectionSize > 0) || !hideGear) {
+      <div class="pagination-masked clearfix top">
+        <div class="row">
+          @if (!hidePaginationDetail && collectionSize > 0) {
+            <div class="col-auto pagination-info">
+              <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>
+              <span class="align-middle">{{ 'pagination.showing.detail' | translate:(showingDetails$ | async)}}</span>
+            </div>
+          }
+          <div class="col">
+            @if (!hideGear) {
+              <div ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-end">
+                <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false"><i class="fas fa-cog" aria-hidden="true"></i></button>
+                <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
+                  <li role="menuitem">
+                    <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
+                    <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
+                      @for (item of pageSizeOptions; track item) {
+                        <li role="option" [attr.aria-selected]="item === (pageSize$ | async)">
+                          <button (click)="doPageSizeChange(item)" class="dropdown-item">
+                            <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
+                          </button>
+                        </li>
+                      }
+                    </ul>
+                  </li>
+                  @if (hideSortOptions === false) {
+                    <li role="menuitem">
+                      <span class="dropdown-header" id="pagination-control_sort-direction" role="heading">{{ 'pagination.sort-direction' | translate}}</span>
+                      <ul aria-labelledby="pagination-control_sort-direction" class="list-unstyled" role="listbox">
+                        @for (direction of (sortDirections | dsKeys); track direction) {
+                          <li [attr.aria-selected]="direction.value === (sortDirection$ | async)" role="option">
+                            <button class="dropdown-item" (click)="doSortDirectionChange(direction.value)">
+                              <i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}}
+                            </button>
+                          </li>
+                        }
+                      </ul>
+                    </li>
+                  }
+                </ul>
+              </div>
+            }
+            <ds-rss></ds-rss>
+          </div>
         </div>
-        <ds-rss></ds-rss>
       </div>
-    </div>
-  </div>
-  <ng-content></ng-content>
-
-  <div *ngIf="shouldShowBottomPager | async">
-    <div *ngIf="showPaginator" class="pagination justify-content-center clearfix bottom">
-      <ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
-                      [boundaryLinks]="paginationOptions.boundaryLinks"
-                      [collectionSize]="collectionSize"
-                      [disabled]="paginationOptions.disabled"
-                      [ellipses]="paginationOptions.ellipses"
-                      [maxSize]="(isXs)?5:paginationOptions.maxSize"
-                      [page]="(currentPage$|async)"
-                      (pageChange)="doPageChange($event)"
-                      [pageSize]="(pageSize$ |async)"
-                      [rotate]="paginationOptions.rotate"
-                      [size]="(isXs)?'sm':paginationOptions.size">
-      </ngb-pagination>
-    </div>
-
-    <div *ngIf="!showPaginator" class="d-flex justify-content-between">
-        <button id="nav-prev" type="button" class="btn btn-outline-primary float-left"
-                (click)="goPrev()"
-                [disabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
-          <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
-        </button>
-      <button id="nav-next" type="button" class="btn btn-outline-primary float-right"
+    }
+    <ng-content></ng-content>
+    @if (shouldShowBottomPager | async) {
+      <div>
+        @if (showPaginator) {
+          <div class="pagination justify-content-center clearfix bottom">
+            <ngb-pagination [attr.aria-label]="('pagination-control.page-number-bar' | translate) + paginationOptions.id"
+              [boundaryLinks]="paginationOptions.boundaryLinks"
+              [collectionSize]="collectionSize"
+              [disabled]="paginationOptions.disabled"
+              [ellipses]="paginationOptions.ellipses"
+              [maxSize]="(isXs)?5:paginationOptions.maxSize"
+              [page]="(currentPage$|async)"
+              (pageChange)="doPageChange($event)"
+              [pageSize]="(pageSize$ |async)"
+              [rotate]="paginationOptions.rotate"
+              [size]="(isXs)?'sm':paginationOptions.size">
+            </ngb-pagination>
+          </div>
+        }
+        @if (!showPaginator) {
+          <div class="d-flex justify-content-between">
+            <button id="nav-prev" type="button" class="btn btn-outline-primary float-start"
+              (click)="goPrev()"
+              [dsBtnDisabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
+              <i class="fas fa-angle-left"></i> {{'pagination.previous.button' |translate}}
+            </button>
+            <button id="nav-next" type="button" class="btn btn-outline-primary float-end"
               (click)="goNext()"
-              [disabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
-          <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
-            <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
-          </span>
-      </button>
-    </div>
+              [dsBtnDisabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
+              <span [ngbTooltip]="objects?.payload?.currentPage >= objects?.payload?.totalPages ? ('pagination.next.button.disabled.tooltip' |translate) : null">
+                <i class="fas fa-angle-right"></i> {{'pagination.next.button' |translate}}
+              </span>
+            </button>
+          </div>
+        }
+      </div>
+    }
   </div>
-</div>
+}
diff --git a/src/app/shared/pagination/pagination.component.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts
index 625cfe3998..353ba05ad9 100644
--- a/src/app/shared/pagination/pagination.component.spec.ts
+++ b/src/app/shared/pagination/pagination.component.spec.ts
@@ -397,10 +397,7 @@ describe('Pagination component', () => {
 @Component({
   selector: 'ds-test-cmp', template: '',
   standalone: true,
-  imports: [CommonModule,
-    NgxPaginationModule,
-    PaginationComponent,
-    NgbModule],
+  imports: [NgxPaginationModule, PaginationComponent, NgbModule],
 })
 class TestComponent {
 
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index b6e9d5c2cd..907b427354 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -44,6 +42,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
 import { PaginationRouteParams } from '../../core/pagination/pagination-route-params.interface';
 import { ViewMode } from '../../core/shared/view-mode.model';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import {
   hasValue,
   hasValueOperator,
@@ -70,7 +69,7 @@ interface PaginationDetails {
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe],
+  imports: [NgbDropdownModule, NgClass, RSSComponent, NgbPaginationModule, NgbTooltipModule, AsyncPipe, TranslateModule, EnumKeysPipe, BtnDisabledDirective],
 })
 export class PaginationComponent implements OnChanges, OnDestroy, OnInit {
   /**
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
index cd3b5b932f..49f94970c5 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
@@ -1,10 +1,10 @@
 <td class="text-center">
   <div class="custom-control custom-checkbox">
     <input type="checkbox"
-           class="custom-control-input"
-           [id]="entry.id"
-           [ngModel]="entry.checked"
-           (ngModelChange)="this.toggleCheckbox.emit($event);">
+      class="custom-control-input"
+      [id]="entry.id"
+      [ngModel]="entry.checked"
+      (ngModelChange)="this.toggleCheckbox.emit($event);">
     <label class="custom-control-label" [for]="entry.id">
       <span class="sr-only">{{(entry.checked ? 'resource-policies.table.headers.deselect' : 'resource-policies.table.headers.select') | translate}}</span>
     </label>
@@ -28,14 +28,16 @@
 
   <div class="btn-group edit-field">
     <button class="btn btn-outline-primary btn-sm"
-            [title]="'resource-policies.table.headers.edit.policy' | translate"
-            (click)="redirectToResourcePolicyEditPage()">
+      [title]="'resource-policies.table.headers.edit.policy' | translate"
+      (click)="redirectToResourcePolicyEditPage()">
       <i class="fas fa-edit fa-fw" aria-hidden="true"></i>
     </button>
-    <button *ngIf="groupName$ | async | dsHasValue" class="btn btn-outline-primary btn-sm"
-            [title]="'resource-policies.table.headers.edit.group' | translate"
-            (click)="redirectToGroupEditPage()">
-      <i class="fas fa-users fa-fw" aria-hidden="true"></i>
-    </button>
+    @if (groupName$ | async | dsHasValue) {
+      <button class="btn btn-outline-primary btn-sm"
+        [title]="'resource-policies.table.headers.edit.group' | translate"
+        (click)="redirectToGroupEditPage()">
+        <i class="fas fa-users fa-fw" aria-hidden="true"></i>
+      </button>
+    }
   </div>
 </td>
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
index 491ebffb86..8a9bed8726 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.ts
@@ -5,10 +5,7 @@
  *
  * http://www.dspace.org/license/
  */
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -60,7 +57,6 @@ export interface ResourcePolicyCheckboxEntry {
     AsyncPipe,
     TranslateModule,
     FormsModule,
-    NgIf,
     HasValuePipe,
   ],
   standalone: true,
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.html b/src/app/shared/resource-policies/form/resource-policy-form.component.html
index 3d5465f0e6..2e445a69a7 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.html
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.html
@@ -1,10 +1,12 @@
 <div>
-  <ds-form *ngIf="formModel"
-           #formRef="formComponent"
-           [formId]="formId"
-           [formModel]="formModel"
-           [displaySubmit]="false"
-           [displayCancel]="false"></ds-form>
+  @if (formModel) {
+    <ds-form
+      #formRef="formComponent"
+      [formId]="formId"
+      [formModel]="formModel"
+      [displaySubmit]="false"
+    [displayCancel]="false"></ds-form>
+  }
   <div class="container-fluid">
     <label for="ResourcePolicyObject">{{'resource-policies.form.eperson-group-list.label' | translate}}</label>
     <input id="ResourcePolicyObject" class="form-control mb-3" type="text" [value]="resourcePolicyTargetName$ | async">
@@ -19,58 +21,61 @@
         <a ngbNavLink>{{'resource-policies.form.eperson-group-list.tab.group' | translate}}</a>
         <ng-template ngbNavContent>
           <ds-eperson-group-list [isListOfEPerson]="false"
-                                 (select)="updateObjectSelected($event, false)"></ds-eperson-group-list>
+          (select)="updateObjectSelected($event, false)"></ds-eperson-group-list>
         </ng-template>
       </li>
     </ul>
     <div [ngbNavOutlet]="nav"></div>
     <div>
       <hr>
-      <div class="form-group row">
+        <div class="mb-3 row">
 
-        <div class="col text-right">
-          <button type="reset"
-                  class="btn btn-default"
-                  [disabled]="(isProcessing | async)"
-                  (click)="onReset()">{{'form.cancel' | translate}}</button>
-          <button type="button"
-                  class="btn btn-primary"
-                  [disabled]="(isFormValid() | async) !== true || (isProcessing | async)"
-                  (click)="onSubmit()">
-            <span *ngIf="(isProcessing | async)">
+          <div class="col text-end">
+            <button type="reset"
+              class="btn btn-default"
+              [dsBtnDisabled]="(isProcessing | async)"
+            (click)="onReset()">{{'form.cancel' | translate}}</button>
+            <button type="button"
+              class="btn btn-primary"
+              [dsBtnDisabled]="(isFormValid() | async) !== true || (isProcessing | async)"
+              (click)="onSubmit()">
+              @if ((isProcessing | async)) {
+                <span>
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
                 </span>
-            <span *ngIf="(isProcessing | async) !== true">
+              }
+              @if ((isProcessing | async) !== true) {
+                <span>
                   {{'form.submit' | translate}}
                 </span>
-          </button>
+              }
+            </button>
+          </div>
         </div>
       </div>
     </div>
   </div>
-</div>
 
 
-<ng-template #content let-modal>
-  <div class="modal-header">
-    <h4 class="modal-title" id="modal-basic-title">{{ 'resource-policies.form.eperson-group-list.modal.header' | translate }}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="modal.close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="modal-body">
-    <div class="d-flex flex-row">
-      <div class="mr-3">
-        <i class="fas fa-info-circle fa-2x text-info"></i>
-      </div>
-      <div>
+  <ng-template #content let-modal>
+    <div class="modal-header">
+      <h4 class="modal-title" id="modal-basic-title">{{ 'resource-policies.form.eperson-group-list.modal.header' | translate }}</h4>
+      <button type="button" class="btn-close" aria-label="Close" (click)="modal.close()">
+      </button>
+    </div>
+    <div class="modal-body">
+      <div class="d-flex flex-row">
+        <div class="me-3">
+          <i class="fas fa-info-circle fa-2x text-info"></i>
+        </div>
+        <div>
       <p [innerHTML]="(navActiveId === 'eperson' ? 'resource-policies.form.eperson-group-list.modal.text1.toGroup' :
-       'resource-policies.form.eperson-group-list.modal.text1.toEPerson') | translate" class="font-weight-bold"></p>
-      <p [innerHTML]="'resource-policies.form.eperson-group-list.modal.text2' | translate"></p>
+       'resource-policies.form.eperson-group-list.modal.text1.toEPerson') | translate" class="fw-bold"></p>
+          <p [innerHTML]="'resource-policies.form.eperson-group-list.modal.text2' | translate"></p>
+        </div>
       </div>
     </div>
-  </div>
-  <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" (click)="modal.close()">{{ 'resource-policies.form.eperson-group-list.modal.close' | translate }}</button>
-  </div>
-</ng-template>
+    <div class="modal-footer">
+      <button type="button" class="btn btn-secondary" (click)="modal.close()">{{ 'resource-policies.form.eperson-group-list.modal.close' | translate }}</button>
+    </div>
+  </ng-template>
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
index 4820941c9f..678b893c87 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.spec.ts
@@ -45,6 +45,7 @@ import { ResourcePolicy } from '../../../core/resource-policy/models/resource-po
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
 import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
 import { SubmissionService } from '../../../submission/submission.service';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   dateToISOFormat,
   stringToNgbDateStruct,
@@ -216,6 +217,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
         ResourcePolicyFormComponent,
         TestComponent,
         NgxMaskModule.forRoot(),
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
@@ -426,7 +428,8 @@ describe('ResourcePolicyFormComponent test suite', () => {
 
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
 
-      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('should emit submit event', () => {
@@ -480,7 +483,8 @@ describe('ResourcePolicyFormComponent test suite', () => {
 
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-primary'));
 
-      expect(depositBtn.nativeElement.disabled).toBeTruthy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeTrue();
     });
 
   });
@@ -492,10 +496,10 @@ describe('ResourcePolicyFormComponent test suite', () => {
   template: ``,
   standalone: true,
   imports: [
-    CommonModule,
     FormsModule,
     NgbModule,
-    ReactiveFormsModule],
+    ReactiveFormsModule,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index 534e88bcef..ce33a8e8c1 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -47,6 +43,7 @@ import { ResourcePolicy } from '../../../core/resource-policy/models/resource-po
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   dateToISOFormat,
   stringToNgbDateStruct,
@@ -93,8 +90,7 @@ export interface ResourcePolicyEvent {
     EpersonGroupListComponent,
     TranslateModule,
     AsyncPipe,
-    NgIf,
-    NgFor,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.model.ts b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
index 98ecd67827..2902f22a2d 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.model.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.model.ts
@@ -118,7 +118,7 @@ export const RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG: DynamicFormGroupModelConfig
 };
 export const RESOURCE_POLICY_FORM_DATE_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
-    control: 'form-row',
+    control: 'row',
   },
 };
 
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index bb6073df85..b560e25267 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -7,27 +7,31 @@
             <span>
               {{ 'resource-policies.table.headers.title.for.' + resourceType | translate }}
               <span class="text-info"> {{resourceName}} </span>
-              <ng-container *ngIf="resourceType !== 'item'">
+              @if (resourceType !== 'item') {
                 ({{resourceUUID}})
-              </ng-container>
+              }
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [disabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
-                      [title]="'resource-policies.delete.btn.title' | translate"
-                      (click)="deleteSelectedResourcePolicies()">
-                <span *ngIf="(isProcessingDelete() | async)">
-                  <i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'submission.workflow.tasks.generic.processing' | translate}}
-                </span>
-                <span *ngIf="(isProcessingDelete() | async) !== true">
-                  <i class='fas fa-trash-alt fa-fw' aria-hidden="true"></i>
-                  {{'resource-policies.delete.btn' | translate}}
-                </span>
+                [dsBtnDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
+                [title]="'resource-policies.delete.btn.title' | translate"
+                (click)="deleteSelectedResourcePolicies()">
+                @if ((isProcessingDelete() | async)) {
+                  <span>
+                    <i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+                  </span>
+                }
+                @if ((isProcessingDelete() | async) !== true) {
+                  <span>
+                    <i class='fas fa-trash-alt fa-fw' aria-hidden="true"></i>
+                    {{'resource-policies.delete.btn' | translate}}
+                  </span>
+                }
               </button>
               <button class="btn btn-success p-1"
-                      [disabled]="(isProcessingDelete() | async)"
-                      [title]="'resource-policies.add.for.' + resourceType | translate"
-                      (click)="redirectToResourcePolicyCreatePage()">
+                [dsBtnDisabled]="(isProcessingDelete() | async)"
+                [title]="'resource-policies.add.for.' + resourceType | translate"
+                (click)="redirectToResourcePolicyCreatePage()">
                 <i class='fas fa-plus' aria-hidden="true"></i>
                 {{'resource-policies.add.button' | translate}}
               </button>
@@ -35,34 +39,40 @@
           </div>
         </th>
       </tr>
-      <tr *ngIf="(getResourcePolicies() | async)?.length > 0" class="text-center">
-        <th>
-          <div class="custom-control custom-checkbox">
-            <input #selectAllBtn type="checkbox"
-                   class="custom-control-input"
-                   [id]="'selectAll_' + resourceUUID"
-                   (change)="selectAllCheckbox($event)">
-            <label class="custom-control-label" [for]="'selectAll_' + resourceUUID">
-              <span class="sr-only">{{(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate}}</span>
-            </label>
-          </div>
-        </th>
-        <th>{{'resource-policies.table.headers.id' | translate}}</th>
-        <th>{{'resource-policies.table.headers.name' | translate}}</th>
-        <th>{{'resource-policies.table.headers.policyType' | translate}}</th>
-        <th>{{'resource-policies.table.headers.action' | translate}}</th>
-        <th>{{'resource-policies.table.headers.eperson' | translate}}</th>
-        <th>{{'resource-policies.table.headers.group' | translate}}</th>
-        <th>{{'resource-policies.table.headers.date.start' | translate}}</th>
-        <th>{{'resource-policies.table.headers.date.end' | translate}}</th>
-        <th>{{'resource-policies.table.headers.edit' | translate}}</th>
-      </tr>
+      @if ((getResourcePolicies() | async)?.length > 0) {
+        <tr class="text-center">
+          <th>
+            <div class="custom-control custom-checkbox">
+              <input #selectAllBtn type="checkbox"
+                class="custom-control-input"
+                [id]="'selectAll_' + resourceUUID"
+                (change)="selectAllCheckbox($event)">
+              <label class="custom-control-label" [for]="'selectAll_' + resourceUUID">
+                <span class="sr-only">{{(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate}}</span>
+              </label>
+            </div>
+          </th>
+          <th>{{'resource-policies.table.headers.id' | translate}}</th>
+          <th>{{'resource-policies.table.headers.name' | translate}}</th>
+          <th>{{'resource-policies.table.headers.policyType' | translate}}</th>
+          <th>{{'resource-policies.table.headers.action' | translate}}</th>
+          <th>{{'resource-policies.table.headers.eperson' | translate}}</th>
+          <th>{{'resource-policies.table.headers.group' | translate}}</th>
+          <th>{{'resource-policies.table.headers.date.start' | translate}}</th>
+          <th>{{'resource-policies.table.headers.date.end' | translate}}</th>
+          <th>{{'resource-policies.table.headers.edit' | translate}}</th>
+        </tr>
+      }
     </thead>
-    <tbody *ngIf="(getResourcePolicies() | async)?.length > 0">
-      <tr ds-resource-policy-entry *ngFor="let entry of (getResourcePolicies() | async)"
-          [entry]="entry"
-          (toggleCheckbox)="selectCheckbox(entry, $event)"
-      ></tr>
-    </tbody>
+    @if ((getResourcePolicies() | async)?.length > 0) {
+      <tbody>
+        @for (entry of (getResourcePolicies() | async); track entry) {
+          <tr ds-resource-policy-entry
+            [entry]="entry"
+            (toggleCheckbox)="selectCheckbox(entry, $event)"
+          ></tr>
+        }
+      </tbody>
+    }
   </table>
 </div>
diff --git a/src/app/shared/resource-policies/resource-policies.component.spec.ts b/src/app/shared/resource-policies/resource-policies.component.spec.ts
index af9b134e5e..917aec5941 100644
--- a/src/app/shared/resource-policies/resource-policies.component.spec.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.spec.ts
@@ -447,9 +447,7 @@ describe('ResourcePoliciesComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule,
-    FormsModule,
-    ReactiveFormsModule],
+  imports: [FormsModule, ReactiveFormsModule],
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index 1d098f554d..90e133dc41 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -41,6 +37,7 @@ import { GroupDataService } from '../../core/eperson/group-data.service';
 import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
 import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
+import { BtnDisabledDirective } from '../btn-disabled.directive';
 import {
   hasValue,
   isEmpty,
@@ -60,9 +57,8 @@ import {
   imports: [
     ResourcePolicyEntryComponent,
     TranslateModule,
-    NgIf,
     AsyncPipe,
-    NgForOf,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/shared/rss-feed/rss.component.html b/src/app/shared/rss-feed/rss.component.html
index 91140c50c5..9bca53b8c8 100644
--- a/src/app/shared/rss-feed/rss.component.html
+++ b/src/app/shared/rss-feed/rss.component.html
@@ -1,5 +1,10 @@
-<ng-container *ngIf="(isEnabled$ | async) && (hasRoute('home') || hasRoute('collections') || hasRoute('communities'))">
-  <div *ngIf="route$ | async as route" class="d-inline-block float-right margin-right">
-    <a [href]="route" class="btn btn-secondary" [title]="'feed.description' | translate" [attr.aria-label]="'feed.description' | translate"><i class="fas fa-rss-square"></i></a>
-  </div>
-</ng-container>
+@if ((isEnabled$ | async) && (isActivated$ | async)) {
+  @if (route$ | async; as route) {
+    <div class="d-inline-block float-end margin-right">
+      <a target="_blank" rel="noopener noreferrer" [href]="route" class="btn btn-secondary"
+        [title]="'feed.description' | translate" [attr.aria-label]="'feed.description' | translate">
+        <i class="fas fa-rss-square"></i>
+      </a>
+    </div>
+  }
+}
diff --git a/src/app/shared/rss-feed/rss.component.spec.ts b/src/app/shared/rss-feed/rss.component.spec.ts
index 724d0abf4a..60de4caef6 100644
--- a/src/app/shared/rss-feed/rss.component.spec.ts
+++ b/src/app/shared/rss-feed/rss.component.spec.ts
@@ -3,9 +3,17 @@ import {
   TestBed,
   waitForAsync,
 } from '@angular/core/testing';
-import { Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { GroupDataService } from '../../core/eperson/group-data.service';
@@ -14,22 +22,24 @@ import { LinkHeadService } from '../../core/services/link-head.service';
 import { Collection } from '../../core/shared/collection.model';
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { MockActivatedRoute } from '../mocks/active-router.mock';
 import { RouterMock } from '../mocks/router.mock';
+import { getMockTranslateService } from '../mocks/translate.service.mock';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import {
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$,
 } from '../remote-data.utils';
 import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
+import { SearchFilter } from '../search/models/search-filter.model';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
 import { createPaginatedList } from '../testing/utils.test';
 import { RSSComponent } from './rss.component';
 
-
-
 describe('RssComponent', () => {
   let comp: RSSComponent;
+  let options: SortOptions;
   let fixture: ComponentFixture<RSSComponent>;
   let uuid: string;
   let query: string;
@@ -69,6 +79,7 @@ describe('RssComponent', () => {
         pageSize: 10,
         currentPage: 1,
       }),
+      sort: new SortOptions('dc.title', SortDirection.ASC),
     }));
     groupDataService = jasmine.createSpyObj('groupsDataService', {
       findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -80,7 +91,6 @@ describe('RssComponent', () => {
       paginatedSearchOptions: mockSearchOptions,
     };
     TestBed.configureTestingModule({
-      imports: [RSSComponent],
       providers: [
         { provide: GroupDataService, useValue: groupDataService },
         { provide: LinkHeadService, useValue: linkHeadService },
@@ -88,11 +98,15 @@ describe('RssComponent', () => {
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
         { provide: PaginationService, useValue: paginationService },
         { provide: Router, useValue: new RouterMock() },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute },
+        { provide: TranslateService, useValue: getMockTranslateService() },
       ],
+      declarations: [],
     }).compileComponents();
   }));
 
   beforeEach(() => {
+    options = new SortOptions('dc.title', SortDirection.DESC);
     uuid = '2cfcf65e-0a51-4bcb-8592-b8db7b064790';
     query = 'test';
     fixture = TestBed.createComponent(RSSComponent);
@@ -100,18 +114,37 @@ describe('RssComponent', () => {
   });
 
   it('should formulate the correct url given params in url', () => {
-    const route = comp.formulateRoute(uuid, 'opensearch/search', query);
-    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&query=test');
+    const route = comp.formulateRoute(uuid, 'opensearch/search', options, query);
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test');
   });
 
   it('should skip uuid if its null', () => {
-    const route = comp.formulateRoute(null, 'opensearch/search', query);
-    expect(route).toBe('/opensearch/search?format=atom&query=test');
+    const route = comp.formulateRoute(null, 'opensearch/search', options, query);
+    expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=test');
   });
 
   it('should default to query * if none provided', () => {
-    const route = comp.formulateRoute(null, 'opensearch/search', null);
-    expect(route).toBe('/opensearch/search?format=atom&query=*');
+    const route = comp.formulateRoute(null, 'opensearch/search', options, null);
+    expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=*');
+  });
+
+  it('should include filters in opensearch url if provided', () => {
+    const filters = [
+      new SearchFilter('f.test', ['value','another value'], 'contains'), // should be split into two arguments, spaces should be URI-encoded
+      new SearchFilter('f.range', ['[1987 TO 1988]'], 'equals'), // value should be URI-encoded, ',equals' should not
+    ];
+    const route = comp.formulateRoute(uuid, 'opensearch/search', options, query, filters);
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test&f.test=value,contains&f.test=another%20value,contains&f.range=%5B1987%20TO%201988%5D,equals');
+  });
+
+  it('should include configuration in opensearch url if provided', () => {
+    const route = comp.formulateRoute(uuid, 'opensearch/search', options, query, null, 'adminConfiguration');
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test&configuration=adminConfiguration');
+  });
+
+  it('should include rpp in opensearch url if provided', () => {
+    const route = comp.formulateRoute(uuid, 'opensearch/search', options, query, null, null, 50);
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test&rpp=50');
   });
 });
 
diff --git a/src/app/shared/rss-feed/rss.component.ts b/src/app/shared/rss-feed/rss.component.ts
index e089525a72..8d2b49f0e1 100644
--- a/src/app/shared/rss-feed/rss.component.ts
+++ b/src/app/shared/rss-feed/rss.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -9,11 +6,16 @@ import {
   OnInit,
   ViewEncapsulation,
 } from '@angular/core';
-import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import {
   BehaviorSubject,
-  Observable,
   Subscription,
 } from 'rxjs';
 import {
@@ -21,7 +23,8 @@ import {
   switchMap,
 } from 'rxjs/operators';
 
-import { environment } from '../../../../src/environments/environment';
+import { environment } from '../../../environments/environment';
+import { SortOptions } from '../../core/cache/models/sort-options.model';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { GroupDataService } from '../../core/eperson/group-data.service';
@@ -29,9 +32,12 @@ import { PaginationService } from '../../core/pagination/pagination.service';
 import { LinkHeadService } from '../../core/services/link-head.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import {
+  hasValue,
+  isUndefined,
+} from '../empty.util';
 import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
-
-
+import { SearchFilter } from '../search/models/search-filter.model';
 /**
  * The Rss feed button component.
  */
@@ -43,7 +49,7 @@ import { PaginatedSearchOptions } from '../search/models/paginated-search-option
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class RSSComponent implements OnInit, OnDestroy  {
 
@@ -51,8 +57,9 @@ export class RSSComponent implements OnInit, OnDestroy  {
 
   isEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
 
+  isActivated$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
   uuid: string;
-  configuration$: Observable<string>;
 
   subs: Subscription[] = [];
 
@@ -61,7 +68,9 @@ export class RSSComponent implements OnInit, OnDestroy  {
               private configurationService: ConfigurationDataService,
               private searchConfigurationService: SearchConfigurationService,
               private router: Router,
-              protected paginationService: PaginationService) {
+              private route: ActivatedRoute,
+              protected paginationService: PaginationService,
+              protected translateService: TranslateService) {
   }
   /**
    * Removes the linktag created when the component gets removed from the page.
@@ -78,8 +87,11 @@ export class RSSComponent implements OnInit, OnDestroy  {
    * Generates the link tags and the url to opensearch when the component is loaded.
    */
   ngOnInit(): void {
-    this.configuration$ = this.searchConfigurationService.getCurrentConfiguration('default');
-
+    if (hasValue(this.route.snapshot.data?.enableRSS)) {
+      this.isActivated$.next(this.route.snapshot.data.enableRSS);
+    } else if (isUndefined(this.route.snapshot.data?.enableRSS)) {
+      this.isActivated$.next(false);
+    }
     this.subs.push(this.configurationService.findByPropertyName('websvc.opensearch.enable').pipe(
       getFirstCompletedRemoteData(),
     ).subscribe((result) => {
@@ -106,7 +118,7 @@ export class RSSComponent implements OnInit, OnDestroy  {
         return null;
       }
       this.uuid = this.groupDataService.getUUIDFromString(this.router.url);
-      const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.query);
+      const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.sort, searchOptions.query, searchOptions.filters, searchOptions.configuration, searchOptions.pagination?.pageSize, searchOptions.fixedFilter);
       this.addLinks(route);
       this.linkHeadService.addTag({
         href: environment.rest.baseUrl + '/' + openSearchUri + '/service',
@@ -122,20 +134,40 @@ export class RSSComponent implements OnInit, OnDestroy  {
    * Function created a route given the different params available to opensearch
    * @param uuid The uuid if a scope is present
    * @param opensearch openSearch uri
+   * @param sort The sort options for the opensearch request
    * @param query The query string that was provided in the search
    * @returns The combine URL to opensearch
    */
-  formulateRoute(uuid: string, opensearch: string, query: string): string {
-    let route = '?format=atom';
+  formulateRoute(uuid: string, opensearch: string, sort?: SortOptions, query?: string, searchFilters?: SearchFilter[], configuration?: string, pageSize?: number, fixedFilter?: string): string {
+    let route = 'format=atom';
     if (uuid) {
       route += `&scope=${uuid}`;
     }
+    if (sort && sort.direction && sort.field && sort.field !== 'id') {
+      route += `&sort=${sort.field}&sort_direction=${sort.direction}`;
+    }
     if (query) {
       route += `&query=${query}`;
     } else {
       route += `&query=*`;
     }
-    route = '/' + opensearch + route;
+    if (configuration) {
+      route += `&configuration=${configuration}`;
+    }
+    if (pageSize) {
+      route += `&rpp=${pageSize}`;
+    }
+    if (searchFilters) {
+      for (const filter of searchFilters) {
+        for (const val of filter.values) {
+          route += '&' + filter.key + '=' + encodeURIComponent(val) + (filter.operator ? ',' + filter.operator : '');
+        }
+      }
+    }
+    if (fixedFilter) {
+      route += '&' + fixedFilter;
+    }
+    route = '/' + opensearch + '?' + route;
     return route;
   }
 
@@ -169,4 +201,5 @@ export class RSSComponent implements OnInit, OnDestroy  {
       title: 'Sitewide RSS feed',
     });
   }
+
 }
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
index 74c71b1d12..60b6bd3324 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
@@ -1,12 +1,11 @@
 <div>
     <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-        <button type="button" class="close" (click)="selectObject(undefined)" aria-label="Close">
-            <span aria-hidden="true">×</span>
+        <button type="button" class="btn-close" (click)="selectObject(undefined)" aria-label="Close">
         </button>
     </div>
     <div class="modal-body">
-        <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
-        <div class="position-relative py-1 my-3 font-weight-normal h3">
+        <button class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
+        <div class="position-relative py-1 my-3 fw-normal h3">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.or-divider' | translate}}</span>
@@ -14,6 +13,8 @@
         </div>
 
         <h2 class="px-2 h5">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h2>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <ds-dso-selector [context]="Context.ScopeSelectorModal" [currentDSOId]="dsoRD?.payload.uuid"
+                         [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)">
+        </ds-dso-selector>
     </div>
 </div>
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
index a53b87caf1..c9008e2bc7 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
@@ -12,6 +12,7 @@ import {
   SortDirection,
   SortOptions,
 } from '../../../core/cache/models/sort-options.model';
+import { Context } from '../../../core/shared/context.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { DSOSelectorComponent } from '../../dso-selector/dso-selector/dso-selector.component';
@@ -34,6 +35,9 @@ import {
   imports: [DSOSelectorComponent, TranslateModule],
 })
 export class ScopeSelectorModalComponent extends DSOSelectorModalWrapperComponent implements OnInit {
+
+  readonly Context = Context;
+
   objectType = DSpaceObjectType.COMMUNITY;
   /**
    * The types of DSO that can be selected from this list
diff --git a/src/app/shared/search-form/search-form.component.html b/src/app/shared/search-form/search-form.component.html
index 96e45240a1..1f887c1ba6 100644
--- a/src/app/shared/search-form/search-form.component.html
+++ b/src/app/shared/search-form/search-form.component.html
@@ -1,19 +1,17 @@
 <form #form="ngForm" (ngSubmit)="onSubmit(form.value)" action="/search">
-    <div>
-        <div class="form-group input-group">
-            <div *ngIf="showScopeSelector" class="input-group-prepend">
-                <button class="scope-button btn btn-outline-secondary text-truncate"
-                        [ngbTooltip]="dsoNameService.getName(selectedScope | async)" type="button"
-                        (click)="openScopeModal()">
-                  {{dsoNameService.getName(selectedScope | async) || ('search.form.scope.all' | translate)}}
-                </button>
-            </div>
-            <input type="text" [(ngModel)]="query" name="query" class="form-control"
-                   [attr.aria-label]="searchPlaceholder" [attr.data-test]="'search-box' | dsBrowserOnly"
-                   [placeholder]="searchPlaceholder">
-            <span class="input-group-append">
-            <button type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly"><i class="fas fa-search"></i> {{ ('search.form.search' | translate) }}</button>
-        </span>
-        </div>
+  <div>
+    <div class="mb-3 input-group">
+      @if (showScopeSelector) {
+        <button class="scope-button btn btn-outline-secondary text-truncate"
+          [ngbTooltip]="dsoNameService.getName(selectedScope | async)" type="button"
+          (click)="openScopeModal()">
+          {{dsoNameService.getName(selectedScope | async) || ('search.form.scope.all' | translate)}}
+        </button>
+      }
+      <input type="text" [(ngModel)]="query" name="query" class="form-control"
+        [attr.aria-label]="searchPlaceholder" [attr.data-test]="'search-box' | dsBrowserOnly"
+        [placeholder]="searchPlaceholder">
+      <button type="submit" class="search-button btn btn-{{brandColor}}" [attr.data-test]="'search-button' | dsBrowserOnly"><i class="fas fa-search"></i> {{ ('search.form.search' | translate) }}</button>
     </div>
+  </div>
 </form>
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 14eb2e2f9f..dba8c67ed8 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -40,7 +37,7 @@ import { ScopeSelectorModalComponent } from './scope-selector-modal/scope-select
   styleUrls: ['./search-form.component.scss'],
   templateUrl: './search-form.component.html',
   standalone: true,
-  imports: [FormsModule, NgIf, NgbTooltipModule, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [FormsModule, NgbTooltipModule, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 /**
  * Component that represents the search form
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.html b/src/app/shared/search/advanced-search/advanced-search.component.html
index bd8ad0dfc9..64b4a0197f 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.html
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -5,32 +5,36 @@
     {{ 'search.sidebar.advanced-search.filters' | translate }}
   </label>
   <select [(ngModel)]="currentFilter" (keyup.enter)="applyFilter()"
-          (ngModelChange)="currentOperator = advancedFilterMap.get(currentFilter).operators[0].operator"
-          class="form-control mb-2" id="advanced-search-filters">
-    <option *ngFor="let advancedFilter of (advancedFilters$ | async) | keyvalue" [value]="advancedFilter.value.filter">
-      {{ 'search.filters.filter.' + advancedFilter.value.filter + '.head' | translate }}
-    </option>
+    (ngModelChange)="currentOperator = advancedFilterMap.get(currentFilter).operators[0].operator"
+    class="form-control mb-2" id="advanced-search-filters">
+    @for (advancedFilter of (advancedFilters$ | async); track advancedFilter.filter) {
+      <option [value]="advancedFilter.filter">
+        {{ 'search.filters.filter.' + advancedFilter.filter + '.head' | translate }}
+      </option>
+    }
   </select>
   <label class="sr-only" for="advanced-search-operators">
     {{ 'search.sidebar.advanced-search.operators' | translate }}
   </label>
   <select [(ngModel)]="currentOperator" (keyup.enter)="applyFilter()"
-          class="form-control mb-2" id="advanced-search-operators">
-    <option *ngFor="let operator of advancedFilterMap.get(currentFilter)?.operators" [value]="operator.operator">
-      {{ 'search.filters.operator.' + operator.operator + '.text' | translate }}
-    </option>
+    class="form-control mb-2" id="advanced-search-operators">
+    @for (operator of advancedFilterMap.get(currentFilter)?.operators; track operator) {
+      <option [value]="operator.operator">
+        {{ 'search.filters.operator.' + operator.operator + '.text' | translate }}
+      </option>
+    }
   </select>
   <ds-filter-input-suggestions [suggestions]="(filterSearchResults$ | async)"
-                               [placeholder]="'search.filters.filter.' + currentFilter + '.placeholder' | translate"
-                               [label]="'search.filters.filter.' + currentFilter + '.label' | translate"
-                               [action]="router.url"
-                               [name]="'f.' + currentFilter"
-                               [(ngModel)]="currentValue"
-                               (submitSuggestion)="applyFilter()"
-                               (findSuggestions)="findSuggestions($event)"
-                               ngDefaultControl>
+    [placeholder]="'search.filters.filter.' + currentFilter + '.placeholder' | translate"
+    [label]="'search.filters.filter.' + currentFilter + '.label' | translate"
+    [action]="router.url"
+    [name]="'f.' + currentFilter"
+    [(ngModel)]="currentValue"
+    (submitSuggestion)="applyFilter()"
+    (findSuggestions)="findSuggestions($event)"
+    ngDefaultControl>
   </ds-filter-input-suggestions>
-  <button (click)="applyFilter()" [disabled]="currentValue === ''" class="btn btn-primary mt-2">
+  <button (click)="applyFilter()" [dsBtnDisabled]="currentValue === ''" class="btn btn-primary mt-2">
     {{ 'search.sidebar.advanced-search.add' | translate }}
   </button>
 </div>
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts
index f8ebb51dad..574ffb2c4f 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.ts
+++ b/src/app/shared/search/advanced-search/advanced-search.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   KeyValuePipe,
-  NgForOf,
 } from '@angular/common';
 import {
   Component,
@@ -31,6 +30,7 @@ import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { FilterConfig } from '../../../core/shared/search/search-filters/search-config.model';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -53,8 +53,8 @@ import { SearchFilterConfig } from '../models/search-filter-config.model';
     FilterInputSuggestionsComponent,
     FormsModule,
     KeyValuePipe,
-    NgForOf,
     TranslateModule,
+    BtnDisabledDirective,
   ],
 })
 export class AdvancedSearchComponent implements OnInit, OnDestroy {
diff --git a/src/app/shared/search/models/search-filter-config.model.ts b/src/app/shared/search/models/search-filter-config.model.ts
index 4498ba5763..5ec6b0720f 100644
--- a/src/app/shared/search/models/search-filter-config.model.ts
+++ b/src/app/shared/search/models/search-filter-config.model.ts
@@ -52,7 +52,7 @@ export class SearchFilterConfig implements CacheableObject {
     /**
      * Defines if the item facet is collapsed by default or not on the search page
      */
-    @autoserialize
+    @autoserializeAs(Boolean, 'openByDefault')
       isOpenByDefault: boolean;
 
     /**
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.html b/src/app/shared/search/search-export-csv/search-export-csv.component.html
index 7bf8704300..efc5c5dc4a 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.html
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.html
@@ -1,7 +1,9 @@
-<button *ngIf="shouldShowButton$ | async"
-   class="export-button btn btn-dark btn-sm"
-   [ngbTooltip]="tooltipMsg | translate"
-   (click)="export()"
-   [title]="tooltipMsg |translate" [attr.aria-label]="tooltipMsg |translate">
+@if (shouldShowButton$ | async) {
+  <button
+    class="export-button btn btn-dark btn-sm"
+    [ngbTooltip]="tooltipMsg | translate"
+    (click)="export()"
+    [title]="tooltipMsg |translate" [attr.aria-label]="tooltipMsg |translate">
     <i class="fas fa-file-export fa-fw"></i>
-</button>
\ No newline at end of file
+  </button>
+}
\ No newline at end of file
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
index fc4052a52e..9abdd8d366 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.spec.ts
@@ -13,7 +13,6 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
 import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths';
 import { Process } from '../../../process-page/processes/process.model';
-import { Script } from '../../../process-page/scripts/script.model';
 import { NotificationsService } from '../../notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
@@ -33,7 +32,6 @@ describe('SearchExportCsvComponent', () => {
   let notificationsService;
   let router;
 
-  const script = Object.assign(new Script(), { id: 'metadata-export-search', name: 'metadata-export-search' });
   const process = Object.assign(new Process(), { processId: 5, scriptName: 'metadata-export-search' });
 
   const searchConfig = new PaginatedSearchOptions({
@@ -49,7 +47,7 @@ describe('SearchExportCsvComponent', () => {
 
   function initBeforeEachAsync() {
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
-      findById: createSuccessfulRemoteDataObject$(script),
+      scriptWithNameExistsAndCanExecute: observableOf(true),
       invoke: createSuccessfulRemoteDataObject$(process),
     });
     authorizationDataService = jasmine.createSpyObj('authorizationService', {
@@ -117,15 +115,22 @@ describe('SearchExportCsvComponent', () => {
     describe('when the metadata-export-search script is not present', () => {
       beforeEach(waitForAsync(() => {
         initBeforeEachAsync();
-        (scriptDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Not found', 404));
+        (scriptDataService.scriptWithNameExistsAndCanExecute as jasmine.Spy).and.returnValue(observableOf(false));
       }));
-      beforeEach(() => {
-        initBeforeEach();
-      });
+
       it('should should not add the button', () => {
+        initBeforeEach();
+
         const debugElement = fixture.debugElement.query(By.css('button.export-button'));
         expect(debugElement).toBeNull();
       });
+
+      it('should not call scriptWithNameExistsAndCanExecute when unauthorized', () => {
+        (authorizationDataService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
+        initBeforeEach();
+
+        expect(scriptDataService.scriptWithNameExistsAndCanExecute).not.toHaveBeenCalled();
+      });
     });
   });
   describe('export', () => {
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.ts b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
index 9e25e387c2..579cabca94 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.ts
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -13,11 +10,13 @@ import {
   TranslateModule,
   TranslateService,
 } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
 import {
-  combineLatest as observableCombineLatest,
-  Observable,
-} from 'rxjs';
-import { map } from 'rxjs/operators';
+  filter,
+  map,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
 
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
@@ -32,13 +31,14 @@ import {
 } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
 
 @Component({
   selector: 'ds-search-export-csv',
   styleUrls: ['./search-export-csv.component.scss'],
   templateUrl: './search-export-csv.component.html',
   standalone: true,
-  imports: [NgIf, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 /**
  * Display a button to export the current search results as csv
@@ -69,15 +69,11 @@ export class SearchExportCsvComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const scriptExists$ = this.scriptDataService.findById('metadata-export-search').pipe(
-      getFirstCompletedRemoteData(),
-      map((rd) => rd.isSuccess && hasValue(rd.payload)),
-    );
-
-    const isAuthorized$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf);
-
-    this.shouldShowButton$ = observableCombineLatest([scriptExists$, isAuthorized$]).pipe(
-      map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized),
+    this.shouldShowButton$ = this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
+      filter((isAuthorized: boolean) => isAuthorized),
+      switchMap(() => this.scriptDataService.scriptWithNameExistsAndCanExecute('metadata-export-search')),
+      map((canExecute: boolean) => canExecute),
+      startWith(false),
     );
   }
 
@@ -97,19 +93,19 @@ export class SearchExportCsvComponent implements OnInit {
         parameters.push({ name: '-c', value: this.searchConfig.configuration });
       }
       if (isNotEmpty(this.searchConfig.filters)) {
-        this.searchConfig.filters.forEach((filter) => {
-          if (hasValue(filter.values)) {
-            filter.values.forEach((value) => {
+        this.searchConfig.filters.forEach((searchFilter: SearchFilter) => {
+          if (hasValue(searchFilter.values)) {
+            searchFilter.values.forEach((value: string) => {
               let operator;
               let filterValue;
-              if (hasValue(filter.operator)) {
-                operator = filter.operator;
+              if (hasValue(searchFilter.operator)) {
+                operator = searchFilter.operator;
                 filterValue = value;
               } else {
                 operator = value.substring(value.lastIndexOf(',') + 1);
                 filterValue = value.substring(0, value.lastIndexOf(','));
               }
-              const valueToAdd = `${filter.key.substring(2)},${operator}=${filterValue}`;
+              const valueToAdd = `${searchFilter.key.substring(2)},${operator}=${filterValue}`;
               parameters.push({ name: '-f', value: valueToAdd });
             });
           }
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
index 1a95d68b2c..b25a602996 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
@@ -1,31 +1,40 @@
 <div>
-    <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedAppliedFilters$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
-        <ng-container *ngFor="let page of (facetValues$ | async)">
-          <div [@facetLoad]="animationState">
-            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
-          </div>
-        </ng-container>
-        <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
-               (click)="showMore()" href="javascript:void(0);">
-              {{"search.filters.filter.show-more" | translate}}
-            </a>
-            <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
-              {{"search.filters.filter.show-less" | translate}}
-            </a>
-        </div>
+  <div class="filters py-2">
+    @for (value of (selectedAppliedFilters$ | async); track value) {
+      <ds-search-facet-selected-option [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+        }
+      </div>
+    }
+    <div class="clearfix toggle-more-filters">
+      @if ((isLastPage$ | async) !== true) {
+        <a class="float-start"
+          (click)="showMore()" href="javascript:void(0);">
+          {{"search.filters.filter.show-more" | translate}}
+        </a>
+      }
+      @if ((currentPage | async) > 1) {
+        <a class="float-end"
+          (click)="showFirstPageOnly()" href="javascript:void(0);">
+          {{"search.filters.filter.show-less" | translate}}
+        </a>
+      }
     </div>
+  </div>
+  @if ((isAvailableForShowSearchText | async) === false) {
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults$ | async)"
-                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
-                          [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
-                          [action]="currentUrl"
-                          [name]="filterConfig.paramName"
-                          [(ngModel)]="filter"
-                          (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onClick($event)"
-                          (findSuggestions)="findSuggestions($event)"
-                          *ngIf="(isAvailableForShowSearchText | async) === false"
-                          ngDefaultControl></ds-filter-input-suggestions>
+      [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
+      [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
+      [action]="currentUrl"
+      [name]="filterConfig.paramName"
+      [(ngModel)]="filter"
+      (submitSuggestion)="onSubmit($event)"
+      (clickSuggestion)="onClick($event)"
+      (findSuggestions)="findSuggestions($event)"
+    ngDefaultControl></ds-filter-input-suggestions>
+  }
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
index eaf5768cce..309d75c42f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -24,7 +20,7 @@ import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-optio
   templateUrl: './search-authority-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, TranslateModule],
+  imports: [SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
index 6c26198e65..c5abc198a6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
@@ -1,21 +1,29 @@
 <div>
-    <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedAppliedFilters$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
-      <ng-container *ngFor="let page of (facetValues$ | async)">
-        <div [@facetLoad]="animationState">
-            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
-        </div>
-        </ng-container>
-        <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
-               (click)="showMore()" href="javascript:void(0);">
-              {{"search.filters.filter.show-more" | translate}}
-            </a>
-            <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
-              {{"search.filters.filter.show-less" | translate}}
-            </a>
-        </div>
+  <div class="filters py-2">
+    @for (value of (selectedAppliedFilters$ | async); track value) {
+      <ds-search-facet-selected-option [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+        }
+      </div>
+    }
+    <div class="clearfix toggle-more-filters">
+      @if ((isLastPage$ | async) !== true) {
+        <a class="float-start"
+          (click)="showMore()" href="javascript:void(0);">
+          {{"search.filters.filter.show-more" | translate}}
+        </a>
+      }
+      @if ((currentPage | async) > 1) {
+        <a class="float-end"
+          (click)="showFirstPageOnly()" href="javascript:void(0);">
+          {{"search.filters.filter.show-less" | translate}}
+        </a>
+      }
     </div>
+  </div>
 
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
index 5c52b5b529..7fb5ec6019 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -22,7 +18,7 @@ import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-optio
   templateUrl: './search-boolean-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, AsyncPipe, TranslateModule],
+  imports: [SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
index f0e6120725..75387550b2 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
@@ -1,14 +1,15 @@
-<a *ngIf="isVisible | async" class="d-flex flex-row"
-   [tabIndex]="-1"
-   [routerLink]="[searchLink]"
-   [queryParams]="addQueryParams$ | async"
-   (click)="filterService.minimizeAll()">
-  <label class="mb-0 d-flex w-100">
-    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
-    <span class="w-100 pl-1 break-facet">
-      <span class="float-right badge badge-secondary badge-pill mt-1 ml-1">{{filterValue.count | dsShortNumber}}</span>
-      {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
-    </span>
-  </label>
-
-</a>
+@if (isVisible | async) {
+  <a class="d-flex flex-row"
+    [tabIndex]="-1"
+    [routerLink]="[searchLink]"
+    [queryParams]="addQueryParams$ | async"
+    (click)="announceFilter(); filterService.minimizeAll()">
+    <label class="mb-0 d-flex w-100">
+      <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
+      <span class="w-100 ps-1 break-facet">
+        <span class="float-end badge bg-secondary rounded-pill mt-1 ms-1">{{filterValue.count | dsShortNumber}}</span>
+        {{ 'search.filters.' + filterConfig.name + '.' + filterValue.value | translate: {default: filterValue.value} }}
+      </span>
+    </label>
+  </a>
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index 297ae12f09..b0b255615b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -12,7 +9,10 @@ import {
   Router,
   RouterLink,
 } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
@@ -20,6 +20,7 @@ import { PaginationService } from '../../../../../../core/pagination/pagination.
 import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
+import { LiveRegionService } from '../../../../../../shared/live-region/live-region.service';
 import { currentPath } from '../../../../../utils/route.utils';
 import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
 import { FacetValue } from '../../../../models/facet-value.model';
@@ -31,7 +32,7 @@ import { getFacetValueForType } from '../../../../search.utils';
   styleUrls: ['./search-facet-option.component.scss'],
   templateUrl: './search-facet-option.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, TranslateModule, ShortNumberPipe],
+  imports: [RouterLink, AsyncPipe, TranslateModule, ShortNumberPipe],
 })
 
 /**
@@ -75,6 +76,8 @@ export class SearchFacetOptionComponent implements OnInit {
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
               protected paginationService: PaginationService,
+              protected liveRegionService: LiveRegionService,
+              private translateService: TranslateService,
   ) {
   }
 
@@ -119,4 +122,11 @@ export class SearchFacetOptionComponent implements OnInit {
     return getFacetValueForType(this.filterValue, this.filterConfig);
   }
 
+  /**
+   * Announces to the screen reader that the page will be reloaded, which filter has been selected
+   */
+  announceFilter() {
+    const message = this.translateService.instant('search-facet-option.update.announcement', { filter: this.filterValue.value });
+    this.liveRegionService.addMessage(message);
+  }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
index 068c9bc775..595609d5a4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
@@ -1,9 +1,11 @@
-<a *ngIf="isVisible | async" class="d-flex flex-row"
-   (click)="filterService.minimizeAll()"
-   [routerLink]="[searchLink]"
-   [queryParams]="changeQueryParams" queryParamsHandling="merge">
-  <span class="filter-value px-1">{{filterValue.label}}</span>
-  <span class="float-right filter-value-count ml-auto">
-    <span class="badge badge-secondary badge-pill">{{filterValue.count | dsShortNumber}}</span>
-  </span>
-</a>
+@if (isVisible | async) {
+  <a class="d-flex flex-row"
+    (click)="filterService.minimizeAll()"
+    [routerLink]="[searchLink]"
+    [queryParams]="changeQueryParams" queryParamsHandling="merge">
+    <span class="filter-value px-1">{{filterValue.label}}</span>
+    <span class="float-end filter-value-count ms-auto">
+      <span class="badge bg-secondary rounded-pill">{{filterValue.count | dsShortNumber}}</span>
+    </span>
+  </a>
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index 3c2028664c..893691fc0f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -41,7 +38,7 @@ const rangeDelimiter = '-';
   // templateUrl: './search-facet-range-option.component.html',
   templateUrl: './search-facet-range-option.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, ShortNumberPipe],
+  imports: [RouterLink, AsyncPipe, ShortNumberPipe],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
index 0887e4d6a5..b1045a854a 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
@@ -5,7 +5,7 @@
    (click)="searchFilterService.minimizeAll()">
   <label class="mb-0 d-flex w-100">
     <input type="checkbox" [checked]="true" class="my-1 align-self-stretch filter-checkbox"/>
-    <span class="filter-value pl-1 break-facet">
+    <span class="filter-value ps-1 break-facet">
         {{ 'search.filters.' + filterConfig.name + '.' + selectedValue.value | translate: {default: selectedValue.label} }}
     </span>
   </label>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index f09c4f18f4..0bb708db91 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
@@ -160,7 +160,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
     this.currentUrl = this.router.url;
     this.currentPage = this.getCurrentPage().pipe(distinctUntilChanged());
     this.searchOptions$ = this.searchConfigService.searchOptions.pipe(
-      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign({}, options, {
+      map((options: SearchOptions) => hasNoValue(this.scope) ? options : Object.assign(new SearchOptions(options), {
         scope: this.scope,
       })),
     );
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index f20a256063..32821d27b6 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -1,28 +1,30 @@
-<div class="facet-filter d-block mb-3 p-3" *ngIf="active$ | async"
-     [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
-  <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
-          class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
-          [attr.aria-expanded]="(collapsed$ | async) !== true"
-          [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
-          [attr.data-test]="'filter-toggle' | dsBrowserOnly"
-  >
-    <span class="h4 d-inline-block text-left mt-auto mb-auto dark:text-white text-dark">
-      {{'search.filters.filter.' + filter.name + '.head'| translate}}
-    </span>
-    <i class="filter-toggle flex-grow-1 fas p-auto"
-       aria-hidden="true"
-       [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
-       [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
-    </i>
-  </button>
-  <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
-       (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
-       class="search-filter-wrapper" [ngClass]="{ 'closed' : closed, 'notab': notab }">
-    <ds-search-facet-filter-wrapper
-      [scope]="scope"
-      [filterConfig]="filter"
-      [inPlaceSearch]="inPlaceSearch"
-      [refreshFilters]="refreshFilters">
-    </ds-search-facet-filter-wrapper>
+@if (active$ | async) {
+  <div class="facet-filter d-block mb-3 p-3"
+    [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
+    <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
+      class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
+      [attr.aria-expanded]="(collapsed$ | async) !== true"
+      [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
+      [attr.data-test]="'filter-toggle' | dsBrowserOnly"
+      >
+      <span class="h4 d-inline-block text-left mt-auto mb-auto dark:text-white text-dark">
+        {{'search.filters.filter.' + filter.name + '.head'| translate}}
+      </span>
+      <i class="filter-toggle flex-grow-1 fas p-auto"
+        aria-hidden="true"
+        [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'"
+        [title]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
+      </i>
+    </button>
+    <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
+      (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
+      class="search-filter-wrapper" [ngClass]="{ 'closed' : closed, 'notab': notab }">
+      <ds-search-facet-filter-wrapper
+        [scope]="scope"
+        [filterConfig]="filter"
+        [inPlaceSearch]="inPlaceSearch"
+        [refreshFilters]="refreshFilters">
+      </ds-search-facet-filter-wrapper>
+    </div>
   </div>
-</div>
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index cc8d05e459..03081581ee 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -2,15 +2,16 @@ import {
   AsyncPipe,
   LowerCasePipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
+  EventEmitter,
   Inject,
   Input,
   OnChanges,
   OnDestroy,
   OnInit,
+  Output,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import {
@@ -51,7 +52,7 @@ import { SearchFacetFilterWrapperComponent } from './search-facet-filter-wrapper
   templateUrl: './search-filter.component.html',
   animations: [slide],
   standalone: true,
-  imports: [NgIf, NgClass, SearchFacetFilterWrapperComponent, AsyncPipe, LowerCasePipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgClass, SearchFacetFilterWrapperComponent, AsyncPipe, LowerCasePipe, TranslateModule, BrowserOnlyPipe],
 })
 
 /**
@@ -78,6 +79,8 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
    */
   @Input() scope: string;
 
+  @Output() isVisibilityComputed = new EventEmitter<boolean>();
+
   /**
    * True when the filter is 100% collapsed in the UI
    */
@@ -136,11 +139,16 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
     this.active$ = this.isActive();
     this.collapsed$ = this.isCollapsed();
     this.initializeFilter();
-    this.subs.push(this.appliedFilters$.pipe(take(1)).subscribe((selectedValues: AppliedFilter[]) => {
-      if (isNotEmpty(selectedValues)) {
-        this.filterService.expand(this.filter.name);
-      }
-    }));
+    this.subs.push(
+      this.appliedFilters$.subscribe((selectedValues: AppliedFilter[]) => {
+        if (isNotEmpty(selectedValues)) {
+          this.filterService.expand(this.filter.name);
+        }
+      }),
+      this.getIsActive().pipe(take(1)).subscribe(() => {
+        this.isVisibilityComputed.emit(true);
+      }),
+    );
   }
 
   ngOnChanges(): void {
@@ -223,6 +231,16 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
    * @returns {Observable<boolean>} Emits true whenever a given filter config should be shown
    */
   isActive(): Observable<boolean> {
+    return this.getIsActive().pipe(
+      startWith(true),
+    );
+  }
+
+  /**
+   * Return current filter visibility
+   * @returns {Observable<boolean>} Emits true whenever a given filter config should be shown
+   */
+  private getIsActive():  Observable<boolean> {
     return combineLatest([
       this.appliedFilters$,
       this.searchConfigService.searchOptions,
@@ -243,7 +261,6 @@ export class SearchFilterComponent implements OnInit, OnChanges, OnDestroy {
           );
         }
       }),
-      startWith(true),
     );
   }
 }
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
index f2841ea42d..eff66dd3a4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   SearchFilterCollapseAction,
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
index 51200571bd..1774aba0a0 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
@@ -1,39 +1,50 @@
 <div>
-    <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedAppliedFilters$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
-        <ng-container *ngFor="let page of (facetValues$ | async)">
-          <div [@facetLoad]="animationState">
-            <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
-          </div>
-        </ng-container>
-        <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
-               (click)="showMore()" href="javascript:void(0);">
-              {{"search.filters.filter.show-more" | translate}}
-            </a>
-            <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
-              {{"search.filters.filter.show-less" | translate}}
-            </a>
-        </div>
+  <div class="filters py-2">
+    @for (value of (selectedAppliedFilters$ | async); track value) {
+      <ds-search-facet-selected-option [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+        }
+      </div>
+    }
+    <div class="clearfix toggle-more-filters">
+      @if ((isLastPage$ | async) !== true) {
+        <a class="float-start"
+          (click)="showMore()" href="javascript:void(0);">
+          {{"search.filters.filter.show-more" | translate}}
+        </a>
+      }
+      @if ((currentPage | async) > 1) {
+        <a class="float-end"
+          (click)="showFirstPageOnly()" href="javascript:void(0);">
+          {{"search.filters.filter.show-less" | translate}}
+        </a>
+      }
     </div>
+  </div>
+  @if ((isAvailableForShowSearchText | async) === false) {
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults$ | async)"
-                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
-                          [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
-                          [action]="currentUrl"
-                          [name]="filterConfig.paramName"
-                          [(ngModel)]="filter"
-                          (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onClick($event)"
-                          (findSuggestions)="findSuggestions($event)"
-                          *ngIf="(isAvailableForShowSearchText | async) === false"
-                          ngDefaultControl
+      [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
+      [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
+      [action]="currentUrl"
+      [name]="filterConfig.paramName"
+      [(ngModel)]="filter"
+      (submitSuggestion)="onSubmit($event)"
+      (clickSuggestion)="onClick($event)"
+      (findSuggestions)="findSuggestions($event)"
+      ngDefaultControl
     ></ds-filter-input-suggestions>
+  }
 </div>
 
-<a *ngIf="vocabularyExists$ | async"
-     href="javascript:void(0);"
-     id="show-{{filterConfig.name}}-tree"
-     (click)="showVocabularyTree()">
-  {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate | lowercase )} }}
-</a>
+@if (vocabularyExists$ | async) {
+  <a
+    href="javascript:void(0);"
+    id="show-{{filterConfig.name}}-tree"
+    (click)="showVocabularyTree()">
+    {{'search.filters.filter.show-tree' | translate: {name: ('search.filters.filter.' + filterConfig.name + '.head' | translate | lowercase )} }}
+  </a>
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index 3442780919..1b0f88684e 100644
--- a/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   LowerCasePipe,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -61,7 +59,7 @@ import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-optio
   templateUrl: './search-hierarchy-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, LowerCasePipe, TranslateModule],
+  imports: [SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, LowerCasePipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 6f1f95738c..3e0a80875e 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -1,51 +1,53 @@
 <div>
-    <div class="filters py-2">
-        <form #form="ngForm" (ngSubmit)="onSubmit()" class="add-filter row"
-              [action]="currentUrl">
-            <div class="col-6 form-group mb-0">
-                <label>
-                  <span class="font-weight-bold">
-                    {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
-                  </span>
-                  <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
-                         class="form-control"
-                         [attr.aria-label]="minLabel"
-                         [placeholder]="minLabel"
-                  />
-                </label>
-            </div>
-            <div class="col-6">
-                <label>
-                    <span class="font-weight-bold">
-                      {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
-                    </span>
-                    <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
-                           class="form-control"
-                           [attr.aria-label]="maxLabel"
-                           [placeholder]="maxLabel"
-                    />
-                </label>
-            </div>
-            <button class="sr-only" type="submit">
-                {{'search.filters.search.submit' | translate}}
-            </button>
-        </form>
+  <div class="filters py-2">
+    <form #form="ngForm" (ngSubmit)="onSubmit()" class="add-filter row"
+      [action]="currentUrl">
+      <div class="col-6 mb-3 mb-0">
+        <label class="form-label">
+          <span class="fw-bold">
+            {{'search.filters.filter.' + filterConfig.name + '.min.label' | translate}}
+          </span>
+          <input type="text" [(ngModel)]="range[0]" [name]="filterConfig.paramName + '.min'"
+            class="form-control"
+            [attr.aria-label]="minLabel"
+            [placeholder]="minLabel"
+            />
+        </label>
+      </div>
+      <div class="col-6">
+        <label class="form-label">
+          <span class="fw-bold">
+            {{'search.filters.filter.' + filterConfig.name + '.max.label' | translate}}
+          </span>
+          <input type="text" [(ngModel)]="range[1]" [name]="filterConfig.paramName + '.max'"
+            class="form-control"
+            [attr.aria-label]="maxLabel"
+            [placeholder]="maxLabel"
+            />
+        </label>
+      </div>
+      <button class="sr-only" type="submit">
+        {{'search.filters.search.submit' | translate}}
+      </button>
+    </form>
 
-        <ng-container *ngIf="shouldShowSlider()">
-            <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
-                        [dsDebounce]="250"
-                        (change)="onSliderChange($event)"
-                        (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
-                        [(ngModel)]="range" ngDefaultControl>
-            </nouislider>
-        </ng-container>
-      <ng-container *ngFor="let page of (facetValues$ | async)">
-        <div [@facetLoad]="animationState">
-          <ds-search-facet-range-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-range-option>
-          </div>
-        </ng-container>
-        <button (click)="onSubmit()" class="btn btn-primary">
-          {{'search.filters.search.submit' | translate}}
-        </button>
-    </div>
+    @if (shouldShowSlider()) {
+      <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
+        [dsDebounce]="250"
+        (change)="onSliderChange($event)"
+        (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
+        [(ngModel)]="range" ngDefaultControl>
+      </nouislider>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-range-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-range-option>
+        }
+      </div>
+    }
+    <button (click)="onSubmit()" class="btn btn-primary">
+      {{'search.filters.search.submit' | translate}}
+    </button>
+  </div>
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 85f3a4c42c..ded7d98c02 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   isPlatformBrowser,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -53,7 +51,7 @@ import {
   templateUrl: './search-range-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [FormsModule, NgIf, NouisliderComponent, DebounceDirective, NgFor, SearchFacetRangeOptionComponent, AsyncPipe, TranslateModule],
+  imports: [FormsModule, NouisliderComponent, DebounceDirective, SearchFacetRangeOptionComponent, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
index 037964c63f..b25a602996 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
@@ -1,31 +1,40 @@
 <div>
-    <div class="filters py-2">
-        <ds-search-facet-selected-option *ngFor="let value of (selectedAppliedFilters$ | async)" [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
-        <ng-container *ngFor="let page of (facetValues$ | async)">
-          <div [@facetLoad]="animationState">
-                  <ds-search-facet-option *ngFor="let value of page.page; trackBy: trackUpdate" [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
-          </div>
-        </ng-container>
-        <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
-               (click)="showMore()" href="javascript:void(0);">
-              {{"search.filters.filter.show-more" | translate}}
-            </a>
-            <a class="float-right" *ngIf="(currentPage | async) > 1"
-               (click)="showFirstPageOnly()" href="javascript:void(0);">
-              {{"search.filters.filter.show-less" | translate}}
-            </a>
-        </div>
+  <div class="filters py-2">
+    @for (value of (selectedAppliedFilters$ | async); track value) {
+      <ds-search-facet-selected-option [selectedValue]="value" [filterConfig]="filterConfig" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-selected-option>
+    }
+    @for (page of (facetValues$ | async); track page) {
+      <div [@facetLoad]="animationState">
+        @for (value of page.page; track trackUpdate($index, value)) {
+          <ds-search-facet-option [filterConfig]="filterConfig" [filterValue]="value" [inPlaceSearch]="inPlaceSearch"></ds-search-facet-option>
+        }
+      </div>
+    }
+    <div class="clearfix toggle-more-filters">
+      @if ((isLastPage$ | async) !== true) {
+        <a class="float-start"
+          (click)="showMore()" href="javascript:void(0);">
+          {{"search.filters.filter.show-more" | translate}}
+        </a>
+      }
+      @if ((currentPage | async) > 1) {
+        <a class="float-end"
+          (click)="showFirstPageOnly()" href="javascript:void(0);">
+          {{"search.filters.filter.show-less" | translate}}
+        </a>
+      }
     </div>
+  </div>
+  @if ((isAvailableForShowSearchText | async) === false) {
     <ds-filter-input-suggestions [suggestions]="(filterSearchResults$ | async)"
-                          [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
-                          [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
-                          [action]="currentUrl"
-                          [name]="filterConfig.paramName"
-                          [(ngModel)]="filter"
-                          (submitSuggestion)="onSubmit($event)"
-                          (clickSuggestion)="onClick($event)"
-                          (findSuggestions)="findSuggestions($event)"
-                          *ngIf="(isAvailableForShowSearchText | async) === false"
-                          ngDefaultControl></ds-filter-input-suggestions>
+      [placeholder]="'search.filters.filter.' + filterConfig.name + '.placeholder' | translate"
+      [label]="'search.filters.filter.' + filterConfig.name + '.label' | translate"
+      [action]="currentUrl"
+      [name]="filterConfig.paramName"
+      [(ngModel)]="filter"
+      (submitSuggestion)="onSubmit($event)"
+      (clickSuggestion)="onClick($event)"
+      (findSuggestions)="findSuggestions($event)"
+    ngDefaultControl></ds-filter-input-suggestions>
+  }
 </div>
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
index 3db6bfc027..f478588415 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -31,7 +27,7 @@ import { SearchFacetSelectedOptionComponent } from '../search-facet-filter-optio
   templateUrl: './search-text-filter.component.html',
   animations: [facetLoad],
   standalone: true,
-  imports: [NgFor, SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, NgIf, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, TranslateModule],
+  imports: [SearchFacetSelectedOptionComponent, SearchFacetOptionComponent, FilterInputSuggestionsComponent, FormsModule, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index dc2ab1f6da..a9afaf7e5e 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -1,10 +1,24 @@
-<h3 *ngIf="inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h3>
-<h2 *ngIf="!inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h2>
-<div *ngIf="(filters | async)?.hasSucceeded">
-    <div *ngFor="let filter of (filters | async)?.payload; trackBy: trackUpdate">
-        <ds-search-filter [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
-    </div>
-</div>
-<button *ngIf="inPlaceSearch" class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" (click)="minimizeFilters()" queryParamsHandling="merge" role="button">
-  <i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}
-</button>
+@if (inPlaceSearch) {
+  <h3>{{filterLabel+'.filters.head' | translate}}</h3>
+} @else {
+  <h2>{{filterLabel+'.filters.head' | translate}}</h2>
+}
+
+@if ((filters | async)?.hasSucceeded) {
+  <div [class.visually-hidden]="filtersWithComputedVisibility !== (filters | async)?.payload?.length">
+    @for (filter of (filters | async)?.payload; track filter.name) {
+      <ds-search-filter (isVisibilityComputed)="countFiltersWithComputedVisibility($event)" [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
+    }
+  </div>
+}
+
+@if(filtersWithComputedVisibility !== (filters | async)?.payload?.length) {
+  <ngx-skeleton-loader [count]="defaultFilterCount"/>
+}
+
+@if (inPlaceSearch) {
+  <button class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" (click)="minimizeFilters()" queryParamsHandling="merge" role="button">
+    <i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}
+  </button>
+}
+
diff --git a/src/app/shared/search/search-filters/search-filters.component.scss b/src/app/shared/search/search-filters/search-filters.component.scss
index b5b2816e89..6170b9281c 100644
--- a/src/app/shared/search/search-filters/search-filters.component.scss
+++ b/src/app/shared/search/search-filters/search-filters.component.scss
@@ -1,2 +1,12 @@
 @import '../../../../styles/variables';
-@import '../../../../styles/mixins';
\ No newline at end of file
+@import '../../../../styles/mixins';
+
+:host ::ng-deep {
+  ngx-skeleton-loader .skeleton-loader {
+    height: var(--ds-filters-skeleton-height);
+    margin-bottom: var(--ds-filters-skeleton-spacing);
+    padding: var(--ds-filters-skeleton-spacing);
+    background-color: var(--bs-light);
+    box-shadow: none;
+  }
+}
diff --git a/src/app/shared/search/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index 0277551eea..878b3a5f7e 100644
--- a/src/app/shared/search/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -11,6 +11,8 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { environment } from '../../../../environments/environment';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
@@ -41,6 +43,7 @@ describe('SearchFiltersComponent', () => {
         { provide: SearchService, useValue: searchService },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SearchFilterService, useValue: searchFilters },
+        { provide: APP_CONFIG, useValue: environment },
       ],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).overrideComponent(SearchFiltersComponent, {
diff --git a/src/app/shared/search/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
index 97358ea8e9..dad3bffb75 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -14,19 +10,23 @@ import {
   RouterLink,
 } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import {
   BehaviorSubject,
   Observable,
 } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
 import { RemoteData } from '../../../core/data/remote-data';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-configuration.service';
 import { currentPath } from '../../utils/route.utils';
-import { AdvancedSearchComponent } from '../advanced-search/advanced-search.component';
 import { AppliedFilter } from '../models/applied-filter.model';
 import { SearchFilterConfig } from '../models/search-filter-config.model';
 import { SearchFilterComponent } from './search-filter/search-filter.component';
@@ -36,7 +36,7 @@ import { SearchFilterComponent } from './search-filter/search-filter.component';
   styleUrls: ['./search-filters.component.scss'],
   templateUrl: './search-filters.component.html',
   standalone: true,
-  imports: [NgIf, NgFor, SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, AdvancedSearchComponent],
+  imports: [SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, NgxSkeletonLoaderModule],
 })
 
 /**
@@ -81,15 +81,23 @@ export class SearchFiltersComponent implements OnInit {
    */
   searchLink: string;
 
+  /**
+   * Filters for which visibility has been computed
+   */
+  filtersWithComputedVisibility = 0;
+
   subs = [];
   filterLabel = 'search';
+  defaultFilterCount: number;
 
   constructor(
     protected searchService: SearchService,
     protected searchFilterService: SearchFilterService,
     protected router: Router,
     @Inject(SEARCH_CONFIG_SERVICE) protected searchConfigService: SearchConfigurationService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
+    this.defaultFilterCount = this.appConfig.search.filterPlaceholdersCount ?? 5;
   }
 
   ngOnInit(): void {
@@ -125,4 +133,10 @@ export class SearchFiltersComponent implements OnInit {
       this.searchFilterService.minimizeAll();
     }
   }
+
+  countFiltersWithComputedVisibility(computed: boolean) {
+    if (computed) {
+      this.filtersWithComputedVisibility += 1;
+    }
+  }
 }
diff --git a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
index 609d9ad785..1eb83e071b 100644
--- a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
+++ b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
@@ -1,22 +1,26 @@
-<a *ngIf="min !== '*'"
-   [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate, value: min }"
-   [routerLink]="searchLink"
-   [queryParams]="(removeParametersMin$ | async)"
-   (click)="searchFilterService.minimizeAll()"
-   class="badge badge-primary">
-  <span class="d-flex">
-    <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }}</span>
-    <span class="pl-1" aria-hidden="true">×</span>
-  </span>
-</a>
-<a *ngIf="max !== '*'"
-   [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate, value: max }"
-   [routerLink]="searchLink"
-   [queryParams]="(removeParametersMax$ | async)"
-   (click)="searchFilterService.minimizeAll()"
-   class="badge badge-primary">
-  <span class="d-flex">
-    <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }}</span>
-    <span class="pl-1" aria-hidden="true">×</span>
-  </span>
-</a>
+@if (min !== '*') {
+  <a
+    [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate, value: min }"
+    [routerLink]="searchLink"
+    [queryParams]="(removeParametersMin$ | async)"
+    (click)="searchFilterService.minimizeAll()"
+    class="badge bg-primary">
+    <span class="d-flex">
+      <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }}</span>
+      <span class="ps-1" aria-hidden="true">×</span>
+    </span>
+  </a>
+}
+@if (max !== '*') {
+  <a
+    [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate, value: max }"
+    [routerLink]="searchLink"
+    [queryParams]="(removeParametersMax$ | async)"
+    (click)="searchFilterService.minimizeAll()"
+    class="badge bg-primary">
+    <span class="d-flex">
+      <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }}</span>
+      <span class="ps-1" aria-hidden="true">×</span>
+    </span>
+  </a>
+}
diff --git a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts
index 0c3079cf5e..ade3e43227 100644
--- a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts
+++ b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -32,7 +29,6 @@ import { AppliedFilter } from '../../models/applied-filter.model';
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     RouterLink,
     TranslateModule,
   ],
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index 58308d4928..4550d41c21 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -1,10 +1,10 @@
-<a class="badge badge-primary"
+<a class="badge bg-primary me-1 mb-1 text-capitalize"
    [attr.aria-label]="'search.filters.remove' | translate:{ type: ('search.filters.applied.f.' + appliedFilter.filter) | translate, value: appliedFilter.label }"
    [routerLink]="searchLink"
    [queryParams]="(removeParameters$ | async)"
    (click)="searchFilterService.minimizeAll()">
   <span class="d-flex">
     <span class="flex-grow-1 text-left">{{ ('search.filters.applied.f.' + appliedFilter.filter) | translate}}{{'search.filters.applied.operator.' + appliedFilter.operator | translate}}: {{'search.filters.' + appliedFilter.filter + '.' + appliedFilter.label | translate: { default: appliedFilter.label } }}</span>
-    <span class="pl-1" aria-hidden="true">×</span>
+    <span class="ps-1" aria-hidden="true">×</span>
   </span>
 </a>
diff --git a/src/app/shared/search/search-labels/search-labels.component.html b/src/app/shared/search/search-labels/search-labels.component.html
index 4e84de0ceb..de8e59de78 100644
--- a/src/app/shared/search/search-labels/search-labels.component.html
+++ b/src/app/shared/search/search-labels/search-labels.component.html
@@ -1,6 +1,8 @@
 <div class="labels">
-  <ds-search-label-loader *ngFor="let appliedFilter of appliedFilters$ | async"
-                          [appliedFilter]="appliedFilter"
-                          [inPlaceSearch]="inPlaceSearch">
-  </ds-search-label-loader>
+  @for (appliedFilter of appliedFilters$ | async; track appliedFilter) {
+    <ds-search-label-loader
+      [appliedFilter]="appliedFilter"
+      [inPlaceSearch]="inPlaceSearch">
+    </ds-search-label-loader>
+  }
 </div>
diff --git a/src/app/shared/search/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts
index b7fe4db780..b7a9b7a82c 100644
--- a/src/app/shared/search/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   KeyValuePipe,
-  NgFor,
 } from '@angular/common';
 import {
   Component,
@@ -21,7 +20,7 @@ import { SearchLabelLoaderComponent } from './search-label-loader/search-label-l
   styleUrls: ['./search-labels.component.scss'],
   templateUrl: './search-labels.component.html',
   standalone: true,
-  imports: [NgFor, SearchLabelComponent, AsyncPipe, ObjectKeysPipe, SearchLabelLoaderComponent, KeyValuePipe],
+  imports: [SearchLabelComponent, AsyncPipe, ObjectKeysPipe, SearchLabelLoaderComponent, KeyValuePipe],
 })
 
 /**
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
new file mode 100644
index 0000000000..a42bda0674
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.html
@@ -0,0 +1,38 @@
+<div class="row flex-nowrap">
+  <div [class.mb-2]="(viewMode$ | async) === ViewMode.ListElement" class="info-skeleton col-12">
+    <ngx-skeleton-loader/>
+  </div>
+</div>
+
+@if((viewMode$ | async) === ViewMode.ListElement) {
+  @for (result of loadingResults; track result; let first = $first) {
+      <div [class.my-4]="!first" class="row">
+      @if(showThumbnails) {
+        <div class="col-3 col-md-2">
+          <div class="thumbnail-skeleton position-relative">
+            <ngx-skeleton-loader/>
+          </div>
+        </div>
+      }
+      <div [class.col-9]="showThumbnails" [class.col-md-10]="showThumbnails" [class.col-md-12]="!showThumbnails">
+        <div class="badge-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+        <div class="text-skeleton">
+          <ngx-skeleton-loader [count]="textLineCount"/>
+        </div>
+      </div>
+    </div>
+  }
+} @else if ((viewMode$ | async) === ViewMode.GridElement) {
+  <div class="card-columns row">
+    @for (result of loadingResults; track result) {
+      <div class="card-column col col-sm-6 col-lg-4">
+        <div class="card-skeleton">
+          <ngx-skeleton-loader/>
+        </div>
+      </div>
+    }
+
+  </div>
+}
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
new file mode 100644
index 0000000000..9345f1ab43
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.scss
@@ -0,0 +1,56 @@
+:host ::ng-deep {
+  --ds-wrapper-grid-spacing: calc(var(--bs-spacer) / 2);
+
+  .info-skeleton, .badge-skeleton, .text-skeleton{
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-text-height);
+    }
+  }
+
+  .badge-skeleton, .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-badge-width);
+    }
+  }
+
+  .info-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      width: var(--ds-search-skeleton-info-width);
+    }
+  }
+
+  .thumbnail-skeleton {
+    max-width: var(--ds-thumbnail-max-width);
+    height: 100%;
+
+    ngx-skeleton-loader .skeleton-loader {
+      margin-right: var(--ds-search-skeleton-thumbnail-margin);
+      border-radius: 0;
+      height: 100%;
+    }
+  }
+
+  .card-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      height: var(--ds-search-skeleton-card-height);
+    }
+  }
+
+  ngx-skeleton-loader .skeleton-loader {
+    background-color: var(--bs-light);
+    box-shadow: none;
+  }
+
+  .card-columns {
+    margin-left: calc(-1 * var(--ds-wrapper-grid-spacing));
+    margin-right: calc(-1 * var(--ds-wrapper-grid-spacing));
+    column-gap: 0;
+
+    .card-column {
+      padding-left: var(--ds-wrapper-grid-spacing);
+      padding-right: var(--ds-wrapper-grid-spacing);
+    }
+  }
+}
+
+
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
new file mode 100644
index 0000000000..68c8db5a8e
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.spec.ts
@@ -0,0 +1,32 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton.component';
+
+describe('SearchResultsSkeletonComponent', () => {
+  let component: SearchResultsSkeletonComponent;
+  let fixture: ComponentFixture<SearchResultsSkeletonComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [SearchResultsSkeletonComponent, NgxSkeletonLoaderModule],
+      providers: [
+        { provide: SearchService, useValue: new SearchServiceStub() },
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(SearchResultsSkeletonComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
new file mode 100644
index 0000000000..56742f75f5
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component.ts
@@ -0,0 +1,66 @@
+import { AsyncPipe } from '@angular/common';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import { Observable } from 'rxjs';
+
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { hasValue } from '../../../empty.util';
+
+@Component({
+  selector: 'ds-search-results-skeleton',
+  standalone: true,
+  imports: [
+    NgxSkeletonLoaderModule,
+    AsyncPipe,
+  ],
+  templateUrl: './search-results-skeleton.component.html',
+  styleUrl: './search-results-skeleton.component.scss',
+})
+/**
+ * Component to show placeholders for search results while loading, to give a loading feedback to the user without layout shifting.
+ */
+export class SearchResultsSkeletonComponent implements OnInit {
+  /**
+   * Whether the search result contains thumbnail
+   */
+  @Input()
+  showThumbnails: boolean;
+  /**
+   * The number of search result loaded in the current page
+   */
+  @Input()
+  numberOfResults = 0;
+  /**
+   * How many placeholder are displayed for the search result text
+   */
+  @Input()
+  textLineCount = 2;
+  /**
+   * The view mode of the search page
+   */
+  public viewMode$: Observable<ViewMode>;
+  /**
+   * Array built from numberOfResults to count and iterate based on index
+   */
+  public loadingResults: number[];
+
+  protected readonly ViewMode = ViewMode;
+
+  constructor(private searchService: SearchService) {
+    this.viewMode$ = this.searchService.getViewMode();
+  }
+
+  ngOnInit() {
+    this.loadingResults = Array.from({ length: this.numberOfResults }, (_, i) => i + 1);
+
+    if (!hasValue(this.showThumbnails)) {
+      // this is needed as the default value of show thumbnails is true but set in lower levels of the DOM.
+      this.showThumbnails = true;
+    }
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
index 871b2b2ca8..0026d0ea5b 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,32 +1,61 @@
+@if ((activeFilters$ | async).length > 0 && (appliedFilters$ | async).length === 0) {
+  <div class="row">
+    <div class="col-12">
+      <div class="filters-badge-skeleton-container">
+        <div class="filter-badge-skeleton">
+          <ngx-skeleton-loader [count]="(activeFilters$ | async).length" />
+        </div>
+      </div>
+    </div>
+  </div>
+}
+
 <div class="d-flex justify-content-between">
-    <h1 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
-    <ds-search-export-csv *ngIf="showCsvExport" [searchConfig]="searchConfig"></ds-search-export-csv>
+  @if (!disableHeader) {
+    <h1>{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h1>
+  }
+  @if (showCsvExport) {
+    <ds-search-export-csv [searchConfig]="searchConfig"></ds-search-export-csv>
+  }
 </div>
-<div *ngIf="searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
+@if (searchResults && searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0) {
+  <div @fadeIn>
     <ds-viewable-collection
-            [config]="searchConfig.pagination"
-            [sortConfig]="searchConfig.sort"
-            [objects]="searchResults"
-            [hideGear]="true"
-            [selectable]="selectable"
-            [selectionConfig]="selectionConfig"
-            [linkType]="linkType"
-            [context]="context"
-            [hidePaginationDetail]="hidePaginationDetail"
-            [showThumbnails]="showThumbnails"
-            (contentChange)="contentChange.emit($event)"
-            (deselectObject)="deselectObject.emit($event)"
-            (selectObject)="selectObject.emit($event)">
+      [config]="searchConfig.pagination"
+      [sortConfig]="searchConfig.sort"
+      [objects]="searchResults"
+      [hideGear]="true"
+      [selectable]="selectable"
+      [selectionConfig]="selectionConfig"
+      [linkType]="linkType"
+      [context]="context"
+      [hidePaginationDetail]="hidePaginationDetail"
+      [showThumbnails]="showThumbnails"
+      (contentChange)="contentChange.emit($event)"
+      (deselectObject)="deselectObject.emit($event)"
+      (selectObject)="selectObject.emit($event)">
     </ds-viewable-collection>
-</div>
-<ds-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-loading>
-<ds-error *ngIf="showError()"
-          message="{{errorMessageLabel() | translate}}"></ds-error>
-<div *ngIf="searchResults?.payload?.page.length === 0 || searchResults?.statusCode === 400">
+  </div>
+}
+
+@if (isLoading()) {
+  <ds-search-results-skeleton
+    [showThumbnails]="showThumbnails"
+    [numberOfResults]="searchConfig.pagination.pageSize"
+  ></ds-search-results-skeleton>
+}
+
+@if (showError()) {
+  <ds-error
+  message="{{errorMessageLabel() | translate}}"></ds-error>
+}
+@if (searchResults?.payload?.page.length === 0 || searchResults?.statusCode === 400) {
+  <div>
     {{ 'search.results.no-results' | translate }}
     <a [routerLink]="['/search']"
-       [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
-       queryParamsHandling="merge">
-        {{"search.results.no-results-link" | translate}}
+      [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
+      queryParamsHandling="merge">
+      {{"search.results.no-results-link" | translate}}
     </a>
-</div>
+  </div>
+}
diff --git a/src/app/shared/search/search-results/search-results.component.scss b/src/app/shared/search/search-results/search-results.component.scss
new file mode 100644
index 0000000000..6e369c729b
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results.component.scss
@@ -0,0 +1,17 @@
+:host ::ng-deep {
+  .filter-badge-skeleton {
+    ngx-skeleton-loader .skeleton-loader {
+      background-color: var(--bs-light);
+      box-shadow: none;
+      width: var(--ds-search-skeleton-filter-badge-width);
+      height: var(--ds-search-skeleton-badge-height);
+      margin-bottom: 0;
+      margin-right: calc(var(--bs-spacer) / 4);
+    }
+  }
+
+  .filters-badge-skeleton-container {
+    display: flex;
+    max-height: var(--ds-search-skeleton-badge-height);
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
index fedea57e07..33b8432b74 100644
--- a/src/app/shared/search/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -13,16 +13,20 @@ import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { Community } from '../../../core/shared/community.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { ErrorComponent } from '../../error/error.component';
-import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
 import { getMockThemeService } from '../../mocks/theme-service.mock';
 import { ObjectCollectionComponent } from '../../object-collection/object-collection.component';
 import { createFailedRemoteDataObject } from '../../remote-data.utils';
 import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { SearchServiceStub } from '../../testing/search-service.stub';
 import { ThemeService } from '../../theme-support/theme.service';
 import { SearchExportCsvComponent } from '../search-export-csv/search-export-csv.component';
 import { SearchResultsComponent } from './search-results.component';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton/search-results-skeleton.component';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
@@ -35,6 +39,11 @@ describe('SearchResultsComponent', () => {
       providers: [
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
         { provide: ThemeService, useValue: getMockThemeService() },
+        { provide: SearchService, useValue: new SearchServiceStub() },
+        {
+          provide: SearchConfigurationService,
+          useValue: new SearchConfigurationServiceStub(),
+        },
       ],
       imports: [
         TranslateModule.forRoot(),
@@ -48,8 +57,8 @@ describe('SearchResultsComponent', () => {
           imports: [
             SearchExportCsvComponent,
             ObjectCollectionComponent,
-            ThemedLoadingComponent,
             ErrorComponent,
+            SearchResultsSkeletonComponent,
           ],
         },
         add: { imports: [QueryParamsDirectiveStub] },
@@ -96,7 +105,7 @@ describe('SearchResultsComponent', () => {
 
   it('should display link with new search where query is quoted if search return a error 400', () => {
     (comp as any).searchResults = createFailedRemoteDataObject('Error', 400);
-    (comp as any).searchConfig = { query: 'foobar' };
+    (comp as any).searchConfig = { query: 'foobar', pagination: { pageSize: 10 } };
     fixture.detectChanges();
 
     const linkDes = fixture.debugElement.queryAll(By.directive(QueryParamsDirectiveStub));
diff --git a/src/app/shared/search/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
index 09186e8c6c..421f361bc0 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -7,12 +7,19 @@ import {
 } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Context } from '../../../core/shared/context.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import {
   fadeIn,
@@ -23,13 +30,15 @@ import {
   isNotEmpty,
 } from '../../empty.util';
 import { ErrorComponent } from '../../error/error.component';
-import { ThemedLoadingComponent } from '../../loading/themed-loading.component';
 import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
 import { ObjectCollectionComponent } from '../../object-collection/object-collection.component';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { AppliedFilter } from '../models/applied-filter.model';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
 import { SearchResult } from '../models/search-result.model';
 import { SearchExportCsvComponent } from '../search-export-csv/search-export-csv.component';
+import { SearchResultsSkeletonComponent } from './search-results-skeleton/search-results-skeleton.component';
 
 export interface SelectionConfig {
   repeatable: boolean;
@@ -39,12 +48,22 @@ export interface SelectionConfig {
 @Component({
   selector: 'ds-base-search-results',
   templateUrl: './search-results.component.html',
+  styleUrls: ['./search-results.component.scss'],
   animations: [
     fadeIn,
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, RouterLink, TranslateModule],
+  imports: [
+    AsyncPipe,
+    ErrorComponent,
+    NgxSkeletonLoaderModule,
+    ObjectCollectionComponent,
+    RouterLink,
+    SearchExportCsvComponent,
+    SearchResultsSkeletonComponent,
+    TranslateModule,
+  ],
 })
 
 /**
@@ -52,6 +71,15 @@ export interface SelectionConfig {
  */
 export class SearchResultsComponent {
   hasNoValue = hasNoValue;
+  /**
+   * Currently active filters in url
+   */
+  activeFilters$: Observable<SearchFilter[]>;
+
+  /**
+   * Filter applied to show labels, once populated the activeFilters$ will be loaded
+   */
+  appliedFilters$: BehaviorSubject<AppliedFilter[]>;
 
   /**
    * The link type of the listed search results
@@ -125,10 +153,18 @@ export class SearchResultsComponent {
 
   @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
 
+  constructor(
+    protected searchConfigService: SearchConfigurationService,
+    protected searchService: SearchService,
+  ) {
+    this.activeFilters$ = this.searchConfigService.getCurrentFilters();
+    this.appliedFilters$ = this.searchService.appliedFilters$;
+  }
+
   /**
    * Check if search results are loading
    */
-  isLoading() {
+  isLoading(): boolean {
     return !this.showError() && (hasNoValue(this.searchResults) || hasNoValue(this.searchResults.payload) || this.searchResults.isLoading);
   }
 
diff --git a/src/app/shared/search/search-settings/search-settings.component.html b/src/app/shared/search/search-settings/search-settings.component.html
index 6469f8ce7e..55b94bf694 100644
--- a/src/app/shared/search/search-settings/search-settings.component.html
+++ b/src/app/shared/search/search-settings/search-settings.component.html
@@ -1,16 +1,20 @@
 <ng-container>
-    <h3>{{ 'search.sidebar.settings.title' | translate}}</h3>
-    <div class="result-order-settings">
-    <ds-sidebar-dropdown *ngIf="sortOptionsList"
-                         [id]="'search-sidebar-sort'"
-                         [label]="'search.sidebar.settings.sort-by'"
-                         (changed)="reloadOrder($event)">
-        <option *ngFor="let sortOptionsEntry of sortOptionsList"
-                [value]="sortOptionsEntry.field + ',' + sortOptionsEntry.direction.toString()"
-                [selected]="sortOptionsEntry.field === currentSortOption?.field && sortOptionsEntry.direction === (currentSortOption?.direction)? 'selected': null">
+  <h3>{{ 'search.sidebar.settings.title' | translate}}</h3>
+  <div class="result-order-settings">
+    @if (sortOptionsList) {
+      <ds-sidebar-dropdown
+        [id]="'search-sidebar-sort'"
+        [label]="'search.sidebar.settings.sort-by'"
+        (changed)="reloadOrder($event)">
+        @for (sortOptionsEntry of sortOptionsList; track sortOptionsEntry) {
+          <option
+            [value]="sortOptionsEntry.field + ',' + sortOptionsEntry.direction.toString()"
+            [selected]="sortOptionsEntry.field === currentSortOption?.field && sortOptionsEntry.direction === (currentSortOption?.direction)? 'selected': null">
             {{'sorting.' + sortOptionsEntry.field + '.' + sortOptionsEntry.direction | translate}}
-        </option>
-    </ds-sidebar-dropdown>
-    </div>
-    <ds-page-size-selector></ds-page-size-selector>
+          </option>
+        }
+      </ds-sidebar-dropdown>
+    }
+  </div>
+  <ds-page-size-selector></ds-page-size-selector>
 </ng-container>
diff --git a/src/app/shared/search/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts
index 68f118bd1c..14e0b1a62a 100644
--- a/src/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -25,7 +22,7 @@ import { SidebarDropdownComponent } from '../../sidebar/sidebar-dropdown.compone
   styleUrls: ['./search-settings.component.scss'],
   templateUrl: './search-settings.component.html',
   standalone: true,
-  imports: [NgIf, SidebarDropdownComponent, NgFor, FormsModule, PageSizeSelectorComponent, TranslateModule],
+  imports: [SidebarDropdownComponent, FormsModule, PageSizeSelectorComponent, TranslateModule],
 })
 
 /**
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
index 43fdc99391..9c9e4a9001 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -1,38 +1,46 @@
 <div>
-    <div id="sidebar-options" class="d-block d-md-none search-controls clearfix">
-        <small class="results">{{resultCount}} {{"search.sidebar.results" | translate}}</small>
-        <button (click)="toggleSidebar.emit()"
-                [attr.aria-label]="'search.sidebar.close' | translate"
-                aria-controls="search-content"
-                class="btn btn-outline-primary float-right close-sidebar"><i
-                class="fas fa-arrow-right"></i> {{'search.sidebar.close' | translate}}
-        </button>
-    </div>
-    <div id="search-sidebar-content">
-        <ds-view-mode-switch *ngIf="showViewModes" class="d-none d-md-block"
-                             [viewModeList]="viewModeList"
-                             (changeViewMode)="changeViewMode.emit($event)"></ds-view-mode-switch>
-        <div class="sidebar-content">
-            <ds-search-switch-configuration *ngIf="configurationList"
-                                            [configurationList]="configurationList"
-                                            [defaultConfiguration]="configuration"
-                                            [inPlaceSearch]="inPlaceSearch"
-                                            (changeConfiguration)="changeConfiguration.emit($event)"></ds-search-switch-configuration>
-            <ds-search-filters [currentScope]="currentScope"
-                               [currentConfiguration]="configuration"
-                               [filters]="filters"
-                               [refreshFilters]="refreshFilters"
-                               [inPlaceSearch]="inPlaceSearch">
-            </ds-search-filters>
-            <ds-advanced-search *ngIf="inPlaceSearch && (this.showAdvancedSearch$ | async) === true"
-                                [configuration]="configuration"
-                                [filtersConfig]="(filters | async)?.payload"
-                                [scope]="currentScope">
-            </ds-advanced-search>
-            <ds-search-settings *ngIf="inPlaceSearch"
-                                [currentSortOption]="currentSortOption"
-                                [sortOptionsList]="sortOptionsList">
-            </ds-search-settings>
-        </div>
-    </div>
+  <div id="sidebar-options" class="d-block d-md-none search-controls clearfix">
+    <small class="results">{{resultCount}} {{"search.sidebar.results" | translate}}</small>
+    <button (click)="toggleSidebar.emit()"
+      [attr.aria-label]="'search.sidebar.close' | translate"
+      aria-controls="search-content"
+      class="btn btn-outline-primary float-end close-sidebar"><i
+    class="fas fa-arrow-right"></i> {{'search.sidebar.close' | translate}}
+  </button>
+</div>
+<div id="search-sidebar-content">
+  @if (showViewModes) {
+    <ds-view-mode-switch class="d-none d-md-block"
+      [viewModeList]="viewModeList"
+    (changeViewMode)="changeViewMode.emit($event)"></ds-view-mode-switch>
+  }
+  <div class="sidebar-content">
+    @if (configurationList) {
+      <ds-search-switch-configuration
+        [configurationList]="configurationList"
+        [defaultConfiguration]="configuration"
+        [inPlaceSearch]="inPlaceSearch"
+      (changeConfiguration)="changeConfiguration.emit($event)"></ds-search-switch-configuration>
+    }
+    <ds-search-filters [currentScope]="currentScope"
+      [currentConfiguration]="configuration"
+      [filters]="filters"
+      [refreshFilters]="refreshFilters"
+      [inPlaceSearch]="inPlaceSearch">
+    </ds-search-filters>
+    @if (inPlaceSearch && (this.showAdvancedSearch$ | async) === true) {
+      <ds-advanced-search
+        [configuration]="configuration"
+        [filtersConfig]="(filters | async)?.payload"
+        [scope]="currentScope">
+      </ds-advanced-search>
+    }
+    @if (inPlaceSearch) {
+      <ds-search-settings
+        [currentSortOption]="currentSortOption"
+        [sortOptionsList]="sortOptionsList">
+      </ds-search-settings>
+    }
+  </div>
+</div>
 </div>
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
index d6cbc82ce2..77b05ef0dd 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -46,7 +43,7 @@ import { SearchSwitchConfigurationComponent } from '../search-switch-configurati
   styleUrls: ['./search-sidebar.component.scss'],
   templateUrl: './search-sidebar.component.html',
   standalone: true,
-  imports: [NgIf, ViewModeSwitchComponent, SearchSwitchConfigurationComponent, ThemedSearchFiltersComponent, ThemedSearchSettingsComponent, TranslateModule, AdvancedSearchComponent, AsyncPipe],
+  imports: [ViewModeSwitchComponent, SearchSwitchConfigurationComponent, ThemedSearchFiltersComponent, ThemedSearchSettingsComponent, TranslateModule, AdvancedSearchComponent, AsyncPipe],
 })
 
 /**
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
index 64c0cd5008..e4ac701043 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
@@ -1,14 +1,16 @@
-<div *ngIf="configurationList?.length > 1" class="search-switch-configuration">
-  <h3 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h3>
-
-  <select class="form-control"
-          aria-labelledby="configuration-switch"
-          [compareWith]="compare"
-          [(ngModel)]="selectedOption"
-          (change)="onSelect()">
-    <option *ngFor="let option of configurationList;" [ngValue]="option">
-      {{option.label | translate}}
-    </option>
-  </select>
-
-</div>
+@if (configurationList?.length > 1) {
+  <div class="search-switch-configuration">
+    <h3 id="configuration-switch">{{ 'search.switch-configuration.title' | translate}}</h3>
+    <select class="form-select"
+      aria-labelledby="configuration-switch"
+      [compareWith]="compare"
+      [(ngModel)]="selectedOption"
+      (change)="onSelect()">
+      @for (option of configurationList; track option) {
+        <option [ngValue]="option">
+          {{option.label | translate}}
+        </option>
+      }
+    </select>
+  </div>
+}
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
index d1562b3734..913b9cba0b 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
@@ -87,7 +87,7 @@ describe('SearchSwitchConfigurationComponent', () => {
   });
 
   it('should display select field properly', () => {
-    const selectField = fixture.debugElement.query(By.css('.form-control'));
+    const selectField = fixture.debugElement.query(By.css('.form-select'));
     expect(selectField).not.toBeNull();
 
     const childElements = selectField.children;
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
index e301a3729e..5828e69c3b 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -33,7 +30,7 @@ import { SearchConfigurationOption } from './search-configuration-option.model';
   styleUrls: ['./search-switch-configuration.component.scss'],
   templateUrl: './search-switch-configuration.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, NgFor, TranslateModule],
+  imports: [FormsModule, TranslateModule],
 })
 /**
  * Represents a select that allow to switch over available search configurations
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index e090280692..e0f778e55d 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -1,106 +1,122 @@
-<div class="container" *ngIf="searchEnabled && (isXsOrSm$ | async)">
+@if (searchEnabled && (isXsOrSm$ | async)) {
+  <div class="container">
     <div class="row">
-        <div class="col-12">
-            <ng-template *ngTemplateOutlet="searchForm"></ng-template>
-        </div>
+      <div class="col-12">
+        <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+      </div>
     </div>
-</div>
+  </div>
+}
 
-<div *ngIf="!showSidebar && (initialized$ | async)">
-  <ng-template *ngTemplateOutlet="searchContent"></ng-template>
-</div>
+@if (!showSidebar && (initialized$ | async)) {
+  <div>
+    <ng-template *ngTemplateOutlet="searchContent"></ng-template>
+  </div>
+}
 
-<ds-page-with-sidebar *ngIf="showSidebar && (initialized$ | async)" [id]="'search-page'" [sideBarWidth]="sideBarWidth"
+@if (showSidebar && (initialized$ | async)) {
+  <ds-page-with-sidebar [id]="'search-page'" [sideBarWidth]="sideBarWidth"
     [sidebarContent]="sidebarContent">
     <ng-template *ngTemplateOutlet="searchContent"></ng-template>
-</ds-page-with-sidebar>
+  </ds-page-with-sidebar>
+}
 
 <ng-template #searchContent>
-    <div class="row">
-        <div class="col-12" *ngIf="(isXsOrSm$ | async) !== true">
-            <ng-container *ngIf="searchEnabled">
-                <ng-template *ngTemplateOutlet="searchForm"></ng-template>
-            </ng-container>
-            <ng-content select="[additionalSearchOptions]"></ng-content>
-        </div>
-        <div id="search-content" class="col-12">
-            <div class="d-block d-md-none search-controls clearfix">
-                <ds-view-mode-switch *ngIf="inPlaceSearch && showViewModes" [viewModeList]="viewModeList"
-                    [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
-                <button (click)="openSidebar()" aria-controls="#search-body"
-                        class="btn btn-outline-primary float-right open-sidebar"><i
-                        class="fas fa-sliders"></i> {{"search.sidebar.open"
-                       | translate}}
-                </button>
-            </div>
-            <ng-content select="[searchContentTop]"></ng-content>
-            <ds-search-results *ngIf="inPlaceSearch"
-                                      [searchResults]="resultsRD$ | async"
-                                      [searchConfig]="searchOptions$ | async"
-                                      [configuration]="(currentConfiguration$ | async)"
-                                      [disableHeader]="!searchEnabled"
-                                      [linkType]="linkType"
-                                      [context]="(currentContext$ | async)"
-                                      [selectable]="selectable"
-                                      [selectionConfig]="selectionConfig"
-                                      [showCsvExport]="showCsvExport"
-                                      [showThumbnails]="showThumbnails"
-                                      (contentChange)="onContentChange($event)"
-                                      (deselectObject)="deselectObject.emit($event)"
-                                      (selectObject)="selectObject.emit($event)"></ds-search-results>
-        </div>
+  <div class="row">
+    @if ((isXsOrSm$ | async) !== true) {
+      <div class="col-12">
+        @if (searchEnabled) {
+          <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+        }
+        <ng-content select="[additionalSearchOptions]"></ng-content>
+      </div>
+    }
+    <div id="search-content" class="col-12">
+      <div class="d-block d-md-none search-controls clearfix">
+        @if (inPlaceSearch && showViewModes) {
+          <ds-view-mode-switch [viewModeList]="viewModeList"
+          [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
+        }
+        <button (click)="openSidebar()" aria-controls="#search-body"
+          class="btn btn-outline-primary float-end open-sidebar"><i
+        class="fas fa-sliders"></i> {{"search.sidebar.open"
+        | translate}}
+      </button>
     </div>
+    <ng-content select="[searchContentTop]"></ng-content>
+    @if (inPlaceSearch) {
+      <ds-search-results
+        [searchResults]="resultsRD$ | async"
+        [searchConfig]="searchOptions$ | async"
+        [configuration]="(currentConfiguration$ | async)"
+        [disableHeader]="!searchEnabled"
+        [linkType]="linkType"
+        [context]="(currentContext$ | async)"
+        [selectable]="selectable"
+        [selectionConfig]="selectionConfig"
+        [showCsvExport]="showCsvExport"
+        [showThumbnails]="showThumbnails"
+        (contentChange)="onContentChange($event)"
+        (deselectObject)="deselectObject.emit($event)"
+      (selectObject)="selectObject.emit($event)"></ds-search-results>
+    }
+  </div>
+</div>
 </ng-template>
 
 <ng-template #sidebarContent>
-    <ds-search-sidebar id="search-sidebar" *ngIf="(isXsOrSm$ | async) !== true"
-                       [configurationList]="configurationList"
-                       [configuration]="(currentConfiguration$ | async)"
-                       [currentScope]="(currentScope$ | async)"
-                       [filters]="filtersRD$.asObservable()"
-                       [refreshFilters]="refreshFilters"
-                       [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
-                       [searchOptions]="(searchOptions$ | async)"
-                       [sortOptionsList]="(sortOptionsList$ | async)"
-                       [currentSortOption]="(currentSortOptions$ | async)"
-                       [inPlaceSearch]="inPlaceSearch"
-                       [viewModeList]="viewModeList"
-                       [showViewModes]="showViewModes"
-                       (changeConfiguration)="changeContext($event.context)"
-                       (changeViewMode)="changeViewMode()"></ds-search-sidebar>
-    <ds-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
-                       [configurationList]="configurationList"
-                       [configuration]="(currentConfiguration$ | async)"
-                       [currentScope]="(currentScope$ | async)"
-                       [filters]="filtersRD$.asObservable()"
-                       [refreshFilters]="refreshFilters"
-                       [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
-                       [searchOptions]="(searchOptions$ | async)"
-                       [sortOptionsList]="(sortOptionsList$ | async)"
-                       [currentSortOption]="(currentSortOptions$ | async)"
-                       [inPlaceSearch]="inPlaceSearch"
-                       [viewModeList]="viewModeList"
-                       [showViewModes]="showViewModes"
-                       (toggleSidebar)="closeSidebar()"
-                       (changeConfiguration)="changeContext($event.context)"
-                       (changeViewMode)="changeViewMode()">
+  @if ((isXsOrSm$ | async) !== true) {
+    <ds-search-sidebar id="search-sidebar"
+      [configurationList]="configurationList"
+      [configuration]="(currentConfiguration$ | async)"
+      [currentScope]="(currentScope$ | async)"
+      [filters]="filtersRD$.asObservable()"
+      [refreshFilters]="refreshFilters"
+      [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
+      [searchOptions]="(searchOptions$ | async)"
+      [sortOptionsList]="(sortOptionsList$ | async)"
+      [currentSortOption]="(currentSortOptions$ | async)"
+      [inPlaceSearch]="inPlaceSearch"
+      [viewModeList]="viewModeList"
+      [showViewModes]="showViewModes"
+      (changeConfiguration)="changeContext($event.context)"
+    (changeViewMode)="changeViewMode()"></ds-search-sidebar>
+  }
+  @if ((isXsOrSm$ | async)) {
+    <ds-search-sidebar id="search-sidebar-sm"
+      [configurationList]="configurationList"
+      [configuration]="(currentConfiguration$ | async)"
+      [currentScope]="(currentScope$ | async)"
+      [filters]="filtersRD$.asObservable()"
+      [refreshFilters]="refreshFilters"
+      [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
+      [searchOptions]="(searchOptions$ | async)"
+      [sortOptionsList]="(sortOptionsList$ | async)"
+      [currentSortOption]="(currentSortOptions$ | async)"
+      [inPlaceSearch]="inPlaceSearch"
+      [viewModeList]="viewModeList"
+      [showViewModes]="showViewModes"
+      (toggleSidebar)="closeSidebar()"
+      (changeConfiguration)="changeContext($event.context)"
+      (changeViewMode)="changeViewMode()">
     </ds-search-sidebar>
+  }
 </ng-template>
 
 <ng-template #searchForm>
-    <ds-search-form id="search-form"
-                    [query]="(searchOptions$ | async)?.query"
-                    [scope]="(searchOptions$ | async)?.scope"
-                    [hideScopeInUrl]="hideScopeInUrl"
-                    [currentUrl]="searchLink"
-                    [showScopeSelector]="showScopeSelector"
-                    [inPlaceSearch]="inPlaceSearch"
-                    [searchPlaceholder]="searchFormPlaceholder | translate">
-    </ds-search-form>
-    <div class="row mb-3 mb-md-1">
-        <div class="labels col-12">
-            <ds-search-labels [inPlaceSearch]="inPlaceSearch">
-            </ds-search-labels>
-        </div>
+  <ds-search-form id="search-form"
+    [query]="(searchOptions$ | async)?.query"
+    [scope]="(searchOptions$ | async)?.scope"
+    [hideScopeInUrl]="hideScopeInUrl"
+    [currentUrl]="searchLink"
+    [showScopeSelector]="showScopeSelector"
+    [inPlaceSearch]="inPlaceSearch"
+    [searchPlaceholder]="searchFormPlaceholder | translate">
+  </ds-search-form>
+  <div class="row mb-3 mb-md-1">
+    <div class="labels col-12">
+      <ds-search-labels [inPlaceSearch]="inPlaceSearch">
+      </ds-search-labels>
     </div>
+  </div>
 </ng-template>
diff --git a/src/app/shared/search/search.component.scss b/src/app/shared/search/search.component.scss
index 82de1f4772..bea773455d 100644
--- a/src/app/shared/search/search.component.scss
+++ b/src/app/shared/search/search.component.scss
@@ -1,10 +1,14 @@
-@include media-breakpoint-down(md) {
+@include media-breakpoint-down(lg) {
   .container {
     width: 100%;
     max-width: none;
   }
 }
 
+:host {
+    --bs-gutter-x: .75rem;
+}
+
 ::ng-deep .search-controls {
     margin-bottom: var(--bs-spacer);
 }
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index 31c8a6e9b8..8b533b4105 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -1,6 +1,7 @@
 import {
   ChangeDetectionStrategy,
   NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -246,6 +247,7 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
       },
       { provide: APP_DATA_SERVICES_MAP, useValue: {} },
       { provide: APP_CONFIG, useValue: environment },
+      { provide: PLATFORM_ID, useValue: 'browser' },
     ],
     schemas: [NO_ERRORS_SCHEMA],
   }).overrideComponent(compType, {
@@ -415,5 +417,34 @@ describe('SearchComponent', () => {
         expect(result).toBeNull();
       });
     });
+
+    describe('when rendered in SSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'server';
+      });
+
+      it('should not call search method on init', (done) => {
+        comp.ngOnInit();
+        //Check that the first method from which the search depend upon is not being called
+        expect(searchConfigurationServiceStub.getCurrentConfiguration).not.toHaveBeenCalled();
+        comp.initialized$.subscribe((res) => {
+          expect(res).toBeTruthy();
+          done();
+        });
+      });
+    });
+
+    describe('when rendered in CSR', () => {
+      beforeEach(() => {
+        comp.platformId = 'browser';
+      });
+
+      it('should call search method on init', fakeAsync(() => {
+        comp.ngOnInit();
+        tick(100);
+        //Check that the last method from which the search depend upon is being called
+        expect(searchServiceStub.search).toHaveBeenCalled();
+      }));
+    });
   });
 });
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 337cb67171..aa1a37fe27 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,6 +1,6 @@
 import {
   AsyncPipe,
-  NgIf,
+  isPlatformServer,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -12,6 +12,7 @@ import {
   OnDestroy,
   OnInit,
   Output,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   NavigationStart,
@@ -37,6 +38,7 @@ import {
   APP_CONFIG,
   AppConfig,
 } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
 import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
 import { SortOptions } from '../../core/cache/models/sort-options.model';
@@ -90,7 +92,6 @@ import { SearchConfigurationOption } from './search-switch-configuration/search-
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     NgTemplateOutlet,
     PageWithSidebarComponent,
     ThemedSearchFormComponent,
@@ -236,6 +237,11 @@ export class SearchComponent implements OnDestroy, OnInit {
    */
   @Input() hideScopeInUrl: boolean;
 
+  /**
+   * Defines whether to fetch search results during SSR execution
+   */
+  @Input() renderOnServerSide: boolean;
+
   /**
    * The current configuration used during the search
    */
@@ -251,6 +257,7 @@ export class SearchComponent implements OnDestroy, OnInit {
    */
   currentScope$: Observable<string>;
 
+
   /**
    * The current sort options used
    */
@@ -345,6 +352,7 @@ export class SearchComponent implements OnDestroy, OnInit {
               protected routeService: RouteService,
               protected router: Router,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
+              @Inject(PLATFORM_ID) public platformId: any,
   ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
@@ -357,6 +365,14 @@ export class SearchComponent implements OnDestroy, OnInit {
    * If something changes, update the list of scopes for the dropdown
    */
   ngOnInit(): void {
+    if (!this.renderOnServerSide && !environment.ssr.enableSearchComponent && isPlatformServer(this.platformId)) {
+      this.subs.push(this.getSearchOptions().pipe(distinctUntilChanged()).subscribe((options) => {
+        this.searchOptions$.next(options);
+      }));
+      this.initialized$.next(true);
+      return;
+    }
+
     if (this.useUniquePageId) {
       // Create an unique pagination id related to the instance of the SearchComponent
       this.paginationId = uniqueId(this.paginationId);
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.html b/src/app/shared/sidebar/page-with-sidebar.component.html
index 42f1b53819..24d7a2f038 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.html
+++ b/src/app/shared/sidebar/page-with-sidebar.component.html
@@ -1,15 +1,17 @@
 <div class="container">
   <div class="row">
-    <div class="row-with-sidebar row-offcanvas row-offcanvas-left"
-         [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
-      <div *ngIf="sideBarWidth > 0" id="{{id}}-sidebar-content"
-           [class.invisible]="(isSidebarCollapsed$ | async) === true && (isXsOrSm$ | async) === true"
-           class="col-12 col-md-{{sideBarWidth}} sidebar-content {{sidebarClasses | async}}">
-        <ng-container *ngTemplateOutlet="sidebarContent"></ng-container>
-      </div>
+    <div class="row-with-sidebar row-offcanvas row-offcanvas-left px-0"
+      [@pushInOut]="(isSidebarCollapsed$ | async) ? 'collapsed' : 'expanded'">
+      @if (sideBarWidth > 0) {
+        <div id="{{id}}-sidebar-content"
+          [class.invisible]="(isSidebarCollapsed$ | async) === true && (isXsOrSm$ | async) === true"
+          class="col-12 col-md-{{sideBarWidth}} sidebar-content {{sidebarClasses | async}}">
+          <ng-container *ngTemplateOutlet="sidebarContent"></ng-container>
+        </div>
+      }
       <div class="col-12 col-md-{{12 - sideBarWidth}}"
-           [class.px-0]="sideBarWidth === 0"
-           [class.invisible]="(isSidebarCollapsed$ | async) !== true && (isXsOrSm$ | async) === true">
+        [class.px-0]="sideBarWidth === 0"
+        [class.invisible]="(isSidebarCollapsed$ | async) !== true && (isXsOrSm$ | async) === true">
         <ng-content></ng-content>
       </div>
     </div>
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.scss b/src/app/shared/sidebar/page-with-sidebar.component.scss
index 4949694313..df87cdf054 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.scss
+++ b/src/app/shared/sidebar/page-with-sidebar.component.scss
@@ -1,4 +1,4 @@
-@include media-breakpoint-down(md) {
+@include media-breakpoint-down(lg) {
   .container {
     width: 100%;
     max-width: none;
@@ -6,16 +6,19 @@
 }
 
 .row-with-sidebar {
-
   &.row-offcanvas {
     width: 100%;
+    > * {
+      padding-right: calc(var(--bs-gutter-x) / 2);
+      padding-left: calc(var(--bs-gutter-x) / 2);
+    }
   }
 
   @include media-breakpoint-up(md) {
     display: flex;
   }
 
-  @include media-breakpoint-down(sm) {
+  @include media-breakpoint-down(md) {
     position: relative;
 
     &.row-offcanvas {
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.ts b/src/app/shared/sidebar/page-with-sidebar.component.ts
index aa7ae23a8b..fa2460995b 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.ts
@@ -1,6 +1,5 @@
 import {
   AsyncPipe,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -25,7 +24,6 @@ import { SidebarService } from './sidebar.service';
   imports: [
     AsyncPipe,
     NgTemplateOutlet,
-    NgIf,
   ],
 })
 /**
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.html b/src/app/shared/sidebar/sidebar-dropdown.component.html
index 644e1e0d27..101276de82 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.html
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.html
@@ -1,6 +1,6 @@
 <div class="setting-option mb-3 p-3">
-  <h4><label for="{{id}}">{{label | translate}}</label></h4>
-  <select id="{{id}}" class="form-control" (change)="changed.emit($event)">
+  <h4><label class="form-label" for="{{id}}">{{label | translate}}</label></h4>
+  <select id="{{id}}" class="form-select" (change)="changed.emit($event)">
     <ng-content></ng-content>
   </select>
 </div>
diff --git a/src/app/shared/sidebar/sidebar.reducer.spec.ts b/src/app/shared/sidebar/sidebar.reducer.spec.ts
index a654b0af18..ec44dc0994 100644
--- a/src/app/shared/sidebar/sidebar.reducer.spec.ts
+++ b/src/app/shared/sidebar/sidebar.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   SidebarCollapseAction,
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.html b/src/app/shared/starts-with/date/starts-with-date.component.html
index b350d9896c..cd07a898c0 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.html
+++ b/src/app/shared/starts-with/date/starts-with-date.component.html
@@ -1,34 +1,39 @@
 <form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
   <div class="row">
-    <span class="col-12 font-weight-bold mb-1">
-      {{'browse.startsWith.jump' | translate}}
+    <span class="col-12 fw-bold mb-1">
+      {{ 'browse.startsWith.jump' | translate }}
     </span>
     <div class="col-6 col-md-2">
-      <select id="year-select" class="form-control" (change)="setStartsWithYearEvent($event)" [attr.aria-label]="'browse.startsWith.choose_year.label' |translate">
+      <select id="year-select" class="form-select" (change)="setStartsWithYearEvent($event)" [attr.aria-label]="'browse.startsWith.choose_year.label' |translate">
         <option [value]="-1" [selected]="!startsWithYear">
-          {{'browse.startsWith.choose_year' | translate}}
-        </option>
-        <option *ngFor="let option of startsWithOptions"
-                [value]="option"
-                [selected]="option === startsWithYear ? 'selected': null">
-          {{option}}
+          {{ 'browse.startsWith.choose_year' | translate }}
         </option>
+        @for (option of startsWithOptions; track option) {
+          <option
+            [value]="option"
+            [selected]="option === startsWithYear ? 'selected': null">
+            {{ option }}
+          </option>
+        }
       </select>
     </div>
     <div class="col-6 col-md-2">
-      <select id="month-select" class="form-control" (change)="setStartsWithMonthEvent($event)" [attr.aria-label]="'browse.startsWith.months.none.label' |translate">
-        <option *ngFor="let option of monthOptions"
-                [value]="option"
-                [selected]="option === startsWithMonth ? 'selected': null">
-          {{'browse.startsWith.months.' + option | translate}}
-        </option>
+      <select id="month-select" class="form-select" (change)="setStartsWithMonthEvent($event)" [attr.aria-label]="'browse.startsWith.months.none.label' |translate">
+        @for (option of monthOptions; track option) {
+          <option
+            [value]="option"
+            [selected]="option === startsWithMonth ? 'selected': null">
+            {{ 'browse.startsWith.months.' + option | translate }}
+          </option>
+        }
       </select>
     </div>
-    <div class="form-group input-group col-12 col-md-6 pt-1 pt-md-0">
-      <input class="form-control" placeholder="{{'browse.startsWith.type_date' | translate}}" [attr.aria-label]="'browse.startsWith.type_date.label' |translate" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith() ? getStartsWith() : ''" />
-      <span class="input-group-append">
-        <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
-      </span>
+    <div class="col-12 col-md-6">
+      <div class="mb-3 input-group pt-1 pt-md-0">
+        <input class="form-control" placeholder="{{'browse.startsWith.type_date' | translate}}" [attr.aria-label]="'browse.startsWith.type_date.label' |translate" type="text" name="startsWith"
+          formControlName="startsWith" [value]="getStartsWith() ? getStartsWith() : ''"/>
+        <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{ 'browse.startsWith.submit' | translate }}</button>
+      </div>
     </div>
   </div>
 </form>
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.ts b/src/app/shared/starts-with/date/starts-with-date.component.ts
index 726f708fe8..53b9bb52f5 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.ts
+++ b/src/app/shared/starts-with/date/starts-with-date.component.ts
@@ -1,4 +1,4 @@
-import { NgFor } from '@angular/common';
+
 import {
   Component,
   OnInit,
@@ -21,7 +21,7 @@ import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
   styleUrls: ['./starts-with-date.component.scss'],
   templateUrl: './starts-with-date.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgFor, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, TranslateModule],
 })
 export class StartsWithDateComponent extends StartsWithAbstractComponent implements OnInit {
 
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.html b/src/app/shared/starts-with/text/starts-with-text.component.html
index edbd1f1960..5208427f34 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.html
+++ b/src/app/shared/starts-with/text/starts-with-text.component.html
@@ -1,11 +1,9 @@
 <form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
 <div class="mb-3">
   <div class="row">
-    <div class="form-group input-group col-sm-12 col-md-6 col-auto">
+    <div class="mb-3 input-group col-sm-12 col-md-6 col-auto">
       <input class="form-control" [attr.aria-label]="'browse.startsWith.input' | translate" placeholder="{{'browse.search-form.placeholder' | translate}}" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith()" />
-      <span class="input-group-append">
         <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
-      </span>
     </div>
   </div>
   <small class="text-muted">{{'browse.startsWith.type_text' | translate}}</small>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index e0bbc1a609..0037f44092 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -1,46 +1,63 @@
-<form *ngIf="subscriptionForm" [formGroup]="subscriptionForm" (ngSubmit)="submit()" data-test="subscription-form">
-  <div class="modal-header">
-    <h4 class="modal-title">{{'subscriptions.modal.title' | translate}}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="activeModal.close()">
-      <span aria-hidden="true">&times;</span>
-    </button>
-  </div>
-  <div class="modal-body">
-    <p class="mb-3"><strong>{{ dsoNameService.getName(dso) }}</strong>
-      <span *ngIf="!!dso" class="float-right"><ds-type-badge *ngIf="!!dso" [object]="dso"></ds-type-badge></span>
+@if (subscriptionForm) {
+  <form [formGroup]="subscriptionForm" (ngSubmit)="submit()" data-test="subscription-form">
+    <div class="modal-header">
+      <h4 class="modal-title">{{'subscriptions.modal.title' | translate}}</h4>
+      <button type="button" class="btn-close" aria-label="Close" (click)="activeModal.close()">
+      </button>
+    </div>
+    <div class="modal-body">
+      <p class="mb-3"><strong>{{ dsoNameService.getName(dso) }}</strong>
+      @if (!!dso) {
+        <span class="float-end">@if (!!dso) {
+          <ds-type-badge [object]="dso"></ds-type-badge>
+        }</span>
+      }
     </p>
     <div>
-      <fieldset *ngFor="let subscriptionType of subscriptionForm?.controls | keyvalue" formGroupName="{{subscriptionType.key}}" class="form-group form-row">
-        <legend class="col-md-4 col-form-label float-md-left pt-0">
-          {{ 'subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
-        </legend>
-        <div class="col-md-8">
-          <input type="hidden" formControlName="subscriptionId" [value]="subscriptionType?.value?.controls['subscriptionId'].value" >
-          <div class="form-check" formGroupName="frequencies" *ngFor="let frequency of frequencyDefaultValues">
-            <input type="checkbox" [id]="'checkbox-' + frequency" class="form-check-input" [formControlName]="frequency"/>
-            <label class="form-check-label"
-                   [for]="'checkbox-' + frequency">{{ 'subscriptions.modal.new-subscription-form.frequency.' + frequency | translate }}</label>
+      @for (subscriptionType of subscriptionForm?.controls | keyvalue; track subscriptionType) {
+        <fieldset formGroupName="{{subscriptionType.key}}" class="mb-3 row">
+          <legend class="col-md-4 col-form-label float-md-left pt-0">
+            {{ 'subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
+          </legend>
+          <div class="col-md-8">
+            <input type="hidden" formControlName="subscriptionId" [value]="subscriptionType?.value?.controls['subscriptionId'].value" >
+            @for (frequency of frequencyDefaultValues; track frequency) {
+              <div class="form-check" formGroupName="frequencies">
+                <input type="checkbox" [id]="'checkbox-' + frequency" class="form-check-input" [formControlName]="frequency"/>
+                <label class="form-check-label"
+                [for]="'checkbox-' + frequency">{{ 'subscriptions.modal.new-subscription-form.frequency.' + frequency | translate }}</label>
+              </div>
+            }
           </div>
-        </div>
-        <ds-alert *ngIf="!!submitted && subscriptionType?.value?.controls['frequencies'].errors?.required" [type]="'alert-danger'">
-          {{ 'context-menu.actions.subscription.frequency.required' | translate }}
-        </ds-alert>
-      </fieldset>
+          @if (!!submitted && subscriptionType?.value?.controls['frequencies'].errors?.required) {
+            <ds-alert [type]="'alert-danger'">
+              {{ 'context-menu.actions.subscription.frequency.required' | translate }}
+            </ds-alert>
+          }
+        </fieldset>
+      }
     </div>
-    <p class="text-muted" *ngIf="(showDeleteInfo$ | async)">{{'subscriptions.modal.delete-info' | translate}}</p>
+    @if ((showDeleteInfo$ | async)) {
+      <p class="text-muted">{{'subscriptions.modal.delete-info' | translate}}</p>
+    }
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-outline-secondary"
-            (click)="activeModal.close()">
+      (click)="activeModal.close()">
       {{'subscriptions.modal.close' | translate}}
     </button>
-    <button type="submit" class="btn btn-success" [disabled]="(processing$ | async) || !isValid">
-        <span *ngIf="(processing$ | async)">
+    <button type="submit" class="btn btn-success" [dsBtnDisabled]="(processing$ | async) || !isValid">
+      @if ((processing$ | async)) {
+        <span>
           <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
         </span>
-      <span *ngIf="(processing$ | async) !== true">
-        {{'subscriptions.modal.new-subscription-form.submit' | translate}}
-      </span>
+      }
+      @if ((processing$ | async) !== true) {
+        <span>
+          {{'subscriptions.modal.new-subscription-form.submit' | translate}}
+        </span>
+      }
     </button>
   </div>
 </form>
+}
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
index 452d890a55..c6eee27e94 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   KeyValuePipe,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -50,6 +48,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { AlertComponent } from '../../alert/alert.component';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { isNotEmpty } from '../../empty.util';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -61,7 +60,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-modal.component.html',
   styleUrls: ['./subscription-modal.component.scss'],
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, NgFor, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, ThemedTypeBadgeComponent, AlertComponent, AsyncPipe, KeyValuePipe, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Modal that allows to manage the subscriptions for the selected item
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 8934b8476f..41e00be702 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -1,34 +1,40 @@
 <td class="dso-info">
-  <ng-container *ngIf="!!dso">
+  @if (!!dso) {
     <ds-type-badge [object]="dso"></ds-type-badge>
     <p><a [routerLink]="getPageRoute(dso)">{{ dsoNameService.getName(dso) }}</a></p>
-  </ng-container>
-  <ng-container *ngIf="!dso">
+  }
+  @if (!dso) {
     <p class="my-0">{{ 'subscriptions.table.not-available' | translate }}</p>
     <p class="text-muted my-0">{{ 'subscriptions.table.not-available-message' | translate }}</p>
-  </ng-container>
+  }
 </td>
 <td>
-  <span *ngIf="!!subscription" class="subscription-type">{{subscription.subscriptionType}}</span>
+  @if (!!subscription) {
+    <span class="subscription-type">{{subscription.subscriptionType}}</span>
+  }
 </td>
 <td class="subscription-parameters">
-  <ng-container *ngIf="!!subscription">
-		<span *ngFor="let parameterList of subscription.subscriptionParameterList; let i = index">
-			{{ 'subscriptions.frequency.' + parameterList.value | translate}}<span
-      *ngIf="i < subscription.subscriptionParameterList.length-1 ">,</span>
-		</span>
-  </ng-container>
+  @if (!!subscription) {
+    @for (parameterList of subscription.subscriptionParameterList; track parameterList; let i = $index) {
+      <span>
+        {{ 'subscriptions.frequency.' + parameterList.value | translate}}@if (i < subscription.subscriptionParameterList.length-1 ) {
+        <span
+        >,</span>
+      }
+    </span>
+  }
+}
 </td>
 <td class="subscription-actions">
   <div class="btn-group edit-field">
-    <button (click)="$event.preventDefault();openSubscriptionModal();" [disabled]="!dso"
-            [title]="'subscriptions.table.edit' | translate"
-            class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
+    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsBtnDisabled]="!dso"
+      [title]="'subscriptions.table.edit' | translate"
+      class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
       <i class="fas fa-edit fa-fw"></i>
     </button>
     <button (click)="deleteSubscriptionPopup(subscription)"
-            [title]="'subscriptions.table.delete' | translate"
-            class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton">
+      [title]="'subscriptions.table.delete' | translate"
+      class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton">
       <i class="fas fa-trash-alt fa-fw"></i>
     </button>
   </div>
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
index 001a2ed687..ae590edb2a 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -19,6 +16,7 @@ import { getDSORoute } from 'src/app/app-routing-paths';
 
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../empty.util';
 import { ThemedTypeBadgeComponent } from '../../object-collection/shared/badges/type-badge/themed-type-badge.component';
@@ -32,7 +30,7 @@ import { SubscriptionsDataService } from '../subscriptions-data.service';
   templateUrl: './subscription-view.component.html',
   styleUrls: ['./subscription-view.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedTypeBadgeComponent, RouterLink, NgFor, TranslateModule],
+  imports: [ThemedTypeBadgeComponent, RouterLink, TranslateModule, BtnDisabledDirective],
 })
 /**
  * Table row representing a subscription that displays all information and action buttons to manage it
diff --git a/src/app/shared/testing/browse-service.stub.ts b/src/app/shared/testing/browse-service.stub.ts
new file mode 100644
index 0000000000..85ca717cb0
--- /dev/null
+++ b/src/app/shared/testing/browse-service.stub.ts
@@ -0,0 +1,91 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model';
+import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+const mockData = [
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'dateissued',
+    'browseType': 'flatBrowse',
+    'dataType': 'date',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.date.issued',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'author',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.contributor.*',
+      'dc.creator',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new FlatBrowseDefinition(), {
+    'id': 'title',
+    'browseType': 'flatBrowse',
+    'dataType': 'title',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.title',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new ValueListBrowseDefinition(), {
+    'id': 'subject',
+    'browseType': 'valueList',
+    'dataType': 'text',
+    'sortOptions': EMPTY,
+    'order': 'ASC',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject.*',
+    ],
+    '_links': EMPTY,
+  }),
+
+  Object.assign(new HierarchicalBrowseDefinition(), {
+    'id': 'srsc',
+    'browseType': 'hierarchicalBrowse',
+    'facetType': 'subject',
+    'vocabulary': 'srsc',
+    'type': 'browse',
+    'metadataKeys': [
+      'dc.subject',
+    ],
+    '_links': EMPTY,
+  }),
+];
+export const BrowseServiceStub: any = {
+  /**
+   * Get all browse definitions.
+   */
+  getBrowseDefinitions(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockData));
+  },
+};
diff --git a/src/app/shared/testing/css-variable-service.stub.ts b/src/app/shared/testing/css-variable-service.stub.ts
index b1f1ba6ee2..554bfaf179 100644
--- a/src/app/shared/testing/css-variable-service.stub.ts
+++ b/src/app/shared/testing/css-variable-service.stub.ts
@@ -6,10 +6,10 @@ import {
 import { KeyValuePair } from '../key-value-pair.model';
 
 const variables = {
-  '--bs-sm-min': '576px,',
-  '--bs-md-min': '768px,',
-  '--bs-lg-min': '992px',
-  '--bs-xl-min': '1200px',
+  '--bs-sm': '576px,',
+  '--bs-md': '768px,',
+  '--bs-lg': '992px',
+  '--bs-xl': '1200px',
 } as any;
 
 export class CSSVariableServiceStub {
diff --git a/src/app/shared/testing/search-configuration-service.stub.ts b/src/app/shared/testing/search-configuration-service.stub.ts
index c567808e87..426dc72930 100644
--- a/src/app/shared/testing/search-configuration-service.stub.ts
+++ b/src/app/shared/testing/search-configuration-service.stub.ts
@@ -26,6 +26,10 @@ export class SearchConfigurationServiceStub {
     return observableOf([]);
   }
 
+  getCurrentFilters() {
+    return observableOf([]);
+  }
+
   getCurrentScope(a) {
     return observableOf('test-id');
   }
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
index 32a2a21349..fef02ea6d7 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
@@ -2,12 +2,16 @@
   <div #content class="content dont-break-out preserve-line-breaks">
     <ng-content></ng-content>
   </div>
-  <button class="btn btn-link p-0 expandButton" dsDragClick (actualClick)="toggle()">
-    <i class="fas fa-angle-down"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-more' | translate }}</span>
-  </button>
-  <button class="btn btn-link p-0 collapseButton" dsDragClick (actualClick)="toggle()" *ngIf="expand && expandable">
-    <i class="fas fa-angle-up"></i>
-    <span class="ml-1">{{ 'item.truncatable-part.show-less' | translate }}</span>
+  <button
+    class="btn btn-link p-0 {{isExpanded ? 'collapseButton' : 'expandButton'}}"
+    dsDragClick
+    (actualClick)="toggle()"
+    (keyup.Enter)="toggle()"
+    (keyup.Space)="toggle()"
+    role="button"
+    [attr.aria-expanded]="isExpanded"
+  >
+    <i class="fas {{isExpanded ? 'fa-angle-up' : 'fa-angle-down'}}"></i>
+    <span class="ms-1">{{ 'item.truncatable-part.show-' + (isExpanded ? 'less' : 'more') | translate }}</span>
   </button>
 </div>
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
index 7e528650d9..7b3ac2242b 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.spec.ts
@@ -87,6 +87,11 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).toBeNull();
     });
+
+    it('expandButton aria-expanded should be false', () => {
+      const btn = fixture.debugElement.query(By.css('.expandButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('false');
+    });
   });
 
   describe('When the item is expanded', () => {
@@ -115,6 +120,14 @@ describe('TruncatablePartComponent', () => {
       const a = fixture.debugElement.query(By.css('.collapseButton'));
       expect(a).not.toBeNull();
     });
+
+    it('collapseButton aria-expanded should be true', () => {
+      (comp as any).setLines();
+      (comp as any).expandable = true;
+      fixture.detectChanges();
+      const btn = fixture.debugElement.query(By.css('.collapseButton'));
+      expect(btn.nativeElement.getAttribute('aria-expanded')).toEqual('true');
+    });
   });
 });
 
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
index 54220d7f10..61f637c16a 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   AfterViewChecked,
   Component,
@@ -19,7 +19,7 @@ import { TruncatableService } from '../truncatable.service';
   templateUrl: './truncatable-part.component.html',
   styleUrls: ['./truncatable-part.component.scss'],
   standalone: true,
-  imports: [DragClickDirective, NgIf, TranslateModule],
+  imports: [DragClickDirective, TranslateModule],
 })
 
 /**
@@ -150,6 +150,13 @@ export class TruncatablePartComponent implements AfterViewChecked, OnInit, OnDes
     }
   }
 
+  /**
+   * Indicates if the content is expanded, button state is 'Collapse'
+   */
+  public get isExpanded() {
+    return this.expand && this.expandable;
+  }
+
   /**
    * Unsubscribe from the subscription
    */
diff --git a/src/app/shared/truncatable/truncatable.reducer.spec.ts b/src/app/shared/truncatable/truncatable.reducer.spec.ts
index dca19d0225..a95a55ad7c 100644
--- a/src/app/shared/truncatable/truncatable.reducer.spec.ts
+++ b/src/app/shared/truncatable/truncatable.reducer.spec.ts
@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-namespace
-import * as deepFreeze from 'deep-freeze';
+import deepFreeze from 'deep-freeze';
 
 import {
   TruncatableCollapseAction,
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index 38c2af97fc..79d3b2ca90 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -1,27 +1,31 @@
 <div ng2FileDrop
-     class="ds-document-drop-zone position-fixed h-100 w-100"
-     [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
-     [uploader]="uploader"
-     (onFileDrop)="setFile($event)"
-     (fileOver)="fileOverDocument($event)">
+  class="ds-document-drop-zone position-fixed h-100 w-100"
+  [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
+  [uploader]="uploader"
+  (onFileDrop)="setFile($event)"
+  (fileOver)="fileOverDocument($event)">
 </div>
-<div *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
+@if ((isOverDocumentDropZone | async)) {
   <div
-    class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
-    <p class="text-primary">{{ dropMessageLabel | translate}}</p>
+    class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
+    <div
+      class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
+      <p class="text-primary">{{ dropMessageLabel | translate}}</p>
+    </div>
   </div>
-</div>
+}
 <div class="well ds-base-drop-zone mt-1 mb-3 text-muted p-2">
-  <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center"
-     *ngIf="fileObject">  {{ fileObject?.name }} </p>
+  @if (fileObject) {
+    <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center"
+    >  {{ fileObject?.name }} </p>
+  }
   <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center">
-      <span><i class="fas fa-cloud-upload"
-               aria-hidden="true"></i> {{ ((fileObject === null || fileObject === undefined) ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
-    <label class="btn btn-link m-0 p-0 ml-1">
+    <span><i class="fas fa-cloud-upload"
+    aria-hidden="true"></i> {{ ((fileObject === null || fileObject === undefined) ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
+    <label class="btn btn-link m-0 p-0 ms-1">
       <input class="form-control-file d-none" type="file" name="file-upload"
-             id="file-upload"
-             (change)="handleFileInput($event)">
+        id="file-upload"
+        (change)="handleFileInput($event)">
       {{'uploader.browse' | translate}}
     </label>
   </p>
diff --git a/src/app/shared/upload/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
index 4c1db13d13..44b90d8189 100644
--- a/src/app/shared/upload/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -1,55 +1,68 @@
-<div ng2FileDrop
-     *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone position-fixed h-100 w-100"
-     [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
-     [uploader]="uploader"
-     (fileOver)="fileOverDocument($event)">
-</div>
-<div *ngIf="(isOverDocumentDropZone | async)"
-     class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
-  <div class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
-    <p class="text-primary">{{dropOverDocumentMsg | translate}}</p>
+@if ((isOverDocumentDropZone | async)) {
+  <div ng2FileDrop
+    class="ds-document-drop-zone position-fixed h-100 w-100"
+    [class.ds-document-drop-zone-active]="(isOverDocumentDropZone | async)"
+    [uploader]="uploader"
+    (fileOver)="fileOverDocument($event)">
   </div>
-</div>
+}
+@if ((isOverDocumentDropZone | async)) {
+  <div
+    class="ds-document-drop-zone-inner position-fixed h-100 w-100 p-2">
+    <div class="ds-document-drop-zone-inner-content position-relative d-flex flex-column justify-content-center text-center h-100 w-100">
+      <p class="text-primary">{{dropOverDocumentMsg | translate}}</p>
+    </div>
+  </div>
+}
 <div [attr.id]="uploaderId" class="row">
   <div class="col-md-12">
     <div ng2FileDrop
-         [ngClass]="{'ds-base-drop-zone-file-over': (isOverBaseDropZone | async)}"
-         [uploader]="uploader"
-         (fileOver)="fileOverBase($event)"
-         class="well ds-base-drop-zone mt-1 mb-3 text-muted">
-      <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
-        <span class="d-flex align-items-center">
-          <i class="fas fa-upload pr-1" aria-hidden="true"></i>
-          {{dropMsg | translate}}{{'uploader.or' | translate}}
-          <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ml-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
-            <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>
-          </label>
-          <input #fileInput id="inputFileUploader-{{uploaderId}}" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
-        </span>
-      </div>
-      <div *ngIf="(isOverBaseDropZone | async) || uploader?.queue?.length !== 0">
-        <div class="m-1">
-          <div class="upload-item-top">
-            <span class="filename">
-              <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
-            </span>
-            <div class="btn-group btn-group-sm float-right" role="group">
-              <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [disabled]="!uploader.queue.length">
-                <i class="fas fa-trash" aria-hidden="true"></i>
-              </button>
-            </div>
-            <span *ngIf="uploader.progress < 100 && !(uploader.progress === 0 && !uploader.options.autoUpload)" class="float-right mr-3">{{ uploader.progress }}%</span>
-            <span *ngIf="uploader.progress === 100" class="float-right mr-3">{{'uploader.processing' | translate}}</span>
-          </div>
-          <div class="ds-base-drop-zone-progress clearfix mt-2">
-            <div role="progressbar"
-                 style="height: 5px; width: 0;"
-                 [ngStyle]="{ 'width': uploader.progress + '%' }"
-                 [ngClass]="{'progress-bar': true, 'bg-success progress-bar-striped progress-bar-animated': uploader.progress === 100}"></div>
-          </div>
+      [ngClass]="{'ds-base-drop-zone-file-over': (isOverBaseDropZone | async)}"
+      [uploader]="uploader"
+      (fileOver)="fileOverBase($event)"
+      class="well ds-base-drop-zone mt-1 mb-3 text-muted">
+      @if (uploader?.queue?.length === 0) {
+        <div class="text-center m-0 p-2 d-flex justify-content-center align-items-center">
+          <span class="d-flex align-items-center">
+            <i class="fas fa-upload pe-1" aria-hidden="true"></i>
+            {{dropMsg | translate}}{{'uploader.or' | translate}}
+            <label for="inputFileUploader-{{uploaderId}}" class="btn btn-link m-0 p-0 ms-1" tabindex="0" (keyup.enter)="$event.stopImmediatePropagation(); fileInput.click()">
+              <span role="button" [attr.aria-label]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>
+            </label>
+            <input #fileInput id="inputFileUploader-{{uploaderId}}" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
+          </span>
         </div>
+      }
+      @if ((isOverBaseDropZone | async) || uploader?.queue?.length !== 0) {
+        <div>
+          <div class="m-1">
+            <div class="upload-item-top">
+              <span class="filename">
+                @if (!uploader.options.disableMultipart) {
+                  <span>{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>
+                  }{{ uploader?.queue[0]?.file.name }}
+                </span>
+                <div class="btn-group btn-group-sm float-end" role="group">
+                  <button type="button" class="btn btn-danger" title="{{'uploader.delete.btn-title' | translate}}" (click)="uploader.clearQueue()" [dsBtnDisabled]="!uploader.queue.length">
+                    <i class="fas fa-trash" aria-hidden="true"></i>
+                  </button>
+                </div>
+                @if (uploader.progress < 100 && !(uploader.progress === 0 && !uploader.options.autoUpload)) {
+                  <span class="float-end me-3">{{ uploader.progress }}%</span>
+                }
+                @if (uploader.progress === 100) {
+                  <span class="float-end me-3">{{'uploader.processing' | translate}}</span>
+                }
+              </div>
+              <div class="ds-base-drop-zone-progress clearfix mt-2">
+                <div role="progressbar"
+                  style="height: 5px; width: 0;"
+                  [ngStyle]="{ 'width': uploader.progress + '%' }"
+                [ngClass]="{'progress-bar': true, 'bg-success progress-bar-striped progress-bar-animated': uploader.progress === 100}"></div>
+              </div>
+            </div>
+          </div>
+        }
       </div>
     </div>
   </div>
-</div>
diff --git a/src/app/shared/upload/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
index fbab09be3e..fbafe811eb 100644
--- a/src/app/shared/upload/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -27,6 +27,7 @@ import {
   XSRF_REQUEST_HEADER,
   XSRF_RESPONSE_HEADER,
 } from '../../../core/xsrf/xsrf.constants';
+import { BtnDisabledDirective } from '../../btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -42,7 +43,7 @@ import { UploaderProperties } from './uploader-properties.model';
   changeDetection: ChangeDetectionStrategy.Default,
   encapsulation: ViewEncapsulation.Emulated,
   standalone: true,
-  imports: [TranslateModule, FileUploadModule, CommonModule],
+  imports: [TranslateModule, FileUploadModule, CommonModule, BtnDisabledDirective],
 })
 export class UploaderComponent implements OnInit, AfterViewInit {
 
diff --git a/src/app/shared/utils/file-size-pipe.ts b/src/app/shared/utils/file-size-pipe.ts
index 310fc08d17..1c6d2b646b 100644
--- a/src/app/shared/utils/file-size-pipe.ts
+++ b/src/app/shared/utils/file-size-pipe.ts
@@ -3,7 +3,7 @@ import {
   PipeTransform,
 } from '@angular/core';
 // eslint-disable-next-line import/no-namespace
-import * as fileSize from 'filesize';
+import fileSize from 'filesize';
 
 /*
  * Convert bytes into largest possible unit.
diff --git a/src/app/shared/utils/hover-outside.directive.ts b/src/app/shared/utils/hover-outside.directive.ts
new file mode 100644
index 0000000000..e046d3a087
--- /dev/null
+++ b/src/app/shared/utils/hover-outside.directive.ts
@@ -0,0 +1,53 @@
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  HostListener,
+  Input,
+  Output,
+} from '@angular/core';
+
+/**
+ * Directive to detect when the user hovers outside the element the directive was put on
+ *
+ * **Performance Consideration**: it's probably not good for performance to use this excessively (on
+ * {@link ExpandableNavbarSectionComponent} for example, a workaround for this problem was to add an `*ngIf` to prevent
+ * this Directive from always being active)
+ */
+@Directive({
+  selector: '[dsHoverOutside]',
+  standalone: true,
+})
+export class HoverOutsideDirective {
+
+  /**
+   * Emits null when the user hovers outside of the element
+   */
+  @Output()
+  public dsHoverOutside = new EventEmitter();
+
+  /**
+   * CSS selector for the parent element to monitor. If set, the directive will use this
+   * selector to determine if the hover event originated within the selected parent element.
+   * If left unset, the directive will monitor mouseover hover events for the element it is applied to.
+   */
+  @Input()
+  public dsHoverOutsideOfParentSelector: string;
+
+  constructor(
+    private elementRef: ElementRef,
+  ) {
+  }
+
+  @HostListener('document:mouseover', ['$event'])
+  public onMouseOver(event: MouseEvent): void {
+    const targetElement: HTMLElement = event.target as HTMLElement;
+    const element: Element = document.querySelector(this.dsHoverOutsideOfParentSelector);
+    const hoveredInside = (element ? new ElementRef(element) : this.elementRef).nativeElement.contains(targetElement);
+
+    if (!hoveredInside) {
+      this.dsHoverOutside.emit(null);
+    }
+  }
+
+}
diff --git a/src/app/shared/utils/safe-url-pipe.ts b/src/app/shared/utils/safe-url-pipe.ts
index 6cb9d9fb1b..f8bc728829 100644
--- a/src/app/shared/utils/safe-url-pipe.ts
+++ b/src/app/shared/utils/safe-url-pipe.ts
@@ -16,6 +16,6 @@ import { DomSanitizer } from '@angular/platform-browser';
 export class SafeUrlPipe implements PipeTransform {
   constructor(private domSanitizer: DomSanitizer) { }
   transform(url) {
-    return this.domSanitizer.bypassSecurityTrustResourceUrl(url);
+    return url == null ? null : this.domSanitizer.bypassSecurityTrustResourceUrl(url);
   }
 }
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.html b/src/app/shared/view-mode-switch/view-mode-switch.component.html
index 74ee22533d..79fa5f471a 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.html
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.html
@@ -1,38 +1,44 @@
 <div class="btn-group" data-toggle="buttons">
-    <button *ngIf="isToShow(viewModeEnum.ListElement)"
-            [attr.aria-current]="currentMode === viewModeEnum.ListElement"
-            [attr.aria-label]="'search.view-switch.show-list' | translate"
-       routerLink="."
-       [queryParams]="{view: 'list'}"
-       queryParamsHandling="merge"
-       (click)="switchViewTo(viewModeEnum.ListElement)"
-       [class.active]="currentMode === viewModeEnum.ListElement"
-       class="btn btn-secondary"
-       [attr.data-test]="'list-view' | dsBrowserOnly">
-       <i class="fas fa-list"></i>
+  @if (isToShow(viewModeEnum.ListElement)) {
+    <button
+      [attr.aria-current]="currentMode === viewModeEnum.ListElement"
+      [attr.aria-label]="'search.view-switch.show-list' | translate"
+      routerLink="."
+      [queryParams]="{view: 'list'}"
+      queryParamsHandling="merge"
+      (click)="switchViewTo(viewModeEnum.ListElement)"
+      [class.active]="currentMode === viewModeEnum.ListElement"
+      class="btn btn-secondary"
+      [attr.data-test]="'list-view' | dsBrowserOnly">
+      <i class="fas fa-list"></i>
     </button>
-    <button *ngIf="isToShow(viewModeEnum.GridElement)"
-            [attr.aria-current]="currentMode === viewModeEnum.GridElement"
-            [attr.aria-label]="'search.view-switch.show-grid' | translate"
-       routerLink="."
-       [queryParams]="{view: 'grid'}"
-       queryParamsHandling="merge"
-       (click)="switchViewTo(viewModeEnum.GridElement)"
-       [class.active]="currentMode === viewModeEnum.GridElement"
-       class="btn btn-secondary"
-       [attr.data-test]="'grid-view' | dsBrowserOnly">
-       <i class="fas fa-th-large"></i>
+  }
+  @if (isToShow(viewModeEnum.GridElement)) {
+    <button
+      [attr.aria-current]="currentMode === viewModeEnum.GridElement"
+      [attr.aria-label]="'search.view-switch.show-grid' | translate"
+      routerLink="."
+      [queryParams]="{view: 'grid'}"
+      queryParamsHandling="merge"
+      (click)="switchViewTo(viewModeEnum.GridElement)"
+      [class.active]="currentMode === viewModeEnum.GridElement"
+      class="btn btn-secondary"
+      [attr.data-test]="'grid-view' | dsBrowserOnly">
+      <i class="fas fa-th-large"></i>
     </button>
-    <button *ngIf="isToShow(viewModeEnum.DetailedListElement)"
-          [attr.aria-current]="currentMode === viewModeEnum.DetailedListElement"
-          [attr.aria-label]="'search.view-switch.show-detail' | translate"
-       routerLink="."
-       [queryParams]="{view: 'detailed'}"
-       queryParamsHandling="merge"
-       (click)="switchViewTo(viewModeEnum.DetailedListElement)"
-       [class.active]="currentMode === viewModeEnum.DetailedListElement"
-       class="btn btn-secondary"
-       [attr.data-test]="'detail-view' | dsBrowserOnly">
+  }
+  @if (isToShow(viewModeEnum.DetailedListElement)) {
+    <button
+      [attr.aria-current]="currentMode === viewModeEnum.DetailedListElement"
+      [attr.aria-label]="'search.view-switch.show-detail' | translate"
+      routerLink="."
+      [queryParams]="{view: 'detailed'}"
+      queryParamsHandling="merge"
+      (click)="switchViewTo(viewModeEnum.DetailedListElement)"
+      [class.active]="currentMode === viewModeEnum.DetailedListElement"
+      class="btn btn-secondary"
+      [attr.data-test]="'detail-view' | dsBrowserOnly">
       <i class="far fa-square"></i>
     </button>
+  }
 </div>
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
index baed3c9336..cf94e62544 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   EventEmitter,
@@ -33,7 +33,7 @@ import { currentPath } from '../utils/route.utils';
   styleUrls: ['./view-mode-switch.component.scss'],
   templateUrl: './view-mode-switch.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, RouterLinkActive, TranslateModule, BrowserOnlyPipe],
+  imports: [RouterLink, RouterLinkActive, TranslateModule, BrowserOnlyPipe],
 })
 export class ViewModeSwitchComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.html b/src/app/statistics-page/statistics-page/statistics-page.component.html
index 78e736bd3a..a61e57faf5 100644
--- a/src/app/statistics-page/statistics-page/statistics-page.component.html
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.html
@@ -1,28 +1,34 @@
 <div class="container">
 
   <ng-container *ngVar="(scope$ | async) as scope">
-    <h1 *ngIf="scope"
+    @if (scope) {
+      <h1
         class="header"
         id="{{ scope.id }}">
-      {{ 'statistics.header' | translate: { scope: getName(scope) } }}
-    </h1>
+        {{ 'statistics.header' | translate: { scope: getName(scope) } }}
+      </h1>
+    }
   </ng-container>
 
   <ng-container *ngVar="reports$ | async as reports">
 
-    <ng-container *ngIf="!reports">
+    @if (!reports) {
       <ds-loading></ds-loading>
-    </ng-container>
+    }
 
-    <ng-container *ngIf="reports">
-      <ds-statistics-table *ngFor="let report of reports"
-                           [report]="report"
-                           class="m-2 {{ report.id }}">
-      </ds-statistics-table>
-      <div *ngIf="(hasData$ | async) !== true">
-        {{ 'statistics.page.no-data' | translate }}
-      </div>
-    </ng-container>
+    @if (reports) {
+      @for (report of reports; track report) {
+        <ds-statistics-table
+          [report]="report"
+          class="m-2 {{ report.id }}">
+        </ds-statistics-table>
+      }
+      @if ((hasData$ | async) !== true) {
+        <div>
+          {{ 'statistics.page.no-data' | translate }}
+        </div>
+      }
+    }
 
   </ng-container>
 
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.html b/src/app/statistics-page/statistics-table/statistics-table.component.html
index efa9ce43d9..4a0f87076c 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.html
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.html
@@ -1,36 +1,35 @@
-<div *ngIf="hasData"
-     class="m-1">
-
-  <h2 class="m-1">
-    {{ 'statistics.table.title.' + report.reportType | translate }}
-  </h2>
-
-  <table class="table table-striped" [attr.data-test]="report.reportType">
-
-    <tbody>
-
-    <tr>
-      <td></td>
-      <th scope="col"
-          *ngFor="let header of headers"
-          class="{{header}}-header">
-        {{ header }}
-      </th>
-    </tr>
-
-    <tr *ngFor="let point of report.points"
-        class="{{point.id}}-data">
-      <th scope="row" data-test="statistics-label">
-        {{ getLabel(point) | async }}
-      </th>
-      <td *ngFor="let header of headers"
-          class="{{point.id}}-{{header}}-data">
-        {{ point.values[header] }}
-      </td>
-    </tr>
-
-    </tbody>
-
-  </table>
-
-</div>
+@if (hasData) {
+  <div
+    class="m-1">
+    <h2 class="m-1">
+      {{ 'statistics.table.title.' + report.reportType | translate }}
+    </h2>
+    <table class="table table-striped" [attr.data-test]="report.reportType">
+      <tbody>
+        <tr>
+          <td></td>
+          @for (header of headers; track header) {
+            <th scope="col"
+              class="{{header}}-header">
+              {{ header }}
+            </th>
+          }
+        </tr>
+        @for (point of report.points; track point) {
+          <tr
+            class="{{point.id}}-data">
+            <th scope="row" data-test="statistics-label">
+              {{ getLabel(point) | async }}
+            </th>
+            @for (header of headers; track header) {
+              <td
+                class="{{point.id}}-{{header}}-data">
+                {{ point.values[header] }}
+              </td>
+            }
+          </tr>
+        }
+      </tbody>
+    </table>
+  </div>
+}
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.ts b/src/app/statistics-page/statistics-table/statistics-table.component.ts
index cd71730568..9f59e33fa8 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.ts
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -38,7 +34,7 @@ import { isEmpty } from '../../shared/empty.util';
   templateUrl: './statistics-table.component.html',
   styleUrls: ['./statistics-table.component.scss'],
   standalone: true,
-  imports: [NgIf, NgFor, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class StatisticsTableComponent implements OnInit {
 
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 16370a5873..4888ecad0f 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -1,43 +1,42 @@
 <div>
-  <div
-    *ngIf="(available$ | async) !== true"
-    class="input-group mb-3">
-    <div class="input-group-prepend">
+  @if ((available$ | async) !== true) {
+    <div
+      class="input-group mb-3">
       <span class="input-group-text">{{ 'submission.sections.general.collection' | translate }}</span>
-    </div>
-    <div class="input-group-append">
       <span class="input-group-text">{{ selectedCollectionName$ | async }}</span>
     </div>
-  </div>
-  <div
-    ngbDropdown
-    #collectionControls="ngbDropdown"
-    *ngIf="(available$ | async)"
-    class="btn-group input-group"
-    (openChange)="toggled($event)">
-    <div class="input-group-prepend">
+  }
+  @if ((available$ | async)) {
+    <div
+      ngbDropdown
+      #collectionControls="ngbDropdown"
+      class="btn-group input-group"
+      (openChange)="toggled($event)">
       <span id="collectionControlsMenuLabel" class="input-group-text">
         {{ 'submission.sections.general.collection' | translate }}
       </span>
+      <button aria-describedby="collectionControlsMenuLabel"
+        id="collectionControlsMenuButton"
+        class="btn btn-outline-primary"
+        (blur)="onClose()"
+        (click)="onClose()"
+        [dsBtnDisabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
+        ngbDropdownToggle>
+        @if ((processingChange$ | async)) {
+          <span><i class='fas fa-circle-notch fa-spin'></i></span>
+        }
+        @if ((processingChange$ | async) !== true) {
+          <span>{{ selectedCollectionName$ | async }}</span>
+        }
+      </button>
+      <div ngbDropdownMenu
+        class="dropdown-menu p-0"
+        id="collectionControlsDropdownMenu"
+        aria-labelledby="collectionControlsMenuButton">
+        <ds-collection-dropdown
+          (selectionChange)="onSelect($event)">
+        </ds-collection-dropdown>
+      </div>
     </div>
-    <button aria-describedby="collectionControlsMenuLabel"
-            id="collectionControlsMenuButton"
-            class="btn btn-outline-primary"
-            (blur)="onClose()"
-            (click)="onClose()"
-            [disabled]="(processingChange$ | async) || collectionModifiable === false || isReadonly"
-            ngbDropdownToggle>
-      <span *ngIf="(processingChange$ | async)"><i class='fas fa-circle-notch fa-spin'></i></span>
-      <span *ngIf="(processingChange$ | async) !== true">{{ selectedCollectionName$ | async }}</span>
-    </button>
-
-    <div ngbDropdownMenu
-         class="dropdown-menu p-0"
-         id="collectionControlsDropdownMenu"
-         aria-labelledby="collectionControlsMenuButton">
-      <ds-collection-dropdown
-        (selectionChange)="onSelect($event)">
-      </ds-collection-dropdown>
-    </div>
-  </div>
+  }
 </div>
diff --git a/src/app/submission/form/collection/submission-form-collection.component.spec.ts b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
index 540c2ba561..3a5ae8a18d 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.spec.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.spec.ts
@@ -30,6 +30,7 @@ import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import { Collection } from '../../../core/shared/collection.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
 import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import {
@@ -152,6 +153,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
         TranslateModule.forRoot(),
         SubmissionFormCollectionComponent,
         TestComponent,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: DSONameService, useValue: new DSONameServiceMock() },
@@ -275,7 +277,8 @@ describe('SubmissionFormCollectionComponent Component', () => {
       it('the dropdown button should be disabled when isReadonly is true', () => {
         comp.isReadonly = true;
         fixture.detectChanges();
-        expect(dropdowBtn.nativeNode.attributes.disabled).toBeDefined();
+        expect(dropdowBtn.nativeNode.getAttribute('aria-disabled')).toBe('true');
+        expect(dropdowBtn.nativeNode.classList.contains('disabled')).toBeTrue();
       });
 
       it('should be simulated when the drop-down menu is closed', () => {
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index 2aec1c9e30..1736b474d5 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -34,6 +34,7 @@ import { Collection } from '../../../core/shared/collection.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { ThemedCollectionDropdownComponent } from '../../../shared/collection-dropdown/themed-collection-dropdown.component';
 import {
@@ -57,6 +58,7 @@ import { SubmissionService } from '../../submission.service';
     TranslateModule,
     NgbDropdownModule,
     ThemedCollectionDropdownComponent,
+    BtnDisabledDirective,
   ],
 })
 export class SubmissionFormCollectionComponent implements OnDestroy, OnChanges, OnInit {
diff --git a/src/app/submission/form/footer/submission-form-footer.component.html b/src/app/submission/form/footer/submission-form-footer.component.html
index f1162cea4d..1001d4c619 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -1,65 +1,80 @@
-<div class="row" *ngIf="!!submissionId">
-  <div class="col">
-    <button *ngIf="(showDepositAndDiscard | async)"
+@if (!!submissionId) {
+  <div class="row">
+    <div class="col">
+      @if ((showDepositAndDiscard | async)) {
+        <button
+          type="button"
+          id="discard"
+          [attr.data-test]="'discard' | dsBrowserOnly"
+          class="btn btn-danger"
+          [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+          (click)="$event.preventDefault();confirmDiscard(content)">
+          <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
+        </button>
+      }
+    </div>
+    <div class="col text-end d-flex justify-content-end align-items-center">
+      @if ((hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true) {
+        <span>
+          <i class="fas fa-check-circle"></i> {{'submission.general.info.saved' | translate}}
+        </span>
+      }
+      @if ((hasUnsavedModification | async) && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true) {
+        <span>
+          <i class="fas fa-exclamation-circle"></i> {{'submission.general.info.pending-changes' | translate}}
+        </span>
+      }
+      @if ((processingSaveStatus | async) || (processingDepositStatus | async)) {
+        <div class="col d-flex justify-content-end align-items-center">
+          <div class="progress w-75">
+            @if ((processingSaveStatus | async)) {
+              <div class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Saving...</div>
+            }
+            @if ((processingDepositStatus | async)) {
+              <div class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Depositing...</div>
+            }
+          </div>
+        </div>
+      }
+      <div class="ms-2 space-children-mr">
+        <button type="button"
+          class="btn btn-secondary"
+          id="save"
+          [attr.data-test]="'save' | dsBrowserOnly"
+          [dsBtnDisabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
+          (click)="save($event)">
+          <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
+        </button>
+        <button type="button"
+          [class.btn-primary]="(showDepositAndDiscard | async) !== true"
+          [class.btn-secondary]="(showDepositAndDiscard | async)"
+          class="btn"
+          id="saveForLater"
+          [attr.data-test]="'save-for-later' | dsBrowserOnly"
+          [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+          (click)="saveLater($event)">
+          <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
+        </button>
+        @if ((showDepositAndDiscard | async)) {
+          <button
             type="button"
-            id="discard"
-            [attr.data-test]="'discard' | dsBrowserOnly"
-            class="btn btn-danger"
-            [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
-            (click)="$event.preventDefault();confirmDiscard(content)">
-      <i class="fas fa-trash"></i> {{'submission.general.discard.submit' | translate}}
-    </button>
-  </div>
-  <div class="col text-right d-flex justify-content-end align-items-center">
-    <span *ngIf="(hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true">
-      <i class="fas fa-check-circle"></i> {{'submission.general.info.saved' | translate}}
-    </span>
-    <span *ngIf="(hasUnsavedModification | async) && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true">
-      <i class="fas fa-exclamation-circle"></i> {{'submission.general.info.pending-changes' | translate}}
-    </span>
-    <div *ngIf="(processingSaveStatus | async) || (processingDepositStatus | async)" class="col d-flex justify-content-end align-items-center">
-      <div class="progress w-75">
-        <div *ngIf="(processingSaveStatus | async)" class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Saving...</div>
-        <div *ngIf="(processingDepositStatus | async)" class="progress-bar progress-bar-striped progress-bar-animated bg-info" [style.width]="'100%'" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100">Depositing...</div>
+            id="deposit"
+            [attr.data-test]="'deposit' | dsBrowserOnly"
+            class="btn btn-success"
+            [dsBtnDisabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
+            (click)="deposit($event)">
+            <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
+          </button>
+        }
       </div>
     </div>
-    <div class="ml-2 space-children-mr">
-      <button type="button"
-              class="btn btn-secondary"
-              id="save"
-              [attr.data-test]="'save' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
-              (click)="save($event)">
-        <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
-      </button>
-      <button type="button"
-              [class.btn-primary]="(showDepositAndDiscard | async) !== true"
-              [class.btn-secondary]="(showDepositAndDiscard | async)"
-              class="btn"
-              id="saveForLater"
-              [attr.data-test]="'save-for-later' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
-              (click)="saveLater($event)">
-        <span><i class="fas fa-save"></i> {{'submission.general.save-later' | translate}}</span>
-      </button>
-      <button *ngIf="(showDepositAndDiscard | async)"
-              type="button"
-              id="deposit"
-              [attr.data-test]="'deposit' | dsBrowserOnly"
-              class="btn btn-success"
-              [disabled]="(processingSaveStatus | async) || (processingDepositStatus | async)"
-              (click)="deposit($event)">
-        <span><i class="fas fa-plus"></i> {{'submission.general.deposit' | translate}}</span>
-      </button>
-    </div>
   </div>
-</div>
+}
 
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
     <h4 class="modal-title text-danger">{{'submission.general.discard.confirm.title' | translate}}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="d('cancel')">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" class="btn-close" aria-label="Close" (click)="d('cancel')">
     </button>
   </div>
   <div class="modal-body">
diff --git a/src/app/submission/form/footer/submission-form-footer.component.spec.ts b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
index 4c6d04c970..82bc309cc8 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.spec.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.spec.ts
@@ -25,6 +25,7 @@ import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
 import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
@@ -51,6 +52,7 @@ describe('SubmissionFormFooterComponent', () => {
         TranslateModule.forRoot(),
         SubmissionFormFooterComponent,
         TestComponent,
+        BtnDisabledDirective,
       ],
       providers: [
         { provide: SubmissionService, useValue: submissionServiceStub },
@@ -227,7 +229,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
 
-      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('should not have deposit button disabled when submission is valid', () => {
@@ -236,7 +239,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
       const depositBtn: any = fixture.debugElement.query(By.css('.btn-success'));
 
-      expect(depositBtn.nativeElement.disabled).toBeFalsy();
+      expect(depositBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(depositBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
     it('should disable save button when all modifications had been saved', () => {
@@ -244,7 +248,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
 
       const saveBtn: any = fixture.debugElement.query(By.css('#save'));
-      expect(saveBtn.nativeElement.disabled).toBeTruthy();
+      expect(saveBtn.nativeElement.getAttribute('aria-disabled')).toBe('true');
+      expect(saveBtn.nativeElement.classList.contains('disabled')).toBeTrue();
     });
 
     it('should enable save button when there are not saved modifications', () => {
@@ -252,7 +257,8 @@ describe('SubmissionFormFooterComponent', () => {
       fixture.detectChanges();
 
       const saveBtn: any = fixture.debugElement.query(By.css('#save'));
-      expect(saveBtn.nativeElement.disabled).toBeFalsy();
+      expect(saveBtn.nativeElement.getAttribute('aria-disabled')).toBe('false');
+      expect(saveBtn.nativeElement.classList.contains('disabled')).toBeFalse();
     });
 
   });
diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts
index 712a944a84..8645003783 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.ts
@@ -15,6 +15,7 @@ import { map } from 'rxjs/operators';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
 import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { BrowserOnlyPipe } from '../../../shared/utils/browser-only.pipe';
 import { SubmissionService } from '../../submission.service';
@@ -27,7 +28,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-footer.component.scss'],
   templateUrl: './submission-form-footer.component.html',
   standalone: true,
-  imports: [CommonModule, BrowserOnlyPipe, TranslateModule],
+  imports: [CommonModule, BrowserOnlyPipe, TranslateModule, BtnDisabledDirective],
 })
 export class SubmissionFormFooterComponent implements OnChanges {
 
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index 0c7035c7f8..5f2a26b8a1 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -1,26 +1,30 @@
 <div ngbDropdown
-     #sectionAdd="ngbDropdown"
-     placement="bottom-right"
-     class="d-inline-block"
-     [ngClass]="{'w-100': windowService.isXs()}">
-  <ng-container *ngIf="hasSections$ | async">
-  <button class="btn btn-outline-primary dropdown-toggle"
-          id="sectionControls"
-          [disabled]="(hasSections$ | async) !== true"
-          [ngClass]="{'w-100': (windowService.isXs() | async)}"
-          ngbDropdownToggle>
-          {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
-  </button>
-  </ng-container>
+  #sectionAdd="ngbDropdown"
+  placement="bottom-right"
+  class="d-inline-block"
+  [ngClass]="{'w-100': windowService.isXs()}">
+  @if (hasSections$ | async) {
+    <button class="btn btn-outline-primary dropdown-toggle"
+      id="sectionControls"
+      [dsBtnDisabled]="(hasSections$ | async) !== true"
+      [ngClass]="{'w-100': (windowService.isXs() | async)}"
+      ngbDropdownToggle>
+      {{ 'submission.sections.general.add-more' | translate }} <i class="fa fa-plus" aria-hidden="true"></i>
+    </button>
+  }
   <div ngbDropdownMenu
-       class="sections-dropdown-menu"
-       aria-labelledby="sectionControls"
-       [ngClass]="{'w-100': (windowService.isXs() | async)}">
-    <button class="dropdown-item disabled" *ngIf="(hasSections$ | async) !== true">
-      {{ 'submission.sections.general.no-sections' | translate }}
-    </button>
-    <button class="dropdown-item" *ngFor="let listItem of (sectionList$ | async)" (click)="addSection(listItem.id)">
-      {{'submission.sections.'+listItem.header | translate }}
-    </button>
+    class="sections-dropdown-menu"
+    aria-labelledby="sectionControls"
+    [ngClass]="{'w-100': (windowService.isXs() | async)}">
+    @if ((hasSections$ | async) !== true) {
+      <button class="dropdown-item disabled">
+        {{ 'submission.sections.general.no-sections' | translate }}
+      </button>
+    }
+    @for (listItem of (sectionList$ | async); track listItem) {
+      <button class="dropdown-item" (click)="addSection(listItem.id)">
+        {{'submission.sections.'+listItem.header | translate }}
+      </button>
+    }
   </div>
 </div>
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.ts b/src/app/submission/form/section-add/submission-form-section-add.component.ts
index 4cf10e55d8..eeeda893f1 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.ts
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.ts
@@ -9,6 +9,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { SectionDataObject } from '../../sections/models/section-data.model';
 import { SectionsService } from '../../sections/sections.service';
@@ -22,7 +23,7 @@ import { SubmissionService } from '../../submission.service';
   styleUrls: ['./submission-form-section-add.component.scss'],
   templateUrl: './submission-form-section-add.component.html',
   standalone: true,
-  imports: [CommonModule, TranslateModule, NgbDropdownModule],
+  imports: [CommonModule, TranslateModule, NgbDropdownModule, BtnDisabledDirective],
 })
 export class SubmissionFormSectionAddComponent implements OnInit {
 
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index 17e863d435..802d0e1c4c 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -1,42 +1,49 @@
 <div class="container-fluid">
-    <div *ngIf="(isLoading() | async) !== true" class="submission-form-header mb-3 d-flex flex-wrap position-sticky">
-        <div *ngIf="(uploadEnabled$ | async)" class="w-100">
-            <ds-submission-upload-files [submissionId]="submissionId"
-                                        [collectionId]="collectionId"
-                                        [uploadFilesOptions]="uploadFilesOptions"></ds-submission-upload-files>
-            <div class="clearfix"></div>
+  @if ((isLoading() | async) !== true) {
+    <div class="submission-form-header mb-3 d-flex flex-wrap position-sticky">
+      @if ((uploadEnabled$ | async)) {
+        <div class="w-100">
+          <ds-submission-upload-files [submissionId]="submissionId"
+            [collectionId]="collectionId"
+          [uploadFilesOptions]="uploadFilesOptions"></ds-submission-upload-files>
+          <div class="clearfix"></div>
         </div>
-
-        <div class="submission-form-header-item mb-3 mb-sm-0 flex-sm-grow-1 flex-md-grow-0">
-          <ng-container *ngIf="!isSectionHidden">
-            <ds-submission-form-collection
+      }
+      <div class="submission-form-header-item mb-3 mb-sm-0 flex-sm-grow-1 flex-md-grow-0">
+        @if (!isSectionHidden) {
+          <ds-submission-form-collection
             [currentCollectionId]="collectionId"
-                                           [currentDefinition]="definitionId"
-                                           [submissionId]="submissionId"
-                                           [collectionModifiable]="collectionModifiable"
-                                           [isReadonly]="isSectionReadonly"
-                                           (collectionChange)="onCollectionChange($event)">
-            </ds-submission-form-collection>
-          </ng-container>
-        </div>
-        <div class="submission-form-header-item text-right">
-            <ds-submission-form-section-add [collectionId]="collectionId"
-                                            [submissionId]="submissionId">
-            </ds-submission-form-section-add>
-        </div>
+            [currentDefinition]="definitionId"
+            [submissionId]="submissionId"
+            [collectionModifiable]="collectionModifiable"
+            [isReadonly]="isSectionReadonly"
+            (collectionChange)="onCollectionChange($event)">
+          </ds-submission-form-collection>
+        }
+      </div>
+      <div class="submission-form-header-item text-end">
+        <ds-submission-form-section-add [collectionId]="collectionId"
+          [submissionId]="submissionId">
+        </ds-submission-form-section-add>
+      </div>
     </div>
+  }
 
-    <div class="submission-form-content">
-        <ds-loading *ngIf="(isLoading() | async)" message="Loading..."></ds-loading>
-        <ng-container *ngFor="let object of $any(submissionSections | async)">
-            <ds-submission-section-container [collectionId]="collectionId"
-                                             [submissionId]="submissionId"
-                                             [sectionData]="$any(object)">
-            </ds-submission-section-container>
-        </ng-container>
-    </div>
-    <div *ngIf="(isLoading() | async) !== true" class="submission-form-footer mt-3 mb-3 position-sticky">
-        <ds-submission-form-footer [submissionId]="submissionId"></ds-submission-form-footer>
+  <div class="submission-form-content">
+    @if ((isLoading() | async)) {
+      <ds-loading message="Loading..."></ds-loading>
+    }
+    @for (object of $any(submissionSections | async); track object) {
+      <ds-submission-section-container [collectionId]="collectionId"
+        [submissionId]="submissionId"
+        [sectionData]="$any(object)">
+      </ds-submission-section-container>
+    }
+  </div>
+  @if ((isLoading() | async) !== true) {
+    <div class="submission-form-footer mt-3 mb-3 position-sticky">
+      <ds-submission-form-footer [submissionId]="submissionId"></ds-submission-form-footer>
     </div>
+  }
 </div>
 
diff --git a/src/app/submission/form/submission-form.component.scss b/src/app/submission/form/submission-form.component.scss
index c5e142b89c..772849791c 100644
--- a/src/app/submission/form/submission-form.component.scss
+++ b/src/app/submission/form/submission-form.component.scss
@@ -22,7 +22,7 @@
   font-weight: $font-weight-normal;
   color: $link-color;
   text-decoration: $link-decoration;
-  @include hover {
+  &:hover {
     color: $link-hover-color;
     text-decoration: $link-hover-decoration;
   }
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 2e97c2df63..74c262befc 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -22,10 +22,7 @@ import {
 
 import { AuthService } from '../../core/auth/auth.service';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
-import {
-  SubmissionSectionModel,
-  SubmissionSectionVisibility,
-} from '../../core/config/models/config-submission-section.model';
+import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model';
 import { Collection } from '../../core/shared/collection.model';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { Item } from '../../core/shared/item.model';
@@ -38,6 +35,7 @@ import {
 } from '../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../shared/loading/themed-loading.component';
 import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
+import { SectionVisibility } from '../objects/section-visibility.model';
 import { SubmissionError } from '../objects/submission-error.model';
 import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
 import { SubmissionSectionContainerComponent } from '../sections/container/section-container.component';
@@ -233,7 +231,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
   /**
    *  Returns the visibility object of the collection section
    */
-  private getCollectionVisibility(): SubmissionSectionVisibility {
+  private getCollectionVisibility(): SectionVisibility {
     const submissionSectionModel: SubmissionSectionModel =
       this.submissionDefinition.sections.page.find(
         (section) => isEqual(section.sectionType, SectionsType.Collection),
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.html b/src/app/submission/form/submission-upload-files/submission-upload-files.component.html
index dfad8c422e..a8c8b9ca48 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.html
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.html
@@ -1,8 +1,10 @@
-<ds-uploader *ngIf="uploadFilesOptions.url"
-             [dropMsg]="dropMsg"
-             [dropOverDocumentMsg]="dropOverDocumentMsg"
-             [enableDragOverDocument]="enableDragOverDocument"
-             [onBeforeUpload]="onBeforeUpload"
-             [uploadFilesOptions]="uploadFilesOptions"
-             (onCompleteItem)="onCompleteItem($event)"
-             (onUploadError)="onUploadError()"></ds-uploader>
+@if (uploadFilesOptions.url) {
+  <ds-uploader
+    [dropMsg]="dropMsg"
+    [dropOverDocumentMsg]="dropOverDocumentMsg"
+    [enableDragOverDocument]="enableDragOverDocument"
+    [onBeforeUpload]="onBeforeUpload"
+    [uploadFilesOptions]="uploadFilesOptions"
+    (onCompleteItem)="onCompleteItem($event)"
+  (onUploadError)="onUploadError()"></ds-uploader>
+}
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index 3632ec6760..13d7bf8fb8 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -40,7 +40,6 @@ import parseSectionErrors from '../../utils/parseSectionErrors';
   templateUrl: './submission-upload-files.component.html',
   imports: [
     UploaderComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
index e2b769295a..c1de983b38 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
@@ -1,15 +1,16 @@
 <div>
   <div class="modal-header">{{'dso-selector.select.collection.head' | translate}}
-    <button type="button" class="close" (click)="closeCollectionModal()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="closeCollectionModal()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
-    <ds-loading *ngIf="isLoading()"></ds-loading>
+    @if (isLoading()) {
+      <ds-loading></ds-loading>
+    }
     <ds-collection-dropdown [ngClass]="{'d-none': isLoading()}"
-                            (selectionChange)="selectObject($event)"
-                            (searchComplete)="searchComplete()"
-                            [entityType]="entityType">
+      (selectionChange)="selectObject($event)"
+      (searchComplete)="searchComplete()"
+      [entityType]="entityType">
     </ds-collection-dropdown>
   </div>
 </div>
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss
index 1a70081367..5a3c2bd9c6 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.scss
@@ -1,3 +1,3 @@
-.close:focus {
+.btn-close:focus {
   outline: none !important;
 }
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
index 03bd10cfc2..57171ebe8e 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import {
   Component,
   EventEmitter,
@@ -26,7 +23,6 @@ import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.c
     ThemedCollectionDropdownComponent,
     TranslateModule,
     NgClass,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
index beecd68d70..02bcc78bf4 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
@@ -1,8 +1,7 @@
 <div class="modal-header">
   <h2>{{'submission.import-external.preview.title.' + labelPrefix | translate}}</h2>
-  <button type="button" class="close"
-          (click)="closeMetadataModal()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+  <button type="button" class="btn-close"
+    (click)="closeMetadataModal()" aria-label="Close">
   </button>
 </div>
 <div class="modal-body">
@@ -15,27 +14,29 @@
     <div class="row">
       <div class="col-md-12">
         <hr>
+        </div>
+      </div>
+      @for (metadata of metadataList; track metadata) {
+        <div class="row">
+          <p class="col-md-12">
+            <strong class="">{{'item.preview.' + metadata.key | translate}}</strong><br>
+            @for (metadatum of metadata.values; track metadatum) {
+              <span>{{metadatum.value}}</span><br>
+            }
+          </p>
+        </div>
+      }
+      <div class="row">
+        <div class="col-md-12">
+          <hr>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-md-12 text-end">
+            <button class="btn btn-success" (click)="import()" role="button">
+              <i class="fa fa-file-import" aria-hidden="true"></i> {{'submission.import-external.preview.button.import' | translate}}
+            </button>
+          </div>
+        </div>
       </div>
     </div>
-    <div *ngFor="let metadata of metadataList" class="row">
-      <p class="col-md-12">
-        <strong class="">{{'item.preview.' + metadata.key | translate}}</strong><br>
-        <ng-container *ngFor="let metadatum of metadata.values">
-          <span>{{metadatum.value}}</span><br>
-        </ng-container>
-      </p>
-    </div>
-    <div class="row">
-      <div class="col-md-12">
-        <hr>
-      </div>
-    </div>
-    <div class="row">
-      <div class="col-md-12 text-right">
-        <button class="btn btn-success" (click)="import()" role="button">
-          <i class="fa fa-file-import" aria-hidden="true"></i> {{'submission.import-external.preview.button.import' | translate}}
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss
index 1a70081367..5a3c2bd9c6 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.scss
@@ -1,3 +1,3 @@
-.close:focus {
+.btn-close:focus {
   outline: none !important;
 }
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
index c7f434b23c..7194b59f6a 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.ts
@@ -1,4 +1,4 @@
-import { NgFor } from '@angular/common';
+
 import {
   Component,
   Input,
@@ -30,7 +30,6 @@ import { SubmissionImportExternalCollectionComponent } from '../import-external-
   styleUrls: ['./submission-import-external-preview.component.scss'],
   templateUrl: './submission-import-external-preview.component.html',
   imports: [
-    NgFor,
     TranslateModule,
   ],
   standalone: true,
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 7b5a2004d7..3dfbea992b 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -1,13 +1,18 @@
-<div *ngIf="(isXsOrSm$ | async)" class="input-group mb-2">
-  <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
-</div>
+@if ((isXsOrSm$ | async)) {
+  <div class="input-group mb-2">
+    <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' |translate}}"
+      [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+  </div>
+}
 <div class="input-group mb-5">
-  <input *ngIf="(isXsOrSm$ | async) !== true" type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+  @if ((isXsOrSm$ | async) !== true) {
+    <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
+  }
   <div [ngClass]="{'input-group-append': (isXsOrSm$ | async) !== true}" ngbDropdown role="group">
     <button [attr.aria-label]="'submission.import-external.search.source.hint' |translate"
-            class="btn btn-outline-secondary w-fx"
-            title="{{'submission.import-external.search.source.hint' |translate}}"
-            ngbDropdownToggle>
+      class="btn btn-outline-secondary w-fx"
+      title="{{'submission.import-external.search.source.hint' |translate}}"
+      ngbDropdownToggle>
       {{'submission.import-external.source.' + selectedElement?.name | translate}}
     </button>
     <ul ngbDropdownMenu class="dropdown-menu scrollable-dropdown-menu w-100"
@@ -19,10 +24,17 @@
         [infiniteScrollThrottle]="50"
         (scrolled)="onScroll()"
         [scrollWindow]="false">
-        <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)" *ngFor="let source of sourceList">{{'submission.import-external.source.' + source?.name | translate}}</button>
-        <div ngbDropdownItem class="scrollable-dropdown-loading text-center" *ngIf="sourceListLoading"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
+        @for (source of sourceList; track source) {
+          <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)"
+            >{{ 'submission.import-external.source.' + source?.name | translate }}
+          </button>
+        }
+        @if (sourceListLoading) {
+          <div ngbDropdownItem class="scrollable-dropdown-loading text-center"><p>{{'submission.import-external.source.loading' | translate}}</p></div>
+        }
       </li>
     </ul>
-    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
+    <button type="button" class="btn btn-primary" [title]="(searchString === '')?('submission.import-external.search.button.hint' | translate):''"
+      [dsBtnDisabled]="searchString === ''" (click)="search()">{{ 'submission.import-external.search.button' | translate }}
+    </button>
   </div>
-</div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
index aace4de79a..eb7a703cc2 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
@@ -36,6 +36,7 @@ import {
   getFirstSucceededRemoteDataPayload,
 } from '../../../core/shared/operators';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { hasValue } from '../../../shared/empty.util';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
@@ -70,6 +71,7 @@ export interface ExternalSourceData {
     InfiniteScrollModule,
     NgbDropdownModule,
     FormsModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/import-external/submission-import-external.component.html b/src/app/submission/import-external/submission-import-external.component.html
index 21783f9a2e..3d0580f37e 100644
--- a/src/app/submission/import-external/submission-import-external.component.html
+++ b/src/app/submission/import-external/submission-import-external.component.html
@@ -8,43 +8,59 @@
       </ds-submission-import-external-searchbar>
     </div>
   </div>
-  <div class="row" *ngIf="reload$.value.entity">
-    <div *ngIf="reload$.value.sourceId !== ''" class="col-md-12">
-      <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
-        <h2 *ngIf="entriesRD && entriesRD?.payload?.page?.length !== 0">{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h2>
-        <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && (isLoading$ | async) !== true && entriesRD?.payload?.page?.length > 0" @fadeIn
-                                [objects]="entriesRD"
-                                [selectionConfig]="{ repeatable: repeatable, listId: listId }"
-                                [config]="initialPagination"
-                                [hideGear]="true"
-                                [context]="context"
-                                [importable]="true"
-                                [importConfig]="importConfig"
-                                (importObject)="import($event)">
-        </ds-viewable-collection>
-        <ds-loading *ngIf="(isLoading$ | async)"
-                    message="{{'loading.search-results' | translate}}"></ds-loading>
-        <div *ngIf="(isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0" data-test="empty-external-entry-list">
-          <ds-alert [type]="AlertType.Info">{{ 'search.results.empty' | translate }}</ds-alert>
+  @if (reload$.value.entity) {
+    <div class="row">
+      @if (reload$.value.sourceId !== '') {
+        <div class="col-md-12">
+          <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
+            @if (entriesRD && entriesRD?.payload?.page?.length !== 0) {
+              <h2>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title' | translate}}</h2>
+            }
+            @if (entriesRD?.hasSucceeded && (isLoading$ | async) !== true && entriesRD?.payload?.page?.length > 0) {
+              <ds-viewable-collection @fadeIn
+                [objects]="entriesRD"
+                [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+                [config]="initialPagination"
+                [hideGear]="true"
+                [context]="context"
+                [importable]="true"
+                [importConfig]="importConfig"
+                (importObject)="import($event)">
+              </ds-viewable-collection>
+            }
+            @if ((isLoading$ | async)) {
+              <ds-loading
+              message="{{'loading.search-results' | translate}}"></ds-loading>
+            }
+            @if ((isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0) {
+              <div data-test="empty-external-entry-list">
+                <ds-alert [type]="AlertType.Info">{{ 'search.results.empty' | translate }}</ds-alert>
+              </div>
+            }
+            @if ((isLoading$ | async) !== true && entriesRD.statusCode === 500) {
+              <div data-test="empty-external-error-500">
+                <ds-alert [type]="AlertType.Info">{{ 'search.results.response.500' | translate }}</ds-alert>
+              </div>
+            }
+          </ng-container>
         </div>
-        <div *ngIf="(isLoading$ | async) !== true && entriesRD.statusCode === 500" data-test="empty-external-error-500">
-          <ds-alert [type]="AlertType.Info">{{ 'search.results.response.500' | translate }}</ds-alert>
+      }
+      @if (reload$.value.sourceId === '') {
+        <div class="col-md-12">
+          <ds-alert [type]="AlertType.Info">
+            <p class="lead mb-0">{{'submission.import-external.page.hint' | translate}}</p>
+          </ds-alert>
         </div>
-      </ng-container>
+      }
     </div>
-    <div *ngIf="reload$.value.sourceId === ''" class="col-md-12">
-      <ds-alert [type]="AlertType.Info">
-        <p class="lead mb-0">{{'submission.import-external.page.hint' | translate}}</p>
-      </ds-alert>
-    </div>
-  </div>
+  }
 
   <div class="row">
     <div class="col-md-12">
       <hr>
-      <a class="btn btn-outline-secondary" [routerLink]="['/mydspace']" role="button">
-        <i class="fa fa-chevron-left" aria-hidden="true"></i> {{'submission.import-external.back-to-my-dspace' | translate}}
-      </a>
+        <a class="btn btn-outline-secondary" [routerLink]="['/mydspace']" role="button">
+          <i class="fa fa-chevron-left" aria-hidden="true"></i> {{'submission.import-external.back-to-my-dspace' | translate}}
+        </a>
+      </div>
     </div>
   </div>
-</div>
diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts
index 47b5c09d66..a67520b636 100644
--- a/src/app/submission/import-external/submission-import-external.component.ts
+++ b/src/app/submission/import-external/submission-import-external.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -72,7 +69,6 @@ import {
     ObjectCollectionComponent,
     ThemedLoadingComponent,
     AlertComponent,
-    NgIf,
     AsyncPipe,
     SubmissionImportExternalSearchbarComponent,
     TranslateModule,
diff --git a/src/app/submission/objects/section-visibility.model.ts b/src/app/submission/objects/section-visibility.model.ts
index c41735178c..16cf16b2ab 100644
--- a/src/app/submission/objects/section-visibility.model.ts
+++ b/src/app/submission/objects/section-visibility.model.ts
@@ -5,3 +5,9 @@ export interface SectionVisibility {
   main: any;
   other: any;
 }
+
+
+export enum SectionScope {
+  Submission = 'SUBMISSION',
+  Workflow = 'WORKFLOW',
+}
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index e075ce5e5b..956c8f9533 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -11,7 +11,10 @@ import {
 } from '../../core/submission/models/workspaceitem-sections.model';
 import { type } from '../../shared/ngrx/type';
 import { SectionsType } from '../sections/sections-type';
-import { SectionVisibility } from './section-visibility.model';
+import {
+  SectionScope,
+  SectionVisibility,
+} from './section-visibility.model';
 import { SubmissionError } from './submission-error.model';
 import { SubmissionSectionError } from './submission-section-error.model';
 
@@ -120,6 +123,7 @@ export class InitSectionAction implements Action {
     header: string;
     config: string;
     mandatory: boolean;
+    scope: SectionScope;
     sectionType: SectionsType;
     visibility: SectionVisibility;
     enabled: boolean;
@@ -140,6 +144,8 @@ export class InitSectionAction implements Action {
    *    the section's config
    * @param mandatory
    *    the section's mandatory
+   * @param scope
+   *    the section's scope
    * @param sectionType
    *    the section's type
    * @param visibility
@@ -156,12 +162,13 @@ export class InitSectionAction implements Action {
     header: string,
     config: string,
     mandatory: boolean,
+    scope: SectionScope,
     sectionType: SectionsType,
     visibility: SectionVisibility,
     enabled: boolean,
     data: WorkspaceitemSectionDataType,
     errors: SubmissionSectionError[]) {
-    this.payload = { submissionId, sectionId, header, config, mandatory, sectionType, visibility, enabled, data, errors };
+    this.payload = { submissionId, sectionId, header, config, mandatory, scope, sectionType, visibility, enabled, data, errors };
   }
 }
 
diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts
index 4a3e08384d..a16dc365f2 100644
--- a/src/app/submission/objects/submission-objects.effects.spec.ts
+++ b/src/app/submission/objects/submission-objects.effects.spec.ts
@@ -167,6 +167,7 @@ describe('SubmissionObjectEffects test suite', () => {
             sectionDefinition.header,
             config,
             sectionDefinition.mandatory,
+            sectionDefinition.scope,
             sectionDefinition.sectionType,
             sectionDefinition.visibility,
             enabled,
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index 9afb6cec40..ef1610794c 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -116,6 +116,7 @@ export class SubmissionObjectEffects {
             sectionDefinition.header,
             config,
             sectionDefinition.mandatory,
+            sectionDefinition.scope,
             sectionDefinition.sectionType,
             sectionDefinition.visibility,
             enabled,
diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts
index 2389a5600c..2bbb875c3c 100644
--- a/src/app/submission/objects/submission-objects.reducer.spec.ts
+++ b/src/app/submission/objects/submission-objects.reducer.spec.ts
@@ -237,6 +237,7 @@ describe('submissionReducer test suite', () => {
       header: 'submit.progressbar.describe.stepone',
       config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
       mandatory: true,
+      scope: null,
       sectionType: 'submission-form',
       visibility: undefined,
       collapsed: false,
@@ -257,6 +258,7 @@ describe('submissionReducer test suite', () => {
       'submit.progressbar.describe.stepone',
       'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
       true,
+      null,
       SectionsType.SubmissionForm,
       undefined,
       true,
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index 82e33062cd..a34cf236b9 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -565,6 +565,7 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
             header: action.payload.header,
             config: action.payload.config,
             mandatory: action.payload.mandatory,
+            scope: action.payload.scope,
             sectionType: action.payload.sectionType,
             visibility: action.payload.visibility,
             collapsed: false,
diff --git a/src/app/submission/objects/submission-section-object.model.ts b/src/app/submission/objects/submission-section-object.model.ts
index 7338539607..5d8a14c745 100644
--- a/src/app/submission/objects/submission-section-object.model.ts
+++ b/src/app/submission/objects/submission-section-object.model.ts
@@ -1,6 +1,9 @@
 import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
 import { SectionsType } from '../sections/sections-type';
-import { SectionVisibility } from './section-visibility.model';
+import {
+  SectionScope,
+  SectionVisibility,
+} from './section-visibility.model';
 import { SubmissionSectionError } from './submission-section-error.model';
 
 /**
@@ -22,6 +25,11 @@ export interface SubmissionSectionObject {
    */
   mandatory: boolean;
 
+  /**
+   * The submission scope for this section
+   */
+  scope: SectionScope;
+
   /**
    * The section type
    */
diff --git a/src/app/submission/sections/accesses/section-accesses.component.html b/src/app/submission/sections/accesses/section-accesses.component.html
index 1ba2d4fe6d..009a0ca675 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.html
+++ b/src/app/submission/sections/accesses/section-accesses.component.html
@@ -1,7 +1,9 @@
-<ds-form *ngIf="!!formModel" #formRef="formComponent"
-         [formId]="formId"
-         [formModel]="formModel"
-         [displaySubmit]="false"
-         [displayCancel]="false"
-         (dfChange)="onChange($event)"
-         (removeArrayItem)="onRemove($event)"></ds-form>
+@if (!!formModel) {
+  <ds-form #formRef="formComponent"
+    [formId]="formId"
+    [formModel]="formModel"
+    [displaySubmit]="false"
+    [displayCancel]="false"
+    (dfChange)="onChange($event)"
+  (removeArrayItem)="onRemove($event)"></ds-form>
+}
diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts
index b47f1cf8ff..53c67a8bf2 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   Component,
   Inject,
@@ -79,7 +79,6 @@ import { SectionAccessesService } from './section-accesses.service';
   styleUrls: ['./section-accesses.component.scss'],
   imports: [
     FormComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/accesses/section-accesses.model.ts b/src/app/submission/sections/accesses/section-accesses.model.ts
index 6b4732b881..2967971b83 100644
--- a/src/app/submission/sections/accesses/section-accesses.model.ts
+++ b/src/app/submission/sections/accesses/section-accesses.model.ts
@@ -18,7 +18,7 @@ export const ACCESS_FORM_CHECKBOX_CONFIG: DynamicCheckboxModelConfig = {
 export const ACCESS_FORM_CHECKBOX_LAYOUT = {
 
   element: {
-    container: 'custom-control custom-checkbox pl-1',
+    container: 'custom-control custom-checkbox ps-1',
     control: 'custom-control-input',
     label: 'custom-control-label pt-1',
   },
@@ -31,9 +31,9 @@ export const ACCESS_CONDITION_GROUP_CONFIG: DynamicFormGroupModelConfig = {
 
 export const ACCESS_CONDITION_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
-    host: 'form-group access-condition-group col',
-    container: 'pl-1 pr-1',
-    control: 'form-row ',
+    host: 'mb-3 access-condition-group col',
+    container: 'ps-1 pe-1',
+    control: 'row ',
   },
 };
 
@@ -43,7 +43,7 @@ export const ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayModelConfig =
 };
 export const ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT: DynamicFormControlLayout = {
   grid: {
-    group: 'form-row pt-4',
+    group: 'row pt-4',
   },
 };
 
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 0c8c1abeeb..2a7ff552af 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -1,145 +1,151 @@
-<div class="mb-4 ccLicense-select">
-  <ds-select
-    [disabled]="!submissionCcLicenses">
+@if (submissionCcLicenses) {
+  <div class="mb-4 ccLicense-select">
+    <div ngbDropdown>
+      <input id="cc-license-dropdown"
+        class="form-control"
+        [(ngModel)]="selectedCcLicense.name"
+        placeholder="{{ !storedCcLicenseLink ? ('submission.sections.ccLicense.select' | translate) : ('submission.sections.ccLicense.change' | translate)}}"
+        [ngModelOptions]="{standalone: true}"
+        ngbDropdownToggle
+        role="combobox"
+        #script="ngModel">
+      <div ngbDropdownMenu aria-labelledby="cc-license-dropdown" class="w-100 scrollable-menu"
+        role="menu"
+        infiniteScroll
+        (scroll)="onScroll($event)"
+        [infiniteScrollDistance]="5"
+        [infiniteScrollThrottle]="300"
+        [infiniteScrollUpDistance]="1.5"
+        [fromRoot]="true"
+        [scrollWindow]="false">
 
-    <ng-container class="selection">
-      <span *ngIf="!submissionCcLicenses">
-        <ds-loading></ds-loading>
-      </span>
-      <span *ngIf="getSelectedCcLicense()">
-        {{ getSelectedCcLicense().name }}
-      </span>
-      <span *ngIf="submissionCcLicenses && !getSelectedCcLicense()">
-        <ng-container *ngIf="storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.change' | translate }}
-        </ng-container>
-        <ng-container *ngIf="!storedCcLicenseLink">
-          {{ 'submission.sections.ccLicense.select' | translate }}
-        </ng-container>
-      </span>
-    </ng-container>
-
-    <ng-container class="menu">
-      <button *ngIf="submissionCcLicenses?.length === 0"
-              class="dropdown-item disabled">
-        {{ 'submission.sections.ccLicense.none' | translate }}
-      </button>
-      <button *ngFor="let license of submissionCcLicenses"
-              class="dropdown-item"
-              (click)="selectCcLicense(license)">
-        {{ license.name }}
-      </button>
-    </ng-container>
-
-  </ds-select>
-</div>
-
-<ng-container *ngIf="getSelectedCcLicense()">
-
-  <div *ngFor="let field of getSelectedCcLicense().fields"
-       class="mb-4">
-
-    <div class="d-flex flex-row">
-      <div class="font-weight-bold {{ field.id }}">
-        {{ field.label }}
-      </div>
-      <button
-        class="btn btn-outline-info btn-sm ml-2"
-        (click)="openInfoModal(infoModal)">
-        <i class="fas fa-question"></i>
-      </button>
-    </div>
-
-    <ng-template #infoModal>
-
-      <div>
-
-        <div class="modal-header mb-4 ">
-          <div>
-            <h4>
-              {{ field.label }}
-            </h4>
-            <div [innerHTML]="field.description"></div>
-          </div>
-          <button type="button" class="close"
-                  (click)="closeInfoModal()" aria-label="Close">
-            <span aria-hidden="true">×</span>
+        @if(submissionCcLicenses?.length === 0) {
+          <button class="dropdown-item disabled">
+            {{ 'submission.sections.ccLicense.none' | translate }}
           </button>
-        </div>
+        } @else {
+          @for(license of submissionCcLicenses; track license.id) {
+            <button class="dropdown-item" (click)="selectCcLicense(license)">
+              {{ license.name }}
+            </button>
+          }
+        }
+      </div>
+    </div>
+  </div>
+}
 
-        <div class="modal-body">
-          <div *ngFor="let value of field.enums"
-               class="mb-4">
-            <h5>
-              {{ value.label }}
-            </h5>
-            <div [innerHTML]="value.description" class="font-weight-light"></div>
+@if (getSelectedCcLicense()) {
+  @for (field of getSelectedCcLicense().fields; track field) {
+    <div
+      class="mb-4">
+      <div class="d-flex flex-row">
+        <div class="fw-bold {{ field.id }}">
+          {{ field.label }}
+        </div>
+        <button
+          class="btn btn-outline-info btn-sm ms-2"
+          (click)="openInfoModal(infoModal)">
+          <i class="fas fa-question"></i>
+        </button>
+      </div>
+      <ng-template #infoModal>
+        <div>
+          <div class="modal-header mb-4 ">
+            <div>
+              <h4>
+                {{ field.label }}
+              </h4>
+              <div [innerHTML]="field.description"></div>
+            </div>
+            <button type="button" class="btn-close"
+              (click)="closeInfoModal()" aria-label="Close">
+            </button>
+          </div>
+          <div class="modal-body">
+            @for (value of field.enums; track value) {
+              <div
+                class="mb-4">
+                <h5>
+                  {{ value.label }}
+                </h5>
+                <div [innerHTML]="value.description" class="fw-light"></div>
+              </div>
+            }
           </div>
         </div>
-
-      </div>
-
-    </ng-template>
-
-    <ds-select *ngIf="field.enums?.length > 5" [disabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
-      <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
-        <span *ngIf="option">
-          {{ option.label }}
-        </span>
-        <span *ngIf="!option">
-          {{ 'submission.sections.ccLicense.option.select' | translate }}
-        </span>
-      </ng-container>
-      <ng-container class="menu">
-        <div class="options-select-menu overflow-auto">
-          <button *ngFor="let option of field.enums"
+      </ng-template>
+      @if (field.enums?.length > 5) {
+        <ds-select [disabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
+          <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
+            @if (option) {
+              <span>
+                {{ option.label }}
+              </span>
+            }
+            @if (!option) {
+              <span>
+                {{ 'submission.sections.ccLicense.option.select' | translate }}
+              </span>
+            }
+          </ng-container>
+          <ng-container class="menu">
+            <div class="options-select-menu overflow-auto">
+              @for (option of field.enums; track option) {
+                <button
                   class="dropdown-item"
                   (click)="selectOption(getSelectedCcLicense(), field, option)">
-            {{ option.label }}
-          </button>
-        </div>
-      </ng-container>
-    </ds-select>
+                  {{ option.label }}
+                </button>
+              }
+            </div>
+          </ng-container>
+        </ds-select>
+      }
+      @if (field.enums?.length <= 5) {
+        @for (option of field.enums; track option) {
+          <div
+            class="d-flex flex-row m-1">
+            <div (click)="selectOption(getSelectedCcLicense(), field, option)">
+              <input type="radio"
+                title="{{ option.label }}"
+                class="me-1"
+                [checked]="isSelectedOption(getSelectedCcLicense(), field, option)">
+              <span>{{ option.label }}</span>
+            </div>
+          </div>
+        }
+      }
+    </div>
+  }
+}
 
-    <ng-container *ngIf="field.enums?.length <= 5">
-      <div *ngFor="let option of field.enums"
-           class="d-flex flex-row m-1">
-        <div (click)="selectOption(getSelectedCcLicense(), field, option)">
-          <input type="radio"
-                 title="{{ option.label }}"
-                 class="mr-1"
-                 [checked]="isSelectedOption(getSelectedCcLicense(), field, option)">
-          <span>{{ option.label }}</span>
-        </div>
-      </div>
-    </ng-container>
-
-  </div>
-
-</ng-container>
-
-<ng-container *ngIf="getCcLicenseLink$()">
+@if (getCcLicenseLink$()) {
   <ng-container *ngVar="getCcLicenseLink$() | async as licenseLink">
-    <div *ngIf="!licenseLink">
-      <ds-loading></ds-loading>
-    </div>
-    <div *ngIf="licenseLink"
-         class="mt-2 p-4 bg-light text-dark">
+    @if (!licenseLink) {
       <div>
-        {{ 'submission.sections.ccLicense.link' | translate }}
+        <ds-loading></ds-loading>
       </div>
-      <a class="license-link" href="{{ licenseLink }}" target="_blank" rel="noopener noreferrer">
-        {{ licenseLink }}
-      </a>
-      <div class="m-2">
-        <div (click)="setAccepted(!accepted)">
-          <input type="checkbox"
-                 class="mr-2"
-                 title="accepted"
-                 [checked]="accepted">
-          <span> {{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
+    }
+    @if (licenseLink) {
+      <div
+        class="mt-2 p-4 bg-light text-dark">
+        <div>
+          {{ 'submission.sections.ccLicense.link' | translate }}
+        </div>
+        <a class="license-link" href="{{ licenseLink }}" target="_blank" rel="noopener noreferrer">
+          {{ licenseLink }}
+        </a>
+        <div class="m-2">
+          <div (click)="setAccepted(!accepted)">
+            <input type="checkbox"
+              class="me-2"
+              title="accepted"
+              [checked]="accepted">
+            <span> {{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
+          </div>
         </div>
       </div>
-    </div>
+    }
   </ng-container>
-</ng-container>
+}
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
index 62a902b79a..142cd82822 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.scss
@@ -1,3 +1,13 @@
 .options-select-menu {
   max-height: 25vh;
 }
+
+.ccLicense-select {
+  width: fit-content;
+}
+
+.scrollable-menu {
+  height: auto;
+  max-height: var(--ds-dropdown-menu-max-height);
+  overflow-x: hidden;
+}
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
index 7b540ecd91..2e82948c14 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.spec.ts
@@ -209,10 +209,10 @@ describe('SubmissionSectionCcLicensesComponent', () => {
 
   it('should display a dropdown with the different cc licenses', () => {
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(1)')).nativeElement.innerText,
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(1)')).nativeElement.innerText,
     ).toContain('test license name 1');
     expect(
-      de.query(By.css('.ccLicense-select ds-select .dropdown-menu button:nth-child(2)')).nativeElement.innerText,
+      de.query(By.css('.ccLicense-select .scrollable-menu button:nth-child(2)')).nativeElement.innerText,
     ).toContain('test license name 2');
   });
 
@@ -226,9 +226,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     });
 
     it('should display the selected cc license', () => {
-      expect(
-        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText,
-      ).toContain('test license name 2');
+      expect(component.selectedCcLicense.name).toContain('test license name 2');
     });
 
     it('should display all field labels of the selected cc license only', () => {
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
index d286a830e2..8681c33f66 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts
@@ -1,17 +1,17 @@
+import { AsyncPipe } from '@angular/common';
 import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
-import {
+  ChangeDetectorRef,
   Component,
   Inject,
 } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 import {
+  NgbDropdownModule,
   NgbModal,
   NgbModalRef,
 } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 import {
   Observable,
   of as observableOf,
@@ -22,14 +22,16 @@ import {
   filter,
   map,
   take,
+  tap,
 } from 'rxjs/operators';
 
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
 import {
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../core/shared/operators';
 import {
@@ -40,6 +42,7 @@ import {
 import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
 import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
+import { BtnDisabledDirective } from '../../../shared/btn-disabled.directive';
 import { DsSelectComponent } from '../../../shared/ds-select/ds-select.component';
 import { isNotEmpty } from '../../../shared/empty.util';
 import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
@@ -58,12 +61,14 @@ import { SectionsType } from '../sections-type';
   styleUrls: ['./submission-section-cc-licenses.component.scss'],
   imports: [
     TranslateModule,
-    NgIf,
     ThemedLoadingComponent,
     AsyncPipe,
     VarDirective,
-    NgForOf,
     DsSelectComponent,
+    NgbDropdownModule,
+    FormsModule,
+    InfiniteScrollModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
@@ -95,7 +100,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   /**
    * Cache of the available Creative Commons licenses.
    */
-  submissionCcLicenses: SubmissionCcLicence[];
+  submissionCcLicenses: SubmissionCcLicence[] = [];
 
   /**
    * Reference to NgbModal
@@ -107,6 +112,25 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   defaultJurisdiction: string;
 
+  /**
+   * The currently selected cc licence
+   */
+  selectedCcLicense: SubmissionCcLicence = new SubmissionCcLicence();
+
+  /**
+   * Options for paginated data loading
+   */
+  ccLicenceOptions: FindListOptions = {
+    elementsPerPage: 20,
+    currentPage: 1,
+  };
+  /**
+   * Check to stop paginated search
+   *
+   * @private
+   */
+  private _isLastPage: boolean;
+
   /**
    * The Creative Commons link saved in the workspace item.
    */
@@ -131,6 +155,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     protected submissionCcLicenseUrlDataService: SubmissionCcLicenseUrlDataService,
     protected operationsBuilder: JsonPatchOperationsBuilder,
     protected configService: ConfigurationDataService,
+    protected ref: ChangeDetectorRef,
     @Inject('collectionIdProvider') public injectedCollectionId: string,
     @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
     @Inject('submissionIdProvider') public injectedSubmissionId: string,
@@ -154,9 +179,10 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    * @param ccLicense the Creative Commons license to select.
    */
   selectCcLicense(ccLicense: SubmissionCcLicence) {
-    if (!!this.getSelectedCcLicense() && this.getSelectedCcLicense().id === ccLicense.id) {
+    if (this.selectedCcLicense.id === ccLicense.id) {
       return;
     }
+    this.selectedCcLicense = ccLicense;
     this.setAccepted(false);
     this.updateSectionData({
       ccLicense: {
@@ -300,13 +326,6 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         }
         this.sectionData.data = data;
       }),
-      this.submissionCcLicensesDataService.findAll({ elementsPerPage: 9999 }).pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-        map((list) => list.page),
-      ).subscribe(
-        (licenses) => this.submissionCcLicenses = licenses,
-      ),
       this.configService.findByPropertyName('cc.license.jurisdiction').pipe(
         getFirstCompletedRemoteData(),
         getRemoteDataPayload(),
@@ -319,6 +338,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         }
       }),
     );
+    this.loadCcLicences();
   }
 
   /**
@@ -338,4 +358,31 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
   updateSectionData(data: WorkspaceitemSectionCcLicenseObject) {
     this.sectionService.updateSectionData(this.submissionId, this.sectionData.id, Object.assign({}, this.data, data));
   }
+
+  onScroll(event) {
+    if (event.target.scrollTop + event.target.clientHeight >= event.target.scrollHeight) {
+      if (!this.isLoading && !this._isLastPage) {
+        this.ccLicenceOptions.currentPage++;
+        this.loadCcLicences();
+      }
+    }
+  }
+
+  loadCcLicences() {
+    this.isLoading = true;
+
+    this.subscriptions.push(
+      this.submissionCcLicensesDataService.findAll(this.ccLicenceOptions).pipe(
+        getFirstSucceededRemoteDataPayload(),
+        tap((response) => this._isLastPage = response.pageInfo.currentPage === response.pageInfo.totalPages),
+        map((list) => list.page),
+      ).subscribe(
+        (licenses) => {
+          this.submissionCcLicenses = [...this.submissionCcLicenses, ...licenses];
+          this.isLoading = false;
+          this.ref.detectChanges();
+        },
+      ),
+    );
+  }
 }
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index 3f0050ea51..cb31d2766c 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -1,51 +1,61 @@
 <div dsSection #sectionRef="sectionRef" [attr.id]="'section_' + sectionData.id"
+  class="mb-2"
   [ngClass]="{ 'section-focus' : sectionRef.isSectionActive() }" [mandatory]="sectionData.mandatory"
   [submissionId]="submissionId" [sectionType]="sectionData.sectionType" [sectionId]="sectionData.id">
-  <ngb-accordion #acc="ngbAccordion" *ngIf="(sectionRef.isEnabled() | async)"
-    (panelChange)="sectionRef.sectionChange($event)" activeIds="{{ sectionData.id }}" [destroyOnHide]="false">
-    <ngb-panel id="{{ sectionData.id }}" [type]="sectionRef.isInfo() ? 'info' : ''">
-      <ng-template ngbPanelTitle>
-        <span [ngClass]="{ 'text-white' : sectionRef.isInfo()}" class="float-left section-title" tabindex="0">{{
-          'submission.sections.'+sectionData.header | translate
+  @if ((sectionRef.isEnabled() | async)) {
+    <ngb-accordion #acc="ngbAccordion"
+      (panelChange)="sectionRef.sectionChange($event)" activeIds="{{ sectionData.id }}" [destroyOnHide]="false">
+      <ngb-panel id="{{ sectionData.id }}" [type]="sectionRef.isInfo() ? 'info' : ''">
+        <ng-template ngbPanelTitle class="d-flex">
+          <span [ngClass]="{ 'text-white' : sectionRef.isInfo()}" class="flex-grow-1 section-title" tabindex="0">{{
+            'submission.sections.'+sectionData.header | translate
           }}</span>
-        <div class="d-inline-block float-right">
-          <i *ngIf="(sectionRef.isValid() | async) !== true && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
-            class="fas fa-exclamation-circle text-warning mr-3"
-            title="{{'submission.sections.status.warnings.title' | translate}}" role="img"
-            [attr.aria-label]="'submission.sections.status.warnings.aria' | translate"></i>
-          <i *ngIf="(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
-            class="fas fa-exclamation-circle text-danger mr-3"
-            title="{{'submission.sections.status.errors.title' | translate}}" role="img"
-            [attr.aria-label]="'submission.sections.status.errors.aria' | translate"></i>
-          <i *ngIf="(sectionRef.isValid() | async) && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
-            class="fas fa-check-circle text-success mr-3"
-            title="{{'submission.sections.status.valid.title' | translate}}" role="img"
-            [attr.aria-label]="'submission.sections.status.valid.aria' | translate"></i>
-          <i *ngIf="sectionRef.isInfo()" class="fas fa-info-circle mr-3 text-white"
-            title="{{'submission.sections.status.info.title' | translate}}" role="img"
-            [attr.aria-label]="'submission.sections.status.info.aria' | translate"></i>
-          <a class="close" tabindex="0" role="button"
-            [attr.aria-label]="(sectionRef.isOpen() ? 'submission.sections.toggle.aria.close' : 'submission.sections.toggle.aria.open') | translate: {sectionHeader: ('submission.sections.'+sectionData.header | translate)}"
-            [title]="(sectionRef.isOpen() ? 'submission.sections.toggle.close' : 'submission.sections.toggle.open') | translate">
-            <span *ngIf="sectionRef.isOpen()" [ngClass]="{ 'text-white' : sectionRef.isInfo()}"
-              class="fas fa-chevron-up fa-fw"></span>
-            <span *ngIf="!sectionRef.isOpen()" class="fas fa-chevron-down fa-fw"></span>
-          </a>
-          <a href="javascript:void(0);" class="close mr-3" *ngIf="!sectionRef.isMandatory()"
-            (click)="removeSection($event)">
-            <i class="fas fa-trash-o" aria-hidden="true" tabindex="0"></i>
-          </a>
-        </div>
-      </ng-template>
-      <ng-template ngbPanelContent>
-        <div id="sectionGenericError_{{sectionData.id}}" *ngIf="sectionRef.hasGenericErrors()">
-          <ds-alert *ngFor="let error of sectionRef.getErrors(); let i = index" [content]="error" [dismissible]="true"
-            [type]="AlertTypeEnum.Error" (close)="sectionRef.removeError(i)"></ds-alert>
-        </div>
-        <div id="sectionContent_{{sectionData.id}}" (click)="sectionRef.setFocus($event)">
-          <ng-container *ngComponentOutlet="getSectionContent(); injector: objectInjector;"></ng-container>
-        </div>
-      </ng-template>
-    </ngb-panel>
-  </ngb-accordion>
+          <div class="d-inline-block">
+            @if ((sectionRef.isValid() | async) !== true && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())) {
+              <i
+                class="fas fa-exclamation-circle text-warning me-3"
+                title="{{'submission.sections.status.warnings.title' | translate}}" role="img"
+              [attr.aria-label]="'submission.sections.status.warnings.aria' | translate"></i>
+            }
+            @if ((sectionRef.hasErrors()) && !(sectionRef.isInfo())) {
+              <i
+                class="fas fa-exclamation-circle text-danger me-3"
+                title="{{'submission.sections.status.errors.title' | translate}}" role="img"
+              [attr.aria-label]="'submission.sections.status.errors.aria' | translate"></i>
+            }
+            @if ((sectionRef.isValid() | async) && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())) {
+              <i
+                class="fas fa-check-circle text-success me-3"
+                title="{{'submission.sections.status.valid.title' | translate}}" role="img"
+              [attr.aria-label]="'submission.sections.status.valid.aria' | translate"></i>
+            }
+            @if (sectionRef.isInfo()) {
+              <i class="fas fa-info-circle me-3 text-white"
+                title="{{'submission.sections.status.info.title' | translate}}" role="img"
+              [attr.aria-label]="'submission.sections.status.info.aria' | translate"></i>
+            }
+            @if (!sectionRef.isMandatory()) {
+              <a href="javascript:void(0);" class="me-3"
+                (click)="removeSection($event)">
+                <i class="fas fa-trash-o" aria-hidden="true" tabindex="0"></i>
+              </a>
+            }
+          </div>
+        </ng-template>
+        <ng-template ngbPanelContent>
+          @if (sectionRef.hasGenericErrors()) {
+            <div id="sectionGenericError_{{sectionData.id}}">
+              @for (error of sectionRef.getErrors(); track error; let i = $index) {
+                <ds-alert [content]="error" [dismissible]="true"
+                [type]="AlertTypeEnum.Error" (close)="sectionRef.removeError(i)"></ds-alert>
+              }
+            </div>
+          }
+          <div id="sectionContent_{{sectionData.id}}" (click)="sectionRef.setFocus($event)">
+            <ng-container *ngComponentOutlet="getSectionContent(); injector: objectInjector;"></ng-container>
+          </div>
+        </ng-template>
+      </ngb-panel>
+    </ngb-accordion>
+  }
 </div>
diff --git a/src/app/submission/sections/container/section-container.component.ts b/src/app/submission/sections/container/section-container.component.ts
index 6f4126a173..96f8cbcff6 100644
--- a/src/app/submission/sections/container/section-container.component.ts
+++ b/src/app/submission/sections/container/section-container.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -30,12 +28,10 @@ import { rendersSectionType } from '../sections-decorator';
   styleUrls: ['./section-container.component.scss'],
   imports: [
     AlertComponent,
-    NgForOf,
     NgbAccordionModule,
     NgComponentOutlet,
     TranslateModule,
     NgClass,
-    NgIf,
     AsyncPipe,
     SectionsDirective,
   ],
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.html b/src/app/submission/sections/duplicates/section-duplicates.component.html
index d9e33a70f7..d8c9467efe 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.html
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.html
@@ -3,18 +3,26 @@ Template for the detect duplicates submission section component
 @author Kim Shepherd
 -->
 <div class="text-sm-left" *ngVar="(this.getDuplicateData() | async) as data">
-  <ng-container *ngIf="data?.potentialDuplicates.length === 0">
+  @if (data?.potentialDuplicates.length === 0) {
     <div class="alert alert-success w-100">{{ 'submission.sections.duplicates.none' | translate }}</div>
-  </ng-container>
-    <ng-container *ngIf="data?.potentialDuplicates.length > 0">
-      <div class="alert alert-warning w-100">{{ 'submission.sections.duplicates.detected' | translate }}</div>
-      <div *ngFor="let dupe of data?.potentialDuplicates" class="ds-duplicate">
+  }
+  @if (data?.potentialDuplicates.length > 0) {
+    <div class="alert alert-warning w-100">{{ 'submission.sections.duplicates.detected' | translate }}</div>
+    @for (dupe of data?.potentialDuplicates; track dupe) {
+      <div class="ds-duplicate">
         <a target="_blank" [href]="getItemLink(dupe.uuid)">{{dupe.title}}</a>
-        <div *ngFor="let metadatum of Metadata.toViewModelList(dupe.metadata)">
-          {{('item.preview.' + metadatum.key) | translate}} {{metadatum.value}}
-        </div>
-        <p *ngIf="dupe.workspaceItemId">{{ 'submission.sections.duplicates.in-workspace' | translate }}</p>
-        <p *ngIf="dupe.workflowItemId">{{ 'submission.sections.duplicates.in-workflow' | translate }}</p>
+        @for (metadatum of Metadata.toViewModelList(dupe.metadata); track metadatum) {
+          <div>
+            {{('item.preview.' + metadatum.key) | translate}} {{metadatum.value}}
+          </div>
+        }
+        @if (dupe.workspaceItemId) {
+          <p>{{ 'submission.sections.duplicates.in-workspace' | translate }}</p>
+        }
+        @if (dupe.workflowItemId) {
+          <p>{{ 'submission.sections.duplicates.in-workflow' | translate }}</p>
+        }
       </div>
-    </ng-container>
+    }
+  }
 </div>
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
index 501a60e3b8..8aa2cfee24 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
@@ -6,7 +6,9 @@ import {
 } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import {
@@ -210,6 +212,11 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => {
       formOperationsService = TestBed.inject(SectionFormOperationsService);
       collectionDataService = TestBed.inject(CollectionDataService);
       compAsAny.pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionObject.id);
+      spyOn(comp, 'getDuplicateData').and.returnValue(observableOf({ potentialDuplicates: duplicates }));
+      collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      compAsAny.submissionService.getSubmissionScope.and.returnValue(SubmissionScopeType.WorkspaceItem);
     });
 
     afterEach(() => {
@@ -219,18 +226,13 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => {
     });
 
     // Test initialisation of the submission section
-    it('Should init section properly', () => {
-      collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
-      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
-      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
-      compAsAny.submissionService.getSubmissionScope.and.returnValue(SubmissionScopeType.WorkspaceItem);
+    it('Should init section properly', fakeAsync(() => {
       spyOn(comp, 'getSectionStatus').and.returnValue(observableOf(true));
-      spyOn(comp, 'getDuplicateData').and.returnValue(observableOf({ potentialDuplicates: duplicates }));
       expect(comp.isLoading).toBeTruthy();
       comp.onSectionInit();
-      fixture.detectChanges();
+      tick(100);
       expect(comp.isLoading).toBeFalsy();
-    });
+    }));
 
     // The following tests look for proper logic in the getSectionStatus() implementation
     // These are very simple as we don't really have a 'false' state unless we're still loading
@@ -241,7 +243,7 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => {
       }));
     });
     it('Should return FALSE', () => {
-      compAsAny.isLoadin = true;
+      compAsAny.isLoading = true;
       expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
         a: false,
       }));
@@ -255,11 +257,7 @@ describe('SubmissionSectionDuplicatesComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [BrowserModule,
-    CommonModule,
-    FormsModule,
-    ReactiveFormsModule,
-    NgxPaginationModule],
+  imports: [BrowserModule, FormsModule, ReactiveFormsModule, NgxPaginationModule],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts
index 885511ca52..cd7f0b4bea 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.ts
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -41,10 +37,8 @@ import { SectionsService } from '../sections.service';
   changeDetection: ChangeDetectionStrategy.Default,
   imports: [
     VarDirective,
-    NgIf,
     AsyncPipe,
     TranslateModule,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/form/section-form.component.html b/src/app/submission/sections/form/section-form.component.html
index cd7b45bb00..58032131af 100644
--- a/src/app/submission/sections/form/section-form.component.html
+++ b/src/app/submission/sections/form/section-form.component.html
@@ -1,11 +1,15 @@
-<ds-loading *ngIf="isLoading" message="Loading..."></ds-loading>
-<ds-form *ngIf="!isLoading && formModel" #formRef="formComponent"
-         [formId]="formId"
-         [formModel]="formModel"
-         [displaySubmit]="false"
-         [displayCancel]="false"
-         (dfChange)="onChange($event)"
-         (dfFocus)="onFocus($event)"
-         (remove)="onRemove($event)"
-         (ngbEvent)="onCustomEvent($event)"
-         (removeArrayItem)="onRemove($event)"></ds-form>
+@if (isLoading) {
+  <ds-loading message="Loading..."></ds-loading>
+}
+@if (!isLoading && formModel) {
+  <ds-form #formRef="formComponent"
+    [formId]="formId"
+    [formModel]="formModel"
+    [displaySubmit]="false"
+    [displayCancel]="false"
+    (dfChange)="onChange($event)"
+    (dfFocus)="onFocus($event)"
+    (remove)="onRemove($event)"
+    (ngbEvent)="onCustomEvent($event)"
+  (removeArrayItem)="onRemove($event)"></ds-form>
+}
diff --git a/src/app/submission/sections/form/section-form.component.spec.ts b/src/app/submission/sections/form/section-form.component.spec.ts
index efd410713f..4cce0daa7b 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -659,6 +659,6 @@ describe('SubmissionSectionFormComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [CommonModule, FormsModule, ReactiveFormsModule],
+  imports: [FormsModule, ReactiveFormsModule],
 })
 class TestComponent {}
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 26285320b0..75950bfe52 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -78,7 +78,6 @@ import { SectionFormOperationsService } from './section-form-operations.service'
   imports: [
     FormComponent,
     ThemedLoadingComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html
index dd0b5d2930..e86742caf1 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.html
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.html
@@ -4,17 +4,17 @@ Template for the identifiers submission section component
 -->
 <!-- Main identifier data -->
 <ng-container *ngVar="(getIdentifierData() | async) as identifierData">
-  <ng-container *ngIf="identifierData && identifierData.identifiers">
-  <div>
-  <span>{{'submission.sections.identifiers.info' | translate}}</span>
-  <ul>
-    <ng-container *ngFor="let identifier of identifierData.identifiers">
-      <ng-container *ngIf="identifierData.displayTypes.includes(identifier.identifierType) && identifier.value">
-        <li>{{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}}
-          {{identifier.value}}</li>
-      </ng-container>
-    </ng-container>
-  </ul>
- </div>
- </ng-container>
+  @if (identifierData && identifierData.identifiers) {
+    <div>
+      <span>{{'submission.sections.identifiers.info' | translate}}</span>
+      <ul>
+        @for (identifier of identifierData.identifiers; track identifier) {
+          @if (identifierData.displayTypes.includes(identifier.identifierType) && identifier.value) {
+            <li>{{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}}
+            {{identifier.value}}</li>
+          }
+        }
+      </ul>
+    </div>
+  }
 </ng-container>
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
index 8aa760bb3e..85cda85241 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
@@ -276,10 +276,10 @@ describe('SubmissionSectionIdentifiersComponent test suite', () => {
   template: ``,
   standalone: true,
   imports: [
-    CommonModule,
     FormsModule,
     ReactiveFormsModule,
-    NgxPaginationModule],
+    NgxPaginationModule,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts
index e297c795df..4105ff6187 100644
--- a/src/app/submission/sections/identifiers/section-identifiers.component.ts
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -40,8 +36,6 @@ import { SectionsService } from '../sections.service';
   changeDetection: ChangeDetectionStrategy.Default,
   imports: [
     TranslateModule,
-    NgForOf,
-    NgIf,
     AsyncPipe,
     VarDirective,
   ],
diff --git a/src/app/submission/sections/license/section-license.component.html b/src/app/submission/sections/license/section-license.component.html
index ed10203596..4918a3e32a 100644
--- a/src/app/submission/sections/license/section-license.component.html
+++ b/src/app/submission/sections/license/section-license.component.html
@@ -1,9 +1,11 @@
 <span class="mb-5 preserve-line-breaks" [innerHTML]="licenseText$ | async"></span>
 <br> <br>
-<ds-form *ngIf="formModel" #formRef="formComponent"
-         [formId]="formId"
-         [formModel]="formModel"
-         [formLayout]="formLayout"
-         [displaySubmit]="displaySubmit"
-         [displayCancel]="false"
-         (dfChange)="onChange($event)"></ds-form>
+@if (formModel) {
+  <ds-form #formRef="formComponent"
+    [formId]="formId"
+    [formModel]="formModel"
+    [formLayout]="formLayout"
+    [displaySubmit]="displaySubmit"
+    [displayCancel]="false"
+  (dfChange)="onChange($event)"></ds-form>
+}
diff --git a/src/app/submission/sections/license/section-license.component.spec.ts b/src/app/submission/sections/license/section-license.component.spec.ts
index 95b2e7f50a..5c274d0a59 100644
--- a/src/app/submission/sections/license/section-license.component.spec.ts
+++ b/src/app/submission/sections/license/section-license.component.spec.ts
@@ -377,7 +377,6 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
   standalone: true,
   imports: [
     SubmissionSectionLicenseComponent,
-    CommonModule,
     FormsModule,
     FormComponent,
     ReactiveFormsModule,
diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts
index 86a0455c30..c3fbb3946f 100644
--- a/src/app/submission/sections/license/section-license.component.ts
+++ b/src/app/submission/sections/license/section-license.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   AfterViewChecked,
   ChangeDetectorRef,
@@ -67,7 +64,6 @@ import {
   providers: [],
   imports: [
     FormComponent,
-    NgIf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/submission/sections/license/section-license.model.ts b/src/app/submission/sections/license/section-license.model.ts
index 33f7721ac3..43ed56d1fd 100644
--- a/src/app/submission/sections/license/section-license.model.ts
+++ b/src/app/submission/sections/license/section-license.model.ts
@@ -3,7 +3,7 @@ export const SECTION_LICENSE_FORM_LAYOUT = {
 
   granted: {
     element: {
-      container: 'custom-control custom-checkbox pl-1',
+      container: 'custom-control custom-checkbox ps-1',
       control: 'custom-control-input',
       label: 'custom-control-label pt-1',
     },
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
index c6dfa700d8..ecd66f1d4d 100644
--- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
@@ -1,148 +1,168 @@
 <div class="container-fluid">
-  <ng-container *ngIf="patterns?.length > 0 ">
-    <div *ngFor="let ldnPattern of patterns; let i = index" class="col">
-      <div *ngIf="(filterServices(ldnPattern.pattern ) | async)?.length > 0">
-        <label class="row col-form-label">
-          {{'submission.section.section-coar-notify.control.' + ldnPattern.pattern + '.label' | translate }}
-        </label>
-        <div *ngIf="ldnServiceByPattern[ldnPattern.pattern]?.services.length">
-          <div
-            *ngFor="
-            let service of ldnServiceByPattern[ldnPattern.pattern].services;
-            let serviceIndex = index
-          "
-          >
-            <div class="row">
-              <div ngbDropdown #myDropdown="ngbDropdown" [class.mt-2]="serviceIndex > 0" class="flex-grow-1">
-                <div class="position-relative right-addon"
-                     [attr.aria-label]="ldnPattern.pattern + '.dropdown'">
-                  <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
-                     aria-hidden="true"></i>
-                  <input
-                    [attr.aria-label]="ldnPattern.pattern+'.dropdownanchor'"
-                    type="text"
-                    [readonly]="true"
-                    [ngClass]="{'border-danger': (getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0}"
-                    class="form-control w-100 scrollable-dropdown-input"
-                    [value]="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.name"
-                    (click)="myDropdown.open()"
-                  />
-                </div>
-                <div
-                  ngbDropdownMenu
-                  class="dropdown-menu scrollable-dropdown-menu w-100"
-                  aria-haspopup="true"
-                  aria-expanded="false"
-                >
-                  <div
-                    class="scrollable-menu"
-                    role="listbox"
-                    infiniteScroll
-                    [infiniteScrollDistance]="2"
-                    [infiniteScrollThrottle]="50"
-                    [scrollWindow]="false"
-                  >
-                    <button
-                      *ngIf="(filterServices(ldnPattern.pattern) | async)?.length === 0"
-                      class="dropdown-item collection-item text-truncate w-100"
-                    >
-                      {{'submission.section.section-coar-notify.dropdown.no-data' | translate}}
-                    </button>
-                    <button
-                      *ngIf="(filterServices(ldnPattern.pattern ) | async)?.length > 0"
-                      class="dropdown-item collection-item text-truncate w-100"
-                      (click)="onChange(ldnPattern.pattern, serviceIndex, null)"
-                    >
-                      {{'submission.section.section-coar-notify.dropdown.select-none' | translate}}
-                    </button>
-                    <button
-                      *ngFor="let serviceOption of filterServices(ldnPattern.pattern ) | async"
-                      [ngClass]="{'bg-light': ldnServiceByPattern[ldnPattern.pattern ].services[serviceIndex]?.id === serviceOption.id}"
-                      class="dropdown-item collection-item text-truncate w-100"
-                      (click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)"
-                    >
-                      <b>
-                        {{ serviceOption.name }}
-                      </b>
-                      <br />
-                      {{ serviceOption.description }}
-                    </button>
-                  </div>
-                </div>
-              </div>
-              <button *ngIf="ldnServiceByPattern[ldnPattern.pattern].services.length > 1"
-                      type="button" [class.mt-2]="serviceIndex > 0"
-                      class="btn btn-secondary ml-2"
-                      role="button"
-                      title="{{'form.remove' | translate}}"
-                      [attr.aria-label]="'form.remove' | translate"
-                      (click)="removeService(ldnPattern, serviceIndex)"
+  @if (patterns?.length > 0 ) {
+    @for (ldnPattern of patterns; track ldnPattern; let i = $index) {
+      <div class="col">
+        @if ((filterServices(ldnPattern.pattern ) | async)?.length > 0) {
+          <div>
+            <label class="row col-form-label">
+              {{'submission.section.section-coar-notify.control.' + ldnPattern.pattern + '.label' | translate }}
+              </label
               >
-                <span><i class="fas fa-trash" aria-hidden="true"></i></span>
-              </button>
-            </div>
-
-            <small
-              class="row text-muted"
-              *ngIf="!ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex] &&
-                    serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length -1"
-            >
-              {{'submission.section.section-coar-notify.small.notification' | translate : {pattern : ldnPattern.pattern} }}
-            </small>
-            <ng-container *ngIf="(getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)?.length > 0">
-              <small class="row text-danger" *ngFor="let error of (getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)">
-                {{ error.message | translate}}
-              </small>
-            </ng-container>
-            <div
-              class="row mt-1"
-              *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]"
-            >
-              <div
-                class="alert alert-info w-100 d-flex align-items-center flex-row"
-              >
-                <i class="fa-solid fa-circle-info fa-xl ml-2"></i>
-                <div class="ml-4">
-                  <div>{{ 'submission.section.section-coar-notify.selection.description' | translate }}</div>
-                  <div *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.description; else noDesc">
-                    {{ ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex].description }}
-                  </div>
-                  <ng-template #noDesc>
-                <span class="text-muted">
-                  {{ 'submission.section.section-coar-notify.selection.no-description' | translate }}
-                </span>
-                  </ng-template>
+              @if (ldnServiceByPattern[ldnPattern.pattern]?.services.length) {
+                <div>
+                  @for (
+                    service of ldnServiceByPattern[ldnPattern.pattern].services; track
+                    service; let serviceIndex = $index) {
+                    <div
+                      >
+                      <div class="row">
+                        <div ngbDropdown #myDropdown="ngbDropdown" [class.mt-2]="serviceIndex > 0" class="flex-grow-1">
+                          <div class="position-relative right-addon"
+                            [attr.aria-label]="ldnPattern.pattern + '.dropdown'">
+                            <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
+                            aria-hidden="true"></i>
+                            <input
+                              [attr.aria-label]="ldnPattern.pattern+'.dropdownanchor'"
+                              type="text"
+                              [readonly]="true"
+                              [ngClass]="{'border-danger': (getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0}"
+                              class="form-control w-100 scrollable-dropdown-input"
+                              [value]="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.name"
+                              (click)="myDropdown.open()"
+                              />
+                          </div>
+                          <div
+                            ngbDropdownMenu
+                            class="dropdown-menu scrollable-dropdown-menu w-100"
+                            aria-haspopup="true"
+                            aria-expanded="false"
+                            >
+                            <div
+                              class="scrollable-menu"
+                              role="listbox"
+                              infiniteScroll
+                              [infiniteScrollDistance]="2"
+                              [infiniteScrollThrottle]="50"
+                              [scrollWindow]="false"
+                              >
+                              @if ((filterServices(ldnPattern.pattern) | async)?.length === 0) {
+                                <button
+                                  class="dropdown-item collection-item text-truncate w-100"
+                                  >
+                                  {{'submission.section.section-coar-notify.dropdown.no-data' | translate}}
+                                </button>
+                              }
+                              @if ((filterServices(ldnPattern.pattern ) | async)?.length > 0) {
+                                <button
+                                  class="dropdown-item collection-item text-truncate w-100"
+                                  (click)="onChange(ldnPattern.pattern, serviceIndex, null)"
+                                  >
+                                  {{'submission.section.section-coar-notify.dropdown.select-none' | translate}}
+                                </button>
+                              }
+                              @for (serviceOption of filterServices(ldnPattern.pattern ) | async; track serviceOption) {
+                                <button
+                                  [ngClass]="{'bg-light': ldnServiceByPattern[ldnPattern.pattern ].services[serviceIndex]?.id === serviceOption.id}"
+                                  class="dropdown-item collection-item text-truncate w-100"
+                                  (click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)"
+                                  >
+                                  <b>
+                                    {{ serviceOption.name }}
+                                  </b>
+                                  <br />
+                                  {{ serviceOption.description }}
+                                </button>
+                              }
+                            </div>
+                          </div>
+                        </div>
+                        @if (ldnServiceByPattern[ldnPattern.pattern].services.length > 1) {
+                          <button
+                            type="button" [class.mt-2]="serviceIndex > 0"
+                            class="btn btn-secondary ms-2"
+                            role="button"
+                            title="{{'form.remove' | translate}}"
+                            [attr.aria-label]="'form.remove' | translate"
+                            (click)="removeService(ldnPattern, serviceIndex)"
+                            >
+                            <span><i class="fas fa-trash" aria-hidden="true"></i></span>
+                          </button>
+                        }
+                      </div>
+                      @if (!ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex] &&
+                        serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length -1) {
+                        <small
+                          class="row text-muted"
+                          >
+                          {{'submission.section.section-coar-notify.small.notification' | translate : {pattern : ldnPattern.pattern} }}
+                        </small>
+                      }
+                      @if ((getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)?.length > 0) {
+                        @for (error of (getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async); track error) {
+                          <small class="row text-danger">
+                            {{ error.message | translate}}
+                          </small>
+                        }
+                      }
+                      @if (ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]) {
+                        <div
+                          class="row mt-1"
+                          >
+                          <div
+                            class="alert alert-info w-100 d-flex align-items-center flex-row"
+                            >
+                            <i class="fa-solid fa-circle-info fa-xl ms-2"></i>
+                            <div class="ms-4">
+                              <div>{{ 'submission.section.section-coar-notify.selection.description' | translate }}</div>
+                              @if (ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.description) {
+                                <div>
+                                  {{ ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex].description }}
+                                </div>
+                              } @else {
+                                <span class="text-muted">
+                                  {{ 'submission.section.section-coar-notify.selection.no-description' | translate }}
+                                </span>
+                              }
+                            </div>
+                          </div>
+                        </div>
+                      }
+                      @if ((getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0) {
+                        <div class="row">
+                          <div
+                            class="alert alert-danger w-100 d-flex align-items-center flex-row"
+                            >
+                            <div class="ms-4">
+                              <span>
+                                {{ 'submission.section.section-coar-notify.notification.error' | translate }}
+                              </span>
+                            </div>
+                          </div>
+                        </div>
+                      }
+                      <div class="row">
+                        @if (ldnPattern.multipleRequest && (serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length - 1)) {
+                          <div
+                            (click)="addNewService(ldnPattern)"
+                            class="btn btn-link mt-2 ps-0"
+                            >
+                            <i class="fas fa-plus"></i>
+                            {{ 'submission.sections.general.add-more' | translate }}
+                          </div>
+                        }
+                      </div>
+                    </div>
+                  }
                 </div>
-              </div>
+              }
             </div>
-            <div class="row" *ngIf="(getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0">
-              <div
-                class="alert alert-danger w-100 d-flex align-items-center flex-row"
-              >
-                <div class="ml-4">
-              <span>
-                {{ 'submission.section.section-coar-notify.notification.error' | translate }}
-              </span>
-                </div>
-              </div>
-            </div>
-            <div class="row">
-              <div *ngIf="ldnPattern.multipleRequest && (serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length - 1)"
-                   (click)="addNewService(ldnPattern)"
-                   class="btn btn-link mt-2 pl-0"
-              >
-                <i class="fas fa-plus"></i>
-                {{ 'submission.sections.general.add-more' | translate }}
-              </div>
-            </div>
-          </div>
+          }
         </div>
-      </div>
-    </div>
-  </ng-container>
-    <ng-container *ngIf="!hasSectionData">
-    <p>
-      {{ 'submission.section.section-coar-notify.info.no-pattern' | translate }}
-    </p>
-  </ng-container>
-</div>
+      }
+    }
+    @if (!hasSectionData) {
+      <p>
+        {{ 'submission.section.section-coar-notify.info.no-pattern' | translate }}
+      </p>
+    }
+  </div>
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
index c47e4c644d..ed0ee65994 100644
--- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -59,8 +57,6 @@ import { LdnPattern } from './submission-coar-notify.config';
   styleUrls: ['./section-coar-notify.component.scss'],
   standalone: true,
   imports: [
-    NgIf,
-    NgForOf,
     AsyncPipe,
     TranslateModule,
     NgbDropdownModule,
diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts
index d8644a0db8..0241564ab7 100644
--- a/src/app/submission/sections/sections.service.spec.ts
+++ b/src/app/submission/sections/sections.service.spec.ts
@@ -35,6 +35,7 @@ import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { SectionScope } from '../objects/section-visibility.model';
 import {
   DisableSectionAction,
   EnableSectionAction,
@@ -265,46 +266,282 @@ describe('SectionsService test suite', () => {
   });
 
   describe('isSectionReadOnly', () => {
-    it('should return an observable of true when it\'s a readonly section and scope is not workspace', () => {
-      store.select.and.returnValue(observableOf({
-        visibility: {
-          main: null,
-          other: 'READONLY',
-        },
-      }));
+    describe('when submission scope is workspace', () => {
+      describe('and section scope is workspace', () => {
+        it('should return an observable of true when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other are READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
 
-      const expected = cold('(b|)', {
-        b: true,
       });
 
-      expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+      describe('and section scope is workflow', () => {
+        it('should return an observable of false when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other are READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+
+      });
+
+      describe('and section scope is null', () => {
+        it('should return an observable of false', () => {
+          store.select.and.returnValue(observableOf({
+            scope: null,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
+        });
+      });
     });
 
-    it('should return an observable of false when it\'s a readonly section and scope is workspace', () => {
-      store.select.and.returnValue(observableOf({
-        visibility: {
-          main: null,
-          other: 'READONLY',
-        },
-      }));
+    describe('when submission scope is workflow', () => {
+      describe('and section scope is workspace', () => {
+        it('should return an observable of false when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other are READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Submission,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
 
-      const expected = cold('(b|)', {
-        b: false,
       });
 
-      expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
-    });
+      describe('and section scope is workflow', () => {
+        it('should return an observable of true when visibility main is READONLY and visibility other is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: null,
+            },
+          }));
 
-    it('should return an observable of false when it\'s not a readonly section', () => {
-      store.select.and.returnValue(observableOf({
-        visibility: null,
-      }));
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of true when both visibility main and other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'READONLY',
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: true,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility main is null and visibility other is READONLY', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'READONLY',
+            },
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+        it('should return an observable of false when visibility is null', () => {
+          store.select.and.returnValue(observableOf({
+            scope: SectionScope.Workflow,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
 
-      const expected = cold('(b|)', {
-        b: false,
       });
 
-      expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+      describe('and section scope is null', () => {
+        it('should return an observable of false', () => {
+          store.select.and.returnValue(observableOf({
+            scope: null,
+            visibility: null,
+          }));
+
+          const expected = cold('(b|)', {
+            b: false,
+          });
+
+          expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
+        });
+      });
     });
   });
 
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index 6cc064283e..cec60a9cdf 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -36,6 +36,7 @@ import { FormClearErrorsAction } from '../../shared/form/form.actions';
 import { FormError } from '../../shared/form/form.reducer';
 import { FormService } from '../../shared/form/form.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SectionScope } from '../objects/section-visibility.model';
 import {
   DisableSectionAction,
   EnableSectionAction,
@@ -347,10 +348,14 @@ export class SectionsService {
     return this.store.select(submissionSectionFromIdSelector(submissionId, sectionId)).pipe(
       filter((sectionObj) => hasValue(sectionObj)),
       map((sectionObj: SubmissionSectionObject) => {
-        return isNotEmpty(sectionObj.visibility)
-          && ((sectionObj.visibility.other === 'READONLY' && submissionScope !== SubmissionScopeType.WorkspaceItem)
-              || (sectionObj.visibility.main === 'READONLY' && submissionScope === SubmissionScopeType.WorkspaceItem)
-          );
+        if (isEmpty(submissionScope) || isEmpty(sectionObj.visibility) || isEmpty(sectionObj.scope)) {
+          return false;
+        }
+        const convertedSubmissionScope: SectionScope = submissionScope.valueOf() === SubmissionScopeType.WorkspaceItem.valueOf() ?
+          SectionScope.Submission : SectionScope.Workflow;
+        const visibility = convertedSubmissionScope.valueOf() === sectionObj.scope.valueOf() ?
+          sectionObj.visibility.main : sectionObj.visibility.other;
+        return visibility ===  'READONLY';
       }),
       distinctUntilChanged());
   }
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html
index 3d4fba5cea..1d436e1ab8 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.html
@@ -1,90 +1,119 @@
 <div class="mb-3 border-bottom" data-test="collapse">
-    <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
-        <div class="d-flex">
-            <button type="button" class="btn btn-link p-0 mr-4" (click)="$event.preventDefault()"
-                [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
-                {{version.articleVersion | titlecase}} {{ 'submission.sections.sherpa.publisher.policy.version' |
-                translate
-                }}
-            </button>
-            <div>
-                <span *ngIf="!!version?.embargo && !!version?.embargo.amount;else noEmbargoTitle"> <i
-                        class="fas fa-hourglass-half"></i> {{version.embargo.amount}}
-                    {{version.embargo?.units[0]}}</span>
-                <ng-template #noEmbargoTitle>
-                    <span><i class="fas fa-hourglass-half"></i> {{
-                        'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</span>
-                </ng-template>
+  <div class="w-100 d-flex justify-content-between collapse-toggle" (click)="collapse.toggle()">
+    <div class="d-flex">
+      <button type="button" class="btn btn-link p-0 me-4" (click)="$event.preventDefault()"
+        [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
+        {{version.articleVersion | titlecase}} {{ 'submission.sections.sherpa.publisher.policy.version' |
+        translate
+        }}
+      </button>
+      <div>
+        @if (!!version?.embargo && !!version?.embargo.amount) {
+          <span> <i
+          class="fas fa-hourglass-half"></i> {{version.embargo.amount}}
+        {{version.embargo?.units[0]}}</span>
+      } @else {
+        <span><i class="fas fa-hourglass-half"></i> {{
+      'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</span>
+    }
 
-                <span class="m-1 ml-4">
-                    <i class="far fa-folder-open"></i>
-                    <span *ngIf="!!version?.locations && version.locations.length > 0; else noLocations">
-                        {{version.locations[0]}} <span
-                            *ngIf="version.locations.length > 1">+{{version.locations.length-1}}</span>
-                    </span>
-                    <ng-template #noLocations>
-                        <span>{{
-                            'submission.sections.sherpa.publisher.policy.nolocation' | translate }}</span>
-                    </ng-template>
-                </span>
-            </div>
+    <span class="m-1 ms-4">
+      <i class="far fa-folder-open"></i>
+      @if (!!version?.locations && version.locations.length > 0) {
+        <span>
+          {{version.locations[0]}} @if (version.locations.length > 1) {
+          <span
+          >+{{version.locations.length-1}}</span>
+        }
+      </span>
+    } @else {
+      <span>{{
+      'submission.sections.sherpa.publisher.policy.nolocation' | translate }}</span>
+    }
+  </span>
+</div>
+</div>
+<div class="d-inline-block">
+  @if (collapse.collapsed) {
+    <span class="fas fa-chevron-down"></span>
+  }
+  @if (!collapse.collapsed) {
+    <span class="fas fa-chevron-up"></span>
+  }
+</div>
+</div>
+<div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+  @if (!!version) {
+    <div class="ms-4">
+      @if (!!version?.embargo && !!version?.embargo.amount) {
+        <div class="row">
+          <div class="col-4">
+            <p class="m-1"><i class="fas fa-hourglass-half"></i> {{
+          'submission.sections.sherpa.publisher.policy.embargo' | translate }}</p>
         </div>
-        <div class="d-inline-block">
-            <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-            <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
+        <div class="col-6">
+          @if (!!version.embargo) {
+            <p class="m-1">{{version.embargo.amount}}
+            {{version.embargo.units}}</p>
+          } @else {
+            <p class="m-1">{{ 'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</p>
+          }
         </div>
+      </div>
+    }
+    @if (!!version?.licenses && version.licenses.length > 0) {
+      <div class="row">
+        <div class="col-4">
+          <p class="m-1"><i class="fas fa-certificate"></i> {{
+        'submission.sections.sherpa.publisher.policy.license' | translate }}</p>
+      </div>
+      <div class="col-6">
+        @for (license of version.licenses; track license) {
+          <p class="m-1">{{license}}</p>
+        }
+      </div>
     </div>
-    <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
-        <div *ngIf="!!version" class="ml-4">
-            <div class="row" *ngIf="!!version?.embargo && !!version?.embargo.amount">
-                <div class="col-4">
-                    <p class="m-1"><i class="fas fa-hourglass-half"></i> {{
-                        'submission.sections.sherpa.publisher.policy.embargo' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngIf="!!version.embargo;else noEmbargo">{{version.embargo.amount}}
-                        {{version.embargo.units}}</p>
-                    <ng-template #noEmbargo>
-                        <p class="m-1">{{ 'submission.sections.sherpa.publisher.policy.noembargo' | translate }}</p>
-                    </ng-template>
-                </div>
-            </div>
-            <div class="row" *ngIf="!!version?.licenses && version.licenses.length > 0">
-                <div class="col-4">
-                    <p class="m-1"><i class="fas fa-certificate"></i> {{
-                        'submission.sections.sherpa.publisher.policy.license' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngFor="let license of version.licenses">{{license}}</p>
-                </div>
-            </div>
-            <div class="row" *ngIf="!!version?.prerequisites && version.prerequisites.length > 0">
-                <div class="col-4">
-                    <p class="m-1"><i class="fas fa-exclamation-circle"></i> {{
-                        'submission.sections.sherpa.publisher.policy.prerequisites' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngFor="let prerequisite of version.prerequisites">{{prerequisite}}</p>
-                </div>
-            </div>
-            <div class="row" *ngIf="!!version?.locations && version.locations.length > 0">
-                <div class="col-4">
-                    <p class="m-1"><i class="far fa-folder-open"></i> {{
-                        'submission.sections.sherpa.publisher.policy.location' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngFor="let location of version.locations">{{location}}</p>
-                </div>
-            </div>
-            <div class="row" *ngIf="!!version?.conditions && version.conditions.length > 0">
-                <div class="col-4">
-                    <p class="m-1"><i class="fas fa-tasks"></i> {{
-                        'submission.sections.sherpa.publisher.policy.conditions' | translate }}</p>
-                </div>
-                <div class="col-6">
-                    <p class="m-1" *ngFor="let condition of version.conditions">{{condition}}</p>
-                </div>
-            </div>
-        </div>
+  }
+  @if (!!version?.prerequisites && version.prerequisites.length > 0) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1"><i class="fas fa-exclamation-circle"></i> {{
+      'submission.sections.sherpa.publisher.policy.prerequisites' | translate }}</p>
     </div>
-</div>
\ No newline at end of file
+    <div class="col-6">
+      @for (prerequisite of version.prerequisites; track prerequisite) {
+        <p class="m-1">{{prerequisite}}</p>
+      }
+    </div>
+  </div>
+}
+@if (!!version?.locations && version.locations.length > 0) {
+  <div class="row">
+    <div class="col-4">
+      <p class="m-1"><i class="far fa-folder-open"></i> {{
+    'submission.sections.sherpa.publisher.policy.location' | translate }}</p>
+  </div>
+  <div class="col-6">
+    @for (location of version.locations; track location) {
+      <p class="m-1">{{location}}</p>
+    }
+  </div>
+</div>
+}
+@if (!!version?.conditions && version.conditions.length > 0) {
+  <div class="row">
+    <div class="col-4">
+      <p class="m-1"><i class="fas fa-tasks"></i> {{
+    'submission.sections.sherpa.publisher.policy.conditions' | translate }}</p>
+  </div>
+  <div class="col-6">
+    @for (condition of version.conditions; track condition) {
+      <p class="m-1">{{condition}}</p>
+    }
+  </div>
+</div>
+}
+</div>
+}
+</div>
+</div>
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
index 2fde4f37cd..29d947fdef 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-  TitleCasePipe,
-} from '@angular/common';
+import { TitleCasePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -20,9 +16,7 @@ import { PermittedVersions } from '../../../../core/submission/models/sherpa-pol
   templateUrl: './content-accordion.component.html',
   styleUrls: ['./content-accordion.component.scss'],
   imports: [
-    NgForOf,
     TranslateModule,
-    NgIf,
     NgbCollapseModule,
     TitleCasePipe,
   ],
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html
index 15dd4d7286..f63c1dbe0b 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.html
@@ -1,39 +1,47 @@
-<div class="ml-4">
-    <div class="row" *ngIf="!!metadata?.id">
-        <div class="col-4">
-            <p class="m-1">{{ 'submission.sections.sherpa.record.information.id' | translate }}</p>
-        </div>
-        <div class="col-8">
-            <p class="m-1">{{metadata.id}}
-            </p>
-        </div>
+<div class="ms-4">
+  @if (!!metadata?.id) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{ 'submission.sections.sherpa.record.information.id' | translate }}</p>
+      </div>
+      <div class="col-8">
+        <p class="m-1">{{metadata.id}}
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!metadata?.dateCreated">
-        <div class="col-4">
-            <p class="m-1">{{ 'submission.sections.sherpa.record.information.date.created' | translate }}</p>
-        </div>
-        <div class="col-8">
-            <p class="m-1">{{metadata.dateCreated | date: 'd MMMM Y H:mm:ss zzzz' }}
-            </p>
-        </div>
+  }
+  @if (!!metadata?.dateCreated) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{ 'submission.sections.sherpa.record.information.date.created' | translate }}</p>
+      </div>
+      <div class="col-8">
+        <p class="m-1">{{metadata.dateCreated | date: 'd MMMM Y H:mm:ss zzzz' }}
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!metadata?.dateModified">
-        <div class="col-4">
-            <p class="m-1">{{ 'submission.sections.sherpa.record.information.date.modified' | translate }}</p>
-        </div>
-        <div class="col-8">
-            <p class="m-1">{{metadata.dateModified| date: 'd MMMM Y H:mm:ss zzzz' }}
-            </p>
-        </div>
+  }
+  @if (!!metadata?.dateModified) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{ 'submission.sections.sherpa.record.information.date.modified' | translate }}</p>
+      </div>
+      <div class="col-8">
+        <p class="m-1">{{metadata.dateModified| date: 'd MMMM Y H:mm:ss zzzz' }}
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!metadata?.uri">
-        <div class="col-4">
-            <p class="m-1">{{ 'submission.sections.sherpa.record.information.uri' | translate }}</p>
-        </div>
-        <div class="col-8">
-            <p class="m-1">
-                <a [href]="metadata.uri" target="_blank">{{metadata.uri}}</a>
-            </p>
-        </div>
+  }
+  @if (!!metadata?.uri) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{ 'submission.sections.sherpa.record.information.uri' | translate }}</p>
+      </div>
+      <div class="col-8">
+        <p class="m-1">
+          <a [href]="metadata.uri" target="_blank">{{metadata.uri}}</a>
+        </p>
+      </div>
     </div>
-</div>
\ No newline at end of file
+  }
+</div>
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
index 4eb9567abb..27e5939083 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
@@ -1,7 +1,4 @@
-import {
-  DatePipe,
-  NgIf,
-} from '@angular/common';
+import { DatePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -18,7 +15,6 @@ import { Metadata } from '../../../../core/submission/models/sherpa-policies-det
   templateUrl: './metadata-information.component.html',
   styleUrls: ['./metadata-information.component.scss'],
   imports: [
-    NgIf,
     TranslateModule,
     DatePipe,
   ],
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
index 534b95397e..3f11712354 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
@@ -1,64 +1,82 @@
-<div class="ml-4">
-    <div class="row" *ngIf="!!journal?.titles && journal.titles.length > 0">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.title' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1" *ngFor="let title of journal.titles">{{title}}
-            </p>
-        </div>
+<div class="ms-4">
+  @if (!!journal?.titles && journal.titles.length > 0) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.title' | translate}}</p>
+      </div>
+      <div class="col-4">
+        @for (title of journal.titles; track title) {
+          <p class="m-1">{{title}}
+          </p>
+        }
+      </div>
     </div>
-    <div class="row" *ngIf="!!journal?.issns && journal.issns.length > 0">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.issns' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1" *ngFor="let issn of journal.issns">{{issn}}
-            </p>
-        </div>
+  }
+  @if (!!journal?.issns && journal.issns.length > 0) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.issns' | translate}}</p>
+      </div>
+      <div class="col-4">
+        @for (issn of journal.issns; track issn) {
+          <p class="m-1">{{issn}}
+          </p>
+        }
+      </div>
     </div>
-    <div class="row" *ngIf="!!journal?.url">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.url' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1">
-                <a href="{{journal.url}}" target="_blank" rel="noopener noreferrer">
-                    {{journal.url}}
-                </a>
-            </p>
-        </div>
+  }
+  @if (!!journal?.url) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.url' | translate}}</p>
+      </div>
+      <div class="col-4">
+        <p class="m-1">
+          <a href="{{journal.url}}" target="_blank" rel="noopener noreferrer">
+            {{journal.url}}
+          </a>
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!journal?.publishers && journal.publishers.length > 0">
+  }
+  @if (!!journal?.publishers && journal.publishers.length > 0) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.publishers' | translate}}</p>
+      </div>
+      @for (publisher of journal.publishers; track publisher) {
         <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.publishers' | translate}}</p>
-        </div>
-        <div class="col-4" *ngFor="let publisher of journal.publishers">
-            <p class="m-1">
-                <a href="{{publisher.uri}}" target="_blank" rel="noopener noreferrer">
-                    {{publisher.name}}
-                </a>
-            </p>
+          <p class="m-1">
+            <a href="{{publisher.uri}}" target="_blank" rel="noopener noreferrer">
+              {{publisher.name}}
+            </a>
+          </p>
         </div>
+      }
     </div>
-    <div class="row" *ngIf="!!journal?.romeoPub">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.romeoPub' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1">
-                {{journal.romeoPub}}
-            </p>
-        </div>
+  }
+  @if (!!journal?.romeoPub) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.romeoPub' | translate}}</p>
+      </div>
+      <div class="col-4">
+        <p class="m-1">
+          {{journal.romeoPub}}
+        </p>
+      </div>
     </div>
-    <div class="row" *ngIf="!!journal?.zetoPub">
-        <div class="col-4">
-            <p class="m-1">{{'submission.sections.sherpa.publication.information.zetoPub' | translate}}</p>
-        </div>
-        <div class="col-4">
-            <p class="m-1">
-                {{journal.zetoPub}}
-            </p>
-        </div>
+  }
+  @if (!!journal?.zetoPub) {
+    <div class="row">
+      <div class="col-4">
+        <p class="m-1">{{'submission.sections.sherpa.publication.information.zetoPub' | translate}}</p>
+      </div>
+      <div class="col-4">
+        <p class="m-1">
+          {{journal.zetoPub}}
+        </p>
+      </div>
     </div>
-</div>
\ No newline at end of file
+  }
+</div>
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
index 8f256700a0..27f54a1bba 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -18,9 +15,7 @@ import { Journal } from '../../../../core/submission/models/sherpa-policies-deta
   templateUrl: './publication-information.component.html',
   styleUrls: ['./publication-information.component.scss'],
   imports: [
-    NgIf,
     TranslateModule,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
index 96e42202b3..89eb987730 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
@@ -1,16 +1,22 @@
-<div class="ml-4">
-    <ds-content-accordion *ngFor="let permittedVersions of policy.permittedVersions" [version]="permittedVersions">
+<div class="ms-4">
+  @for (permittedVersions of policy.permittedVersions; track permittedVersions) {
+    <ds-content-accordion [version]="permittedVersions">
     </ds-content-accordion>
-    <div class="row" *ngIf="!!policy?.urls">
-        <div class="col-12">
-            <p class="m-1">
-                {{'submission.sections.sherpa.publisher.policy.more.information' | translate}}
-            </p>
-            <ul>
-                <li *ngFor="let url of policy.urls | keyvalue">
-                    <a href="{{url.key}}" target="_blank" rel="noopener noreferrer">{{url.value}}</a>
-                </li>
-            </ul>
-        </div>
+  }
+  @if (!!policy?.urls) {
+    <div class="row">
+      <div class="col-12">
+        <p class="m-1">
+          {{'submission.sections.sherpa.publisher.policy.more.information' | translate}}
+        </p>
+        <ul>
+          @for (url of policy.urls | keyvalue; track url) {
+            <li>
+              <a href="{{url.key}}" target="_blank" rel="noopener noreferrer">{{url.value}}</a>
+            </li>
+          }
+        </ul>
+      </div>
     </div>
-</div>
\ No newline at end of file
+  }
+</div>
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
index 8cbe2f6904..e2fd37f645 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.ts
@@ -1,8 +1,4 @@
-import {
-  KeyValuePipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { KeyValuePipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -24,8 +20,6 @@ import { ContentAccordionComponent } from '../content-accordion/content-accordio
     ContentAccordionComponent,
     TranslateModule,
     KeyValuePipe,
-    NgForOf,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
index 4b636ee46e..c13f2c71e9 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.html
@@ -1,72 +1,89 @@
-<ds-alert [type]="'alert-info'" *ngIf="hasNoData()" [content]="'submission.sections.sherpa-policy.title-empty'">
-</ds-alert>
-
-<div *ngIf="!hasNoData()" class="d-flex flex-column flex-nowrap mt-2 mb-4">
-  <ds-alert [type]="'alert-info'" >
-    {{'submission.sections.sherpa.publisher.policy.description' | translate}}
+@if (hasNoData()) {
+  <ds-alert [type]="'alert-info'" [content]="'submission.sections.sherpa-policy.title-empty'">
   </ds-alert>
-  <div>
-    <button type="button" class="btn btn-secondary float-right" (click)="refresh()" data-test="refresh-btn">
-      <span><i class="fas fa-sync"></i> {{'submission.sections.sherpa.publisher.policy.refresh' | translate}} </span>
-    </button>
+}
+
+@if (!hasNoData()) {
+  <div class="d-flex flex-column flex-nowrap mt-2 mb-4">
+    <ds-alert [type]="'alert-info'" >
+      {{'submission.sections.sherpa.publisher.policy.description' | translate}}
+    </ds-alert>
+    <div>
+      <button type="button" class="btn btn-secondary float-end" (click)="refresh()" data-test="refresh-btn">
+        <span><i class="fas fa-sync"></i> {{'submission.sections.sherpa.publisher.policy.refresh' | translate}} </span>
+      </button>
+    </div>
   </div>
-</div>
+}
 
 <ng-container *ngVar="(sherpaPoliciesData$ | async)?.sherpaResponse as sherpaData">
-    <ng-container *ngIf="!hasNoData() && (!!sherpaData && !sherpaData.error)">
-        <ng-container *ngFor="let journal of sherpaData.journals;let j=index;">
-            <div class="mb-3 border-bottom" data-test="collapse">
-                <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
-                    <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                        [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
-                        {{'submission.sections.sherpa.publication.information' | translate}}
-                    </button>
-                    <div class="d-inline-block">
-                        <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-                        <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
-                    </div>
-                </div>
-                <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
-                    <ds-publication-information [journal]="journal"></ds-publication-information>
-                </div>
-            </div>
-            <div *ngFor="let policy of journal.policies; let p=index;" class="mb-3 border-bottom" data-test="collapse">
-                <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
-                    <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                        [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
-                        {{'submission.sections.sherpa.publisher.policy' | translate}}
-                    </button>
-                    <div class="d-inline-block">
-                        <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-                        <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
-                    </div>
-                </div>
-                <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
-                    <ds-publisher-policy [policy]="policy"></ds-publisher-policy>
-                </div>
-            </div>
-        </ng-container>
-
-        <div class="mb-3 border-bottom" data-test="collapse">
-            <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
-                <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
-                    [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
-                    {{'submission.sections.sherpa.record.information' | translate}}
-                </button>
-                <div class="d-inline-block">
-                    <span *ngIf="collapse.collapsed" class="fas fa-chevron-down"></span>
-                    <span *ngIf="!collapse.collapsed" class="fas fa-chevron-up"></span>
-                </div>
-            </div>
-            <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
-                <ds-metadata-information [metadata]="sherpaData.metadata"></ds-metadata-information>
-            </div>
+  @if (!hasNoData() && (!!sherpaData && !sherpaData.error)) {
+    @for (journal of sherpaData.journals; track journal; let j = $index) {
+      <div class="mb-3 border-bottom" data-test="collapse">
+        <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
+          <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
+            [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
+            {{'submission.sections.sherpa.publication.information' | translate}}
+          </button>
+          <div class="d-inline-block">
+            @if (collapse.collapsed) {
+              <span class="fas fa-chevron-down"></span>
+            }
+            @if (!collapse.collapsed) {
+              <span class="fas fa-chevron-up"></span>
+            }
+          </div>
         </div>
-    </ng-container>
+        <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+          <ds-publication-information [journal]="journal"></ds-publication-information>
+        </div>
+      </div>
+      @for (policy of journal.policies; track policy; let p = $index) {
+        <div class="mb-3 border-bottom" data-test="collapse">
+          <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
+            <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
+              [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
+              {{'submission.sections.sherpa.publisher.policy' | translate}}
+            </button>
+            <div class="d-inline-block">
+              @if (collapse.collapsed) {
+                <span class="fas fa-chevron-down"></span>
+              }
+              @if (!collapse.collapsed) {
+                <span class="fas fa-chevron-up"></span>
+              }
+            </div>
+          </div>
+          <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+            <ds-publisher-policy [policy]="policy"></ds-publisher-policy>
+          </div>
+        </div>
+      }
+    }
+    <div class="mb-3 border-bottom" data-test="collapse">
+      <div class="w-100 d-flex justify-content-between collapse-toggle mb-3" (click)="collapse.toggle()">
+        <button type="button" class="btn btn-link p-0" (click)="$event.preventDefault()"
+          [attr.aria-expanded]="!collapse.collapsed" aria-controls="collapseExample">
+          {{'submission.sections.sherpa.record.information' | translate}}
+        </button>
+        <div class="d-inline-block">
+          @if (collapse.collapsed) {
+            <span class="fas fa-chevron-down"></span>
+          }
+          @if (!collapse.collapsed) {
+            <span class="fas fa-chevron-up"></span>
+          }
+        </div>
+      </div>
+      <div #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+        <ds-metadata-information [metadata]="sherpaData.metadata"></ds-metadata-information>
+      </div>
+    </div>
+  }
 
-    <ng-container *ngIf="!!sherpaData && sherpaData.error">
-        <ds-alert [type]="AlertTypeEnum.Error"
-            [content]="!!sherpaData.message ? sherpaData.message : 'submission.sections.sherpa.error.message'| translate">
-        </ds-alert>
-    </ng-container>
+  @if (!!sherpaData && sherpaData.error) {
+    <ds-alert [type]="AlertTypeEnum.Error"
+      [content]="!!sherpaData.message ? sherpaData.message : 'submission.sections.sherpa.error.message'| translate">
+    </ds-alert>
+  }
 </ng-container>
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
index 86d55ce8d0..88f72ef94e 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Inject,
@@ -47,11 +43,9 @@ import { PublisherPolicyComponent } from './publisher-policy/publisher-policy.co
     AlertComponent,
     TranslateModule,
     PublisherPolicyComponent,
-    NgIf,
     PublicationInformationComponent,
     AsyncPipe,
     VarDirective,
-    NgForOf,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
index f217abf88e..cb2bdfcbd5 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
@@ -1,8 +1,14 @@
-<ng-container *ngFor="let accessCondition of accessConditionsList">
-  <span *ngIf="accessCondition.action === 'DEFAULT_BITSTREAM_READ'" class="badge badge-primary mt-3 mr-2">
-    {{accessCondition.name}} {{accessCondition.startDate}} {{accessCondition.endDate}}
-  </span>
-  <span *ngIf="accessCondition.name === 'lease'" class="badge badge-primary mt-3 mr-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
-  <span *ngIf="accessCondition.name === 'embargo'" class="badge badge-dark mt-3 mr-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
+@for (accessCondition of accessConditionsList; track accessCondition) {
+  @if (accessCondition.action === 'DEFAULT_BITSTREAM_READ') {
+    <span class="badge bg-primary mt-3 me-2">
+      {{accessCondition.name}} {{accessCondition.startDate}} {{accessCondition.endDate}}
+    </span>
+  }
+  @if (accessCondition.name === 'lease') {
+    <span class="badge bg-primary mt-3 me-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
+  }
+  @if (accessCondition.name === 'embargo') {
+    <span class="badge bg-dark mt-3 me-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
+  }
   <br>
-</ng-container>
+  }
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
index 84eff58f72..eb167f5501 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -22,10 +19,7 @@ import { isEmpty } from '../../../../shared/empty.util';
 @Component({
   selector: 'ds-submission-section-upload-access-conditions',
   templateUrl: './submission-section-upload-access-conditions.component.html',
-  imports: [
-    NgForOf,
-    NgIf,
-  ],
+  imports: [],
   standalone: true,
 })
 export class SubmissionSectionUploadAccessConditionsComponent implements OnInit {
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
index 0cb79e51cb..9187915dcf 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.html
@@ -1,20 +1,21 @@
 <div>
   <div class="modal-header">
     <h4 class="modal-title">{{'submission.sections.upload.edit.title' | translate}}</h4>
-    <button type="button" class="close" (click)="onModalClose()" aria-label="Close" [disabled]="isSaving">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close" [dsBtnDisabled]="isSaving">
     </button>
   </div>
   <div class="modal-body">
-    <ds-form *ngIf="formModel"
-             #formRef="formComponent"
-             [formId]="formId"
-             [formModel]="formModel"
-             [displaySubmit]="!isSaving"
-             [displayCancel]="!isSaving"
-             (submitForm)="onSubmit()"
-             (cancel)="onModalClose()"
-             (dfChange)="onChange($event)"></ds-form>
+    @if (formModel) {
+      <ds-form
+        #formRef="formComponent"
+        [formId]="formId"
+        [formModel]="formModel"
+        [displaySubmit]="!isSaving"
+        [displayCancel]="!isSaving"
+        (submitForm)="onSubmit()"
+        (cancel)="onModalClose()"
+      (dfChange)="onChange($event)"></ds-form>
+    }
 
   </div>
 </div>
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
index 015ccd4ae4..70bb064aee 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.spec.ts
@@ -403,7 +403,6 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
   standalone: true,
   imports: [
     SubmissionSectionUploadFileEditComponent,
-    CommonModule,
     FormsModule,
     FormComponent,
     ReactiveFormsModule,
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
index 24488d1adb..1dc4c1ee52 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.component.ts
@@ -1,4 +1,4 @@
-import { NgIf } from '@angular/common';
+
 import {
   ChangeDetectorRef,
   Component,
@@ -38,6 +38,7 @@ import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/b
 import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
+import { BtnDisabledDirective } from '../../../../../shared/btn-disabled.directive';
 import { dateToISOFormat } from '../../../../../shared/date.util';
 import {
   hasNoValue,
@@ -78,8 +79,8 @@ import {
   templateUrl: './section-upload-file-edit.component.html',
   imports: [
     FormComponent,
-    NgIf,
     TranslateModule,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 4a39dfcfc8..65d233081c 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -15,7 +15,7 @@ export const BITSTREAM_METADATA_FORM_GROUP_CONFIG: DynamicFormGroupModelConfig =
 };
 export const BITSTREAM_METADATA_FORM_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
-    container: 'form-group',
+    container: 'mb-3',
     label: 'col-form-label',
   },
   grid: {
@@ -29,9 +29,9 @@ export const BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG: DynamicFormGroupModelConfi
 
 export const BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
-    host: 'form-group access-condition-group col',
-    container: 'pl-1 pr-1',
-    control: 'form-row ',
+    host: 'mb-3 access-condition-group col',
+    container: 'ps-1 pe-1',
+    control: 'row ',
   },
 };
 
@@ -41,7 +41,7 @@ export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayMode
 };
 export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT: DynamicFormControlLayout = {
   grid: {
-    group: 'form-row pt-4',
+    group: 'row pt-4',
   },
 };
 
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 4698fdf68a..876d00cd0f 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -1,57 +1,64 @@
-<ng-container *ngIf="fileData">
+@if (fileData) {
   <div class="row">
     <!-- Default switch -->
     <div class="col-md-2 d-flex justify-content-center align-items-center" >
       <div class="custom-control custom-switch">
         <input
-        type="checkbox"
-        class="custom-control-input"
-        id="primaryBitstream{{fileIndex}}"
-        [disabled]="processingSaveStatus$ | async"
-        [checked]="isPrimary"
-        (change)="togglePrimaryBitstream($event)">
+          type="checkbox"
+          class="custom-control-input"
+          id="primaryBitstream{{fileIndex}}"
+          [disabled]="processingSaveStatus$ | async"
+          [checked]="isPrimary"
+          (change)="togglePrimaryBitstream($event)">
         <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
-          <span class="sr-only" *ngIf="!isPrimary">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
-          <span class="sr-only" *ngIf="isPrimary">{{'submission.sections.upload.primary.remove' | translate:{ fileName: fileName } }}</span>
+          @if (!isPrimary) {
+            <span class="sr-only">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
+          }
+          @if (isPrimary) {
+            <span class="sr-only">{{'submission.sections.upload.primary.remove' | translate:{ fileName: fileName } }}</span>
+          }
         </label>
       </div>
     </div>
     <div class="col-md-10">
-      <div class="float-left w-75">
+      <div class="float-start w-75">
         <ds-submission-section-upload-file-view [fileData]="fileData"></ds-submission-section-upload-file-view>
       </div>
-      <div class="float-right w-15">
+      <div class="float-end w-15">
         <ng-container>
           <ds-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true"
-                                        [bitstream]="getBitstream()" [enableRequestACopy]="false">
+            [bitstream]="getBitstream()" [enableRequestACopy]="false">
             <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
           </ds-file-download-link>
           <button class="btn btn-link-focus"
-                  [attr.aria-label]="'submission.sections.upload.edit.title' | translate"
-                  title="{{ 'submission.sections.upload.edit.title' | translate }}"
-                  (click)="$event.preventDefault();editBitstreamData();">
+            [attr.aria-label]="'submission.sections.upload.edit.title' | translate"
+            title="{{ 'submission.sections.upload.edit.title' | translate }}"
+            (click)="$event.preventDefault();editBitstreamData();">
             <i class="fa fa-edit fa-2x text-normal"></i>
           </button>
           <button class="btn btn-link-focus"
-                  [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
-                  title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
-                  [disabled]="(processingDelete$ | async)"
-                  (click)="$event.preventDefault();confirmDelete(content);">
-            <i *ngIf="(processingDelete$ | async)" class="fas fa-circle-notch fa-spin fa-2x text-danger"></i>
-            <i *ngIf="(processingDelete$ | async) !== true" class="fa fa-trash fa-2x text-danger"></i>
+            [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
+            title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
+            [dsBtnDisabled]="(processingDelete$ | async)"
+            (click)="$event.preventDefault();confirmDelete(content);">
+            @if ((processingDelete$ | async)) {
+              <i class="fas fa-circle-notch fa-spin fa-2x link-danger"></i>
+            }
+            @if ((processingDelete$ | async) !== true) {
+              <i class="fa fa-trash fa-2x link-danger"></i>
+            }
           </button>
         </ng-container>
       </div>
       <div class="clearfix"></div>
     </div>
   </div>
-</ng-container>
+}
 
 <ng-template #content let-c="close" let-d="dismiss">
   <div class="modal-header">
     <h4 class="modal-title text-danger">{{ 'submission.sections.upload.delete.confirm.title' | translate }}</h4>
-    <button type="button" class="close" aria-label="Close" (click)="d('cancel')">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" class="btn-close" aria-label="Close" (click)="d('cancel')">
     </button>
   </div>
   <div class="modal-body">
@@ -59,8 +66,8 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-secondary"
-            (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
+    (click)="c('cancel')">{{ 'submission.sections.upload.delete.confirm.cancel' | translate }}</button>
     <button type="button" class="btn btn-danger"
-            (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
+    (click)="c('ok')">{{ 'submission.sections.upload.delete.confirm.submit' | translate }}</button>
   </div>
 </ng-template>
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
index c1487b0559..996ee34cd2 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
@@ -286,9 +286,9 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
   standalone: true,
   imports: [
     ThemedSubmissionSectionUploadFileComponent,
-    CommonModule,
     AsyncPipe,
-    NgbModule],
+    NgbModule,
+  ],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index a0519f6c85..cda5d429b5 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -28,6 +25,7 @@ import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotUndefined,
@@ -50,10 +48,10 @@ import { SubmissionSectionUploadFileViewComponent } from './view/section-upload-
   imports: [
     TranslateModule,
     SubmissionSectionUploadFileViewComponent,
-    NgIf,
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
+    BtnDisabledDirective,
   ],
   standalone: true,
 })
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
index dc72fbdad0..73e18afeb5 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.html
@@ -1,38 +1,46 @@
 <div>
-  <ng-container *ngIf="metadata">
-    <ng-container *ngFor="let entry of getAllMetadataValue(fileTitleKey)">
-      <ng-container *ngIf="entry.value !== ''">
+  @if (metadata) {
+    @for (entry of getAllMetadataValue(fileTitleKey); track entry) {
+      @if (entry.value !== '') {
         <h3>
           {{entry.value}}
           <span class="text-muted">({{fileData?.sizeBytes | dsFileSize}})</span>
         </h3>
-      </ng-container>
-      <ng-container *ngIf="entry.value === ''">
-        <h5 *ngIf="metadata[fileTitleKey].indexOf(entry) === 0">
-          <span class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileTitleKey}}</span>
-        </h5>
-      </ng-container>
+      }
+      @if (entry.value === '') {
+        @if (metadata[fileTitleKey].indexOf(entry) === 0) {
+          <h5>
+            <span class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileTitleKey}}</span>
+          </h5>
+        }
+      }
       <span class="clearfix"></span>
-    </ng-container>
-    <ng-container *ngFor="let entry of getAllMetadataValue(fileDescrKey)">
-      <ng-container *ngIf="entry.value !== ''">
+    }
+    @for (entry of getAllMetadataValue(fileDescrKey); track entry) {
+      @if (entry.value !== '') {
         {{entry.value | dsTruncate:['150']}}
-      </ng-container>
-      <ng-container *ngIf="entry.value === ''">
-        <span *ngIf="metadata[fileDescrKey].indexOf(entry) === 0"
-              class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}}</span>
-      </ng-container>
+      }
+      @if (entry.value === '') {
+        @if (metadata[fileDescrKey].indexOf(entry) === 0) {
+          <span
+          class="text-muted">{{'submission.sections.upload.no-entry' | translate}} {{fileDescrKey}}</span>
+        }
+      }
       <span class="clearfix"></span>
-    </ng-container>
-  </ng-container>
+    }
+  }
 
 
-  <div class="mt-1" *ngIf="fileFormat">
-    {{'admin.registries.bitstream-formats.edit.head' | translate:{format: fileFormat} }}
-  </div>
-  <div class="mt-1" *ngIf="fileCheckSum">
-    Checksum {{fileCheckSum.checkSumAlgorithm}}: {{fileCheckSum.value}}
-  </div>
+  @if (fileFormat) {
+    <div class="mt-1">
+      {{'admin.registries.bitstream-formats.edit.head' | translate:{format: fileFormat} }}
+    </div>
+  }
+  @if (fileCheckSum) {
+    <div class="mt-1">
+      Checksum {{fileCheckSum.checkSumAlgorithm}}: {{fileCheckSum.value}}
+    </div>
+  }
   <span class="clearfix"></span>
   <ds-submission-section-upload-access-conditions [accessConditions]="fileData.accessConditions"></ds-submission-section-upload-access-conditions>
 </div>
diff --git a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
index f065fc9e19..0bb7cab947 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.ts
@@ -1,7 +1,4 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+
 import {
   Component,
   Input,
@@ -30,8 +27,6 @@ import { SubmissionSectionUploadAccessConditionsComponent } from '../../accessCo
     SubmissionSectionUploadAccessConditionsComponent,
     TranslateModule,
     TruncatePipe,
-    NgIf,
-    NgForOf,
     FileSizePipe,
   ],
   standalone: true,
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index 9d916a4f98..a9fd762f89 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -1,23 +1,24 @@
 <ds-alert [content]="'submission.sections.upload.info'"
-          [dismissible]="true"
-          [type]="AlertTypeEnum.Info"></ds-alert>
+  [dismissible]="true"
+[type]="AlertTypeEnum.Info"></ds-alert>
 
-<ng-container *ngIf="fileList.length > 0; else noFileUploaded">
-
-  <div *ngIf="collectionDefaultAccessConditions.length > 0" class="row">
-    <div class="col-sm-12" >
-      <ds-alert [type]="AlertTypeEnum.Warning">
-        <ng-container *ngIf="collectionPolicyType === 1">
-          {{ 'submission.sections.upload.header.policy.default.nolist' | translate:{ "collectionName": collectionName } }}
-        </ng-container>
-        <ng-container *ngIf="collectionPolicyType === 2">
-          {{ 'submission.sections.upload.header.policy.default.withlist' | translate:{ "collectionName": collectionName } }}
-        </ng-container>
-        <span class="clearfix"></span>
-        <ds-submission-section-upload-access-conditions [accessConditions]="collectionDefaultAccessConditions"></ds-submission-section-upload-access-conditions>
-      </ds-alert>
+@if (fileList.length > 0) {
+  @if (collectionDefaultAccessConditions.length > 0) {
+    <div class="row">
+      <div class="col-sm-12" >
+        <ds-alert [type]="AlertTypeEnum.Warning">
+          @if (collectionPolicyType === 1) {
+            {{ 'submission.sections.upload.header.policy.default.nolist' | translate:{ "collectionName": collectionName } }}
+          }
+          @if (collectionPolicyType === 2) {
+            {{ 'submission.sections.upload.header.policy.default.withlist' | translate:{ "collectionName": collectionName } }}
+          }
+          <span class="clearfix"></span>
+          <ds-submission-section-upload-access-conditions [accessConditions]="collectionDefaultAccessConditions"></ds-submission-section-upload-access-conditions>
+        </ds-alert>
+      </div>
     </div>
-  </div>
+  }
   <div class="row">
     <div class="col-md-2">
       <span class="text-left font-weight-bold">{{ 'bitstream.edit.form.primaryBitstream.label' | translate }}</span>
@@ -28,30 +29,29 @@
       <hr/>
     </div>
   </div>
-  <ng-container *ngFor="let fileEntry of fileList; let i = index;">
+  @for (fileEntry of fileList; track fileEntry; let i = $index) {
     <ds-submission-upload-section-file
-                                       [isPrimary]="primaryBitstreamUUID ? primaryBitstreamUUID === fileEntry.uuid : null"
-                                       [availableAccessConditionOptions]="availableAccessConditionOptions"
-                                       [collectionId]="collectionId"
-                                       [collectionPolicyType]="collectionPolicyType"
-                                       [configMetadataForm]="(configMetadataForm$ | async)"
-                                       [fileId]="fileEntry.uuid"
-                                       [fileIndex]="i"
-                                       [fileName]="fileNames[i]"
-                                       [sectionId]="sectionData.id"
-                                       [submissionId]="submissionId"></ds-submission-upload-section-file>
+      [isPrimary]="primaryBitstreamUUID ? primaryBitstreamUUID === fileEntry.uuid : null"
+      [availableAccessConditionOptions]="availableAccessConditionOptions"
+      [collectionId]="collectionId"
+      [collectionPolicyType]="collectionPolicyType"
+      [configMetadataForm]="(configMetadataForm$ | async)"
+      [fileId]="fileEntry.uuid"
+      [fileIndex]="i"
+      [fileName]="fileNames[i]"
+      [sectionId]="sectionData.id"
+    [submissionId]="submissionId"></ds-submission-upload-section-file>
     <div class="row">
       <div class="col-md-12">
         <hr/>
       </div>
     </div>
-  </ng-container>
-</ng-container>
-
-<ng-template #noFileUploaded>
+  }
+} @else {
   <div class="row">
     <div class="col-md-12">
       <div class="text-center h3"><span class="text-muted">{{'submission.sections.upload.no-file-uploaded' | translate}}</span></div>
     </div>
   </div>
-</ng-template>
+}
+
diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts
index 61db6c6885..36f1bd4a4d 100644
--- a/src/app/submission/sections/upload/section-upload.component.spec.ts
+++ b/src/app/submission/sections/upload/section-upload.component.spec.ts
@@ -382,8 +382,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
   selector: 'ds-test-cmp',
   template: ``,
   standalone: true,
-  imports: [
-    CommonModule],
+  imports: [],
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index 58008c9dfb..16075f83b3 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectorRef,
   Component,
@@ -74,10 +70,8 @@ export interface AccessConditionGroupsMapEntry {
   imports: [
     ThemedSubmissionSectionUploadFileComponent,
     SubmissionSectionUploadAccessConditionsComponent,
-    NgIf,
     AlertComponent,
     TranslateModule,
-    NgForOf,
     AsyncPipe,
   ],
   standalone: true,
diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts
index 0ba8e5d9a2..b8f982101c 100644
--- a/src/app/submission/submission.service.spec.ts
+++ b/src/app/submission/submission.service.spec.ts
@@ -52,6 +52,7 @@ import { NotificationsService } from '../shared/notifications/notifications.serv
 import { createFailedRemoteDataObject } from '../shared/remote-data.utils';
 import { SubmissionJsonPatchOperationsServiceStub } from '../shared/testing/submission-json-patch-operations-service.stub';
 import { SubmissionRestServiceStub } from '../shared/testing/submission-rest-service.stub';
+import { SectionScope } from './objects/section-visibility.model';
 import {
   CancelSubmissionFormAction,
   ChangeSubmissionCollectionAction,
@@ -82,6 +83,7 @@ describe('SubmissionService test suite', () => {
           extraction: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
@@ -98,6 +100,7 @@ describe('SubmissionService test suite', () => {
           collection: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
@@ -237,6 +240,7 @@ describe('SubmissionService test suite', () => {
           extraction: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
@@ -253,6 +257,7 @@ describe('SubmissionService test suite', () => {
           collection: {
             config: '',
             mandatory: true,
+            scope: SectionScope.Submission,
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
@@ -590,6 +595,7 @@ describe('SubmissionService test suite', () => {
 
   describe('getSubmissionSections', () => {
     it('should return submission form sections', () => {
+      spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkspaceItem);
       spyOn((service as any).store, 'select').and.returnValue(hot('a|', {
         a: subState.objects[826],
       }));
@@ -759,6 +765,7 @@ describe('SubmissionService test suite', () => {
 
   describe('getSubmissionStatus', () => {
     it('should return properly submission status', () => {
+      spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkspaceItem);
       spyOn((service as any).store, 'select').and.returnValue(hot('-a-b', {
         a: subState,
         b: validSubState,
@@ -818,41 +825,207 @@ describe('SubmissionService test suite', () => {
   });
 
   describe('isSectionHidden', () => {
-    it('should return true/false when section is hidden/visible', () => {
-      let section: any = {
-        config: '',
-        header: '',
-        mandatory: true,
-        sectionType: 'collection' as any,
-        visibility: {
-          main: 'HIDDEN',
-          other: 'HIDDEN',
-        },
-        collapsed: false,
-        enabled: true,
-        data: {},
-        errorsToShow: [],
-        serverValidationErrors: [],
-        isLoading: false,
-        isValid: false,
-      };
-      expect(service.isSectionHidden(section)).toBeTruthy();
+    describe('when submission scope is workspace', () => {
+      beforeEach(() => {
+        spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkspaceItem);
+      });
+
+      describe('and section scope is workspace', () => {
+        it('should return true when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is workflow', () => {
+        it('should return false when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is null', () => {
+        it('should return false', () => {
+          let section: any = {
+            scope: null,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
 
-      section = {
-        header: 'submit.progressbar.describe.keyinformation',
-        config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/keyinformation',
-        mandatory: true,
-        sectionType: 'submission-form',
-        collapsed: false,
-        enabled: true,
-        data: {},
-        errorsToShow: [],
-        serverValidationErrors: [],
-        isLoading: false,
-        isValid: false,
-      };
-      expect(service.isSectionHidden(section)).toBeFalsy();
     });
+
+    describe('when submission scope is workflow', () => {
+      beforeEach(() => {
+        spyOn(service, 'getSubmissionScope').and.returnValue(SubmissionScopeType.WorkflowItem);
+      });
+
+      describe('and section scope is workspace', () => {
+        it('should return false when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Submission,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is workflow', () => {
+        it('should return true when visibility main is HIDDEN and visibility other is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return true when both visibility main and other are HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: 'HIDDEN',
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeTrue();
+        });
+        it('should return false when visibility main is null and visibility other is HIDDEN', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: {
+              main: null,
+              other: 'HIDDEN',
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+        it('should return false when visibility is null', () => {
+          let section: any = {
+            scope: SectionScope.Workflow,
+            visibility: null,
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+      describe('and section scope is null', () => {
+        it('should return false', () => {
+          let section: any = {
+            scope: null,
+            visibility: {
+              main: 'HIDDEN',
+              other: null,
+            },
+          };
+          expect(service.isSectionHidden(section)).toBeFalse();
+        });
+      });
+
+    });
+
+
   });
 
   describe('isSubmissionLoading', () => {
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index 19c8893a7e..ba8eff4f38 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -50,6 +50,7 @@ import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
 } from '../shared/remote-data.utils';
+import { SectionScope } from './objects/section-visibility.model';
 import { SubmissionError } from './objects/submission-error.model';
 import {
   CancelSubmissionFormAction,
@@ -504,9 +505,15 @@ export class SubmissionService {
    *    true if section is hidden, false otherwise
    */
   isSectionHidden(sectionData: SubmissionSectionObject): boolean {
-    return (isNotUndefined(sectionData.visibility)
-      && sectionData.visibility.main === 'HIDDEN'
-      && sectionData.visibility.other === 'HIDDEN');
+    const submissionScope: SubmissionScopeType = this.getSubmissionScope();
+    if (isEmpty(submissionScope) || isEmpty(sectionData.visibility) || isEmpty(sectionData.scope)) {
+      return false;
+    }
+    const convertedSubmissionScope: SectionScope = submissionScope.valueOf() === SubmissionScopeType.WorkspaceItem.valueOf() ?
+      SectionScope.Submission : SectionScope.Workflow;
+    const visibility = convertedSubmissionScope.valueOf() === sectionData.scope.valueOf() ?
+      sectionData.visibility.main : sectionData.visibility.other;
+    return visibility ===  'HIDDEN';
   }
 
   /**
diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html
index e8dfc8fc6a..b3489ce66c 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.html
+++ b/src/app/subscriptions-page/subscriptions-page.component.html
@@ -4,39 +4,47 @@
       <h1>{{'subscriptions.title' | translate}}</h1>
       <div class="row">
         <div class="col-md-12 m-40">
-          <ds-loading *ngIf="loading$ | async"></ds-loading>
+          @if (loading$ | async) {
+            <ds-loading></ds-loading>
+          }
           <ng-container *ngVar="(subscriptions$ | async) as subscriptions">
 
-            <ds-pagination *ngIf="subscriptions?.pageInfo?.totalElements > 0 && (loading$ | async) !== true"
-                           [paginationOptions]="config"
-                           [collectionSize]="subscriptions?.pageInfo?.totalElements"
-                           [hideGear]="true"
-                           [hidePagerWhenSinglePage]="true">
-              <div class="table-responsive">
-                <table id="formats" class="table table-striped table-hover" data-test="subscription-table">
-                  <thead>
-                    <tr>
-                      <th style="width: 50%" scope="col">{{'subscriptions.table.dso' | translate}}</th>
-                      <th scope="col">{{'subscriptions.table.subscription_type' | translate}}</th>
-                      <th scope="col">{{'subscriptions.table.subscription_frequency' | translate}}</th>
-                      <th scope="col">{{'subscriptions.table.action' | translate}}</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr ds-subscription-view *ngFor="let subscription of subscriptions?.page"
-                                             [dso]="(subscription?.resource | async)?.payload"
-                                             [eperson]="(subscription?.eperson | async)?.payload?.id"
-                                             [subscription]="subscription"
-                                             (reload)="refresh()">
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-            </ds-pagination>
+            @if (subscriptions?.pageInfo?.totalElements > 0 && (loading$ | async) !== true) {
+              <ds-pagination
+                [paginationOptions]="config"
+                [collectionSize]="subscriptions?.pageInfo?.totalElements"
+                [hideGear]="true"
+                [hidePagerWhenSinglePage]="true">
+                <div class="table-responsive">
+                  <table id="formats" class="table table-striped table-hover" data-test="subscription-table">
+                    <thead>
+                      <tr>
+                        <th style="width: 50%" scope="col">{{'subscriptions.table.dso' | translate}}</th>
+                        <th scope="col">{{'subscriptions.table.subscription_type' | translate}}</th>
+                        <th scope="col">{{'subscriptions.table.subscription_frequency' | translate}}</th>
+                        <th scope="col">{{'subscriptions.table.action' | translate}}</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      @for (subscription of subscriptions?.page; track subscription) {
+                        <tr ds-subscription-view
+                          [dso]="(subscription?.resource | async)?.payload"
+                          [eperson]="(subscription?.eperson | async)?.payload?.id"
+                          [subscription]="subscription"
+                          (reload)="refresh()">
+                        </tr>
+                      }
+                    </tbody>
+                  </table>
+                </div>
+              </ds-pagination>
+            }
 
-            <ds-alert *ngIf="subscriptions?.pageInfo?.totalElements === 0 && (loading$ | async) !== true" [type]="AlertType.Info" data-test="empty-alert">
-              {{ 'subscriptions.table.empty.message' | translate }}
-            </ds-alert>
+            @if (subscriptions?.pageInfo?.totalElements === 0 && (loading$ | async) !== true) {
+              <ds-alert [type]="AlertType.Info" data-test="empty-alert">
+                {{ 'subscriptions.table.empty.message' | translate }}
+              </ds-alert>
+            }
 
           </ng-container>
         </div>
diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts
index 5d0b4b258d..1d967d3332 100644
--- a/src/app/subscriptions-page/subscriptions-page.component.ts
+++ b/src/app/subscriptions-page/subscriptions-page.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnDestroy,
@@ -49,7 +45,7 @@ import { VarDirective } from '../shared/utils/var.directive';
   templateUrl: './subscriptions-page.component.html',
   styleUrls: ['./subscriptions-page.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, VarDirective, PaginationComponent, NgFor, SubscriptionViewComponent, AlertComponent, AsyncPipe, TranslateModule],
+  imports: [ThemedLoadingComponent, VarDirective, PaginationComponent, SubscriptionViewComponent, AlertComponent, AsyncPipe, TranslateModule],
 })
 /**
  * List and allow to manage all the active subscription for the current user
diff --git a/src/app/suggestions-page/suggestions-page.component.html b/src/app/suggestions-page/suggestions-page.component.html
index 45bdff32bf..452f47f9b6 100644
--- a/src/app/suggestions-page/suggestions-page.component.html
+++ b/src/app/suggestions-page/suggestions-page.component.html
@@ -1,50 +1,62 @@
 <div class="container">
   <div class="row">
     <div class="col-12">
-        <ng-container *ngVar="(suggestionsRD$ | async) as suggestionsRD">
-          <ds-loading *ngIf="(processing$ | async)"></ds-loading>
-          <div *ngIf="(processing$ | async) !== true && suggestionsRD?.pageInfo?.totalElements > 0">
-
+      <ng-container *ngVar="(suggestionsRD$ | async) as suggestionsRD">
+        @if ((processing$ | async)) {
+          <ds-loading></ds-loading>
+        }
+        @if ((processing$ | async) !== true && suggestionsRD?.pageInfo?.totalElements > 0) {
+          <div>
             <h1>
               {{'suggestion.suggestionFor' | translate}}
               <a target="_blank" [routerLink]="['/entities/person/', researcherUuid]">{{researcherName}}</a>
               {{'suggestion.from.source' | translate}} {{ translateSuggestionSource() | translate }}
             </h1>
-
             <div class="mb-3 mt-3">
-              <button class="btn mr-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
+              <button class="btn me-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
               <em>({{ getSelectedSuggestionsCount() }})</em>
-              <ds-suggestion-actions *ngIf="getSelectedSuggestionsCount() > 0"
-                                      class="m-2"
-                                     [isBulk]="true"
-                                     [isCollectionFixed]="isCollectionFixed(suggestionsRD.page)"
-                                     (approveAndImport)="approveAndImportAllSelected($event)"
-                                     (ignoreSuggestionClicked)="ignoreSuggestionAllSelected()"></ds-suggestion-actions>
-              <i class='fas fa-circle-notch fa-spin' *ngIf="isBulkOperationPending"></i>
+              @if (getSelectedSuggestionsCount() > 0) {
+                <ds-suggestion-actions
+                  class="m-2"
+                  [isBulk]="true"
+                  [isCollectionFixed]="isCollectionFixed(suggestionsRD.page)"
+                  (approveAndImport)="approveAndImportAllSelected($event)"
+                (ignoreSuggestionClicked)="ignoreSuggestionAllSelected()"></ds-suggestion-actions>
+              }
+              @if (isBulkOperationPending) {
+                <i class='fas fa-circle-notch fa-spin'></i>
+              }
             </div>
-            <ds-pagination *ngIf="(processing$ | async) !== true"
-                           [paginationOptions]="paginationOptions"
-                           [sortOptions]="paginationSortConfig"
-                           [collectionSize]="suggestionsRD?.pageInfo?.totalElements" [hideGear]="false"
-                           [hidePagerWhenSinglePage]="false" [hidePaginationDetail]="false"
-                           (paginationChange)="onPaginationChange()">
-              <ul class="list-unstyled">
-                <li *ngFor="let object of suggestionsRD?.page; let i = index; let last = last" class="mt-4 mb-4">
-                  <ds-suggestion-list-item
-                    [object]="object"
-                    [isSelected]="!!selectedSuggestions[object.id]"
-                    [isCollectionFixed]="isCollectionFixed([object])"
-                    (ignoreSuggestionClicked)="ignoreSuggestion($event)"
-                    (selected)="onSelected(object, $event)"
-                    (approveAndImport)="approveAndImport($event)"></ds-suggestion-list-item>
-                </li>
-              </ul>
-            </ds-pagination>
+            @if ((processing$ | async) !== true) {
+              <ds-pagination
+                [paginationOptions]="paginationOptions"
+                [sortOptions]="paginationSortConfig"
+                [collectionSize]="suggestionsRD?.pageInfo?.totalElements" [hideGear]="false"
+                [hidePagerWhenSinglePage]="false" [hidePaginationDetail]="false"
+                (paginationChange)="onPaginationChange()">
+                <ul class="list-unstyled">
+                  @for (object of suggestionsRD?.page; track object; let i = $index; let last = $last) {
+                    <li class="mt-4 mb-4">
+                      <ds-suggestion-list-item
+                        [object]="object"
+                        [isSelected]="!!selectedSuggestions[object.id]"
+                        [isCollectionFixed]="isCollectionFixed([object])"
+                        (ignoreSuggestionClicked)="ignoreSuggestion($event)"
+                        (selected)="onSelected(object, $event)"
+                      (approveAndImport)="approveAndImport($event)"></ds-suggestion-list-item>
+                    </li>
+                  }
+                </ul>
+              </ds-pagination>
+            }
           </div>
-          <ds-alert *ngIf="(processing$ | async) !== true && (suggestionsRD?.pageInfo?.totalElements === 0 || !suggestionsRD)" [type]="'alert-info'">
+        }
+        @if ((processing$ | async) !== true && (suggestionsRD?.pageInfo?.totalElements === 0 || !suggestionsRD)) {
+          <ds-alert [type]="'alert-info'">
             {{'suggestion.count.missing'  | translate}}
           </ds-alert>
-        </ng-container>
+        }
+      </ng-container>
     </div>
   </div>
 </div>
diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts
index 0fc790a125..dfddc164c2 100644
--- a/src/app/suggestions-page/suggestions-page.component.ts
+++ b/src/app/suggestions-page/suggestions-page.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -70,14 +66,12 @@ import { getWorkspaceItemEditRoute } from '../workflowitems-edit-page/workflowit
   imports: [
     AsyncPipe,
     VarDirective,
-    NgIf,
     RouterLink,
     TranslateModule,
     SuggestionActionsComponent,
     ThemedLoadingComponent,
     PaginationComponent,
     SuggestionListElementComponent,
-    NgForOf,
     AlertComponent,
   ],
   standalone: true,
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
index c2c1942cdd..1e3ee6333e 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -1,21 +1,31 @@
-<div *ngIf="(systemWideAlert$ |async)?.active">
+@if ((systemWideAlert$ |async)?.active) {
+  <div>
     <div class="rounded-0 alert alert-warning w100 m-0 px-1">
-        <div class="container">
-            <span class="font-weight-bold">
-                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
-                </span>
-                <span *ngIf="(countDownDays|async) > 0">
-                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: countDownDays|async } }}
-                </span>
-                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: countDownHours| async } }}
-                </span>
-                <span *ngIf="(countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: countDownMinutes|async } }}
-                </span>
+      <div class="container">
+        <span class="fw-bold">
+          @if ((countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
             </span>
-            <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
-        </div>
+          }
+          @if ((countDownDays|async) > 0) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.days' | translate: { days: countDownDays|async } }}
+            </span>
+          }
+          @if ((countDownDays|async) > 0 || (countDownHours| async) > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: countDownHours| async } }}
+            </span>
+          }
+          @if ((countDownDays|async) > 0 || (countDownHours| async) > 0 || (countDownMinutes|async) > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: countDownMinutes|async } }}
+            </span>
+          }
+        </span>
+        <span [innerHTML]="(systemWideAlert$ |async)?.message"></span>
+      </div>
     </div>
-</div>
\ No newline at end of file
+  </div>
+}
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
index 79ecf2117a..cf98fe9339 100644
--- a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformBrowser,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -42,7 +41,7 @@ import { SystemWideAlert } from '../system-wide-alert.model';
   styleUrls: ['./system-wide-alert-banner.component.scss'],
   templateUrl: './system-wide-alert-banner.component.html',
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index 770f465a4b..f6a5573a74 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -1,94 +1,110 @@
 <div class="container">
-    <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
-    <div [formGroup]="alertForm" [class]="'ng-invalid'">
-        <div class="form-group">
-            <div class="row mb-2">
-                <div class="col">
-                    <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
-                        [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
-                        [checked]="formActive.value" (change)="setActive($event)"></ui-switch>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col">
-                    <label for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
-                    <textarea id="formMessage" rows="5"
-                        [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
-                        formControlName="formMessage">
-                </textarea>
-                    <div *ngIf="formMessage.invalid && (formMessage.dirty || formMessage.touched)"
-                        class="invalid-feedback show-feedback">
-                        <span *ngIf="formMessage.errors">
-                            {{ 'system-wide-alert.form.error.message' | translate }}
-                        </span>
-                    </div>
-                </div>
-            </div>
+  <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
+  <div [formGroup]="alertForm" [class]="'ng-invalid'">
+    <div class="mb-3">
+      <div class="row mb-2">
+        <div class="col">
+          <ui-switch [checkedLabel]="'system-wide-alert.form.label.active' | translate"
+            [uncheckedLabel]="'system-wide-alert.form.label.inactive' | translate"
+          [checked]="formActive.value" (change)="setActive($event)"></ui-switch>
         </div>
-    </div>
-    <div class="row">
-        <div class="col mb-2 d-flex align-items-end">
-            <ui-switch size="small" [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
-                [checked]="counterEnabled$ |async" (change)="setCounterEnabled($event)"></ui-switch>
-            <span class="ml-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
+      </div>
+      <div class="row">
+        <div class="col">
+          <label class="form-label" for="formMessage">{{ 'system-wide-alert.form.label.message' | translate }}</label>
+          <textarea id="formMessage" rows="5"
+            [className]="(formMessage.invalid) && (formMessage.dirty || formMessage.touched) ? 'form-control is-invalid' :'form-control'"
+            formControlName="formMessage">
+          </textarea>
+          @if (formMessage.invalid && (formMessage.dirty || formMessage.touched)) {
+            <div
+              class="invalid-feedback show-feedback">
+              @if (formMessage.errors) {
+                <span>
+                  {{ 'system-wide-alert.form.error.message' | translate }}
+                </span>
+              }
+            </div>
+          }
         </div>
+      </div>
     </div>
-    <div *ngIf="counterEnabled$ |async">
-        <div class="row">
-            <div class="col-sm-12 col-md-6">
-                <div class="input-group">
-                    <input class="form-control" placeholder="yyyy-mm-dd" name="dp" [(ngModel)]="date"
-                        [minDate]="minDate" ngbDatepicker #d="ngbDatepicker" (ngModelChange)="updatePreviewTime()" />
-                    <button [attr.aria-label]="'system-wide-alert-form.select-date-by-calendar' | translate"
-                        (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
-                    </button>
-                </div>
-            </div>
-            <div class="col-12 d-md-none">
-                <div class="input-group">
-                    <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
-                </div>
-            </div>
-            <div class="d-none d-md-block col-md-6 timepicker-margin">
-                <div class="input-group">
-                    <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
-                </div>
-            </div>
+  </div>
+  <div class="row">
+    <div class="col mb-2 d-flex align-items-end">
+      <ui-switch size="small" [ariaLabel]="'system-wide-alert.form.label.countdownTo.enable' | translate"
+      [checked]="counterEnabled$ |async" (change)="setCounterEnabled($event)"></ui-switch>
+      <span class="ms-2">{{ 'system-wide-alert.form.label.countdownTo.enable' | translate }}</span>
+    </div>
+  </div>
+  @if (counterEnabled$ |async) {
+    <div>
+      <div class="row">
+        <div class="col-sm-12 col-md-6">
+          <div class="input-group">
+            <input class="form-control" placeholder="yyyy-mm-dd" name="dp" [(ngModel)]="date"
+              [minDate]="minDate" ngbDatepicker #d="ngbDatepicker" (ngModelChange)="updatePreviewTime()" />
+            <button [attr.aria-label]="'system-wide-alert-form.select-date-by-calendar' | translate"
+              (click)="d.toggle()" class="btn btn-outline-secondary fas fa-calendar" type="button">
+            </button>
+          </div>
         </div>
-    </div>
-    <div class="mb-2">
-        <span class="text-muted">{{ 'system-wide-alert.form.label.countdownTo.hint' | translate }}</span>
-    </div>
-    <div *ngIf="formMessage.value">
-        <div class="row">
-            <div class="col">
-                <label>{{ 'system-wide-alert.form.label.preview' | translate}}</label>
-            </div>
+        <div class="col-12 d-md-none">
+          <div class="input-group">
+            <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
+          </div>
         </div>
-        <div class="rounded-0 alert alert-warning">
-            <span class="font-weight-bold">
-                <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
-                </span>
-                <span *ngIf="previewDays > 0">
-                    {{ 'system-wide-alert-banner.countdown.days' | translate: { days: previewDays } }}
-                </span>
-                <span *ngIf="previewDays > 0 || previewHours > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: previewHours } }}
-                </span>
-                <span *ngIf="previewDays > 0 || previewHours > 0 || previewMinutes > 0 ">
-                    {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: previewMinutes } }}
-                </span>
+        <div class="d-none d-md-block col-md-6 timepicker-margin">
+          <div class="input-group">
+            <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
+          </div>
+        </div>
+      </div>
+    </div>
+  }
+  <div class="mb-2">
+    <span class="text-muted">{{ 'system-wide-alert.form.label.countdownTo.hint' | translate }}</span>
+  </div>
+  @if (formMessage.value) {
+    <div>
+      <div class="row">
+        <div class="col">
+          <label class="form-label">{{ 'system-wide-alert.form.label.preview' | translate }}</label>
+        </div>
+      </div>
+      <div class="rounded-0 alert alert-warning">
+        <span class="fw-bold">
+          @if (previewDays > 0 || previewHours > 0 || previewMinutes > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.prefix' | translate }}
             </span>
-            <span [innerHTML]="formMessage.value"></span>
-        </div>
+          }
+          @if (previewDays > 0) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.days' | translate: { days: previewDays } }}
+            </span>
+          }
+          @if (previewDays > 0 || previewHours > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.hours' | translate: { hours: previewHours } }}
+            </span>
+          }
+          @if (previewDays > 0 || previewHours > 0 || previewMinutes > 0 ) {
+            <span>
+              {{ 'system-wide-alert-banner.countdown.minutes' | translate: { minutes: previewMinutes } }}
+            </span>
+          }
+        </span>
+        <span [innerHTML]="formMessage.value"></span>
+      </div>
     </div>
-    <div class="btn-row float-right space-children-mr mt-2">
-        <button (click)="back()" class="btn btn-outline-secondary">
-            <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
-        </button>
-        <button class="btn btn-primary" [disabled]="alertForm.invalid" (click)="save()">
-            <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
-        </button>
-    </div>
-</div>
\ No newline at end of file
+  }
+  <div class="btn-row float-end space-children-mr mt-2">
+    <button (click)="back()" class="btn btn-outline-secondary">
+      <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
+    </button>
+    <button class="btn btn-primary" [dsBtnDisabled]="alertForm.invalid" (click)="save()">
+      <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
+    </button>
+  </div>
+</div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
index 8e0462d084..5abf93d0aa 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
@@ -184,7 +184,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save();
 
@@ -207,7 +207,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save(false);
 
@@ -254,7 +254,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save();
 
@@ -276,7 +276,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save();
 
@@ -301,7 +301,7 @@ describe('SystemWideAlertFormComponent', () => {
       expectedAlert.message = 'New message';
       expectedAlert.active = true;
       const countDownTo = new Date(2023, 0, 25, 4, 26);
-      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
 
       comp.save();
 
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
index b30e864fa1..428839a057 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -43,6 +40,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { RequestService } from '../../core/data/request.service';
 import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { BtnDisabledDirective } from '../../shared/btn-disabled.directive';
 import {
   hasValue,
   isNotEmpty,
@@ -59,7 +57,7 @@ import { SystemWideAlert } from '../system-wide-alert.model';
   styleUrls: ['./system-wide-alert-form.component.scss'],
   templateUrl: './system-wide-alert-form.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgIf, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, UiSwitchModule, NgbDatepickerModule, NgbTimepickerModule, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class SystemWideAlertFormComponent implements OnInit {
 
@@ -252,7 +250,7 @@ export class SystemWideAlertFormComponent implements OnInit {
     alert.active = this.formActive.value;
     if (this.counterEnabled$.getValue()) {
       const countDownTo = new Date(this.date.year, this.date.month - 1, this.date.day, this.time.hour, this.time.minute);
-      alert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+      alert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toISOString();
     } else {
       alert.countdownTo = null;
     }
@@ -277,7 +275,7 @@ export class SystemWideAlertFormComponent implements OnInit {
           this.back();
         }
       } else {
-        this.notificationsService.error(this.translateService.get(`${messagePrefix}.error`, response.errorMessage));
+        this.notificationsService.error(this.translateService.get(`${messagePrefix}.error`));
       }
     });
   }
diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index e151684a01..de569270e0 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,19 +1,25 @@
 <div class="thumbnail" [class.limit-width]="limitWidth">
-  <div *ngIf="isLoading" class="thumbnail-content outer">
-    <div class="inner">
-      <div class="centered">
-        <ds-loading [spinner]="true"></ds-loading>
+  @if (isLoading) {
+    <div class="thumbnail-content outer">
+      <div class="inner">
+        <div class="centered">
+          <ds-loading [spinner]="true"></ds-loading>
+        </div>
       </div>
     </div>
-  </div>
+  }
   <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
-  <img *ngIf="src !== null" class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
-       [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
-  <div *ngIf="src === null && !isLoading" class="thumbnail-content outer">
-    <div class="inner">
-      <div class="thumbnail-placeholder centered lead">
-        {{ placeholder | translate }}
+  @if (src !== null) {
+    <img class="thumbnail-content img-fluid" [ngClass]="{'d-none': isLoading}"
+      [src]="src | dsSafeUrl" [alt]="alt | translate" (error)="errorHandler()" (load)="successHandler()">
+  }
+  @if (src === null && !isLoading) {
+    <div class="thumbnail-content outer">
+      <div class="inner">
+        <div class="thumbnail-placeholder centered lead">
+          {{ placeholder | translate }}
+        </div>
       </div>
     </div>
-  </div>
+  }
 </div>
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index 10e461112b..f81089e57c 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -2,6 +2,7 @@ import {
   DebugElement,
   Pipe,
   PipeTransform,
+  PLATFORM_ID,
 } from '@angular/core';
 import {
   ComponentFixture,
@@ -48,298 +49,261 @@ describe('ThumbnailComponent', () => {
   let authService;
   let authorizationService;
   let fileService;
+  let spy;
 
-  beforeEach(waitForAsync(() => {
-    authService = jasmine.createSpyObj('AuthService', {
-      isAuthenticated: observableOf(true),
-    });
-    authorizationService = jasmine.createSpyObj('AuthorizationService', {
-      isAuthorized: observableOf(true),
-    });
-    fileService = jasmine.createSpyObj('FileService', {
-      retrieveFileDownloadLink: null,
-    });
-    fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
-
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot(),
-        ThumbnailComponent,
-        SafeUrlPipe,
-        MockTranslatePipe,
-        VarDirective,
-      ],
-      providers: [
-        { provide: AuthService, useValue: authService },
-        { provide: AuthorizationDataService, useValue: authorizationService },
-        { provide: FileService, useValue: fileService },
-        { provide: ThemeService, useValue: getMockThemeService() },
-      ],
-    }).overrideComponent(ThumbnailComponent, {
-      add: {
-        imports: [MockTranslatePipe],
-      },
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ThumbnailComponent);
-    fixture.detectChanges();
-
-    authService = TestBed.inject(AuthService);
-
-    comp = fixture.componentInstance; // ThumbnailComponent test instance
-    de = fixture.debugElement.query(By.css('div.thumbnail'));
-    el = de.nativeElement;
-  });
-
-  describe('loading', () => {
-    it('should start out with isLoading$ true', () => {
-      expect(comp.isLoading).toBeTrue();
-    });
-
-    it('should set isLoading$ to false once an image is successfully loaded', () => {
-      comp.setSrc('http://bit.stream');
-      fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
-      expect(comp.isLoading).toBeFalse();
-    });
-
-    it('should set isLoading$ to false once the src is set to null', () => {
-      comp.setSrc(null);
-      expect(comp.isLoading).toBeFalse();
-    });
-
-    it('should show a loading animation while isLoading$ is true', () => {
-      expect(de.query(By.css('ds-loading'))).toBeTruthy();
-
-      comp.isLoading = false;
-      fixture.detectChanges();
-      expect(fixture.debugElement.query(By.css('ds-loading'))).toBeFalsy();
-    });
-
-    describe('with a thumbnail image', () => {
-      beforeEach(() => {
-        comp.src = 'https://bit.stream';
-        fixture.detectChanges();
+  describe('when platform is browser', () => {
+    beforeEach(waitForAsync(() => {
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
       });
-
-      it('should render but hide the image while loading and show it once done', () => {
-        let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeTrue();
-
-        comp.isLoading = false;
-        fixture.detectChanges();
-        img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-        expect(img).toBeTruthy();
-        expect(img.classes['d-none']).toBeFalsy();
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
       });
-
-    });
-
-    describe('without a thumbnail image', () => {
-      beforeEach(() => {
-        comp.src = null;
-        fixture.detectChanges();
+      fileService = jasmine.createSpyObj('FileService', {
+        retrieveFileDownloadLink: null,
       });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
 
-      it('should only show the HTML placeholder once done loading', () => {
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
-
-        comp.isLoading = false;
-        fixture.detectChanges();
-        expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
-      });
-    });
-
-  });
-
-  const errorHandler = () => {
-    let setSrcSpy;
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot(),
+          ThumbnailComponent,
+          SafeUrlPipe,
+          MockTranslatePipe,
+          VarDirective,
+        ],
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: ThemeService, useValue: getMockThemeService() },
+          { provide: PLATFORM_ID, useValue: 'browser' },
+        ],
+      }).overrideComponent(ThumbnailComponent, {
+        add: {
+          imports: [MockTranslatePipe],
+        },
+      })
+        .compileComponents();
+    }));
 
     beforeEach(() => {
-      // disconnect error handler to be sure it's only called once
-      const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
-      img.nativeNode.onerror = null;
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      fixture.detectChanges();
 
-      comp.ngOnChanges({});
-      setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
+      authService = TestBed.inject(AuthService);
+
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
     });
 
-    describe('retry with authentication token', () => {
-      it('should remember that it already retried once', () => {
-        expect(comp.retriedWithToken).toBeFalse();
-        comp.errorHandler();
-        expect(comp.retriedWithToken).toBeTrue();
+    describe('loading', () => {
+      it('should start out with isLoading$ true', () => {
+        expect(comp.isLoading).toBeTrue();
       });
 
-      describe('if not logged in', () => {
+      it('should set isLoading$ to false once an image is successfully loaded', () => {
+        comp.setSrc('http://bit.stream');
+        fixture.debugElement.query(By.css('img.thumbnail-content')).triggerEventHandler('load', new Event('load'));
+        expect(comp.isLoading).toBeFalse();
+      });
+
+      it('should set isLoading$ to false once the src is set to null', () => {
+        comp.setSrc(null);
+        expect(comp.isLoading).toBeFalse();
+      });
+
+      it('should show a loading animation while isLoading$ is true', () => {
+        expect(de.query(By.css('ds-loading'))).toBeTruthy();
+
+        comp.isLoading = false;
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('ds-loading'))).toBeFalsy();
+      });
+
+      describe('with a thumbnail image', () => {
         beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(false));
+          comp.src = 'https://bit.stream';
+          fixture.detectChanges();
         });
 
-        it('should fall back to default', () => {
+        it('should render but hide the image while loading and show it once done', () => {
+          let img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeTrue();
+
+          comp.isLoading = false;
+          fixture.detectChanges();
+          img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+          expect(img).toBeTruthy();
+          expect(img.classes['d-none']).toBeFalsy();
+        });
+
+      });
+
+      describe('without a thumbnail image', () => {
+        beforeEach(() => {
+          comp.src = null;
+          fixture.detectChanges();
+        });
+
+        it('should only show the HTML placeholder once done loading', () => {
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeFalsy();
+
+          comp.isLoading = false;
+          fixture.detectChanges();
+          expect(fixture.debugElement.query(By.css('div.thumbnail-placeholder'))).toBeTruthy();
+        });
+      });
+
+    });
+
+    const errorHandler = () => {
+      let setSrcSpy;
+
+      beforeEach(() => {
+        // disconnect error handler to be sure it's only called once
+        const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
+        img.nativeNode.onerror = null;
+
+        comp.ngOnChanges({});
+        setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
+      });
+
+      describe('retry with authentication token', () => {
+        it('should remember that it already retried once', () => {
+          expect(comp.retriedWithToken).toBeFalse();
           comp.errorHandler();
-          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-        });
-      });
-
-      describe('if logged in', () => {
-        beforeEach(() => {
-          authService.isAuthenticated.and.returnValue(observableOf(true));
+          expect(comp.retriedWithToken).toBeTrue();
         });
 
-        describe('and authorized to download the thumbnail', () => {
+        describe('if not logged in', () => {
           beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(true));
-          });
-
-          it('should add an authentication token to the thumbnail URL', () => {
-            comp.errorHandler();
-
-            if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              // If we failed to retrieve the Bitstream in the first place, fall back to the default
-              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-            } else {
-              expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
-            }
-          });
-        });
-
-        describe('but not authorized to download the thumbnail', () => {
-          beforeEach(() => {
-            authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            authService.isAuthenticated.and.returnValue(observableOf(false));
           });
 
           it('should fall back to default', () => {
             comp.errorHandler();
-
             expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-
-            // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
-            if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
-              expect(authorizationService.isAuthorized).toHaveBeenCalled();
-            }
           });
         });
+
+        describe('if logged in', () => {
+          beforeEach(() => {
+            authService.isAuthenticated.and.returnValue(observableOf(true));
+          });
+
+          describe('and authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(true));
+            });
+
+            it('should add an authentication token to the thumbnail URL', () => {
+              comp.errorHandler();
+
+              if ((comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                // If we failed to retrieve the Bitstream in the first place, fall back to the default
+                expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+              } else {
+                expect(setSrcSpy).toHaveBeenCalledWith(CONTENT + '?authentication-token=fake');
+              }
+            });
+          });
+
+          describe('but not authorized to download the thumbnail', () => {
+            beforeEach(() => {
+              authorizationService.isAuthorized.and.returnValue(observableOf(false));
+            });
+
+            it('should fall back to default', () => {
+              comp.errorHandler();
+
+              expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+
+              // We don't need to check authorization if we failed to retrieve the Bitstreamin the first place
+              if (!(comp.thumbnail as RemoteData<Bitstream>)?.hasFailed) {
+                expect(authorizationService.isAuthorized).toHaveBeenCalled();
+              }
+            });
+          });
+        });
+      });
+
+      describe('after retrying with token', () => {
+        beforeEach(() => {
+          comp.retriedWithToken = true;
+        });
+
+        it('should fall back to default', () => {
+          comp.errorHandler();
+          expect(authService.isAuthenticated).not.toHaveBeenCalled();
+          expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
+          expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
+        });
+      });
+    };
+
+    describe('fallback', () => {
+      describe('if there is a default image', () => {
+        it('should display the default image', () => {
+          comp.src = 'http://bit.stream';
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+          expect(comp.src).toBe(comp.defaultImage);
+        });
+
+        it('should include the alt text', () => {
+          comp.src = 'http://bit.stream';
+          comp.defaultImage = 'http://default.img';
+          comp.errorHandler();
+
+          fixture.detectChanges();
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
+          expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+        });
+      });
+
+      describe('if there is no default image', () => {
+        it('should display the HTML placeholder', () => {
+          comp.src = 'http://default.img';
+          comp.defaultImage = null;
+          comp.errorHandler();
+          expect(comp.src).toBe(null);
+
+          fixture.detectChanges();
+          const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
+          expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
+        });
       });
     });
 
-    describe('after retrying with token', () => {
+    describe('with thumbnail as Bitstream', () => {
+      let thumbnail;
       beforeEach(() => {
-        comp.retriedWithToken = true;
-      });
-
-      it('should fall back to default', () => {
-        comp.errorHandler();
-        expect(authService.isAuthenticated).not.toHaveBeenCalled();
-        expect(fileService.retrieveFileDownloadLink).not.toHaveBeenCalled();
-        expect(setSrcSpy).toHaveBeenCalledWith(comp.defaultImage);
-      });
-    });
-  };
-
-  describe('fallback', () => {
-    describe('if there is a default image', () => {
-      it('should display the default image', () => {
-        comp.src = 'http://bit.stream';
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-        expect(comp.src).toBe(comp.defaultImage);
-      });
-
-      it('should include the alt text', () => {
-        comp.src = 'http://bit.stream';
-        comp.defaultImage = 'http://default.img';
-        comp.errorHandler();
-
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if there is no default image', () => {
-      it('should display the HTML placeholder', () => {
-        comp.src = 'http://default.img';
-        comp.defaultImage = null;
-        comp.errorHandler();
-        expect(comp.src).toBe(null);
-
-        fixture.detectChanges();
-        const placeholder = fixture.debugElement.query(By.css('div.thumbnail-placeholder')).nativeElement;
-        expect(placeholder.innerHTML).toContain('TRANSLATED ' + comp.placeholder);
-      });
-    });
-  });
-
-  describe('with thumbnail as Bitstream', () => {
-    let thumbnail;
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined,
-      };
-      comp.thumbnail = thumbnail;
-    });
-
-    describe('if content can be loaded', () => {
-      it('should display an image', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
-      });
-
-      it('should include the alt text', () => {
-        comp.ngOnChanges({});
-        fixture.detectChanges();
-        const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
-        expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
-      });
-    });
-
-    describe('if content can\'t be loaded', () => {
-      errorHandler();
-    });
-  });
-
-  describe('with thumbnail as RemoteData<Bitstream>', () => {
-    let thumbnail: Bitstream;
-
-    beforeEach(() => {
-      thumbnail = new Bitstream();
-      thumbnail._links = {
-        self: { href: 'self.url' },
-        bundle: { href: 'bundle.url' },
-        format: { href: 'format.url' },
-        content: { href: CONTENT },
-        thumbnail: undefined,
-      };
-    });
-
-    describe('if RemoteData succeeded', () => {
-      beforeEach(() => {
-        comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+          thumbnail: undefined,
+        };
+        comp.thumbnail = thumbnail;
       });
 
       describe('if content can be loaded', () => {
         it('should display an image', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
         });
 
-        it('should display the alt text', () => {
+        it('should include the alt text', () => {
           comp.ngOnChanges({});
           fixture.detectChanges();
-          const image: HTMLElement = de.query(By.css('img')).nativeElement;
+          const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
           expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
         });
       });
@@ -349,16 +313,117 @@ describe('ThumbnailComponent', () => {
       });
     });
 
-    describe('if RemoteData failed', () => {
+    describe('with thumbnail as RemoteData<Bitstream>', () => {
+      let thumbnail: Bitstream;
+
       beforeEach(() => {
-        comp.thumbnail = createFailedRemoteDataObject();
+        thumbnail = new Bitstream();
+        thumbnail._links = {
+          self: { href: 'self.url' },
+          bundle: { href: 'bundle.url' },
+          format: { href: 'format.url' },
+          content: { href: CONTENT },
+          thumbnail: undefined,
+        };
       });
 
-      it('should show the default image', () => {
-        comp.defaultImage = 'default/image.jpg';
-        comp.ngOnChanges({});
-        expect(comp.src).toBe('default/image.jpg');
+      describe('if RemoteData succeeded', () => {
+        beforeEach(() => {
+          comp.thumbnail = createSuccessfulRemoteDataObject(thumbnail);
+        });
+
+        describe('if content can be loaded', () => {
+          it('should display an image', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('src')).toBe(thumbnail._links.content.href);
+          });
+
+          it('should display the alt text', () => {
+            comp.ngOnChanges({});
+            fixture.detectChanges();
+            const image: HTMLElement = de.query(By.css('img')).nativeElement;
+            expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
+          });
+        });
+
+        describe('if content can\'t be loaded', () => {
+          errorHandler();
+        });
+      });
+
+      describe('if RemoteData failed', () => {
+        beforeEach(() => {
+          comp.thumbnail = createFailedRemoteDataObject();
+        });
+
+        it('should show the default image', () => {
+          comp.defaultImage = 'default/image.jpg';
+          comp.ngOnChanges({});
+          expect(comp.src).toBe('default/image.jpg');
+        });
       });
     });
   });
+
+  describe('when platform is server', () => {
+    beforeEach(waitForAsync(() => {
+
+      authService = jasmine.createSpyObj('AuthService', {
+        isAuthenticated: observableOf(true),
+      });
+      authorizationService = jasmine.createSpyObj('AuthorizationService', {
+        isAuthorized: observableOf(true),
+      });
+      fileService = jasmine.createSpyObj('FileService', {
+        retrieveFileDownloadLink: null,
+      });
+      fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
+
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot(),
+          ThumbnailComponent,
+          SafeUrlPipe,
+          MockTranslatePipe,
+          VarDirective,
+        ],
+        providers: [
+          { provide: AuthService, useValue: authService },
+          { provide: AuthorizationDataService, useValue: authorizationService },
+          { provide: FileService, useValue: fileService },
+          { provide: ThemeService, useValue: getMockThemeService() },
+          { provide: PLATFORM_ID, useValue: 'server' },
+        ],
+      }).overrideComponent(ThumbnailComponent, {
+        add: {
+          imports: [MockTranslatePipe],
+        },
+      })
+        .compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ThumbnailComponent);
+      spyOn(fixture.componentInstance, 'setSrc').and.callThrough();
+      fixture.detectChanges();
+
+      authService = TestBed.inject(AuthService);
+
+      comp = fixture.componentInstance; // ThumbnailComponent test instance
+      de = fixture.debugElement.query(By.css('div.thumbnail'));
+      el = de.nativeElement;
+    });
+
+    it('should start out with isLoading$ true', () => {
+      expect(comp.isLoading).toBeTrue();
+      expect(de.query(By.css('ds-loading'))).toBeTruthy();
+    });
+
+    it('should not call setSrc', () => {
+      expect(comp.setSrc).not.toHaveBeenCalled();
+    });
+
+  });
 });
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index cc583c3998..7b22dde4cd 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -1,8 +1,13 @@
-import { CommonModule } from '@angular/common';
+import {
+  CommonModule,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   Component,
+  Inject,
   Input,
   OnChanges,
+  PLATFORM_ID,
   SimpleChanges,
 } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -76,6 +81,7 @@ export class ThumbnailComponent implements OnChanges {
   isLoading = true;
 
   constructor(
+    @Inject(PLATFORM_ID) private platformID: any,
     protected auth: AuthService,
     protected authorizationService: AuthorizationDataService,
     protected fileService: FileService,
@@ -87,16 +93,18 @@ export class ThumbnailComponent implements OnChanges {
    * Use a default image if no actual image is available.
    */
   ngOnChanges(changes: SimpleChanges): void {
-    if (hasNoValue(this.thumbnail)) {
-      this.setSrc(this.defaultImage);
-      return;
-    }
+    if (isPlatformBrowser(this.platformID)) {
+      if (hasNoValue(this.thumbnail)) {
+        this.setSrc(this.defaultImage);
+        return;
+      }
 
-    const src = this.contentHref;
-    if (hasValue(src)) {
-      this.setSrc(src);
-    } else {
-      this.setSrc(this.defaultImage);
+      const src = this.contentHref;
+      if (hasValue(src)) {
+        this.setSrc(src);
+      } else {
+        this.setSrc(this.defaultImage);
+      }
     }
   }
 
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
index aca9b4da73..4fe2049d97 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
@@ -1,43 +1,56 @@
 <div *ngVar="getAdvancedInfo(workflowAction$ | async) as advancedInfo">
-  <p *ngIf="advancedInfo?.descriptionRequired">
-    {{ 'advanced-workflow-action.rating.description-requiredDescription' | translate }}
-  </p>
-  <p *ngIf="!advancedInfo?.descriptionRequired">
-    {{ 'advanced-workflow-action.rating.description' | translate }}
-  </p>
+  @if (advancedInfo?.descriptionRequired) {
+    <p>
+      {{ 'advanced-workflow-action.rating.description-requiredDescription' | translate }}
+    </p>
+  }
+  @if (!advancedInfo?.descriptionRequired) {
+    <p>
+      {{ 'advanced-workflow-action.rating.description' | translate }}
+    </p>
+  }
 
-  <form (ngSubmit)="performAction()" *ngIf="ratingForm" [formGroup]="ratingForm">
-    <div class="form-group">
-      <label class="control-label">
-        <span>{{ 'advanced-workflow-action.rating.form.review.label' | translate }}</span>
-        <span *ngIf="advancedInfo?.descriptionRequired">*</span>
-      </label>
-      <textarea [ngClass]="{ 'is-invalid' : isInvalid('review') }"
-                [required]="advancedInfo?.descriptionRequired" class="form-control" formControlName="review">
-      </textarea>
-      <small *ngIf="isInvalid('review')" class="invalid-feedback d-block">
-        {{ 'advanced-workflow-action.rating.form.review.error' | translate }}
-      </small>
-    </div>
-
-    <div class="form-group">
-      <label class="control-label mb-1">
-        {{ 'advanced-workflow-action.rating.form.rating.label' | translate }}*
-      </label>
-      <div class="d-block">
-        <ngb-rating [max]="advancedInfo?.maxValue" [ngClass]="{ 'text-danger': isInvalid('rating') }"
-                    formControlName="rating">
-        </ngb-rating>
+  @if (ratingForm) {
+    <form (ngSubmit)="performAction()" [formGroup]="ratingForm">
+      <div class="mb-3">
+        <label class="control-label">
+          <span>{{ 'advanced-workflow-action.rating.form.review.label' | translate }}</span>
+          @if (advancedInfo?.descriptionRequired) {
+            <span>*</span>
+          }
+        </label>
+        <textarea [ngClass]="{ 'is-invalid' : isInvalid('review') }"
+          [required]="advancedInfo?.descriptionRequired" class="form-control" formControlName="review">
+        </textarea>
+        @if (isInvalid('review')) {
+          <small class="invalid-feedback d-block">
+            {{ 'advanced-workflow-action.rating.form.review.error' | translate }}
+          </small>
+        }
       </div>
-      <small *ngIf="isInvalid('rating')" class="invalid-feedback d-block">
-        {{ 'advanced-workflow-action.rating.form.rating.error' | translate }}
-      </small>
-    </div>
-  </form>
+      <div class="mb-3">
+        <label class="control-label mb-1">
+          {{ 'advanced-workflow-action.rating.form.rating.label' | translate }}*
+        </label>
+        <div class="d-block">
+          <ngb-rating [max]="advancedInfo?.maxValue" [ngClass]="{ 'text-danger': isInvalid('rating') }"
+            formControlName="rating">
+          </ngb-rating>
+        </div>
+        @if (isInvalid('rating')) {
+          <small class="invalid-feedback d-block">
+            {{ 'advanced-workflow-action.rating.form.rating.error' | translate }}
+          </small>
+        }
+      </div>
+    </form>
+  }
 
-  <ds-modify-item-overview *ngIf="item$ | async"
-                           [item]="item$ | async">
-  </ds-modify-item-overview>
+  @if (item$ | async) {
+    <ds-modify-item-overview
+      [item]="item$ | async">
+    </ds-modify-item-overview>
+  }
 
   <div class="d-flex flex-wrap justify-content-end">
     <button (click)="previousPage()" class="btn btn-default">
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
index b8620e7d89..1e12a6390c 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -35,7 +34,6 @@ export const ADVANCED_WORKFLOW_ACTION_RATING = 'scorereviewaction';
   preserveWhitespaces: false,
   imports: [
     ModifyItemOverviewComponent,
-    NgIf,
     AsyncPipe,
     TranslateModule,
     NgbRatingModule,
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
index d4ac620811..2d7a7ff8cd 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
@@ -1,22 +1,32 @@
 <div>
-  <p *ngIf="multipleReviewers">{{ 'advanced-workflow-action.select-reviewer.description-multiple' | translate }}</p>
-  <p *ngIf="!multipleReviewers">{{ 'advanced-workflow-action.select-reviewer.description-single' | translate }}</p>
+  @if (multipleReviewers) {
+    <p>{{ 'advanced-workflow-action.select-reviewer.description-multiple' | translate }}</p>
+  }
+  @if (!multipleReviewers) {
+    <p>{{ 'advanced-workflow-action.select-reviewer.description-single' | translate }}</p>
+  }
 
-  <ds-reviewers-list *ngIf="groupId !== undefined"
-                     [actionConfig]="reviewersListActionConfig"
-                     [groupId]="groupId"
-                     [ngClass]="groupId ? 'reviewersListWithGroup' : ''"
-                     [multipleReviewers]="multipleReviewers"
-                     (selectedReviewersUpdated)="selectedReviewers = $event; displayError = false"
-                     messagePrefix="advanced-workflow-action-select-reviewer.groups.form.reviewers-list"
-  ></ds-reviewers-list>
-  <small *ngIf="displayError" class="invalid-feedback d-block mb-3">
-    {{ 'advanced-workflow-action.select-reviewer.no-reviewer-selected.error' | translate }}
-  </small>
+  @if (groupId !== undefined) {
+    <ds-reviewers-list
+      [actionConfig]="reviewersListActionConfig"
+      [groupId]="groupId"
+      [ngClass]="groupId ? 'reviewersListWithGroup' : ''"
+      [multipleReviewers]="multipleReviewers"
+      (selectedReviewersUpdated)="selectedReviewers = $event; displayError = false"
+      messagePrefix="advanced-workflow-action-select-reviewer.groups.form.reviewers-list"
+    ></ds-reviewers-list>
+  }
+  @if (displayError) {
+    <small class="invalid-feedback d-block mb-3">
+      {{ 'advanced-workflow-action.select-reviewer.no-reviewer-selected.error' | translate }}
+    </small>
+  }
 
-  <ds-modify-item-overview *ngIf="item$ | async"
-                           [item]="item$ | async">
-  </ds-modify-item-overview>
+  @if (item$ | async) {
+    <ds-modify-item-overview
+      [item]="item$ | async">
+    </ds-modify-item-overview>
+  }
 
   <div class="d-flex flex-wrap justify-content-end">
     <button class="btn btn-default" (click)="previousPage()">
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
index 5ae3a13f31..1644d22697 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   Component,
@@ -44,6 +42,7 @@ import { EpersonDtoModel } from '../../../../core/eperson/models/eperson-dto.mod
 import { Group } from '../../../../core/eperson/models/group.model';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
+import { BtnDisabledDirective } from '../../../../shared/btn-disabled.directive';
 import { ContextHelpDirective } from '../../../../shared/context-help.directive';
 import { hasValue } from '../../../../shared/empty.util';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
@@ -71,11 +70,10 @@ enum SubKey {
     ContextHelpDirective,
     ReactiveFormsModule,
     PaginationComponent,
-    NgIf,
     AsyncPipe,
     RouterLink,
     NgClass,
-    NgForOf,
+    BtnDisabledDirective,
   ],
 })
 export class ReviewersListComponent extends MembersListComponent implements OnInit, OnChanges, OnDestroy {
diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.html b/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
index 76808c7e14..cd858b01e4 100644
--- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
+++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
@@ -1,6 +1,8 @@
 <div class="container" *ngVar="item$ | async as item">
-    <h2>{{'workflow-item.' + type + '.header' | translate}}</h2>
-    <ds-modify-item-overview *ngIf="item" [item]="item"></ds-modify-item-overview>
-    <button class="btn btn-default" (click)="previousPage()">{{'workflow-item.' + type + '.button.cancel' | translate}}</button>
-    <button class="btn btn-danger" (click)="performAction()">{{'workflow-item.' + type + '.button.confirm' | translate}}</button>
+  <h2>{{'workflow-item.' + type + '.header' | translate}}</h2>
+  @if (item) {
+    <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
+  }
+  <button class="btn btn-default" (click)="previousPage()">{{'workflow-item.' + type + '.button.cancel' | translate}}</button>
+  <button class="btn btn-danger" (click)="performAction()">{{'workflow-item.' + type + '.button.confirm' | translate}}</button>
 </div>
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
index 75c265b420..8b8dda97b7 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
@@ -1,6 +1,8 @@
 <div class="container">
   <h1>{{ 'workspace-item.delete.header' | translate }}</h1>
-  <ds-modify-item-overview *ngIf="(dso$ | async)" [item]="$any(dso$ | async)"></ds-modify-item-overview>
+  @if ((dso$ | async)) {
+    <ds-modify-item-overview [item]="$any(dso$ | async)"></ds-modify-item-overview>
+  }
   <button class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
   <button class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
 </div>
@@ -8,8 +10,7 @@
 <ng-template #content let-c="close" let-d="dismiss" id="delete-modal">
   <div class="modal-header">
     <div class="modal-title text-danger h4">{{ 'workspace-item.delete.header' | translate }}</div>
-    <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
-      <span aria-hidden="true">&times;</span>
+    <button type="button" id="delete_close" class="btn-close" aria-label="Close" (click)="d('cancel')">
     </button>
   </div>
   <div class="modal-body">
@@ -17,8 +18,8 @@
   </div>
   <div class="modal-footer">
     <button type="button" id="delete_cancel" class="btn btn-secondary"
-      (click)="c('cancel')">{{ 'submission.general.discard.confirm.cancel' | translate }}</button>
+    (click)="c('cancel')">{{ 'submission.general.discard.confirm.cancel' | translate }}</button>
     <button type="button" id="delete_confirm" class="btn btn-danger"
-      (click)="c('ok')">{{ 'submission.general.discard.confirm.submit' | translate }}</button>
+    (click)="c('ok')">{{ 'submission.general.discard.confirm.submit' | translate }}</button>
   </div>
 </ng-template>
diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
index c382a90a81..019cef8dab 100644
--- a/src/assets/i18n/ca.json5
+++ b/src/assets/i18n/ca.json5
@@ -6,10 +6,8 @@
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Porta'm a la pàgina d'inici",
 
-  // "401.unauthorized": "unauthorized",
-  "401.unauthorized": "no autoritzat",
-
-
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "No autoritzat",
 
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
   "403.help": "No teniu permisos per accedir a aquesta pàgina. Podeu utilitzar el botó de sota per tornar a la pàgina inicial.",
@@ -17,10 +15,10 @@
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Porta'm a la pàgina d'inici",
 
-  // "403.forbidden": "forbidden",
-  "403.forbidden": "prohibit",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "Prohibit",
 
-  // "500.page-internal-server-error": "Service Unavailable",
+  // "500.page-internal-server-error": "Service unavailable",
   "500.page-internal-server-error": "Servei no disponible",
 
   // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
@@ -29,27 +27,26 @@
   // "500.link.home-page": "Take me to the home page",
   "500.link.home-page": "Porta'm a la pàgina d'inici",
 
-
   // "404.help": "We can't find the page you're looking for. The page may have been moved or deleted. You can use the button below to get back to the home page. ",
   "404.help": "No podem trobar la pàgina que busqueu. La pàgina pot haver estat moguda o eliminada. Podeu utilitzar el botó de sota per tornar a la pàgina d'inici. ",
 
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Porta'm a la pàgina d'inici",
 
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "pàgina no trobada",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "Pàgina no trobada",
 
-  // "error-page.description.401": "unauthorized",
-  "error-page.description.401": "no autoritzat",
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "No autoritzat",
 
-  // "error-page.description.403": "forbidden",
-  "error-page.description.403": "prohibit",
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "Prohibit",
 
-  // "error-page.description.500": "Service Unavailable",
+  // "error-page.description.500": "Service unavailable",
   "error-page.description.500": "Servei no disponible",
 
-  // "error-page.description.404": "page not found",
-  "error-page.description.404": "pàgina no trobada",
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "Pàgina no trobada",
 
   // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
   "error-page.orcid.generic-error": "S'ha produït un error al login via ORCID. Assegureu-vos que heu compartit el correu electrònic del vostre compte ORCID amb Dspace. Si l'error continua, contacteu amb l'administrador",
@@ -90,7 +87,7 @@
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Fallada",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
   "admin.registries.bitstream-formats.create.head": "Crear format de fitxer",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
@@ -194,7 +191,11 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nom",
-  // "admin.registries.bitstream-formats.table.id" : "ID",
+
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "Formats de fitxer seleccionats",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
@@ -215,7 +216,11 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registre de format Fitxer",
 
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "Seleccionar",
 
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "Deseleccionar",
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registre de metadades",
@@ -241,9 +246,18 @@
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "No hi ha esquemes de metadades per mostrar.",
 
+  // "admin.registries.metadata.schemas.select": "Select",
+  "admin.registries.metadata.schemas.select": "Seleccionar",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "Deseleccionar",
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionat",
 
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "Esquemes seleccionats",
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
 
@@ -256,14 +270,18 @@
   // "admin.registries.metadata.title": "Metadata Registry",
   "admin.registries.metadata.title": "Registre de metadades",
 
-
-
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Esquema de metadades",
 
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Aquest és l'esquema de metadades per a \"{{ namespace }}\".",
 
+  // "admin.registries.schema.fields.select": "Select",
+  "admin.registries.schema.fields.select": "Seleccionar",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "Deseleccionar",
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Camps de metadades de l'esquema",
 
@@ -275,7 +293,11 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Camp",
-  // "admin.registries.schema.fields.table.id" : "ID",
+
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "Camps de metadades seleccionats",
+
+  // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
@@ -335,7 +357,29 @@
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Registre d'esquemes de metadades",
 
+  // "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
+  "admin.access-control.bulk-access.breadcrumbs": "Gestió d'accés massiu",
 
+  // "administrativeBulkAccess.search.results.head": "Search Results",
+  "administrativeBulkAccess.search.results.head": "Resultats de la cerca",
+
+  // "admin.access-control.bulk-access": "Bulk Access Management",
+  "admin.access-control.bulk-access": "Gestió d'accés massiu",
+
+  // "admin.access-control.bulk-access.title": "Bulk Access Management",
+  "admin.access-control.bulk-access.title": "Gestió d'accés massiu",
+
+  // "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+  "admin.access-control.bulk-access-browse.header": "Pas 1: Seleccionar objectes",
+
+  // "admin.access-control.bulk-access-browse.search.header": "Search",
+  "admin.access-control.bulk-access-browse.search.header": "Cerca",
+
+  // "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+  "admin.access-control.bulk-access-browse.selected.header": "Selecció actual({{number}})",
+
+  // "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
+  "admin.access-control.bulk-access-settings.header": "Pas 2: Operació a realitzar",
 
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Eliminar usuari",
@@ -355,6 +399,18 @@
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "Usuaris",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nou usuari",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nou usuari",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Afegir usuari",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Afegir usuari",
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Usuaris",
 
@@ -367,7 +423,7 @@
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metadades",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "Correu electrònic (exacte)",
 
   // "admin.access-control.epeople.search.button": "Search",
@@ -385,7 +441,7 @@
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Nom",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
   "admin.access-control.epeople.table.email": "Correu electrònic (exacte)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
@@ -415,10 +471,10 @@
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Cognoms",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
+  // "admin.access-control.epeople.form.email": "Email",
   "admin.access-control.epeople.form.email": "Correu electrònic",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
   "admin.access-control.epeople.form.emailHint": "Ha de ser una adreça de correu electrònic vàlida",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
@@ -472,14 +528,12 @@
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Afegir a grups",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "No s'ha pogut esborrar l'usuari: \"{{ name }}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "S'ha produït un error en intentar eliminar l'usuari amb id \"{{id}}\" amb codi: \"{{statusCode}}\" i missatge: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Usuari eliminat correctament: \"{{ name }}\"",
 
-
-
   // "admin.access-control.groups.title": "Groups",
   "admin.access-control.groups.title": "Grups",
 
@@ -549,8 +603,6 @@
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "Causa: \"{{ cause }}\"",
 
-
-
   // "admin.access-control.groups.form.alert.permanent": "This group is permanent, so it can't be edited or deleted. You can still add and remove group members using this page.",
   "admin.access-control.groups.form.alert.permanent": "Aquest grup és permanent, per la qual cosa no es pot editar ni eliminar. Però podeu afegir i eliminar membres del grup utilitzant aquesta pàgina.",
 
@@ -626,12 +678,6 @@
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Membres actuals",
 
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadades",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  "admin.access-control.groups.form.members-list.search.scope.email": "Correu electrònic (exacte)",
-
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Cerca",
 
@@ -716,9 +762,6 @@
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Afegir subgrup amb el nom \"{{ name }}\"",
 
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grup actual",
-
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrup afegit correctament: \"{{ name }}\"",
 
@@ -746,410 +789,328 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Enrere",
 
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Assegurament de la Qualitat",
 
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Suggeriments d'Assegurament de la Qualitat",
 
-  //"admin.reports.collections.title": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.title": "Collection Filter Report",
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Suggeriments d'Assegurament de la Qualitat",
 
-  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Assegurament de la Qualitat",
 
-  //"admin.reports.collections.head": "Collection Filter Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.head": "Collection Filter Report",
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Assegurament de la Qualitat",
 
-  //"admin.reports.button.show-collections": "Show Collections",
-  // TODO New key - Add a translation
-  "admin.reports.button.show-collections": "Show Collections",
+  // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
+  "admin.access-control.groups.form.tooltip.editGroupPage": "En aquesta pàgina, podeu modificar les propietats i els membres d'un grup. A la secció superior, podeu editar el nom i la descripció del grup, tret que sigui un grup d'administració d'una col·lecció o comunitat, en aquest cas el nom i la descripció del grup es generen automàticament i no es poden editar. A les seccions següents, podeu editar la pertinença al grup. Consulteu [el wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) per a més detalls.",
 
-  //"admin.reports.collections.collections-report": "Collection Report",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collections-report": "Collection Report",
+  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Per afegir o eliminar un usuari d'aquest grup, feu clic al botó 'Examinar tot' o utilitzeu la barra de cerca a continuació per cercar usuaris (utilitzeu el menú desplegable a l'esquerra de la barra de cerca per triar si voleu cercar per metadades o per correu electrònic). A continuació, feu clic a la icona de més per a cada usuari que vulgueu afegir a la llista següent, o a la icona de la paperera per a cada usuari que vulgueu eliminar. La llista següent pot tenir diverses pàgines: utilitzeu els controls de pàgina a sota de la llista per navegar a les pàgines següents.",
 
-  //"admin.reports.collections.item-results": "Item Results",
-  // TODO New key - Add a translation
-  "admin.reports.collections.item-results": "Item Results",
+  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Per afegir o eliminar un subgrup d'aquest grup, feu clic al botó 'Examinar tot' o utilitzeu la barra de cerca a continuació per cercar grups. A continuació, feu clic a la icona de més per a cada grup que vulgueu afegir a la llista següent, o a la icona de la paperera per a cada grup que vulgueu eliminar. La llista següent pot tenir diverses pàgines: utilitzeu els controls de pàgina a sota de la llista per navegar a les pàgines següents.",
 
-  //"admin.reports.collections.community": "Community",
-  // TODO New key - Add a translation
-  "admin.reports.collections.community": "Community",
+  // "admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Informe de filtre de col·lecció",
 
-  //"admin.reports.collections.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.collections.collection": "Collection",
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Informe de filtre de col·lecció",
 
-  //"admin.reports.collections.nb_items": "Nb. Items",
-  // TODO New key - Add a translation
-  "admin.reports.collections.nb_items": "Nb. Items",
+  // "admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Informe de filtre de col·lecció",
 
-  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-  // TODO New key - Add a translation
-  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  // "admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Mostrar col·leccions",
 
+  // "admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Informe de col·lecció",
 
-  //"admin.reports.items.title": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Metadata Query Report",
+  // "admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Resultats d'ítems",
 
-  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // "admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Comunitat",
 
-  //"admin.reports.items.head": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.head": "Metadata Query Report",
+  // "admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Col·lecció",
 
-  //"admin.reports.items.run": "Run Item Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.run": "Run Item Query",
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "Nb. Ítems",
 
-  //"admin.reports.items.section.collectionSelector": "Collection Selector",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.collectionSelector": "Collection Selector",
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Coincidint amb tots els filtres seleccionats",
 
-  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Informe de consulta de metadades",
 
-  //"admin.reports.items.predefinedQueries": "Predefined Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.predefinedQueries": "Predefined Queries",
+  // "admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Informe de consulta de metadades",
 
-  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-  // TODO New key - Add a translation
-  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // "admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Executar consulta d'ítems",
 
-  //"admin.reports.items.limit": "Limit/",
-  // TODO New key - Add a translation
-  "admin.reports.items.limit": "Limit/",
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Selector de col·lecció",
 
-  //"admin.reports.items.wholeRepo": "Whole Repository",
-  // TODO New key - Add a translation
-  "admin.reports.items.wholeRepo": "Whole Repository",
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Consultes de camps de metadades",
 
-  //"admin.reports.items.anyField": "Any field",
-  // TODO New key - Add a translation
-  "admin.reports.items.anyField": "Any field",
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Consultes predefinides",
 
-  //"admin.reports.items.predicate.exists": "exists",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.exists": "exists",
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Consulta paginada",
 
-  //"admin.reports.items.predicate.doesNotExist": "does not exist",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotExist": "does not exist",
+  // "admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Límit/",
 
-  //"admin.reports.items.predicate.equals": "equals",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.equals": "equals",
+  // "admin.reports.items.offset": "Offset",
+  "admin.reports.items.offset": "Desplaçament",
 
-  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Tot el repositori",
 
-  //"admin.reports.items.predicate.like": "like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.like": "like",
+  // "admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Qualsevol camp",
 
-  //"admin.reports.items.predicate.notLike": "not like",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.notLike": "not like",
+  // "admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existeix",
 
-  //"admin.reports.items.predicate.contains": "contains",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.contains": "contains",
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "no existeix",
 
-  //"admin.reports.items.predicate.doesNotContain": "does not contain",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotContain": "does not contain",
+  // "admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "igual a",
 
-  //"admin.reports.items.predicate.matches": "matches",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.matches": "matches",
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "no és igual a",
 
-  //"admin.reports.items.predicate.doesNotMatch": "does not match",
-  // TODO New key - Add a translation
-  "admin.reports.items.predicate.doesNotMatch": "does not match",
+  // "admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "com",
 
-  //"admin.reports.items.preset.new": "New Query",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.new": "New Query",
+  // "admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "no com",
 
-  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // "admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "conté",
 
-  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "no conté",
 
-  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // "admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "coincideix",
 
-  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "no coincideix",
 
-  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  // "admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nova consulta",
 
-  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "No té títol",
 
-  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "No té dc.identifier.uri",
 
-  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "Té matèria composta",
 
-  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "Té autor compost dc.contributor.author",
 
-  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "Té creador compost dc.creator",
 
-  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "Té URL a dc.description",
 
-  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-  // TODO New key - Add a translation
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "Té text complet a dc.description.provenance",
 
-  //"admin.reports.items.number": "No.",
-  // TODO New key - Add a translation
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "Té text no complet a dc.description.provenance",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "Té metadades buides",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Té metadades ininterrompudes a la descripció",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Té entitat XML a les metadades",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Té caràcter no ASCII a les metadades",
+
+  // "admin.reports.items.number": "No.",
   "admin.reports.items.number": "No.",
 
-  //"admin.reports.items.id": "UUID",
-  // TODO New key - Add a translation
+  // "admin.reports.items.id": "UUID",
   "admin.reports.items.id": "UUID",
 
-  //"admin.reports.items.collection": "Collection",
-  // TODO New key - Add a translation
-  "admin.reports.items.collection": "Collection",
+  // "admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Col·lecció",
 
-  //"admin.reports.items.handle": "URI",
-  // TODO New key - Add a translation
+  // "admin.reports.items.handle": "URI",
   "admin.reports.items.handle": "URI",
 
-  //"admin.reports.items.title": "Title",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Title",
+  // "admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Títol",
 
 
-  //"admin.reports.commons.filters": "Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters": "Filters",
+  // "admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtres",
 
-  //"admin.reports.commons.additional-data": "Additional data to return",
-  // TODO New key - Add a translation
-  "admin.reports.commons.additional-data": "Additional data to return",
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Dades addicionals a retornar",
 
-  //"admin.reports.commons.previous-page": "Prev Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.previous-page": "Prev Page",
+  // "admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Pàgina anterior",
 
-  //"admin.reports.commons.next-page": "Next Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.next-page": "Next Page",
+  // "admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Pàgina següent",
 
-  //"admin.reports.commons.page": "Page",
-  // TODO New key - Add a translation
-  "admin.reports.commons.page": "Page",
+  // "admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Pàgina",
 
-  //"admin.reports.commons.of": "of",
-  // TODO New key - Add a translation
-  "admin.reports.commons.of": "of",
+  // "admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
 
-  //"admin.reports.commons.export": "Export for Metadata Update",
-  // TODO New key - Add a translation
-  "admin.reports.commons.export": "Export for Metadata Update",
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exportar per a l'actualització de metadades",
 
-  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "Deseleccionar tots els filtres",
 
-  //"admin.reports.commons.filters.select_all": "Select all filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.select_all": "Select all filters",
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "Seleccionar tots els filtres",
 
-  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Coincideix amb tots els filtres especificats",
 
 
-  //"admin.reports.commons.filters.property": "Item Property Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property": "Item Property Filters",
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtres de propietats d'ítems",
 
-  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "És ítem - sempre cert",
 
-  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Ítems retirats",
 
-  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Ítems disponibles - No retirats",
 
-  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Ítems descobribles - No privats",
 
-  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "No descobrible - Ítem privat",
 
-  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtres bàsics de fitxers",
 
-  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "L'ítem té múltiples fitxers originals",
 
-  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "L'ítem no té fitxers originals",
 
-  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "L'ítem té un fitxer original",
 
-  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtres de fitxers per tipus MIME",
 
-  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "L'ítem té un fitxer original de document (PDF, Office, Text, HTML, XML, etc)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "L'ítem té un fitxer original d'imatge",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Té altres tipus de fitxers (no document o imatge)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "L'ítem té múltiples tipus de fitxers originals (document, imatge, altres)",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "L'ítem té un fitxer original PDF",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "L'ítem té un fitxer original JPG",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Té un PDF inusualment petit",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Té un PDF inusualment gran",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Té fitxer de document sense ítem de TEXT",
 
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtres de tipus MIME suportats",
 
-  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Els fitxers d'imatge de l'ítem són suportats",
 
-  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "L'ítem té un fitxer d'imatge que no és suportat",
 
-  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Els fitxers de document de l'ítem són suportats",
 
-  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "L'ítem té un fitxer de document que no és suportat",
 
-  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtres de paquets de fitxers",
 
-  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Té fitxer en un paquet no suportat",
 
-  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Té una miniatura inusualment petita",
 
-  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Té fitxer original sense miniatura",
 
-  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Té un nom de miniatura invàlid (suposa una miniatura per a cada original)",
 
-  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Té una miniatura no generada",
 
-  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "No té llicència",
 
-  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Té documentació en el paquet de llicència",
 
-  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtres de permisos",
 
-  //"admin.reports.commons.filters.permission": "Permission Filters",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission": "Permission Filters",
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "L'ítem té un fitxer original restringit",
 
-  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "L'ítem té almenys un fitxer original que no és accessible per a l'usuari anònim",
 
-  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "L'ítem té una miniatura restringida",
 
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "L'ítem té almenys una miniatura que no és accessible per a l'usuari anònim",
 
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "L'ítem té metadades restringides",
 
-  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
-  // TODO New key - Add a translation
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "L'ítem té metadades que no són accessibles per a l'usuari anònim",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Cerca administrativa",
@@ -1187,9 +1148,6 @@
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Cerca administrativa",
 
-
-
-
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Administrar flux de treball",
 
@@ -1199,13 +1157,20 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "Flux de treball",
 
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Espai de treball",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Esborrar",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Tornar",
 
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Polítiques",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervisió",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importa metadades",
@@ -1231,6 +1196,9 @@
   // "admin.batch-import.page.help": "Select the Collection to import into. Then, drop or browse to a Simple Archive Format (SAF) zip file that includes the Items to import",
   "admin.batch-import.page.help": "Seleccioneu la Col·lecció a la qual importar. Després, deixeu anar o busqueu el fitxer zip en format Simple Archive Format (SAF) que inclou els ítems a importar",
 
+  // "admin.batch-import.page.toggle.help": "It is possible to perform import either with file upload or via URL, use above toggle to set the input source",
+  "admin.batch-import.page.toggle.help": "És possible realitzar la importació amb la càrrega de fitxers o mitjançant URL, utilitzeu el camp superior per establir la font d'entrada",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Deixeu anar un CSV de metadades per importar",
 
@@ -1255,15 +1223,114 @@
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Seleccioneu el fitxer primer!",
 
-  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+  "admin.metadata-import.page.error.addFileUrl": "Introduïu primer l'URL del fitxer!",
+
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
   "admin.batch-import.page.error.addFile": "Seleccioneu el fitxer ZIP primer!",
 
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Pujar",
+
+  // "admin.metadata-import.page.toggle.url": "URL",
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  // "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
+  "admin.metadata-import.page.urlMsg": "Introduïu l'URL del fitxer ZIP per importar",
+
   // "admin.metadata-import.page.validateOnly": "Validate Only",
   "admin.metadata-import.page.validateOnly": "Només Validar",
 
   // "admin.metadata-import.page.validateOnly.hint": "When selected, the uploaded CSV will be validated. You will receive a report of detected changes, but no changes will be saved.",
   "admin.metadata-import.page.validateOnly.hint": "En seleccionar, es validarà el CSV pujat. Rebreu un informe amb els canvis detectats, però no s'efectuaran aquests canvis.",
 
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Valoració",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Heu de valorar l'ítem",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Revisió",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Heu d'introduir una revisió per enviar aquesta valoració",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Seleccioneu una valoració a continuació",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Seleccioneu una valoració a continuació i afegiu també una revisió",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Seleccioneu un únic revisor a continuació abans d'enviar",
+
+  // "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Seleccioneu un o més revisors a continuació abans d'enviar",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Usuaris",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Afegir usuaris",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Examinar tot",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Membres actuals",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Cerca",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.id": "ID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Name",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.name": "Nom",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identitat",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Correu electrònic",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.netid": "NetID",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Remove / Add",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit": "Eliminar / Afegir",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Eliminar membre amb nom \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Membre afegit correctament: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "No s'ha pogut afegir el membre: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Membre eliminat correctament: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "No s'ha pogut eliminar el membre: \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Afegir membre amb nom \"{{ name }}\"",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "No hi ha un grup actiu actual, envieu primer un nom.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "No members in group yet, search and add.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Encara no hi ha membres al grup, cerqueu i afegiu.",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No s'han trobat usuaris en aquesta cerca",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No s'ha seleccionat cap revisor.",
+
   // "admin.batch-import.page.validateOnly.hint": "When selected, the uploaded ZIP will be validated. You will receive a report of detected changes, but no changes will be saved.",
   "admin.batch-import.page.validateOnly.hint": "En seleccionar, es validarà el fitxer ZIP pujat. Rebreu un informe amb els canvis detectats, però no s'efectuaran aquests canvis.",
 
@@ -1279,15 +1346,12 @@
   // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
   "auth.messages.token-refresh-failed": "No s'ha pogut actualitzar el token de la sessió. Inicieu sessió de nou.",
 
-
-
-  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
   "bitstream.download.page": "Descarregant {{ bitstream }}...",
 
-  // "bitstream.download.page.back": "Back" ,
+  // "bitstream.download.page.back": "Back",
   "bitstream.download.page.back": "Enrere",
 
-
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
   "bitstream.edit.authorizations.link": "Editar les polítiques del fitxer",
 
@@ -1324,7 +1388,7 @@
   // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
   "bitstream.edit.form.newFormat.hint": "L'aplicació que heu utilitzat per crear el fitxer i el número de versió (per exemple, \"<i>ACMESoft SuperApp versió 1.5</i>\").",
 
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
   "bitstream.edit.form.primaryBitstream.label": "Fitxer principal",
 
   // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
@@ -1339,6 +1403,9 @@
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "S'ha produït un error en desar el format del fitxer.",
 
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "S'ha produït un error en desar el fitxer principal",
+
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
   "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
 
@@ -1363,7 +1430,6 @@
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
   "bitstream.edit.form.iiifHeight.hint": "L'alçada del marc normalment hauria de coincidir amb l'alçada de la imatge",
 
-
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "S'han desat els canvis en aquest fitxer.",
 
@@ -1387,6 +1453,7 @@
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
   "bitstream-request-a-copy.intro.bitstream.one": "Sol·licitant el fitxer següent: ",
+
   // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
   "bitstream-request-a-copy.intro.bitstream.all": "Sol·licitant tots els fitxers. ",
 
@@ -1396,7 +1463,7 @@
   // "bitstream-request-a-copy.name.error": "The name is required",
   "bitstream-request-a-copy.name.error": "Es requereix un nom",
 
-  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  // "bitstream-request-a-copy.email.label": "Your email address *",
   "bitstream-request-a-copy.email.label": "La vostra adreça de correu electrònic *",
 
   // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
@@ -1429,8 +1496,6 @@
   // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
   "bitstream-request-a-copy.submit.error": "S'ha produït un error en l'enviament de la sol·licitud de còpia.",
 
-
-
   // "browse.back.all-results": "All browse results",
   "browse.back.all-results": "Tots els resultats de la cerca",
 
@@ -1443,6 +1508,12 @@
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Per matèria",
 
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Per categoria de matèria",
+
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "Per Norwegian Science Index",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Per títol",
 
@@ -1464,6 +1535,9 @@
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Títol",
 
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "Categoria de matèria",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Cerca per autor",
 
@@ -1473,6 +1547,18 @@
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Examinar per matèria",
 
+  // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
+  "browse.metadata.srsc.breadcrumbs": "Examinar per categoria de matèria",
+
+  // "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.descrption": "Seleccioneu una matèria per afegir com a filtre de cerca",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "Examinar per Norwegian Science Index",
+
+  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.descrption": "Seleccioneu un índex per afegir com a filtre de cerca",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Examinar per títol",
 
@@ -1485,6 +1571,9 @@
   // "pagination.next.button.disabled.tooltip": "No more pages of results",
   "pagination.next.button.disabled.tooltip": "No hi ha més pàgines de resultats",
 
+  // "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+  "pagination.page-number-bar": "Barra de control per a la navegació de pàgines, relativa a l'element amb ID: ",
+
   // "browse.startsWith": ", starting with {{ startsWith }}",
   "browse.startsWith": ", començant per {{ startsWith }}",
 
@@ -1554,17 +1643,38 @@
   // "browse.startsWith.type_text": "Filter results by typing the first few letters",
   "browse.startsWith.type_text": "Seleccioneu resultats teclejant les primeres lletres",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title": "Examinant {{ collection }} per {{ field }}{{ startsWith }} {{ value }}",
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "Filtrar",
 
-  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Examinant {{ collection }} per {{ field }} {{ value }}",
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Examinar",
 
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Examinant per {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Examinant per {{ field }} {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Tornar als resultats",
 
   // "chips.remove": "Remove chip",
   "chips.remove": "Treu xip",
 
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Aprovat",
 
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Rebutjat, retornat al remitent",
+
+  // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+  "claimed-declined-task-search-result-list-element.title": "Rebutjat, retornat al flux de treball del gestor de revisions",
+
+  // "collection.create.breadcrumbs": "Create collection",
+  "collection.create.breadcrumbs": "Crear col·lecció",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "Cerca un logotip de col·lecció",
 
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Crear una col·lecció",
@@ -1599,8 +1709,6 @@
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "Estàs segur que vols eliminar la col·lecció \"{{ dso }}\"?",
 
-
-
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Eliminar aquesta col·lecció",
 
@@ -1610,8 +1718,6 @@
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Editar col·lecció",
 
-
-
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "Mapeig d'ítems",
 
@@ -1672,7 +1778,6 @@
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Assignar nous ítems",
 
-
   // "collection.edit.logo.delete.title": "Delete logo",
   "collection.edit.logo.delete.title": "Eliminar logo",
 
@@ -1700,15 +1805,17 @@
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Deixeu anar un logotip de col·lecció per carregar-lo",
 
-
-
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Col·lecció editada amb èxit",
 
   // "collection.edit.return": "Back",
   "collection.edit.return": "Enrere",
 
+  // "collection.edit.tabs.access-control.head": "Access Control",
+  "collection.edit.tabs.access-control.head": "Control d'accés",
 
+  // "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
+  "collection.edit.tabs.access-control.title": "Edició de col·lecció - Control d'accés",
 
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curar",
@@ -1797,8 +1904,6 @@
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
   "collection.edit.tabs.source.title": "Edició de col·lecció: font de contingut",
 
-
-
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "Afegir",
 
@@ -1835,8 +1940,6 @@
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Editar plantilla d'ítem",
 
-
-
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Breu descripció",
 
@@ -1864,18 +1967,14 @@
   // "collection.form.entityType": "Entity Type",
   "collection.form.entityType": "Tipus d'Entitat",
 
-
-
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Col·lecció",
 
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logotip de la col·lecció",
 
-
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  "collection.page.browse.recent.head": "Enviaments recents",
-
-  // "collection.page.browse.recent.empty": "No items to show",
-  "collection.page.browse.recent.empty": "No hi ha elements per mostrar",
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Cerca",
 
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Editar aquesta col·lecció",
@@ -1889,7 +1988,8 @@
   // "collection.page.news": "News",
   "collection.page.news": "Notícies",
 
-
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Resultats de la cerca",
 
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar selecció",
@@ -1897,66 +1997,93 @@
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "No hi ha col·leccions per mostrar",
 
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "Col·leccions seleccionades",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "Seleccionar col·lecció",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "Deseleccionar col·lecció",
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Títol",
 
-
   // "collection.source.controls.head": "Harvest Controls",
   "collection.source.controls.head": "Controls de recol·lecció",
+
   // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
   "collection.source.controls.test.submit.error": "Hi ha hagut errors en realitzar les proves de comprovació de la configuració",
+
   // "collection.source.controls.test.failed": "The script to test the settings has failed",
   "collection.source.controls.test.failed": "La prova de la configuració ha fallat",
+
   // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
   "collection.source.controls.test.completed": "L'script de prova de la configuració s'ha acabat correctament",
+
   // "collection.source.controls.test.submit": "Test configuration",
   "collection.source.controls.test.submit": "Proveu la configuració",
+
   // "collection.source.controls.test.running": "Testing configuration...",
   "collection.source.controls.test.running": "Provant la configuració...",
+
   // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
   "collection.source.controls.import.submit.success": "La importació ha començat correctament",
+
   // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
   "collection.source.controls.import.submit.error": "Hi ha hagut alguna errada en iniciar la importació",
+
   // "collection.source.controls.import.submit": "Import now",
   "collection.source.controls.import.submit": "Importa ara",
+
   // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "Important...",
+
   // "collection.source.controls.import.failed": "An error occurred during the import",
   "collection.source.controls.import.failed": "S'ha produït un error durant la importació",
+
   // "collection.source.controls.import.completed": "The import completed",
   "collection.source.controls.import.completed": "La importació ha finalitzat",
+
   // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
   "collection.source.controls.reset.submit.success": "La restauració i reimportació ha començat correctament",
+
   // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
   "collection.source.controls.reset.submit.error": "S'ha produït un error en iniciar la restauració i reimportació",
+
   // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
   "collection.source.controls.reset.failed": "S'ha produït un error en la restauració i reimportació",
+
   // "collection.source.controls.reset.completed": "The reset and reimport completed",
   "collection.source.controls.reset.completed": "Restauració i reimportació finalitzades",
+
   // "collection.source.controls.reset.submit": "Reset and reimport",
   "collection.source.controls.reset.submit": "Restauració i reimportació",
+
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
   "collection.source.controls.reset.running": "Restaurant i reimportant...",
+
   // "collection.source.controls.harvest.status": "Harvest status:",
   "collection.source.controls.harvest.status": "Estat de la Recol·lecció:",
+
   // "collection.source.controls.harvest.start": "Harvest start time:",
   "collection.source.controls.harvest.start": "Inici de la recol·lecció:",
+
   // "collection.source.controls.harvest.last": "Last time harvested:",
   "collection.source.controls.harvest.last": "Data de la darrera recol·lecció:",
+
   // "collection.source.controls.harvest.message": "Harvest info:",
   "collection.source.controls.harvest.message": "Informació de recol·lecció:",
+
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "N/A",
 
-
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
   "collection.source.update.notifications.error.content": "La configuració proporcionada s'ha provat i no ha funcionat.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Error del servidor",
 
-
-
   // "communityList.breadcrumbs": "Community List",
   "communityList.breadcrumbs": "Llista de comunitats",
 
@@ -1969,7 +2096,20 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mostrar més",
 
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "Expandir {{ name }}",
 
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "Contraure {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "Cerca un logotip de comunitat",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  "community.subcoms-cols.breadcrumbs": "Subcomunitats i col·leccions",
+
+  // "community.create.breadcrumbs": "Create Community",
+  "community.create.breadcrumbs": "Crear comunitat",
 
   // "community.create.head": "Create a Community",
   "community.create.head": "Crear una comunitat",
@@ -2013,20 +2153,25 @@
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Editar comunitat",
 
-
   // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "Eliminar logo",
 
+  // "community-collection.edit.logo.delete.title": "Confirm deletion",
+  "community-collection.edit.logo.delete.title": "Confirmar eliminació",
+
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Desfer eliminació",
 
+  // "community-collection.edit.logo.delete-undo.title": "Undo delete",
+  "community-collection.edit.logo.delete-undo.title": "Desfer eliminació",
+
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Logotip de la comunitat",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
   "community.edit.logo.notifications.add.error": "Error en carregar el logotip de la comunitat. Verifiqueu el contingut abans de tornar-ho a provar.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
   "community.edit.logo.notifications.add.success": "Logotip de la comunitat pujat correctament.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
@@ -2038,31 +2183,33 @@
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "Error en eliminar el logotip",
 
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  // "community.edit.logo.upload": "Drop a community logo to upload",
   "community.edit.logo.upload": "Deixeu anar un logotip de la comunitat per carregar",
 
-
-
   // "community.edit.notifications.success": "Successfully edited the Community",
   "community.edit.notifications.success": "Comunitat editada amb èxit",
 
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "No tens privilegis per fer aquest canvi",
 
-  // "community.edit.notifications.error": "An error occured while editing the Community",
+  // "community.edit.notifications.error": "An error occurred while editing the community",
   "community.edit.notifications.error": "S'ha produït un error en editar la comunitat.",
 
   // "community.edit.return": "Back",
   "community.edit.return": "Enrere",
 
-
-
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Curar",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Edició de la comunitat - Curar",
 
+  // "community.edit.tabs.access-control.head": "Access Control",
+  "community.edit.tabs.access-control.head": "Control d'accés",
+
+  // "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+  "community.edit.tabs.access-control.title": "Edició de la comunitat - Control d'accés",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Editar metadades",
 
@@ -2081,12 +2228,11 @@
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "Edició de la comunitat: autoritzacions",
 
-
-
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Comunitat",
 
-
+  // "community.logo": "Community logo",
+  "community.logo": "Logotip de la comunitat",
 
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Cap",
@@ -2106,28 +2252,24 @@
   // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
   "comcol-role.edit.delete.error.title": "Error en esborrar el grup del rol '{{ role }}'",
 
-
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "Administradors",
 
   // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "Administradors",
 
-
   // "comcol-role.edit.community-admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
   "comcol-role.edit.community-admin.description": "Els administradors de la comunitat poden crear subcomunitats o col·leccions i gestionar o assignar la gestió per a aquestes subcomunitats o col·leccions. A més, decideixen qui pot enviar ítems a les subcol·leccions, editar les metadades de l'ítem (un cop publicats) i afegir (mapejar) ítems existents d'altres col·leccions (subjecte a autorització).",
 
   // "comcol-role.edit.collection-admin.description": "Collection administrators decide who can submit items to the collection, edit item metadata (after submission), and add (map) existing items from other collections to this collection (subject to authorization for that collection).",
   "comcol-role.edit.collection-admin.description": "Els administradors de la col·lecció decideixen qui pot enviar ítems a la col·lecció, editar les metadades de l'ítem (un cop publicats) i afegir (mapejar) ítems existents d'altres col·leccions a aquesta col·lecció (subjecte a autorització).",
 
-
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Remitents",
 
   // "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
   "comcol-role.edit.submitters.description": "Els Usuaris i Grups que tenen permís per enviar nous ítems a aquesta col·lecció.",
 
-
   // "comcol-role.edit.item_read.name": "Default item read access",
   "comcol-role.edit.item_read.name": "Accés de lectura predeterminat de l'ítem",
 
@@ -2137,38 +2279,38 @@
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "La lectura predeterminada per als ítems entrants està configurada actualment com a Anònim.",
 
-
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Accés de lectura per defecte de fitxers",
 
-  // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  "comcol-role.edit.bitstream_read.description": "Els administradors de la comunitat poden crear subcomunitats o col·leccions i gestionar o assignar la gestió per a aquestes subcomunitats o col·leccions. A més, decideixen qui pot enviar ítems a les subcol·leccions, editar les metadades de l'ítem (un cop publicats) i afegir (mapejar) ítems existents d'altres col·leccions (subjecte a autorització).",
+  // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "Usuaris i Grups que poden llegir nous fitxers enviats a aquesta col·lecció. Els canvis en aquest rol no són retroactius. Els fitxers existents al sistema encara seran visibles per a aquells que tenien accés de lectura en el moment de la seva addició.",
 
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "La lectura predeterminada per als fitxers entrants s'estableix actualment a Anònim.",
 
-
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Editors",
 
   // "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
   "comcol-role.edit.editor.description": "Els editors poden editar les metadades dels enviaments entrants i després acceptar-los o rebutjar-los.",
 
-
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Editors finals",
 
   // "comcol-role.edit.finaleditor.description": "Final editors are able to edit the metadata of incoming submissions, but will not be able to reject them.",
   "comcol-role.edit.finaleditor.description": "Els editors finals poden editar les metadades dels enviaments entrants, però no els poden rebutjar.",
 
-
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Revisors",
 
   // "comcol-role.edit.reviewer.description": "Reviewers are able to accept or reject incoming submissions. However, they are not able to edit the submission's metadata.",
   "comcol-role.edit.reviewer.description": "Els revisors poden acceptar o rebutjar enviaments entrants. No obstant això, no poden editar les metadades de l'enviament.",
 
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Revisors de puntuació",
 
+  // "comcol-role.edit.scorereviewers.description": "Reviewers are able to give a score to incoming submissions, this will define whether the submission will be rejected or not.",
+  "comcol-role.edit.scorereviewers.description": "Els revisors poden donar una puntuació als enviaments entrants, això definirà si l'enviament serà rebutjat o no.",
 
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Breu descripció",
@@ -2203,14 +2345,15 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Subcomunitats i col·leccions",
 
-  // "community.sub-collection-list.head": "Collections of this Community",
+  // "community.search.results.head": "Search Results",
+  "community.search.results.head": "Resultats de la cerca",
+
+  // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Col·leccions d'aquesta comunitat",
 
-  // "community.sub-community-list.head": "Communities of this Community",
+  // "community.sub-community-list.head": "Communities in this Community",
   "community.sub-community-list.head": "Comunitats d'aquesta comunitat",
 
-
-
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Acceptar tot",
 
@@ -2241,14 +2384,17 @@
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Declinar",
 
+  // "cookies.consent.decline-all": "Decline all",
+  "cookies.consent.decline-all": "Rebutjar tot",
+
   // "cookies.consent.ok": "That's ok",
   "cookies.consent.ok": "D'acord",
 
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Guardar",
 
-  // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  "cookies.consent.content-notice.description": "Recopilem i processem la vostra informació personal amb les finalitats següents: <strong>Autenticació, Preferències, Reconeixement i Estadístiques</strong>. <br/> Per obtenir més informació, llegiu la nostra {privacyPolicy}.",
+  // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: {purposes}",
+  "cookies.consent.content-notice.description": "Recopilem i processem la vostra informació personal amb les finalitats següents: {purposes}",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Personalitzar",
@@ -2262,6 +2408,9 @@
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "Per a més informació, llegiu si us plau la nostra {privacyPolicy}.",
 
+  // "cookies.consent.content-modal.no-privacy-policy.text": "",
+  "cookies.consent.content-modal.no-privacy-policy.text": "",
+
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Informació que recopilem",
 
@@ -2271,38 +2420,30 @@
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Requerit per iniciar sessió",
 
-
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Preferències",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Requerit per desar les vostres preferències",
 
-
-
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Reconeixement",
 
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
   "cookies.consent.app.description.acknowledgement": "Requerit per guardar els seus reconeixements i consentiments",
 
-
-
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
   "cookies.consent.app.title.google-analytics": "Google Analytics",
 
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
   "cookies.consent.app.description.google-analytics": "Ens permet rastrejar dades estadístiques",
 
-
-
   // "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
   "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
 
   // "cookies.consent.app.description.google-recaptcha": "We use google reCAPTCHA service during registration and password recovery",
   "cookies.consent.app.description.google-recaptcha": "Utilitzem el servei google reCAPTCHA durant el registre i la recuperació de contrasenya",
 
-
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funcional",
 
@@ -2315,10 +2456,10 @@
   // "cookies.consent.purpose.sharing": "Sharing",
   "cookies.consent.purpose.sharing": "Compartició",
 
-  // "curation-task.task.citationpage.label":  "Generate Citation Page",
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
   "curation-task.task.citationpage.label": "Generar pàgina de cita",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
   "curation-task.task.checklinks.label": "Comprovar enllaços a metadades",
 
   // "curation-task.task.noop.label": "NOOP",
@@ -2339,8 +2480,6 @@
   // "curation-task.task.registerdoi.label": "Register DOI",
   "curation-task.task.registerdoi.label": "Registrar DOI",
 
-
-
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Tasca:",
 
@@ -2356,7 +2495,7 @@
   // "curation.form.submit.error.head": "Running the curation task failed",
   "curation.form.submit.error.head": "Error en executar la tasca de curació",
 
-  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  // "curation.form.submit.error.content": "An error occurred when trying to start the curation task.",
   "curation.form.submit.error.content": "S'ha produït un error en intentar iniciar la tasca de curació.",
 
   // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
@@ -2368,8 +2507,6 @@
   // "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
   "curation.form.handle.hint": "Suggeriment: Introduïu [el-vostre-prefix-handle]/0 per executar una tasca en tota la instal·lació (no totes les tasques permeten aquesta opció)",
 
-
-
   // "deny-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I regret to inform you that it's not possible to send you a copy of the file(s) you have requested, concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
   "deny-request-copy.email.message": "Estimat {{ recipientName }},\nEn resposta a la vostra sol·licitud, lamento informar-vos que no és possible enviar-vos una còpia dels fitxers que heu sol·licitat, en relació amb el document: \"{{ itemUrl }}\" ({{ itemName }}), del qual sóc autor.\n\nSalutacions cordials,\n{{ authorName }} <{{ authorEmail }}>",
 
@@ -2388,12 +2525,17 @@
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Sol·licitud de còpia de document denegada",
 
+  // "dropdown.clear": "Clear selection",
+  "dropdown.clear": "Esborrar selecció",
 
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  "dropdown.clear.tooltip": "Esborrar l'opció seleccionada",
 
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sense títol",
 
-
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Sense nom",
 
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nova col·lecció",
@@ -2449,6 +2591,15 @@
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Cerca un/a {{ type }}",
 
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunitat",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "col·lecció",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "ítem",
+
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Seleccionar una col·lecció",
 
@@ -2479,6 +2630,45 @@
   // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
   "dso-selector.results-could-not-be-retrieved": "S'ha produït un error, si us plau, actualitzeu de nou ↻",
 
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Selector de grup de supervisió",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Seleccioneu un tipus d'ordre",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "CAP",
+
+  // "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+
+  // "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVADOR",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Seleccioneu un grup",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Cancel·lar",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Guardar",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Seleccioneu un tipus d'ordre",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Seleccioneu un grup",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Ordre de supervisió creada correctament per al grup {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "supervision-group-selector.notification.create.failure.title": "Error",
+
+  // "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+  "supervision-group-selector.notification.create.already-existing": "Ja existeix una ordre de supervisió en aquest ítem per al grup seleccionat",
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exporta metadades per a {{ dsoName }}",
 
@@ -2515,6 +2705,9 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Esborrar",
 
+  // "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+  "confirmation-modal.delete-community-collection-logo.info": "Esteu segur que voleu eliminar el logotip?",
+
   // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "Esborrar Perfil",
 
@@ -2527,6 +2720,17 @@
   // "confirmation-modal.delete-profile.confirm": "Delete",
   "confirmation-modal.delete-profile.confirm": "Esborrar",
 
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "Eliminar subscripció",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Esteu segur que voleu eliminar la subscripció per a \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Cancel·lar",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Eliminar",
 
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Error en obtenir el fitxer",
@@ -2582,6 +2786,9 @@
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
   "error.validation.license.notgranted": "Ha de concedir aquesta llicència de dipòsit per completar l'enviament. Si no podeu concedir aquesta llicència en aquest moment, podeu desar el vostre treball i tornar més tard o bé eliminar l'enviament.",
 
+  // "error.validation.cclicense.required": "You must grant this cclicense to complete your submission. If you are unable to grant the cclicense at this time, you may save your work and return later or remove the submission.",
+  "error.validation.cclicense.required": "Heu de concedir aquesta llicència CC per completar l'enviament. Si no podeu concedir aquesta llicència CC en aquest moment, podeu desar el vostre treball i tornar més tard o bé eliminar l'enviament.",
+
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Aquest camp d'entrada està restringit per aquest patró: {{ pattern }}.",
 
@@ -2591,25 +2798,45 @@
   // "error.validation.required": "This field is required",
   "error.validation.required": "Aquest camp es obligatori",
 
-  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  // "error.validation.NotValidEmail": "This is not a valid email",
   "error.validation.NotValidEmail": "Aquest no és un correu electrònic vàlid",
 
-  // "error.validation.emailTaken": "This E-mail is already taken",
+  // "error.validation.emailTaken": "This email is already taken",
   "error.validation.emailTaken": "Aquest correu electrònic ja està en ús",
 
   // "error.validation.groupExists": "This group already exists",
   "error.validation.groupExists": "Aquest grup ja existeix",
 
+  // "error.validation.metadata.name.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Element & Qualifier fields instead",
+  "error.validation.metadata.name.invalid-pattern": "Aquest camp no pot contenir punts, comes o espais. Utilitzeu els camps Element i Qualificador en lloc d'això",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Aquest camp no pot contenir més de 32 caràcters",
+
+  // "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+  "error.validation.metadata.namespace.max-length": "Aquest camp no pot contenir més de 256 caràcters",
+
+  // "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+  "error.validation.metadata.element.invalid-pattern": "Aquest camp no pot contenir punts, comes o espais. Utilitzeu el camp Qualificador en lloc d'això",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Aquest camp no pot contenir més de 64 caràcters",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "error.validation.metadata.qualifier.invalid-pattern": "Aquest camp no pot contenir punts, comes o espais",
+
+  // "error.validation.metadata.qualifier.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.qualifier.max-length": "Aquest camp no pot contenir més de 64 caràcters",
 
   // "feed.description": "Syndication feed",
   "feed.description": "Fil de sindicació",
 
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "Fitxer restringit",
 
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Error en obtenir els fitxers per a aquest ítem",
 
-
-
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "copyright © 2002-{{ year }}",
 
@@ -2625,13 +2852,14 @@
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Política de privadesa",
 
-  // "footer.link.end-user-agreement":"End User Agreement",
+  // "footer.link.end-user-agreement": "End User Agreement",
   "footer.link.end-user-agreement": "Acord d'usuari final",
 
-  // "footer.link.feedback":"Send Feedback",
+  // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar Suggeriments",
 
-
+  // "footer.link.coar-notify-support": "COAR Notify",
+  "footer.link.coar-notify-support": "COAR Notify",
 
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Oblit de contrasenya",
@@ -2645,8 +2873,8 @@
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Si us plau introduïu una adreça de correu electrònic",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  "forgot-email.form.email.error.pattern": "Si us plau introduïu una adreça de correu electrònic vàlida",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Si us plau, introduïu una adreça de correu electrònic vàlida",
 
   // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
   "forgot-email.form.email.hint": "Se us enviarà un missatge a aquesta adreça amb les instruccions pertinents.",
@@ -2663,10 +2891,8 @@
   // "forgot-email.form.error.head": "Error when trying to reset password",
   "forgot-email.form.error.head": "Error en intentar restablir la contrasenya",
 
-  // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
-  "forgot-email.form.error.content": "S'ha produït un error intentant restablir la contrasenya del compte associat al correu electrònic: {{ email }}",
-
-
+  // "forgot-email.form.error.content": "An error occurred when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "S'ha produït un error en intentar restablir la contrasenya del compte associat a la següent adreça de correu electrònic: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Oblit de contrasenya",
@@ -2692,8 +2918,8 @@
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Reescriviu per confirmar",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  "forgot-password.form.error.empty-password": "Introduïu una contrasenya al cap a continuació.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
+  "forgot-password.form.error.empty-password": "Introduïu una contrasenya al camp a continuació.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "Les contrasenyes no coincideixen.",
@@ -2710,7 +2936,6 @@
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Envia contrasenya",
 
-
   // "form.add": "Add more",
   "form.add": "Afegir més",
 
@@ -2771,6 +2996,24 @@
   // "form.no-value": "No value entered",
   "form.no-value": "No s'ha introduït cap valor",
 
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Correu electrònic",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Nom",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "Al index de Solr",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Institució",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Cognoms",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID",
+
   // "form.remove": "Remove",
   "form.remove": "Eliminar",
 
@@ -2789,19 +3032,26 @@
   // "form.submit": "Save",
   "form.submit": "Guardar",
 
+  // "form.create": "Create",
+  "form.create": "Crear",
+
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "Disminuir {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "Incrementar {{field}}",
+
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Deixeu anar l'ítem a la nova posició",
 
-
-
   // "grant-deny-request-copy.deny": "Don't send copy",
   "grant-deny-request-copy.deny": "No envieu còpia",
 
   // "grant-deny-request-copy.email.back": "Back",
   "grant-deny-request-copy.email.back": "Enrere",
 
-  // "grant-deny-request-copy.email.message": "Message",
-  "grant-deny-request-copy.email.message": "Missatge",
+  // "grant-deny-request-copy.email.message": "Optional additional message",
+  "grant-deny-request-copy.email.message": "Missatge opcional addicional",
 
   // "grant-deny-request-copy.email.message.empty": "Please enter a message",
   "grant-deny-request-copy.email.message.empty": "Si us plau, introduïu un missatge",
@@ -2839,11 +3089,6 @@
   // "grant-deny-request-copy.processed": "This request has already been processed. You can use the button below to get back to the home page.",
   "grant-deny-request-copy.processed": "Aquesta sol·licitud ja ha estat processada. Podeu utilitzar els botons inferiors per tornar a la pàgina inicial",
 
-
-
-  // "grant-request-copy.email.message": "Dear {{ recipientName }},\nIn response to your request I have the pleasure to send you in attachment a copy of the file(s) concerning the document: \"{{ itemUrl }}\" ({{ itemName }}), of which I am an author.\n\nBest regards,\n{{ authorName }} <{{ authorEmail }}>",
-  "grant-request-copy.email.message": "Estimat {{ recipientName }},\nResponent a la vostra sol·licitud, us envio annexada una còpia del fitxer corresponent al document: \"{{ itemUrl }}\" ({{ itemName }} .\n\nUna cordial salutació,\n{{ authorName }} <{{ authorEmail }}>",
-
   // "grant-request-copy.email.subject": "Request copy of document",
   "grant-request-copy.email.subject": "Sol·licitar còpia de document",
 
@@ -2853,23 +3098,22 @@
   // "grant-request-copy.header": "Grant document copy request",
   "grant-request-copy.header": "Concedir sol·licitud de còpia de document",
 
-  // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.",
-  "grant-request-copy.intro": "Aquest missatge s'enviarà al sol·licitant de la còpia. Se us annexarà una còpia del document.",
+  // "grant-request-copy.intro": "A message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  "grant-request-copy.intro": "S'enviarà un missatge al sol·licitant de la petició. S'adjuntaran els documents sol·licitats.",
 
   // "grant-request-copy.success": "Successfully granted item request",
   "grant-request-copy.success": "Sol·licitud d'ítem concedida amb èxit",
 
-
   // "health.breadcrumbs": "Health",
   "health.breadcrumbs": "Revisió de salut",
 
-  // "health-page.heading" : "Health",
+  // "health-page.heading": "Health",
   "health-page.heading": "Revisió de salut",
 
-  // "health-page.info-tab" : "Info",
+  // "health-page.info-tab": "Info",
   "health-page.info-tab": "Informació",
 
-  // "health-page.status-tab" : "Status",
+  // "health-page.status-tab": "Status",
   "health-page.status-tab": "Estat",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
@@ -2920,7 +3164,6 @@
   // "health-page.section.no-issues": "No issues detected",
   "health-page.section.no-issues": "No s'han detectat problemes",
 
-
   // "home.description": "",
   "home.description": "",
 
@@ -2939,8 +3182,6 @@
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Seleccioneu una comunitat per explorar les seves col·leccions.",
 
-
-
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
   "info.end-user-agreement.accept": "He llegit i accepto l'Acord d'usuari final.",
 
@@ -2965,6 +3206,9 @@
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Acord d'usuari final",
 
+  // "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "els Estats Units",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Declaració de privadesa",
 
@@ -2998,22 +3242,26 @@
   // "info.feedback.email-label": "Your Email",
   "info.feedback.email-label": "El vostre correu electrònic",
 
-  // "info.feedback.create.success" : "Feedback Sent Successfully!",
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
   "info.feedback.create.success": "Enviament exitós de suggeriment",
 
-  // "info.feedback.error.email.required" : "A valid email address is required",
-  "info.feedback.error.email.required": "es requereix una adreça vàlida de correu electrònic",
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Es requereix una adreça vàlida de correu electrònic",
 
-  // "info.feedback.error.message.required" : "A comment is required",
+  // "info.feedback.error.message.required": "A comment is required",
   "info.feedback.error.message.required": "Es requereix un comentari",
 
-  // "info.feedback.page-label" : "Page",
+  // "info.feedback.page-label": "Page",
   "info.feedback.page-label": "Pàgina",
 
-  // "info.feedback.page_help" : "Tha page related to your feedback",
+  // "info.feedback.page_help": "The page related to your feedback",
   "info.feedback.page_help": "La pàgina relacionada amb el vostre suggeriment",
 
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  "info.coar-notify-support.title": "Suport COAR Notify",
 
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  "info.coar-notify-support.breadcrumbs": "Suport COAR Notify",
 
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Aquest ítem és privat",
@@ -3021,7 +3269,11 @@
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Aquest ítem ha estat retirat",
 
+  // "item.alerts.reinstate-request": "Request reinstate",
+  "item.alerts.reinstate-request": "Sol·licitar reintegració",
 
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Sol·licitat per",
 
   // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
   "item.edit.authorizations.heading": "Amb aquest editor pot veure i modificar les polítiques d'un ítem, a més de modificar les polítiques dels components individuals de l'ítem: paquets i fitxers. Breument, un ítem és un contenidor de paquets i els paquets són contenidors d'arxius. Els contenidors solen tenir polítiques AFEGIR/ELIMINAR/LLEGIR/ESCRIURE, mentre que els fitxers només tenen polítiques LLEGIR/ESCRIURE.",
@@ -3029,16 +3281,12 @@
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Editar les polítiques de l'ítem",
 
-
-
   // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Privat",
 
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Retirat",
 
-
-
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Paquet",
 
@@ -3072,8 +3320,6 @@
   // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "Pujar fitxer",
 
-
-
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Pujar",
 
@@ -3089,6 +3335,12 @@
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "PAQUET: {{ name }}",
 
+  // "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
+  "item.edit.bitstreams.bundle.table.aria-label": "Fitxers en el paquet {{ bundle }}",
+
+  // "item.edit.bitstreams.bundle.tooltip": "You can move a bitstream to a different page by dropping it on the page number.",
+  "item.edit.bitstreams.bundle.tooltip": "Podeu moure un fitxer a una pàgina diferent deixant-lo anar al número de pàgina.",
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Descartar",
 
@@ -3107,9 +3359,27 @@
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
   "item.edit.bitstreams.edit.buttons.undo": "Desfer canvis",
 
+  // "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} was returned to position {{ toIndex }} and is no longer selected.",
+  "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} ha estat retornat a la posició {{ toIndex }} i ja no està seleccionat.",
+
+  // "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
+  "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} ja no està seleccionat.",
+
+  // "item.edit.bitstreams.edit.live.loading": "Waiting for move to complete.",
+  "item.edit.bitstreams.edit.live.loading": "Esperant que es completi el moviment.",
+
+  // "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
+  "item.edit.bitstreams.edit.live.select": "{{ bitstream }} està seleccionat.",
+
+  // "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",
+  "item.edit.bitstreams.edit.live.move": "{{ bitstream }} ara està en la posició {{ toIndex }}.",
+
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "item.edit.bitstreams.empty": "Aquest ítem no conté cap fitxer. Feu clic al botó de càrrega per crear-ne un.",
 
+  // "item.edit.bitstreams.info-alert": "Bitstreams can be reordered within their bundles by holding the drag handle and moving the mouse. Alternatively, bitstreams can be moved using the keyboard in the following way: Select the bitstream by pressing enter when the bitstream's drag handle is in focus. Move the bitstream up or down using the arrow keys. Press enter again to confirm the current position of the bitstream.",
+  "item.edit.bitstreams.info-alert": "Els fitxers es poden reordenar dins dels seus paquets mantenint el mànec d'arrossegament i movent el ratolí. Alternativament, els fitxers es poden moure utilitzant el teclat de la següent manera: seleccioneu el fitxer prement enter quan el mànec d'arrossegament del fitxer estigui enfocat. Moveu el fitxer cap amunt o cap avall utilitzant les tecles de fletxa. Premeu enter de nou per confirmar la posició actual del fitxer.",
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Accions",
 
@@ -3164,8 +3434,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Pujar",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Cancel·lar",
 
@@ -3193,13 +3461,75 @@
   // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
   "item.edit.tabs.disabled.tooltip": "No tens autorització per accedir a aquesta pestanya",
 
-
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   "item.edit.tabs.mapper.head": "Mapejador de col·leccions",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
   "item.edit.tabs.item-mapper.title": "Edició d'ítem - Mapeador de col·leccions",
 
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Desconegut",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "En cua per a registre",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "En cua per a reserva",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrat",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Reservat",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reservat (actualització en cua)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrat (actualització en cua)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "En cua per a actualització i registre",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "En cua per a eliminació",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Eliminat",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "Pendent (no registrat)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Creat (no registrat)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrar un DOI nou o pendent",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registrar DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Registrar un DOI nou o pendent",
+
+  // "item.edit.register-doi.description": "Review any pending identifiers and item metadata below and click Confirm to proceed with DOI registration, or Cancel to back out",
+  "item.edit.register-doi.description": "Reviseu qualsevol identificador pendent i les metadades de l'ítem a continuació i feu clic a Confirmar per continuar amb el registre del DOI, o Cancel·lar per sortir",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Confirmar",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Cancel·lar",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI en cua per a registre amb èxit.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Error en registrar el DOI",
+
+  // "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+  "item.edit.register-doi.to-update": "El següent DOI ja ha estat creat i es posarà en cua per a registre en línia",
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Assignar ítem a col·leccions seleccionades",
 
@@ -3254,14 +3584,27 @@
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Mapejar noves col·leccions",
 
-
-
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Afegir",
 
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Descartar",
 
+  // "item.edit.metadata.edit.language": "Edit language",
+  "item.edit.metadata.edit.language": "Editar idioma",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Editar valor",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Editar clau d'autoritat",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Arrossegar per reordenar",
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Editar",
 
@@ -3274,6 +3617,9 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Deixar d'editar",
 
+  // "item.edit.metadata.edit.buttons.virtual": "This is a virtual metadata value, i.e. a value inherited from a related entity. It can’t be modified directly. Add or remove the corresponding relationship in the \"Relationships\" tab",
+  "item.edit.metadata.edit.buttons.virtual": "Aquest és un valor de metadada virtual, és a dir, un valor heretat d'una entitat relacionada. No es pot modificar directament. Afegiu o elimineu la relació corresponent a la pestanya \"Relacions\"",
+
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Actualment, l'ítem no conté metadades. Feu clic a Afegir per començar a afegir un valor de metadades.",
 
@@ -3289,6 +3635,12 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "Editar camp",
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "S'ha produït un error en validar el camp de metadades",
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Trieu un camp de metadades vàlid",
 
@@ -3322,10 +3674,20 @@
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Desfer",
 
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Desfer reordenació",
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
+  // "item.edit.metadata.authority.label": "Authority: ",
+  "item.edit.metadata.authority.label": "Autoritat: ",
 
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Desbloquejar el valor de la clau d'autoritat per a l'edició manual",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Bloquejar el valor de la clau d'autoritat per a l'edició manual",
 
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Camp",
@@ -3336,8 +3698,6 @@
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Valor",
 
-
-
   // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "Enrere",
 
@@ -3362,6 +3722,9 @@
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Hereta les polítiques predeterminades de la col·lecció de destinació",
 
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "Advertència: Quan està habilitat, la política d'accés de lectura per a l'ítem i qualsevol fitxer associat amb l'ítem serà reemplaçada per la política d'accés de lectura predeterminada de la col·lecció. Això no es pot desfer.",
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Moure",
 
@@ -3377,8 +3740,6 @@
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Moure ítem",
 
-
-
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Cancel·lar",
 
@@ -3397,8 +3758,6 @@
   // "item.edit.private.success": "The item is now non-discoverable",
   "item.edit.private.success": "L'ítem ara és privat",
 
-
-
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Cancel·lar",
 
@@ -3417,8 +3776,6 @@
   // "item.edit.public.success": "The item is now discoverable",
   "item.edit.public.success": "L'ítem ara és públic",
 
-
-
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Cancel·lar",
 
@@ -3437,8 +3794,6 @@
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "L'ítem s'ha reintegrat correctament",
 
-
-
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Descartar",
 
@@ -3484,11 +3839,9 @@
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
   "item.edit.relationships.no-entity-type": "Afegiu la metadada 'dspace.entity.type' per habilitar les relacions per a aquest ítem",
 
-
   // "item.edit.return": "Back",
   "item.edit.return": "Enrere",
 
-
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "Fitxers",
 
@@ -3501,6 +3854,15 @@
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Edició d'ítem: Curar",
 
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Curar ítem: {{item}}",
+
+  // "item.edit.tabs.access-control.head": "Access Control",
+  "item.edit.tabs.access-control.head": "Control d'accés",
+
+  // "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+  "item.edit.tabs.access-control.title": "Edició d'ítem: Control d'accés",
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadades",
 
@@ -3531,8 +3893,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Administra col·leccions mapejades",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Moure...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Moure aquest ítem a una col·lecció diferent",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Moure ítem a una altra col·lecció",
@@ -3558,8 +3920,8 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "No estàs autoritzat a realitzar aquesta acció.",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retira...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar aquest ítem",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar ítem del repositori",
@@ -3600,8 +3962,6 @@
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Edició d'ítem - Visualitza",
 
-
-
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Cancel·lar",
 
@@ -3623,7 +3983,6 @@
   // "item.orcid.return": "Back",
   "item.orcid.return": "Enrere",
 
-
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Ítem",
 
@@ -3657,7 +4016,68 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Contraure",
 
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "item.qa-event-notification.check.notification-info": "Hi ha {{num}} suggeriments pendents relacionats amb el vostre compte",
 
+  // "item.qa-event-notification-info.check.button": "View",
+  "item.qa-event-notification-info.check.button": "Veure",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "mydspace.qa-event-notification.check.notification-info": "Hi ha {{num}} suggeriments pendents relacionats amb el vostre compte",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  "mydspace.qa-event-notification-info.check.button": "Veure",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Eliminar ordre de supervisió",
+
+  // "workflow-item.search.result.delete-supervision.modal.info": "Are you sure you want to delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.info": "Esteu segur que voleu eliminar l'ordre de supervisió",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel·lar",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Eliminar",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "S'ha eliminat correctament l'ordre de supervisió \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "No s'ha pogut eliminar l'ordre de supervisió \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Supervisat per:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Eliminar grup de supervisió",
+
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  "confidence.indicator.help-text.accepted": "Aquest valor d'autoritat ha estat confirmat com a exacte per un usuari interactiu",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  "confidence.indicator.help-text.uncertain": "El valor és singular i vàlid, però no ha estat vist i acceptat per un humà, per tant, encara és incert",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  "confidence.indicator.help-text.ambiguous": "Hi ha múltiples valors d'autoritat coincidents amb igual validesa",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  "confidence.indicator.help-text.notfound": "No hi ha respostes coincidents a l'autoritat",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  "confidence.indicator.help-text.failed": "L'autoritat ha trobat un error intern",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  "confidence.indicator.help-text.rejected": "L'autoritat recomana que aquest enviament sigui rebutjat",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  "confidence.indicator.help-text.novalue": "No s'ha retornat cap valor de confiança raonable de l'autoritat",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  "confidence.indicator.help-text.unset": "Mai es va registrar la confiança per aquest valor",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  "confidence.indicator.help-text.unknown": "Valor de confiança desconegut",
 
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resum",
@@ -3749,10 +4169,13 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Contraure",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
+  // "item.page.bitstreams.primary": "Primary",
+  "item.page.bitstreams.primary": "Principal",
+
+  // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Paquet original",
 
-  // "item.page.filesection.license.bundle" : "License bundle",
+  // "item.page.filesection.license.bundle": "License bundle",
   "item.page.filesection.license.bundle": "Paquet de llicències",
 
   // "item.page.return": "Back",
@@ -3761,6 +4184,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crear una nova versió",
 
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Sol·licitar la retirada d'aquest ítem",
+
+  // "item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Sol·licitar la reintegració",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "No es pot crear una nova versió perquè a l'historial de versions hi ha un enviament en curs",
 
@@ -3770,6 +4199,9 @@
   // "item.page.claim.tooltip": "Claim this item as profile",
   "item.page.claim.tooltip": "Reclamar aquest ítem com a perfil",
 
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "ROR logo",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identificador:",
 
@@ -3797,27 +4229,30 @@
   // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "Tipus:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
+  // "item.preview.oaire.citation.issue": "Issue",
   "item.preview.oaire.citation.issue": "Número",
 
-  // "item.preview.oaire.citation.volume" : "Volume",
+  // "item.preview.oaire.citation.volume": "Volume",
   "item.preview.oaire.citation.volume": "Volum",
 
-  // "item.preview.dc.relation.issn" : "ISSN",
+  // "item.preview.dc.relation.issn": "ISSN",
   "item.preview.dc.relation.issn": "ISSN",
 
-  // "item.preview.dc.identifier.isbn" : "ISBN",
+  // "item.preview.dc.identifier.isbn": "ISBN",
   "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
   "item.preview.dc.identifier": "Identificador:",
 
-  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
+  // "item.preview.dc.relation.ispartof": "Journal or Series",
   "item.preview.dc.relation.ispartof": "Revista o Sèrie",
 
-  // "item.preview.dc.identifier.doi" : "DOI",
+  // "item.preview.dc.identifier.doi": "DOI",
   "item.preview.dc.identifier.doi": "DOI",
 
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Editorial:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Cognoms:",
 
@@ -3845,13 +4280,44 @@
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Línia de finançament:",
 
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "URL",
 
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "País",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "Data de fundació",
+
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  "item.preview.organization.identifier.crossrefid": "ID de Crossref",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ID de ROR",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "Nom legal",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  "item.preview.dspace.entity.type": "Tipus d'entitat:",
 
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmar seleccionat",
 
   // "item.select.empty": "No items to show",
-  "item.select.empty": "No hi ha elements per mostrar",
+  "item.select.empty": "No hi ha ítems per mostrar",
+
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "Ítems seleccionats",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "Seleccionar ítem",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "Deseleccionar ítem",
 
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
@@ -3862,7 +4328,6 @@
   // "item.select.table.title": "Title",
   "item.select.table.title": "Títol",
 
-
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "Encara no hi ha altres versions per a aquest ítem.",
 
@@ -3923,14 +4388,21 @@
   // "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.history.table.action.hasDraft": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
 
-
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   "item.version.notice": "Aquesta no és l'última versió d'aquest ítem. L'última versió es pot trobar <a href='{{destination}}'>aquí</a>.",
 
-
   // "item.version.create.modal.header": "New version",
   "item.version.create.modal.header": "Nova versió",
 
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Sol·licitar retirada",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Sol·licitar reintegració",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  "item.qa.reinstate.create.modal.header": "Nova versió",
+
   // "item.version.create.modal.text": "Create a new version for this item",
   "item.version.create.modal.text": "Crear una nova versió d'aquest ítem",
 
@@ -3943,34 +4415,75 @@
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
   "item.version.create.modal.button.confirm.tooltip": "Crear nova versió",
 
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Enviar sol·licitud",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Retirar",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Reintegrar",
+
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancel·lar",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel·lar",
+
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
   "item.version.create.modal.button.cancel.tooltip": "No crear una nova versió",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "No enviar sol·licitud",
+
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Resum",
 
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "Està sol·licitant retirar aquest ítem",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Introduïu el motiu de la retirada",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "Està sol·licitant reintegrar aquest ítem",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Introduïu el motiu de la reintegració",
+
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
   "item.version.create.modal.form.summary.placeholder": "Introduïu el resum d'aquesta nova versió",
 
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  "qa-withdrown.modal.form.summary.placeholder": "Introduïu el motiu de la retirada",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Introduïu el motiu de la reintegració",
+
   // "item.version.create.modal.submitted.header": "Creating new version...",
   "item.version.create.modal.submitted.header": "Creant nova versió...",
 
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "Enviant sol·licitud de retirada...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Sol·licitud de reintegració enviada.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Sol·licitud de retirada enviada.",
+
   // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
   "item.version.create.modal.submitted.text": "S'està creant la nova versió. Si l'ítem té moltes relacions, aquest procés podria trigar.",
 
-  // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
   "item.version.create.notification.success": "S'ha creat una nova versió amb número {{version}}",
 
-  // "item.version.create.notification.failure" : "New version has not been created",
+  // "item.version.create.notification.failure": "New version has not been created",
   "item.version.create.notification.failure": "No s'ha creat una nova versió",
 
-  // "item.version.create.notification.inProgress" : "A new version cannot be created because there is an in-progress submission in the version history",
+  // "item.version.create.notification.inProgress": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.version.create.notification.inProgress": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
 
-
   // "item.version.delete.modal.header": "Delete version",
   "item.version.delete.modal.header": "Esborrar versió",
 
@@ -3989,20 +4502,107 @@
   // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
   "item.version.delete.modal.button.cancel.tooltip": "No esborrar aquesta versió",
 
-  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
   "item.version.delete.notification.success": "S'ha esborrat la versió número {{version}}",
 
-  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
   "item.version.delete.notification.failure": "No s'ha esborrat la versió número {{version}}",
 
-
-  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
   "item.version.edit.notification.success": "Ha canviat el resum de la versió número {{version}}",
 
-  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  // "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
   "item.version.edit.notification.failure": "No ha canviat el resum de la versió número {{version}}",
 
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Afegir",
 
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Descartar",
+
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "Editar idioma",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "Editar valor",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Arrossegar per reordenar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Eliminar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Desfer canvis",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Deixar d'editar",
+
+  // "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.empty": "La plantilla d'ítem actualment no conté cap metadada. Feu clic a Afegir per començar a afegir un valor de metadades.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Camp",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Idioma",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Valor",
+
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "Editar camp",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "S'ha produït un error en validar el camp de metadades",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Trieu un camp de metadades vàlid",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Els teus canvis han sigut descartats. Per restaurar els teus canvis feu clic al botó 'Desfer'",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Canvis descartats",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "S'ha produït un error",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
+  "itemtemplate.edit.metadata.notifications.invalid.content": "Els canvis no s'han desat. Assegureu-vos que tots els camps siguin vàlids abans de desar.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadades invàlides",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.content": "The item template you're currently working on has been changed by another user. Your current changes are discarded to prevent conflicts",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "Un altre usuari ha canviat la plantilla d'ítem en què està treballant actualment. Els teus canvis han estat descartats per evitar conflictes",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Canvis desactualitzats",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "S'han desat els canvis a les metadades d'aquesta plantilla d'ítem.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadades desades",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Desfer",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Desfer reordenació",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Guardar",
 
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
@@ -4034,8 +4634,6 @@
   // "journal.search.title": "Journal Search",
   "journal.search.title": "Cerca de revistes",
 
-
-
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Número de la revista",
 
@@ -4063,7 +4661,8 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Número de la revista: ",
 
-
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Resultats de la cerca de números de la revista",
 
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volum de la revista",
@@ -4083,6 +4682,8 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volum",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "Resultats de la cerca de volums de la revista",
 
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Suport del document",
@@ -4117,7 +4718,6 @@
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Descripció: ",
 
-
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Carregant fitxer...",
 
@@ -4172,8 +4772,6 @@
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Carregant comunitats de primer nivell...",
 
-
-
   // "login.form.email": "Email address",
   "login.form.email": "Correu electrònic",
 
@@ -4186,9 +4784,6 @@
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "Nou Usuari? Feu clic aquí per registrar-se",
 
-  // "login.form.or-divider": "or",
-  "login.form.or-divider": "o",
-
   // "login.form.oidc": "Log in with OIDC",
   "login.form.oidc": "Iniciar sessió amb OIDC",
 
@@ -4210,8 +4805,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Iniciar sessió",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Tancar sessió a DSpace",
 
@@ -4221,7 +4814,8 @@
   // "logout.title": "Logout",
   "logout.title": "Tancar sessió",
 
-
+  // "menu.header.nav.description": "Admin navigation bar",
+  "menu.header.nav.description": "Barra de navegació d'administració",
 
   // "menu.header.admin": "Management",
   "menu.header.admin": "Administració",
@@ -4232,41 +4826,33 @@
   // "menu.header.admin.description": "Management menu",
   "menu.header.admin.description": "Menú d'administració",
 
-
-
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Control d'accés",
 
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autoritzacions",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Gestió massiva d'accés",
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Grups",
 
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Usuaris",
 
-
-
   // "menu.section.reports": "Reports",
-  // TODO New key - Add a translation
-  "menu.section.reports": "Reports",
+  "menu.section.reports": "Informes",
 
   // "menu.section.reports.collections": "Filtered Collections",
-  // TODO New key - Add a translation
-  "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Col·leccions filtrades",
 
   // "menu.section.reports.queries": "Metadata Query",
-  // TODO New key - Add a translation
-  "menu.section.reports.queries": "Metadata Query",
-
-
+  "menu.section.reports.queries": "Consulta de metadades",
 
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Cerca d'administrador",
 
-
-
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Aquesta comunitat",
 
@@ -4291,22 +4877,24 @@
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Per tema",
 
+  // "menu.section.browse_global_by_srsc": "By Subject Category",
+  "menu.section.browse_global_by_srsc": "Per categoria de matèria",
+
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "Per Norwegian Science Index",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Per títol",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Comunitats i col·leccions",
 
-
-
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Panel de control",
 
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Tasques de curació",
 
-
-
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Editar",
 
@@ -4319,8 +4907,6 @@
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Ítem",
 
-
-
   // "menu.section.export": "Export",
   "menu.section.export": "Exportar",
 
@@ -4339,13 +4925,11 @@
   // "menu.section.export_batch": "Batch Export (ZIP)",
   "menu.section.export_batch": "Exportació per lots (ZIP)",
 
-
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Secció del menú de control d'accés",
 
-  //"menu.section.icon.reports": "Reports menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.reports": "Reports menu section",
+  // "menu.section.icon.reports": "Reports menu section",
+  "menu.section.icon.reports": "Secció del menú d'informes",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Secció del menú de cerca d'administrador",
@@ -4392,7 +4976,8 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Desanclar la barra lateral",
 
-
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Secció del menú de notificacions",
 
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
@@ -4403,8 +4988,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadades",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Nou",
 
@@ -4423,7 +5006,14 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Procés",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificacions",
 
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Assegurament de la Qualitat",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reclamació de Publicació",
 
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Ancorar barra lateral",
@@ -4431,16 +5021,12 @@
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Desancorar la barra lateral",
 
-
-
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Processos",
 
   // "menu.section.health": "Health",
   "menu.section.health": "Revisió de salut",
 
-
-
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Registres",
 
@@ -4450,23 +5036,18 @@
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadades",
 
-
-
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Estadístiques",
 
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tasques d'estadístiques",
 
-
-
-  //"menu.section.toggle.reports": "Toggle Reports section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.reports": "Toggle Reports section",
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar secció de Control d'accés",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Alternar secció d'Informes",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Alternar la secció del Panell de control",
 
@@ -4494,19 +5075,18 @@
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Alternar secció de Tasca d'estadístiques",
 
-
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "Administrar flux de treball",
 
-
   // "metadata-export-search.tooltip": "Export search results as CSV",
   "metadata-export-search.tooltip": "Exporta els resultats de cerca a CSV",
+
   // "metadata-export-search.submit.success": "The export was started successfully",
   "metadata-export-search.submit.success": "L'exportació s'ha iniciat satisfactòriament",
+
   // "metadata-export-search.submit.error": "Starting the export has failed",
   "metadata-export-search.submit.error": "Ha fallat l'inici de l'exportació",
 
-
   // "mydspace.breadcrumbs": "MyDSpace",
   "mydspace.breadcrumbs": "El meu DSpace",
 
@@ -4585,18 +5165,21 @@
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Sense títol",
 
-  // "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
   "mydspace.results.no-uri": "Sense URI",
 
-  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
   "mydspace.search-form.placeholder": "Cerca al meu DSpace...",
 
   // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "Tasques del flux de treball",
 
-  // "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workspace": "Your submissions",
   "mydspace.show.workspace": "Els seus enviaments",
 
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Ítems supervisats",
+
   // "mydspace.status.mydspaceArchived": "Archived",
   "mydspace.status.mydspaceArchived": "Arxivat",
 
@@ -4630,7 +5213,17 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Veure",
 
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  "nav.expandable-navbar-section-suffix": "(submenú)",
 
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Hem trobat <b>{{count}} publicacions</b> a {{source}} que semblen estar relacionades amb el vostre perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "revisar les suggerències",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Si us plau",
 
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Tot DSpace",
@@ -4638,13 +5231,16 @@
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Per comunitat",
 
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Alternar ajuda contextual",
+
   // "nav.language": "Language switch",
   "nav.language": "Canvi d'idioma",
 
   // "nav.login": "Log In",
   "nav.login": "Iniciar sessió",
 
-  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
   "nav.user-profile-menu-and-logout": "Menú de perfil d'usuari i tancament de sessió",
 
   // "nav.logout": "Log Out",
@@ -4662,21 +5258,236 @@
   // "nav.search": "Search",
   "nav.search": "Cerca",
 
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Enviar cerca",
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Estadístiques",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "Deixeu de fer-vos passar per usuari",
 
-  // "nav.toggle" : "Toggle navigation",
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Subscripcions",
+
+  // "nav.toggle": "Toggle navigation",
   "nav.toggle": "Alternar navegació",
 
-  // "nav.user.description" : "User profile bar",
+  // "nav.user.description": "User profile bar",
   "nav.user.description": "Barra de perfil d'usuari",
 
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Ítem",
 
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Assegurament de la Qualitat",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "A continuació podeu veure tots els temes rebuts de les subscripcions a {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "A continuació podeu veure totes les fonts de notificació.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Temes actuals",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fonts actuals",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tema",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Font",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Últim esdeveniment",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Accions",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostra temes per a {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostra suggeriments per a {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "No s'han trobat temes.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "No s'han trobat fonts.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Suggeriments d'assegurament de la qualitat",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "S'ha produït un error en carregar els temes d'assegurament de la qualitat",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "S'ha produït un error en carregar la font d'assegurament de la qualitat",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "Carregant ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tema:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "No s'han trobat suggeriments.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confiança",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicació",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalls",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalls del projecte",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Raons",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Accions",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Acceptar suggeriment",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar suggeriment",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Eliminar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rebutjar suggeriment",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar projecte i acceptar suggeriment",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipus de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor de PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor del tema:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resum:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Dades del projecte suggerit per OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Títol del projecte:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrònim:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Codi:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Finançador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de finançament:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdicció:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Tornar als temes",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Tornar a les fonts",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menys",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar més",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Enllaçat al registre local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "No s'ha trobat cap registre local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "Estàs segur?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Aquesta operació no es pot desfer. Ignorar aquest suggeriment?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "Aquesta operació no es pot desfer!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Aquesta operació no es pot desfer. Rebutjar aquest suggeriment?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "No s'ha seleccionat cap projecte DSpace. Es crearà un nou projecte basat en les dades del suggeriment.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancel·lar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "La vostra decisió s'ha desat correctament.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "S'ha produït un error. La vostra decisió no s'ha desat.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Trieu un projecte per enllaçar",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicació:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Enllaçat al registre local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Cerca de projectes",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Cerca",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Netejar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancel·lar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Projecte enllaçat",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Eliminar",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduïu un nom de projecte",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "No s'ha trobat cap projecte.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "El projecte s'ha enllaçat correctament.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "El projecte s'ha desvinculat correctament.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "S'ha produït un error. No s'ha realitzat cap operació.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Raó",
 
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unitat organitzativa",
@@ -4705,7 +5516,11 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Unitat organitzativa: ",
 
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "Identificador ROR",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultats de la cerca d'unitats organitzatives",
 
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opcions de paginació",
@@ -4722,8 +5537,6 @@
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Opcions d'ordenació",
 
-
-
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Persona",
 
@@ -4772,11 +5585,21 @@
   // "person.search.title": "Person Search",
   "person.search.title": "Cerca de persones",
 
-
-
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Paràmetres",
 
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "Seleccionar paràmetre",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "Afegir un paràmetre...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "Eliminar paràmetre",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "Valor del paràmetre",
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Cancel·lar",
 
@@ -4822,6 +5645,9 @@
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "S'ha produït un error en crear aquest procés.",
 
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "El fitxer supera la mida màxima de càrrega",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Crea un nou procés",
 
@@ -4831,18 +5657,16 @@
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Crea un nou procés",
 
-
-
-  // "process.detail.arguments" : "Arguments",
+  // "process.detail.arguments": "Arguments",
   "process.detail.arguments": "Arguments",
 
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
   "process.detail.arguments.empty": "Aquest procés no conté cap argument",
 
-  // "process.detail.back" : "Back",
+  // "process.detail.back": "Back",
   "process.detail.back": "Enrere",
 
-  // "process.detail.output" : "Process Output",
+  // "process.detail.output": "Process Output",
   "process.detail.output": "Sortida del procés",
 
   // "process.detail.logs.button": "Retrieve process output",
@@ -4854,28 +5678,28 @@
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Aquest procés no té sortida",
 
-  // "process.detail.output-files" : "Output Files",
+  // "process.detail.output-files": "Output Files",
   "process.detail.output-files": "Fitxers de sortida",
 
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Aquest procés no conté cap fitxer de sortida",
 
-  // "process.detail.script" : "Script",
-  "process.detail.script": "Seqüència d'ordres",
+  // "process.detail.script": "Script",
+  "process.detail.script": "Script",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
   "process.detail.title": "Procés: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
+  // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Hora d'inici",
 
-  // "process.detail.end-time" : "Finish time",
+  // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Hora de finalització",
 
-  // "process.detail.status" : "Status",
+  // "process.detail.status": "Status",
   "process.detail.status": "Estat",
 
-  // "process.detail.create" : "Create similar process",
+  // "process.detail.create": "Create similar process",
   "process.detail.create": "Crear un procés similar",
 
   // "process.detail.actions": "Actions",
@@ -4902,24 +5726,52 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Alguna cosa ha fallat eliminant el procés",
 
+  // "process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Actualització automàtica…",
 
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Hora de finalització (UTC)",
 
-  // "process.overview.table.finish" : "Finish time (UTC)",
+  // "process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Processos completats amb èxit",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "No s'han trobat processos coincidents.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Hora de finalització (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Processos fallits",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de finalització (UTC)",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "ID de procés",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nom",
 
-  // "process.overview.table.start" : "Start time (UTC)",
+  // "process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Hora d'inici (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Processos en execució",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Hora de creació (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Processos programats",
+
+  // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora d'inici (UTC)",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Estat",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Usuari",
 
   // "process.overview.title": "Processes Overview",
@@ -4937,6 +5789,9 @@
   // "process.overview.delete": "Delete {{count}} processes",
   "process.overview.delete": "Eliminar {{count}} processos",
 
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Eliminar procés",
+
   // "process.overview.delete.clear": "Clear delete selection",
   "process.overview.delete.clear": "Netejar la selecció",
 
@@ -4949,6 +5804,9 @@
   // "process.overview.delete.header": "Delete processes",
   "process.overview.delete.header": "Elimina processos",
 
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Desconegut",
+
   // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "Error eliminant procés",
 
@@ -4958,8 +5816,6 @@
   // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
   "process.bulk.delete.success": "{{count}} procés(sos) s'han eliminat correctament",
 
-
-
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Actualització del perfil",
 
@@ -4978,9 +5834,6 @@
   // "profile.special.groups.head": "Authorization special groups you belong to",
   "profile.special.groups.head": "Grups d'autorització especials als quals pertanys",
 
-  // "profile.head": "Update Profile",
-  "profile.head": "Actualització del perfil",
-
   // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "Es requereix el nom",
 
@@ -5089,8 +5942,6 @@
   // "project-relationships.search.results.head": "Project Search Results",
   "project-relationships.search.results.head": "Resultats de cerca de projectes",
 
-
-
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Publicació",
 
@@ -5124,7 +5975,6 @@
   // "publication.search.title": "Publication Search",
   "publication.search.title": "Cerca de publicacions",
 
-
   // "media-viewer.next": "Next",
   "media-viewer.next": "Següent",
 
@@ -5134,6 +5984,104 @@
   // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "Llista de reproducció",
 
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "Carregant ...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reclamació de Publicació",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reclamació de Publicació",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  "suggestion.targets.description": "A continuació podeu veure totes les suggerències ",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Suggeriments actuals",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nom del investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Accions",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Revisar {{ total }} suggeriment(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  "suggestion.button.review.title": "Revisar {{ total }} suggeriment(s) per a ",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "No s'ha trobat cap objectiu.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "S'ha produït un error en carregar els objectius de suggeriment",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipus",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Puntuació",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notes",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprovar i importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "El suggeriment s'ha importat correctament. <a href='{{ url }}'>Veure.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprovar i importar seleccionats",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} suggeriments s'han importat correctament ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} suggeriments no s'han importat a causa d'errors inesperats del servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar suggeriment",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "El suggeriment ha estat descartat",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar suggeriments seleccionats",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggeriments han estat descartats ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggeriments no han estat descartats a causa d'errors inesperats del servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Veure evidència",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Amagar evidència",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Suggeriments per a",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Suggeriments per a {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "Gràfic OpenAIRE",
+
+  // "suggestion.from.source": "from the ",
+  "suggestion.from.source": "de la ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "No tens reclamacions de publicació restants",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Puntuació total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
 
   // "register-email.title": "New user registration",
   "register-email.title": "Registre de nou usuari",
@@ -5198,7 +6146,6 @@
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Registre completat",
 
-
   // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "Registre de nou usuari",
 
@@ -5211,8 +6158,11 @@
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Si us plau, introduïu una adreça de correu electrònic",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  "register-page.registration.email.error.pattern": "Si us plau, introduïu una adreça de correu electrònic vàlida",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Si us plau, introduïu una adreça de correu electrònic vàlida.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Utilitzeu correu electrònic amb dominis permesos: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Aquesta adreça serà verificada i utilitzada com a nom d'inici de sessió.",
@@ -5229,7 +6179,7 @@
   // "register-page.registration.error.head": "Error when trying to register email",
   "register-page.registration.error.head": "Error en intentar registrar el correu electrònic",
 
-  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  // "register-page.registration.error.content": "An error occurred when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "S'ha produït un error en registrar la següent adreça de correu electrònic: {{ email }}",
 
   // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
@@ -5238,6 +6188,9 @@
   // "register-page.registration.google-recaptcha.must-accept-cookies": "In order to register you must accept the <b>Registration and Password recovery</b> (Google reCaptcha) cookies.",
   "register-page.registration.google-recaptcha.must-accept-cookies": "Per registrar-se heu d'acceptar les cookies de <b>Registre i recuperació de contrasenya</b> (Google reCaptcha).",
 
+  // "register-page.registration.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+  "register-page.registration.error.maildomain": "Aquesta adreça de correu electrònic no està a la llista de dominis que es poden registrar. Els dominis permesos són {{ domains }}",
+
   // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
   "register-page.registration.google-recaptcha.open-cookie-settings": "Obrir configuració de cookies",
 
@@ -5250,6 +6203,9 @@
   // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
   "register-page.registration.google-recaptcha.notification.message.expired": "Verificació caducada. Verifiqueu de nou.",
 
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "Es poden registrar comptes per a adreces de correu electrònic dels dominis",
+
   // "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
   "relationships.add.error.relationship-type.content": "No s'ha pogut trobar una coincidència adequada per al tipus de relació {{ type }} entre els dos ítems",
 
@@ -5271,12 +6227,18 @@
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Números de revista",
 
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "Número de la revista",
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Número de la revista",
 
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Revistes",
 
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "Volum de la revista",
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Unitats organitzatives",
 
@@ -5301,6 +6263,9 @@
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Volums de revistes",
 
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "Volum de la revista",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Col·laboradors",
 
@@ -5313,16 +6278,14 @@
   // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
   "relationships.isFundingAgencyOf.OrgUnit": "Finançador",
 
-
   // "repository.image.logo": "Repository logo",
   "repository.image.logo": "Logotip del repositori",
 
-  // "repository.title.prefix": "DSpace Angular :: ",
-  "repository.title.prefix": "DSpace Angular :: ",
-
-  // "repository.title.prefixDSpace": "DSpace Angular ::",
-  "repository.title.prefixDSpace": "DSpace Angular ::",
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Repositori DSpace",
 
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Repositori DSpace :: ",
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Afegir",
@@ -5441,7 +6404,7 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nom",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
+  // "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.name.hint": "Màxim 30 caràcters",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
@@ -5474,6 +6437,18 @@
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grup",
 
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "Seleccionar tot",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "Deseleccionar tot",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "Seleccionar",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "Deseleccionar",
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
 
@@ -5498,7 +6473,8 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Polítiques per a la col·lecció",
 
-
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Saltar al contingut principal",
 
   // "search.description": "",
   "search.description": "",
@@ -5515,6 +6491,11 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Cerca al repositori ...",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Eliminar filtre de tipus {{ type }} amb valor {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Títol",
 
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
@@ -5537,6 +6518,12 @@
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Té fitxers",
 
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nom del fitxer",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descripció del fitxer",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipus",
 
@@ -5558,10 +6545,41 @@
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Data de naixement, inicial",
 
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Supervisat per",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirat",
 
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
 
+  // "search.filters.applied.operator.notequals": " not equals",
+  "search.filters.applied.operator.notequals": " no igual",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  "search.filters.applied.operator.notauthority": " no autoritat",
+
+  // "search.filters.applied.operator.contains": " contains",
+  "search.filters.applied.operator.contains": " conté",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  "search.filters.applied.operator.notcontains": " no conté",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Títol",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Títol",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Cerca per Títol",
 
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
@@ -5665,6 +6683,24 @@
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Té fitxers",
 
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nom del fitxer",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nom del fitxer",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Cerca per Nom del fitxer",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descripció del fitxer",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripció del fitxer",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Cerca per Descripció del fitxer",
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tipus",
 
@@ -5773,6 +6809,20 @@
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Navega per l'arbre {{ name }}",
 
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Finançament",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Finançament",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Supervisat per",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Supervisat per",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Cerca Supervisat per",
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Número de la revista",
@@ -5783,6 +6833,15 @@
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Unitat organitzativa",
 
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Persona",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Projecte",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicació",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sí",
 
@@ -5795,13 +6854,27 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sí",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Arxivat",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validació",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "Esperant el revisor",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Flux de treball",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Espai de treball",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Sí",
 
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "No",
 
-
   // "search.filters.head": "Filters",
   "search.filters.head": "Filtres",
 
@@ -5811,7 +6884,26 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Iguals",
 
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "No iguals",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoritat",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "No autoritat",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Conté",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "No conté",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
 
   // "search.form.search": "Search",
   "search.form.search": "Cerca",
@@ -5822,8 +6914,6 @@
   // "search.form.scope.all": "All of DSpace",
   "search.form.scope.all": "Tot DSpace",
 
-
-
   // "search.results.head": "Search Results",
   "search.results.head": "Resultats de la cerca",
 
@@ -5848,7 +6938,6 @@
   // "default-relationships.search.results.head": "Search Results",
   "default-relationships.search.results.head": "Resultats de la cerca",
 
-
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Tornar a resultats",
 
@@ -5867,11 +6956,24 @@
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Ordenar per",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Cerca avançada",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar per",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtres",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadors",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Afegir",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Configuració",
 
-
-
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Mostrar detall",
 
@@ -5881,7 +6983,11 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostra com a llista",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "Deseleccionar ítem",
 
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "Seleccionar ítem",
 
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendent",
@@ -5919,6 +7025,23 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última modificació Descendent",
 
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  "sorting.person.familyName.ASC": "Cognoms Ascendent",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  "sorting.person.familyName.DESC": "Cognoms Descendent",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  "sorting.person.givenName.ASC": "Nom Ascendent",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  "sorting.person.givenName.DESC": "Nom Descendent",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  "sorting.person.birthDate.ASC": "Data de naixement Ascendent",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  "sorting.person.birthDate.DESC": "Data de naixement Descendent",
 
   // "statistics.title": "Statistics",
   "statistics.title": "Estadístiques",
@@ -5953,7 +7076,8 @@
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Visites",
 
-
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(no s'ha pogut carregar el nom de l'objecte)",
 
   // "submission.edit.breadcrumbs": "Edit Submission",
   "submission.edit.breadcrumbs": "Editar enviament",
@@ -5964,7 +7088,7 @@
   // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "Cancel·lar",
 
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
   "submission.general.cannot_submit": "No teniu els permisos per fer un enviament nou.",
 
   // "submission.general.deposit": "Deposit",
@@ -5985,6 +7109,9 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Descartar",
 
+  // "submission.general.back.submit": "Back",
+  "submission.general.back.submit": "Enrere",
+
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Guardat",
 
@@ -5997,7 +7124,6 @@
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Desa per més endavant",
 
-
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Importar metadades des d'una font externa",
 
@@ -6061,6 +7187,9 @@
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
 
+  // "submission.import-external.source.doi": "DOI",
+  "submission.import-external.source.doi": "DOI",
+
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
 
@@ -6091,8 +7220,14 @@
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "Editors SHERPA",
 
-  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-  "submission.import-external.source.openAIREFunding": "API de Finançament d'OpenAIRE",
+  // "submission.import-external.source.openaire": "OpenAIRE Search by Authors",
+  "submission.import-external.source.openaire": "Cerca OpenAIRE per Autors",
+
+  // "submission.import-external.source.openaireTitle": "OpenAIRE Search by Title",
+  "submission.import-external.source.openaireTitle": "Cerca OpenAIRE per Títol",
+
+  // "submission.import-external.source.openaireFunding": "OpenAIRE Search by Funder",
+  "submission.import-external.source.openaireFunding": "Cerca OpenAIRE per Finançador",
 
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
@@ -6106,6 +7241,9 @@
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Noms de la Biblioteca del Congrés",
 
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Vista prèvia de l'ítem",
 
@@ -6196,9 +7334,6 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projecte",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "API OpenAIRE de Finançament",
-
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importació remota d'autor",
 
@@ -6232,11 +7367,20 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Important des d'ORCID",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Important des d'OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Important des d'OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Important des d'OpenAIRE",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importar des de Sherpa Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importa des de Sherpa Journal",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importing from Sherpa Publisher",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importar des de Sherpa Publisher",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importa des de Sherpa Publisher",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importing from PubMed",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importa des de PubMed",
@@ -6244,6 +7388,9 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Important des d'arXiv",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Importa des de ROR",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
 
@@ -6277,6 +7424,15 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccioneu una coincidència local:",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Importació remota d'Organització",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Organització local afegida amb èxit a la selecció",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Organització externa importada i afegida amb èxit a la selecció",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar tot",
 
@@ -6309,6 +7465,7 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistes locals ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projectes locals ({{ count }})",
 
@@ -6332,11 +7489,13 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Números de revista locals ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Números de revista locals ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Volums de revista locals ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Local Journal Volumes ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volums de revista locals ({{ count }})",
 
@@ -6358,6 +7517,30 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Cerca per Autors ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Cerca per Títol ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Search by Funder ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Cerca per Finançador ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Revistes per ISSN ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Cerca d'agències de finançament",
 
@@ -6367,9 +7550,6 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Cerca d'unitats organitzatives",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "API OpenAire de Finançament",
-
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projectes",
 
@@ -6379,8 +7559,8 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicació de l'autor",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "API OpenAIRE de Finançament",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "Unitat organitzativa del Projecte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projecte",
@@ -6391,22 +7571,24 @@
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Finançador del Projecte",
 
-
-
-
   // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
   "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Cerca...",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selecció actual ({{ count }})",
 
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "Revista",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Números de revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Números de revista",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volums de revista",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volums de revista",
 
@@ -6418,6 +7600,7 @@
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agència finançadora",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Projectes",
 
@@ -6448,6 +7631,9 @@
   // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
   "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicació",
 
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
 
@@ -6465,6 +7651,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volum de revista seleccionada",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projectes seleccionats",
 
@@ -6488,6 +7675,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número de revista seleccionat",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volums de revista seleccionats",
 
@@ -6496,6 +7684,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Finançaments seleccionats",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Número seleccionat",
 
@@ -6514,6 +7703,15 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultats de la cerca",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Resultats de la cerca",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultats de la cerca",
 
@@ -6538,6 +7736,9 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Resultats de la cerca",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Resultats de la cerca",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultats de la cerca",
 
@@ -6601,6 +7802,9 @@
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "No s'ha trobat cap col·lecció",
 
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "No s'han trobat tipus d'entitat",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "No hi ha opcions disponibles",
 
@@ -6616,7 +7820,23 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Hi ha seccions incompletes.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Es crearan els següents identificadors per al vostre ítem:",
 
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "No s'han creat handles per a aquest ítem.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "No s'han creat DOIs per a aquest ítem.",
+
+  // "submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle: ",
+
+  // "submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI: ",
+
+  // "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Altres identificadors: ",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condicions d'accés a l'ítem",
@@ -6636,8 +7856,11 @@
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Descriure",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  "submission.sections.submit.progressbar.detect-duplicate": "Possibles duplicats",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Possibles duplicats",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identificadors",
 
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Llicència de dipòsit",
@@ -6651,7 +7874,6 @@
   // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
   "submission.sections.submit.progressbar.sherpaPolicies": "Informació sobre polítiques editorials d'accés obert",
 
-
   // "submission.sections.sherpa-policy.title-empty": "No publisher policy information available. If your work has an associated ISSN, please enter it above to see any related publisher open access policies.",
   "submission.sections.sherpa-policy.title-empty": "No es troba disponible la informació sobre política editorial. Si teniu un ISSN associat, introduïu-lo a dalt per veure informació sobre polítiques editorials d'accés obert.",
 
@@ -6691,6 +7913,12 @@
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "Contraure secció {{sectionHeader}}",
 
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  "submission.sections.upload.primary.make": "Fer {{fileName}} el fitxer principal",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  "submission.sections.upload.primary.remove": "Treure {{fileName}} com el fitxer principal",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancel·lar",
 
@@ -6826,16 +8054,27 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Fins",
 
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  "submission.sections.duplicates.none": "No s'han detectat duplicats.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  "submission.sections.duplicates.detected": "S'han detectat possibles duplicats. Si us plau, reviseu la llista a continuació.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  "submission.sections.duplicates.in-workspace": "Aquest ítem està en l'espai de treball",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  "submission.sections.duplicates.in-workflow": "Aquest ítem està en el flux de treball",
+
   // "submission.sections.license.granted-label": "I confirm the license above",
   "submission.sections.license.granted-label": "Confirmo la llicència",
 
   // "submission.sections.license.required": "You must accept the license",
   "submission.sections.license.required": "Ha d'acceptar la llicència",
 
-  // "submission.sections.license.notgranted":  "You must accept the license",
+  // "submission.sections.license.notgranted": "You must accept the license",
   "submission.sections.license.notgranted": "Heu d'acceptar la llicència",
 
-
   // "submission.sections.sherpa.publication.information": "Publication information",
   "submission.sections.sherpa.publication.information": "Informació de la Publicació",
 
@@ -6914,21 +8153,17 @@
   // "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
   "submission.sections.sherpa.error.message": "S'ha produït un error recuperant la informació de Sherpa",
 
-
-
   // "submission.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "Nou enviament",
 
   // "submission.submit.title": "New submission",
   "submission.submit.title": "Nou enviament",
 
-
-
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Eliminar",
 
-  // "submission.workflow.generic.delete-help": "If you would to discard this item, select \"Delete\".  You will then be asked to confirm it.",
-  "submission.workflow.generic.delete-help": "Si voleu descartar aquest element, seleccioneu \"Eliminar\". Després se us demanarà que ho confirmeu.",
+  // "submission.workflow.generic.delete-help": "Select this option to discard this item. You will then be asked to confirm it.",
+  "submission.workflow.generic.delete-help": "Seleccioneu aquesta opció per descartar aquest ítem. Després se us demanarà que ho confirmeu.",
 
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Editar",
@@ -6942,7 +8177,17 @@
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Seleccioneu aquesta opció per veure les metadades de l'ítem.",
 
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Seleccionar revisor",
 
+  // "submission.workflow.generic.submit_select_reviewer-help": "",
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  // "submission.workflow.generic.submit_score": "Rate",
+  "submission.workflow.generic.submit_score": "Qualificar",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
 
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Aprovar",
@@ -6956,6 +8201,12 @@
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Seleccioneu aquesta opció per canviar les metadades de l'ítem.",
 
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Declinar",
+
+  // "submission.workflow.tasks.claimed.decline_help": "",
+  "submission.workflow.tasks.claimed.decline_help": "",
+
   // "submission.workflow.tasks.claimed.reject.reason.info": "Please enter your reason for rejecting the submission into the box below, indicating whether the submitter may fix a problem and resubmit.",
   "submission.workflow.tasks.claimed.reject.reason.info": "Introduïu el vostre motiu per rebutjar l'enviament al quadre a continuació, indicant si el remitent pot solucionar el problema i tornar-lo a enviar.",
 
@@ -6980,8 +8231,6 @@
   // "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
   "submission.workflow.tasks.claimed.return_help": "Torneu la tasca al pool perquè un altre usuari pugui realitzar-la.",
 
-
-
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "S'ha produït un error durant l'operació...",
 
@@ -6994,8 +8243,6 @@
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operació completada amb èxit",
 
-
-
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Assumir tasca",
 
@@ -7008,6 +8255,8 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalls",
 
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  "submission.workflow.tasks.duplicates": "s'han detectat possibles duplicats per a aquest ítem. Reclameu i editeu aquest ítem per veure els detalls.",
 
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Veure",
@@ -7015,6 +8264,113 @@
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Seleccioneu aquesta opció per veure les metadades de l'ítem.",
 
+  // "submitter.empty": "N/A",
+  "submitter.empty": "N/D",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Subscripcions",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Subscripcions per a ítems",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Subscripcions per a col·leccions",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Subscripcions per a comunitats",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Tipus de subscripció",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Freqüència de subscripció",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Diària",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Mensual",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Setmanal",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Subscriure's",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Subscripcions",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tipus i freqüència",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Tancar",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Per eliminar aquesta subscripció, visiteu la pàgina de \"Subscripcions\" al vostre perfil d'usuari",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contingut",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Diària",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Setmanal",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensual",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Enviar",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Processant...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Subscrit a {{ type }} correctament.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Subscripció eliminada correctament",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Subscripció a {{ type }} actualitzada correctament",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "S'ha produït un error durant la creació de la subscripció",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "S'ha produït un error durant l'eliminació de la subscripció",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "S'ha produït un error durant l'actualització de la subscripció",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Assumpte",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Tipus de subscripció",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Freqüència de subscripció",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Acció",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Editar",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Eliminar",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "No disponible",
+
+  // "subscriptions.table.not-available-message": "The subscribed item has been deleted, or you don't currently have the permission to view it",
+  "subscriptions.table.not-available-message": "L'ítem subscrit ha estat eliminat o actualment no teniu permís per veure'l",
+
+  // "subscriptions.table.empty.message": "You do not have any subscriptions at this time. To subscribe to email updates for a Community or Collection, use the subscription button on the object's page.",
+  "subscriptions.table.empty.message": "Actualment no teniu cap subscripció. Per subscriure's a les actualitzacions per correu electrònic d'una Comunitat o Col·lecció, utilitzeu el botó de subscripció a la pàgina de l'objecte.",
 
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Miniatura",
@@ -7040,13 +8396,9 @@
   // "thumbnail.person.placeholder": "No Profile Picture Available",
   "thumbnail.person.placeholder": "No hi ha imatge de perfil disponible",
 
-
-
   // "title": "DSpace",
   "title": "DSpace",
 
-
-
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "Vista d'arbre jeràrquic",
 
@@ -7059,6 +8411,9 @@
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Cerca",
 
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "Filtra els resultats escrivint les primeres lletres",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "No hi havia elements per mostrar",
 
@@ -7098,7 +8453,8 @@
   // "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
   "virtual-metadata.delete-relationship.modal-head": "Seleccioneu els ítems per als quals voleu desar les metadades virtuals com a metadades reals",
 
-
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Ítems supervisats",
 
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Els teus enviaments",
@@ -7109,7 +8465,11 @@
   // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "Tasques del flux de treball",
 
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Tasques del flux de treball i Workspace",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultats de la cerca d'unitats organitzatives",
 
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar ítem del flux de treball",
@@ -7141,7 +8501,6 @@
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Esborrar",
 
-
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "Tornar al remitent",
 
@@ -7175,6 +8534,81 @@
   // "workspace-item.view.title": "Workspace View",
   "workspace-item.view.title": "Vista del flux de treball",
 
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Eliminar Workspace",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Eliminar ítem del workspace",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Eliminar",
+
+  // "workspace-item.delete.button.cancel": "Cancel",
+  "workspace-item.delete.button.cancel": "Cancel·lar",
+
+  // "workspace-item.delete.notification.success.title": "Deleted",
+  "workspace-item.delete.notification.success.title": "Eliminat",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Aquest ítem del workspace s'ha eliminat correctament",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "No s'ha pogut eliminar l'ítem del workspace",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Flux de treball avançat",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Revisor seleccionat",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "El revisor per a aquest ítem del flux de treball s'ha seleccionat correctament",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "No s'ha pogut seleccionar el revisor per a aquest ítem del flux de treball",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Seleccionar revisor",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Seleccionar revisor",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Cancel·lar",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Confirmar",
+
+  // "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+  "workflow-item.scorereviewaction.notification.success.title": "Revisió de qualificació",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "La qualificació per a aquest ítem del flux de treball s'ha enviat correctament",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "No s'ha pogut qualificar aquest ítem",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Qualificar aquest ítem",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Qualificar aquest ítem",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Cancel·lar",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Confirmar",
+
   // "idle-modal.header": "Session will expire soon",
   "idle-modal.header": "La sessió caducarà aviat",
 
@@ -7187,7 +8621,7 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolongar la sessió",
 
-  // "researcher.profile.action.processing" : "Processing...",
+  // "researcher.profile.action.processing": "Processing...",
   "researcher.profile.action.processing": "Processant...",
 
   // "researcher.profile.associated": "Researcher profile associated",
@@ -7220,10 +8654,10 @@
   // "researcher.profile.view": "View",
   "researcher.profile.view": "Veure",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
+  // "researcher.profile.private.visibility": "PRIVATE",
   "researcher.profile.private.visibility": "PRIVAT",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
+  // "researcher.profile.public.visibility": "PUBLIC",
   "researcher.profile.public.visibility": "PÚBLIC",
 
   // "researcher.profile.status": "Status:",
@@ -7232,16 +8666,16 @@
   // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
   "researcherprofile.claim.not-authorized": "No està autoritzat per reclamar aquest ítem. Contacteu amb l'administrador per a més detalls.",
 
-  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
   "researcherprofile.error.claim.body": "S'ha produït un error reclamant el perfil, si us plau, intenteu-ho més tard",
 
-  // "researcherprofile.error.claim.title" : "Error",
+  // "researcherprofile.error.claim.title": "Error",
   "researcherprofile.error.claim.title": "Error",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
   "researcherprofile.success.claim.body": "Perfil reclamat amb èxit",
 
-  // "researcherprofile.success.claim.title" : "Success",
+  // "researcherprofile.success.claim.title": "Success",
   "researcherprofile.success.claim.title": "Èxit",
 
   // "person.page.orcid.create": "Create an ORCID ID",
@@ -7250,7 +8684,7 @@
   // "person.page.orcid.granted-authorizations": "Granted authorizations",
   "person.page.orcid.granted-authorizations": "Autoritzacions concedides",
 
-  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
   "person.page.orcid.grant-authorizations": "Concedir autoritzacions",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
@@ -7298,43 +8732,43 @@
   // "person.page.orcid.save.preference.changes": "Update settings",
   "person.page.orcid.save.preference.changes": "Actualitzar configuració",
 
-  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
   "person.page.orcid.sync-profile.affiliation": "Afiliació",
 
-  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
   "person.page.orcid.sync-profile.biographical": "Biografia",
 
-  // "person.page.orcid.sync-profile.education" : "Education",
+  // "person.page.orcid.sync-profile.education": "Education",
   "person.page.orcid.sync-profile.education": "Titulació",
 
-  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
   "person.page.orcid.sync-profile.identifiers": "Identificadors",
 
-  // "person.page.orcid.sync-fundings.all" : "All fundings",
+  // "person.page.orcid.sync-fundings.all": "All fundings",
   "person.page.orcid.sync-fundings.all": "Tots els finançaments",
 
-  // "person.page.orcid.sync-fundings.mine" : "My fundings",
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
   "person.page.orcid.sync-fundings.mine": "El meu finançament",
 
-  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
   "person.page.orcid.sync-fundings.my_selected": "Finançaments seleccionats",
 
-  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
   "person.page.orcid.sync-fundings.disabled": "Deshabilitat",
 
-  // "person.page.orcid.sync-publications.all" : "All publications",
+  // "person.page.orcid.sync-publications.all": "All publications",
   "person.page.orcid.sync-publications.all": "Totes les publicacions",
 
-  // "person.page.orcid.sync-publications.mine" : "My publications",
+  // "person.page.orcid.sync-publications.mine": "My publications",
   "person.page.orcid.sync-publications.mine": "Les meves publicacions",
 
-  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
   "person.page.orcid.sync-publications.my_selected": "Publicacions seleccionades",
 
-  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
   "person.page.orcid.sync-publications.disabled": "Deshabilitat",
 
-  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
   "person.page.orcid.sync-queue.discard": "Desfer el canvi i no sincronitzar amb ORCID",
 
   // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
@@ -7346,13 +8780,13 @@
   // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
   "person.page.orcid.sync-queue.empty-message": "La cua del registre d'ORCID és buida",
 
-  // "person.page.orcid.sync-queue.table.header.type" : "Type",
+  // "person.page.orcid.sync-queue.table.header.type": "Type",
   "person.page.orcid.sync-queue.table.header.type": "Tipus",
 
-  // "person.page.orcid.sync-queue.table.header.description" : "Description",
+  // "person.page.orcid.sync-queue.table.header.description": "Description",
   "person.page.orcid.sync-queue.table.header.description": "Descripció",
 
-  // "person.page.orcid.sync-queue.table.header.action" : "Action",
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
   "person.page.orcid.sync-queue.table.header.action": "Acció",
 
   // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
@@ -7418,7 +8852,7 @@
   // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL de l'investigador",
 
-  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
   "person.page.orcid.sync-queue.send": "Sincronitzar amb el registre ORCID",
 
   // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
@@ -7472,8 +8906,8 @@
   // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
   "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Es requereix el nom de l'organització",
 
-  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid" : "The publication date must be one year after 1900",
-  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "la data de la publicació ha de ser posterior a 1900",
+  // "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "The publication date must be one year after 1900",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "La data de la publicació ha de ser posterior a 1900",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "The organization to be sent requires an address",
   "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Es requereix l'adreça de l'organització",
@@ -7552,11 +8986,1211 @@
 
   // "person.orcid.registry.auth": "ORCID Authorizations",
   "person.orcid.registry.auth": "Autoritzacions ORCID",
+
   // "home.recent-submissions.head": "Recent Submissions",
   "home.recent-submissions.head": "Enviaments recents",
 
   // "listable-notification-object.default-message": "This object couldn't be retrieved",
   "listable-notification-object.default-message": "Aquest objecte no s'ha pogut recuperar",
 
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "S'ha produït un error en recuperar el banner d'alerta del sistema",
 
-}
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "En",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} dia(es),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hora(es) i",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minut(s):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Alerta del sistema",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Alerta del sistema",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "S'ha produït un error en recuperar l'alerta del sistema",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Cancel·lar",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Guardar",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "ACTIU",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "INACTIU",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "L'alerta del sistema ha de tenir un missatge",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Missatge d'alerta",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Habilitar un temporitzador de compte enrere",
+
+  // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
+  "system-wide-alert.form.label.countdownTo.hint": "Consell: Configureu un temporitzador de compte enrere. Quan estigui habilitat, es pot establir una data en el futur i el banner d'alerta del sistema farà un compte enrere fins a la data establerta. Quan aquest temporitzador acabi, desapareixerà de l'alerta. El servidor NO s'aturarà automàticament.",
+
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "Seleccioneu la data utilitzant el calendari",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Vista prèvia de l'alerta del sistema",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "L'alerta del sistema s'ha actualitzat correctament",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "S'ha produït un error en actualitzar l'alerta del sistema",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "L'alerta del sistema s'ha creat correctament",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "S'ha produït un error en crear l'alerta del sistema",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Alertes del sistema",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Alertes del sistema",
+
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descobrir",
+
+  // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
+  "item-access-control-title": "Aquest formulari us permet realitzar canvis en les condicions d'accés de les metadades de l'ítem o dels seus fitxers.",
+
+  // "collection-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by this collection. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "collection-access-control-title": "Aquest formulari us permet realitzar canvis en les condicions d'accés de tots els ítems propietat d'aquesta col·lecció. Els canvis es poden realitzar a totes les metadades dels ítems o a tot el contingut (fitxers).",
+
+  // "community-access-control-title": "This form allows you to perform changes to the access conditions of all the items owned by any collection under this community. Changes may be performed to either all Item metadata or all content (bitstreams).",
+  "community-access-control-title": "Aquest formulari us permet realitzar canvis en les condicions d'accés de tots els ítems propietat de qualsevol col·lecció sota aquesta comunitat. Els canvis es poden realitzar a totes les metadades dels ítems o a tot el contingut (fitxers).",
+
+  // "access-control-item-header-toggle": "Item's Metadata",
+  "access-control-item-header-toggle": "Metadades de l'ítem",
+
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Habilitar l'opció per realitzar canvis en les metadades de l'ítem",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Deshabilitar l'opció per realitzar canvis en les metadades de l'ítem",
+
+  // "access-control-bitstream-header-toggle": "Bitstreams",
+  "access-control-bitstream-header-toggle": "Fitxers",
+
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Habilitar l'opció per realitzar canvis en els fitxers",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Deshabilitar l'opció per realitzar canvis en els fitxers",
+
+  // "access-control-mode": "Mode",
+  "access-control-mode": "Mode",
+
+  // "access-control-access-conditions": "Access conditions",
+  "access-control-access-conditions": "Condicions d'accés",
+
+  // "access-control-no-access-conditions-warning-message": "Currently, no access conditions are specified below. If executed, this will replace the current access conditions with the default access conditions inherited from the owning collection.",
+  "access-control-no-access-conditions-warning-message": "Actualment, no s'especifiquen condicions d'accés a continuació. Si s'executa, això substituirà les condicions d'accés actuals per les condicions d'accés predeterminades heretades de la col·lecció propietària.",
+
+  // "access-control-replace-all": "Replace access conditions",
+  "access-control-replace-all": "Substituir condicions d'accés",
+
+  // "access-control-add-to-existing": "Add to existing ones",
+  "access-control-add-to-existing": "Afegir a les existents",
+
+  // "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+  "access-control-limit-to-specific": "Limitar els canvis a fitxers específics",
+
+  // "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+  "access-control-process-all-bitstreams": "Actualitzar tots els fitxers de l'ítem",
+
+  // "access-control-bitstreams-selected": "bitstreams selected",
+  "access-control-bitstreams-selected": "fitxers seleccionats",
+
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Seleccionar fitxers",
+
+  // "access-control-cancel": "Cancel",
+  "access-control-cancel": "Cancel·lar",
+
+  // "access-control-execute": "Execute",
+  "access-control-execute": "Executar",
+
+  // "access-control-add-more": "Add more",
+  "access-control-add-more": "Afegir més",
+
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Eliminar condició d'accés",
+
+  // "access-control-select-bitstreams-modal.title": "Select bitstreams",
+  "access-control-select-bitstreams-modal.title": "Seleccionar fitxers",
+
+  // "access-control-select-bitstreams-modal.no-items": "No items to show.",
+  "access-control-select-bitstreams-modal.no-items": "No hi ha ítems per mostrar.",
+
+  // "access-control-select-bitstreams-modal.close": "Close",
+  "access-control-select-bitstreams-modal.close": "Tancar",
+
+  // "access-control-option-label": "Access condition type",
+  "access-control-option-label": "Tipus de condició d'accés",
+
+  // "access-control-option-note": "Choose an access condition to apply to selected objects.",
+  "access-control-option-note": "Trieu una condició d'accés per aplicar als objectes seleccionats.",
+
+  // "access-control-option-start-date": "Grant access from",
+  "access-control-option-start-date": "Permetre accés des de",
+
+  // "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+  "access-control-option-start-date-note": "Seleccioneu la data a partir de la qual s'aplica la condició d'accés relacionada",
+
+  // "access-control-option-end-date": "Grant access until",
+  "access-control-option-end-date": "Permetre accés fins",
+
+  // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+  "access-control-option-end-date-note": "Seleccioneu la data fins a la qual s'aplica la condició d'accés relacionada",
+
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Afegir",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reclamació de Publicació",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reclamació de Publicació",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocol COAR Notify",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Aquí, donem suport complet al protocol COAR Notify, que està dissenyat per millorar la comunicació entre repositoris. Per obtenir més informació sobre el protocol COAR Notify, visiteu el <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">lloc web de COAR Notify</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "LDN InBox",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "Per a la vostra comoditat, la nostra LDN (Linked Data Notifications) InBox és fàcilment accessible a {{ ldnInboxUrl }}. La LDN InBox permet una comunicació i intercanvi de dades sense problemes, garantint una col·laboració eficient i efectiva.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Moderació de Missatges",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Per garantir un entorn segur i productiu, tots els missatges LDN entrants són moderats. Si teniu previst intercanviar informació amb nosaltres, poseu-vos en contacte a través del nostre",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": " Formulari de suggeriments.",
+
+  // "service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Eliminar Servei",
+
+  // "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Serveis Registrats",
+  // "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nom",
+  // "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Descripció",
+  // "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Estat",
+  // "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Acció",
+  // "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NOU",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Serveis Registrats",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Habilitat",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Deshabilitat",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Feu clic per habilitar",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Feu clic per deshabilitar",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Editar Servei",
+  // "ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Crear servei",
+  // "service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Crear Servei",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "Si us plau, confirmeu la creació d'aquest servei.",
+  // "ldn-service-status": "Status",
+  "ldn-service-status": "Estat",
+  // "service.confirm.create": "Create",
+  "service.confirm.create": "Crear",
+  // "service.refuse.create": "Cancel",
+  "service.refuse.create": "Cancel·lar",
+  // "ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Registrar un nou servei",
+  // "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Guardar",
+  // "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nom",
+  // "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Descripció",
+  // "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL del Servei",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Rang d'IP del Servei",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Nivell de confiança",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL de la LDN Inbox",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "Si us plau, proporcioneu el nom del servei",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "Si us plau, proporcioneu una descripció del vostre servei",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "Si us plau, introduïu l'URL perquè els usuaris puguin obtenir més informació sobre el servei",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Límit inferior del rang IPv4",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Límit superior del rang IPv4",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "Si us plau, especifiqueu l'URL de la LDN Inbox",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "Si us plau, introduïu un valor entre 0 i 1. Utilitzeu el “.” com a separador decimal",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Seleccioneu un patró",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Reconèixer i Acceptar",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Aquest patró s'utilitza per reconèixer i acceptar una sol·licitud (oferta). Implica una intenció d'actuar sobre la sol·licitud.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Reconèixer i Rebutjar",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Aquest patró s'utilitza per reconèixer i rebutjar una sol·licitud (oferta). Significa que no hi haurà més accions respecte a la sol·licitud.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Reconèixer i Acceptar Tentativament",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Aquest patró s'utilitza per reconèixer i acceptar tentativament una sol·licitud (oferta). Implica una intenció d'actuar, que pot canviar.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Reconèixer i Rebutjar Tentativament",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Aquest patró s'utilitza per reconèixer i rebutjar tentativament una sol·licitud (oferta). Significa que no hi haurà més accions, subjecte a canvis.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Reconeixements",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Anunciar Suport",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Aquest patró s'utilitza per anunciar l'existència d'un suport, referenciant el recurs recolzat.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Anunciar Ingestió",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Aquest patró s'utilitza per anunciar que un recurs ha estat ingerit.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Anunciar Relació",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Aquest patró s'utilitza per anunciar una relació entre dos recursos.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Anunciar Revisió",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Aquest patró s'utilitza per anunciar l'existència d'una revisió, referenciant el recurs revisat.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Anuncis",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Anunciar Resultat del Servei",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Aquest patró s'utilitza per anunciar l'existència d'un 'resultat del servei', referenciant el recurs rellevant.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Anuncis",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Sol·licitar Suport",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Aquest patró s'utilitza per sol·licitar el suport d'un recurs propietat del sistema d'origen.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Sol·licituds",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Sol·licitar Ingestió",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Aquest patró s'utilitza per sol·licitar que el sistema objectiu ingereixi un recurs.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Sol·licituds",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Sol·licitar Revisió",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Aquest patró s'utilitza per sol·licitar una revisió d'un recurs propietat del sistema d'origen.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Sol·licituds",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Desfer Oferta",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Aquest patró s'utilitza per desfer (retirar) una oferta feta prèviament.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Desfer",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No s'ha seleccionat cap filtre d'ítem",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtre d'ítem",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automàtic",
+  // "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "Es requereix un nom",
+  // "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "Es requereix una URL",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "Si us plau, introduïu un rang d'IP vàlid",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "Si us plau, introduïu un IpV4 vàlid en ambdós límits del rang (nota: per a una IP única, introduïu el mateix valor en ambdós camps)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "Es requereix una URL de LDN",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Es requereix almenys un patró",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "Si us plau, introduïu una puntuació vàlida (entre 0 i 1). Utilitzeu el “.” com a separador decimal",
+
+  // "ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Patró Suportat",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Afegir més",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Eliminar",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Nou Servei",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "Esteu segur que voleu eliminar aquest servei?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "Confirmeu els canvis?",
+  // "service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Editar Servei",
+  // "service.detail.update": "Confirm",
+  "service.detail.update": "Confirmar",
+  // "service.detail.return": "Cancel",
+  "service.detail.return": "Cancel·lar",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "Esteu segur que voleu descartar els canvis i sortir?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Descartar Canvis",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Descartar",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Edició Exitosa",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "El servei ha estat editat",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "Edició Fallida",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "El servei no ha estat editat",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Creació Exitosa",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "El servei ha estat creat",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Creació Fallida",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "El servei no ha estat creat",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Si us plau, seleccioneu almenys un patró d'entrada",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Estat actualitzat amb èxit",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "L'estat del servei ha estat actualitzat",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Eliminació Exitosa",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "El servei ha estat eliminat",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Eliminació Fallida",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "El servei no ha estat eliminat",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Cancel·lar",
+  // "service.overview.delete": "Delete service",
+  "service.overview.delete": "Eliminar servei",
+  // "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Editar servei",
+  // "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nom",
+  // "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Descripció",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL del Servei",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL de la LDN Inbox",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Patró d'Entrada",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Sense Patró d'Entrada",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtre d'Ítem Seleccionat",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Sense Filtre d'Ítem",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automàtic",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Afegir més",
+  // "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Guardar",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Editar Servei",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "No seleccionar cap",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "S'ha produït un error en crear aquest procés",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Èxit",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "El procés s'ha creat correctament",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "El servei seleccionat és compatible amb l'ítem segons el seu estat actual. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Suport",
+
+  // "item.page.review": "Review",
+  "item.page.review": "Revisió",
+
+  // "item.page.referenced": "Referenced By",
+  "item.page.referenced": "Referenciat Per",
+
+  // "item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complementat Per",
+
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Visió general dels serveis LDN",
+
+  // "menu.section.services": "LDN Services",
+  "menu.section.services": "Serveis LDN",
+
+  // "menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Servei LDN",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "A continuació podeu veure tots els temes rebuts de les subscripcions a {{source}} en relació amb el",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "A continuació la llista de totes les suggerències per al tema seleccionat <b>{{topic}}</b>, relacionades amb <b>{{source}}</b>.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  "quality-assurance.events.description-with-topic-and-target": "A continuació la llista de totes les suggerències per al tema seleccionat <b>{{topic}}</b>, relacionades amb <b>{{source}}</b> i ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL del Servei:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Enllaç:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Cancel·lar",
+
+  // "service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Eliminar servei",
+
+  // "service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Eliminar servei",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "Esteu segur que voleu eliminar el servei actual?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Eliminar servei",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "El servei s'ha eliminat correctament.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "S'ha produït un error en eliminar el servei",
+
+  // "service.overview.table.id": "Services ID",
+  "service.overview.table.id": "ID dels Serveis",
+
+  // "service.overview.table.name": "Name",
+  "service.overview.table.name": "Nom",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Hora d'inici (UTC)",
+
+  // "service.overview.table.status": "Status",
+  "service.overview.table.status": "Estat",
+
+  // "service.overview.table.user": "User",
+  "service.overview.table.user": "Usuari",
+
+  // "service.overview.title": "Services Overview",
+  "service.overview.title": "Visió General dels Serveis",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Visió General dels Serveis",
+
+  // "service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Accions",
+
+  // "service.overview.table.description": "Description",
+  "service.overview.table.description": "Descripció",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Podeu sol·licitar una revisió a un dels següents serveis",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Podeu sol·licitar un Suport a una de les següents revistes superposades",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Podeu sol·licitar ingerir una còpia del vostre enviament a un dels següents serveis",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "No hi ha dades disponibles",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "No seleccionar cap",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Seleccioneu un servei per a {{ pattern }} d'aquest ítem",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Descripció del servei seleccionat:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "No hi ha més informació disponible",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "El servei seleccionat no és adequat per a l'ítem actual. Si us plau, consulteu la descripció per obtenir detalls sobre quins registres poden ser gestionats per aquest servei.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "No s'han trobat patrons configurables.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtre invàlid, intenteu seleccionar un altre servei o cap.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "La sol·licitud de {{ offerType }} per a <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha estat acceptada.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "La sol·licitud de {{ offerType }} per a <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha estat rebutjada.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "La sol·licitud de {{ offerType }} per a <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> està pendent.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Marcar patró suportat per a eliminació",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Desmarcar patró suportat per a eliminació",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Seleccioneu el filtre d'ítem per al patró",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Seleccioneu un patró per al servei",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Seleccioneu el servei per a eliminació",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Editar servei LDN",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Tancar modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "El tipus d'ítem és Article de Revista o Dataset",
+
+  // "always_true_filter.label": "Always true",
+  "always_true_filter.label": "Sempre cert",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Processament automàtic",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "URI conté DOI",
+
+  // "doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtre DOI",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "El tipus de document és conductor",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "Té almenys un Bitstream",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "Té Bitstream",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "Té un Bitstream",
+
+  // "is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Està arxivat",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Està retirat",
+
+  // "item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "L'ítem és públic",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Ingestió de revistes",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "El títol comença amb el patró",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "El tipus és Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "El tipus és Article de Revista",
+
+  // "ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Cap",
+
+  // "admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Panell de control",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Panell de control",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Panell de control de notificacions",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "El panell de control de notificacions supervisa l'ús general del protocol COAR Notify a tot el repositori. A la pestanya “Mètriques” hi ha estadístiques sobre l'ús del protocol COAR Notify. A les pestanyes “Registres/Entrants” i “Registres/Sortints” és possible cercar i comprovar l'estat individual de cada missatge LDN, ja sigui rebut o enviat.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Mètriques",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Nombre de LDN rebuts",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Nombre de LDN generats",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Acceptat",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Notificacions entrants acceptades",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Actualment mostrant: Notificacions acceptades",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN processats",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Notificacions entrants processades",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Actualment mostrant: LDN processats",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Actualment mostrant: Notificacions fallides",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Fallida",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Notificacions entrants fallides",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Actualment mostrant: Notificacions fallides",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Fallida",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Notificacions sortints fallides",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Actualment mostrant: Notificacions no fiables",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "No fiable",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Notificacions entrants no fiables",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Actualment mostrant: Notificacions lliurades",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Notificacions entrants lliurades amb èxit",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Lliurat",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Actualment mostrant: Notificacions lliurades",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Notificacions sortints lliurades amb èxit",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Actualment mostrant: Notificacions en cua",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notificacions actualment en cua",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "En cua",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Actualment mostrant: Notificacions en cua per reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "En cua per reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notificacions actualment en cua per reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Ítems implicats",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Ítems relacionats amb notificacions entrants",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Ítems implicats",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Ítems relacionats amb notificacions sortints",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Panell de control",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Missatges entrants",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Registres/Entrants",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  "admin.notify.dashboard.filter": "Filtre: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Ítems relacionats",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Servei LDN",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Notificar Revisió",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Notificar Suport",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Notificar Relació",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  "search.filters.filter.queue_last_start_time.head": "Última hora de processament ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Rang mínim",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Rang màxim",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Rang mínim",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Rang màxim",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Missatges sortints",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Registres/Sortints",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "Entrants",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Ítem relacionat",
+
+  // "search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origen",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Servei LDN",
+
+  // "search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Objectiu",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Estat de la cua",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Tipus de flux d'activitat",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "Tipus de COAR Notify",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Tipus de notificació",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Cerca ítems relacionats",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Cerca estat de la cua",
+
+  // "search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Cerca objectiu",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Cerca tipus de flux d'activitat",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Estat de la cua",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  "search.filters.queue_status.0,authority": "IP no fiable",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  "search.filters.queue_status.1,authority": "En cua",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "Processant",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Processat",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "Fallat",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "No fiable",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Acció no mapejada",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "En cua per reintentar",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Tipus de flux d'activitat",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Tipus de COAR Notify",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Tipus de notificació",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Cerca tipus de COAR Notify",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Cerca tipus de notificació",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Ítems relacionats",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Objectiu",
+
+  // "search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Cerca font",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Font",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Cerca Servei LDN",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Servei LDN",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Estat de la cua",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Tipus de flux d'activitat",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "Tipus de COAR Notify",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Notificació",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Notificar Relació",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Cerca Notificar Relació",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Notificar Relació",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Notificar Revisió",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Cerca Notificar Revisió",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Notificar Revisió",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Acció de revisió",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Acció de revisió",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Acció de revisió",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Acció de suport",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Acció de suport",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Acció de suport",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Acció d'ingestió",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Acció d'ingestió",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Acció d'ingestió",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Acció de relació",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Acció de relació",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Acció de relació",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "En cua",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "En cua",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cua per reintentar",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cua per reintentar",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processant",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processant",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processat",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processat",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Fallat",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Fallat",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "No fiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "IP no fiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "No fiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "IP no fiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Acció no mapejada",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Acció no mapejada",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Última cua iniciada Descendent",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Última cua iniciada Ascendent",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Cua intentada Descendent",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Cua intentada Ascendent",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Ítems implicats en LDN entrant",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Ítems implicats en LDN sortint",
+
+  // "type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Tipus",
+
+  // "id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Tipus de COAR Notify",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Tipus de flux d'activitat",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "En resposta a",
+
+  // "object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Ítem del repositori",
+
+  // "context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Ítem del repositori",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Cua d'intents",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Última vegada que es va iniciar la cua",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Servei LDN",
+
+  // "target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Servei LDN",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Estat de la cua",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Temps d'espera de la cua",
+
+  // "notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Detall del missatge",
+
+  // "notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Mostrar missatge",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Marca de temps",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Ítem del repositori",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Servei LDN",
+
+  // "notify-message-result.type": "Type",
+  "notify-message-result.type": "Tipus",
+
+  // "notify-message-result.status": "Status",
+  "notify-message-result.status": "Estat",
+
+  // "notify-message-result.action": "Action",
+  "notify-message-result.action": "Acció",
+
+  // "notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Detall",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Reprocessar",
+
+  // "notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Processat",
+
+  // "notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "Fallat",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "En cua per reintentar",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Acció no mapejada",
+
+  // "notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "Processant",
+
+  // "notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "En cua",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "No fiable",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Servei LDN",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Ítem relacionat",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Notificar suport",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Notificar suport",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Cercar suport de notificació",
+
+  // "item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Llicència Creative Commons",
+
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Excepte on s'indiqui el contrari, la llicència d'aquest ítem es descriu com",
+
+  // "browse.search-form.placeholder": "Search the repository",
+  "browse.search-form.placeholder": "Cerca al repositori",
+
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descarregar ",
+
+  // "register-page.registration.aria.label": "Enter your e-mail address",
+  "register-page.registration.aria.label": "Introduïu la vostra adreça de correu electrònic",
+
+  // "forgot-email.form.aria.label": "Enter your e-mail address",
+  "forgot-email.form.aria.label": "Introduïu la vostra adreça de correu electrònic",
+
+
+}
\ No newline at end of file
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index 29f2ebe2c1..1d0480015a 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -730,11 +730,6 @@
   // TODO New key - Add a translation
   "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
 
-
-  //"admin.reports.items.title": "Metadata Query Report",
-  // TODO New key - Add a translation
-  "admin.reports.items.title": "Metadata Query Report",
-
   //"admin.reports.items.breadcrumbs": "Metadata Query Report",
   // TODO New key - Add a translation
   "admin.reports.items.breadcrumbs": "Metadata Query Report",
@@ -887,7 +882,6 @@
   // TODO New key - Add a translation
   "admin.reports.items.title": "Title",
 
-
   //"admin.reports.commons.filters": "Filters",
   // TODO New key - Add a translation
   "admin.reports.commons.filters": "Filters",
@@ -4203,33 +4197,67 @@
 
 
 
-  // "process.overview.table.finish" : "Finish time",
+  // "process.overview.table.finish": "Finish time",
   "process.overview.table.finish": "Schlusszeit",
 
-  // "process.overview.table.id" : "Process ID",
+  // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "Prozess ID",
 
-  // "process.overview.table.name" : "Name",
+  // "process.overview.table.name": "Name",
   "process.overview.table.name": "Name",
 
-  // "process.overview.table.start" : "Start time",
+  // "process.overview.table.start": "Start time",
   "process.overview.table.start": "Startzeit",
 
-  // "process.overview.table.status" : "Status",
+  // "process.overview.table.status": "Status",
   "process.overview.table.status": "Status",
 
-  // "process.overview.table.user" : "User",
+  // "process.overview.table.user": "User",
   "process.overview.table.user": "Benutzer:in",
 
   // "process.overview.title": "Processes Overview",
-  "process.overview.title": "Überblick der Prozesse",
+  "process.overview.title": "Übersicht der Prozesse",
 
   // "process.overview.breadcrumbs": "Processes Overview",
-  "process.overview.breadcrumbs": "Überblick der Prozesse",
+  "process.overview.breadcrumbs": "Übersicht der Prozesse",
 
   // "process.overview.new": "New",
   "process.overview.new": "Neu",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Aktionen",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Lösche {{count}} Prozesse",
+
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Lösche Prozess",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Auswahl aufheben",
+
+  // "process.overview.delete.processing": "{{count}} process(es) are being deleted. Please wait for the deletion to fully complete. Note that this can take a while.",
+  "process.overview.delete.processing": "Es werden {{count}} Prozesse gelöscht. Diese Aktion kann einige Zeit dauern. Bitte warten Sie bis zum Abschluss der Aktion.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Wollen Sie tatsächlich {{count}} Prozesse löschen?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Prozess löschen",
+
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Unbekannt",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Fehler beim Löschen des Prozesses",
+
+  // "process.bulk.delete.error.body": "The process with ID {{processId}} could not be deleted. The remaining processes will continue being deleted.",
+  "process.bulk.delete.error.body": "Der Prozess mit ID {{processId}} konnte nicht gelöscht werden. Es wird versucht, die verbleibenden Prozesse zu löschen.",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "Es wurden {{count}} Prozesse erfolgreich gelöscht.",
+
+
 
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Profil aktualisieren",
@@ -5970,4 +5998,14 @@
 
   // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
   "workspace-item.delete.notification.error.content": "Das Workspace-Item konnte nicht gelöscht werden.",
+
+
+  // "form.date-picker.placeholder.year": "Year",
+  "form.date-picker.placeholder.year": "Jahr",
+
+  // "form.date-picker.placeholder.month": "Month",
+  "form.date-picker.placeholder.month": "Monat",
+
+  // "form.date-picker.placeholder.day": "Day",
+  "form.date-picker.placeholder.day": "Tag",
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 00a3bd88d4..e03a813292 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -1034,11 +1034,11 @@
 
   "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
 
-  "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
 
   "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
 
-  "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
 
   "browse.metadata.title.breadcrumbs": "Browse by Title",
 
@@ -1684,6 +1684,8 @@
 
   "deny-request-copy.success": "Successfully denied item request",
 
+  "dynamic-list.load-more": "Load more",
+
   "dropdown.clear": "Clear selection",
 
   "dropdown.clear.tooltip": "Clear the selected option",
@@ -1844,6 +1846,8 @@
 
   "error.recent-submissions": "Error fetching recent submissions",
 
+  "error.profile-groups": "Error retrieving profile groups",
+
   "error.search-results": "Error fetching search results",
 
   "error.invalid-search-query": "Search query is not valid. Please check <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> best practices for further information about this error.",
@@ -2224,6 +2228,10 @@
 
   "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
 
+  "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
+
+  "item.edit.bitstreams.bundle.tooltip": "You can move a bitstream to a different page by dropping it on the page number.",
+
   "item.edit.bitstreams.discard-button": "Discard",
 
   "item.edit.bitstreams.edit.buttons.download": "Download",
@@ -2236,8 +2244,20 @@
 
   "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
 
+  "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} was returned to position {{ toIndex }} and is no longer selected.",
+
+  "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
+
+  "item.edit.bitstreams.edit.live.loading": "Waiting for move to complete.",
+
+  "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
+
+  "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",
+
   "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
 
+  "item.edit.bitstreams.info-alert": "Bitstreams can be reordered within their bundles by holding the drag handle and moving the mouse. Alternatively, bitstreams can be moved using the keyboard in the following way: Select the bitstream by pressing enter when the bitstream's drag handle is in focus. Move the bitstream up or down using the arrow keys. Press enter again to confirm the current position of the bitstream.",
+
   "item.edit.bitstreams.headers.actions": "Actions",
 
   "item.edit.bitstreams.headers.bundle": "Bundle",
@@ -2274,6 +2294,8 @@
 
   "item.edit.bitstreams.upload-button": "Upload",
 
+  "item.edit.bitstreams.load-more.link": "Load more",
+
   "item.edit.delete.cancel": "Cancel",
 
   "item.edit.delete.confirm": "Delete",
@@ -2384,6 +2406,10 @@
 
   "item.edit.metadata.edit.authority.key": "Edit authority key",
 
+  "item.edit.metadata.edit.buttons.enable-free-text-editing": "Enable free-text editing",
+
+  "item.edit.metadata.edit.buttons.disable-free-text-editing": "Disable free-text editing",
+
   "item.edit.metadata.edit.buttons.confirm": "Confirm",
 
   "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
@@ -2792,6 +2818,8 @@
 
   "item.preview.dc.date.issued": "Published date:",
 
+  "item.preview.dc.description": "Description:",
+
   "item.preview.dc.description.abstract": "Abstract:",
 
   "item.preview.dc.identifier.other": "Other identifier:",
@@ -2830,6 +2858,8 @@
 
   "item.preview.project.funder.identifier": "Funder Identifier:",
 
+  "item.preview.project.investigator": "Project Investigator",
+
   "item.preview.oaire.awardNumber": "Funding ID:",
 
   "item.preview.dc.title.alternative": "Acronym:",
@@ -3180,6 +3210,8 @@
 
   "login.form.password": "Password",
 
+  "login.form.saml": "Log in with SAML",
+
   "login.form.shibboleth": "Log in with Shibboleth",
 
   "login.form.submit": "Log in",
@@ -4776,6 +4808,8 @@
 
   "submission.import-external.source.datacite": "DataCite",
 
+  "submission.import-external.source.dataciteProject": "DataCite",
+
   "submission.import-external.source.doi": "DOI",
 
   "submission.import-external.source.scielo": "SciELO",
@@ -5974,6 +6008,10 @@
 
   "person.orcid.registry.auth": "ORCID Authorizations",
 
+  "person.orcid-tooltip.authenticated": "{{orcid}}",
+
+  "person.orcid-tooltip.not-authenticated": "{{orcid}} (unconfirmed)",
+
   "home.recent-submissions.head": "Recent Submissions",
 
   "listable-notification-object.default-message": "This object couldn't be retrieved",
@@ -6734,13 +6772,33 @@
 
   "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
 
+  "form.date-picker.placeholder.year": "Year",
+
+  "form.date-picker.placeholder.month": "Month",
+
+  "form.date-picker.placeholder.day": "Day",
+
   "item.page.cc.license.title": "Creative Commons license",
 
   "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
 
   "browse.search-form.placeholder": "Search the repository",
 
+  "file-download-link.download": "Download ",
+
   "register-page.registration.aria.label": "Enter your e-mail address",
 
   "forgot-email.form.aria.label": "Enter your e-mail address",
+
+  "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+
+  "live-region.ordering.instructions": "Press spacebar to reorder {{ itemName }}.",
+
+  "live-region.ordering.status": "{{ itemName }}, grabbed. Current position in list: {{ index }} of  {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.moved": "{{ itemName }}, moved to position {{ index }} of {{ length }}. Press up and down arrow keys to change position, SpaceBar to drop, Escape to cancel.",
+
+  "live-region.ordering.dropped": "{{ itemName }}, dropped at position {{ index }} of {{ length }}.",
+
+  "dynamic-form-array.sortable-list.label": "Sortable list",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index ba2674a5f1..c67bed6a4d 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -6,8 +6,8 @@
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Llévame a la página de inicio",
 
-  // "401.unauthorized": "unauthorized",
-  "401.unauthorized": "no autorizado",
+  // "401.unauthorized": "Unauthorized",
+  "401.unauthorized": "No autorizado",
 
   // "403.help": "You don't have permission to access this page. You can use the button below to get back to the home page.",
   "403.help": "No tiene permisos para acceder a esta página. Puede utilizar el botón de abajo para volver a la página de inicio.",
@@ -15,10 +15,10 @@
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Llévame a la página de inicio",
 
-  // "403.forbidden": "forbidden",
-  "403.forbidden": "prohibido",
+  // "403.forbidden": "Forbidden",
+  "403.forbidden": "Prohibido",
 
-  // "500.page-internal-server-error": "Service Unavailable",
+  // "500.page-internal-server-error": "Service unavailable",
   "500.page-internal-server-error": "Servicio no disponible",
 
   // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
@@ -33,20 +33,20 @@
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Llévame a la página de inicio",
 
-  // "404.page-not-found": "page not found",
-  "404.page-not-found": "página no encontrada",
+  // "404.page-not-found": "Page not found",
+  "404.page-not-found": "Página no encontrada",
 
-  // "error-page.description.401": "unauthorized",
-  "error-page.description.401": "no autorizado",
+  // "error-page.description.401": "Unauthorized",
+  "error-page.description.401": "No autorizado",
 
-  // "error-page.description.403": "forbidden",
-  "error-page.description.403": "prohibido",
+  // "error-page.description.403": "Forbidden",
+  "error-page.description.403": "Prohibido",
 
-  // "error-page.description.500": "Service Unavailable",
+  // "error-page.description.500": "Service unavailable",
   "error-page.description.500": "Servicio no disponible",
 
-  // "error-page.description.404": "page not found",
-  "error-page.description.404": "página no encontrada",
+  // "error-page.description.404": "Page not found",
+  "error-page.description.404": "Página no encontrada",
 
   // "error-page.orcid.generic-error": "An error occurred during login via ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists, contact the administrator",
   "error-page.orcid.generic-error": "Hubo un error en el login vía ORCID. Asegúrese que ha compartido el correo electrónico de su cuenta ORCID con Dspace. Si continuase el error, contacte con el administrador",
@@ -87,7 +87,7 @@
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Fallo",
 
-  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  // "admin.registries.bitstream-formats.create.head": "Create bitstream format",
   "admin.registries.bitstream-formats.create.head": "Crear formato de archivo",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
@@ -192,6 +192,9 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nombre",
 
+  // "admin.registries.bitstream-formats.table.selected": "Selected bitstream formats",
+  "admin.registries.bitstream-formats.table.selected": "Formatos de archivo seleccionados",
+
   // "admin.registries.bitstream-formats.table.id": "ID",
   "admin.registries.bitstream-formats.table.id": "ID",
 
@@ -213,6 +216,12 @@
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Registro de formato Archivo",
 
+  // "admin.registries.bitstream-formats.select": "Select",
+  "admin.registries.bitstream-formats.select": "Seleccionar",
+
+  // "admin.registries.bitstream-formats.deselect": "Deselect",
+  "admin.registries.bitstream-formats.deselect": "Deseleccionar",
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Registro de metadatos",
 
@@ -237,9 +246,18 @@
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "No hay esquemas de metadatos para mostrar.",
 
+  // "admin.registries.metadata.schemas.select": "Select",
+  "admin.registries.metadata.schemas.select": "Seleccionar",
+
+  // "admin.registries.metadata.schemas.deselect": "Deselect",
+  "admin.registries.metadata.schemas.deselect": "Deseleccionar",
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionado",
 
+  // "admin.registries.metadata.schemas.table.selected": "Selected schemas",
+  "admin.registries.metadata.schemas.table.selected": "Esquemas seleccionados",
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
 
@@ -258,8 +276,14 @@
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Este es el esquema de metadatos para \"{{ namespace }}\".",
 
+  // "admin.registries.schema.fields.select": "Select",
+  "admin.registries.schema.fields.select": "Seleccionar",
+
+  // "admin.registries.schema.fields.deselect": "Deselect",
+  "admin.registries.schema.fields.deselect": "Deseleccionar",
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-  "admin.registries.schema.fields.head": "Campos de metadatos de esquema",
+  "admin.registries.schema.fields.head": "Campos de metadatos del esquema",
 
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "No hay campos de metadatos para mostrar.",
@@ -270,6 +294,9 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Campo",
 
+  // "admin.registries.schema.fields.table.selected": "Selected metadata fields",
+  "admin.registries.schema.fields.table.selected": "Campos de metadatos seleccionados",
+
   // "admin.registries.schema.fields.table.id": "ID",
   "admin.registries.schema.fields.table.id": "ID",
 
@@ -372,6 +399,18 @@
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "Usuarios",
 
+  // "admin.access-control.epeople.edit.breadcrumbs": "New EPerson",
+  "admin.access-control.epeople.edit.breadcrumbs": "Nuevo usuario",
+
+  // "admin.access-control.epeople.edit.title": "New EPerson",
+  "admin.access-control.epeople.edit.title": "Nuevo usuario",
+
+  // "admin.access-control.epeople.add.breadcrumbs": "Add EPerson",
+  "admin.access-control.epeople.add.breadcrumbs": "Agregar usuario",
+
+  // "admin.access-control.epeople.add.title": "Add EPerson",
+  "admin.access-control.epeople.add.title": "Agregar usuario",
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Usuarios",
 
@@ -384,7 +423,7 @@
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metadatos",
 
-  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  // "admin.access-control.epeople.search.scope.email": "Email (exact)",
   "admin.access-control.epeople.search.scope.email": "Correo electrónico (exacto)",
 
   // "admin.access-control.epeople.search.button": "Search",
@@ -402,7 +441,7 @@
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Nombre",
 
-  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  // "admin.access-control.epeople.table.email": "Email (exact)",
   "admin.access-control.epeople.table.email": "Correo electrónico (exacto)",
 
   // "admin.access-control.epeople.table.edit": "Edit",
@@ -432,10 +471,10 @@
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Apellidos",
 
-  // "admin.access-control.epeople.form.email": "E-mail",
+  // "admin.access-control.epeople.form.email": "Email",
   "admin.access-control.epeople.form.email": "Correo electrónico",
 
-  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  // "admin.access-control.epeople.form.emailHint": "Must be a valid email address",
   "admin.access-control.epeople.form.emailHint": "Debe ser una dirección de correo electrónico válida",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
@@ -489,8 +528,8 @@
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Agregar a grupos",
 
-  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "No se pudo borrar el usuario: \"{{ name }}\"",
+  // "admin.access-control.epeople.notification.deleted.failure": "Error occurred when trying to delete EPerson with id \"{{id}}\" with code: \"{{statusCode}}\" and message: \"{{restResponse.errorMessage}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Ocurrió un error al intentar eliminar el usuario con id \"{{id}}\" con el código: \"{{statusCode}}\" y el mensaje: \"{{restResponse.errorMessage}}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Usuario eliminado correctamente: \"{{ name }}\"",
@@ -639,12 +678,6 @@
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Miembros actuales",
 
-  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadatos",
-
-  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  "admin.access-control.groups.form.members-list.search.scope.email": "Correo electrónico (exacto)",
-
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Buscar",
 
@@ -729,312 +762,6 @@
   // "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Agregar subgrupo con el nombre \"{{ name }}\"",
 
-  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo actual",
-
-  //"admin.reports.collections.title": "Collection Filter Report",
-  "admin.reports.collections.title": "Informe de Colecciones Filtradas",
-
-  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
-  "admin.reports.collections.breadcrumbs": "Informe de Colecciones Filtradas",
-
-  //"admin.reports.collections.head": "Collection Filter Report",
-  "admin.reports.collections.head": "Informe de Colecciones Filtradas",
-
-  //"admin.reports.button.show-collections": "Show Collections",
-  "admin.reports.button.show-collections": "Mostrar Colecciones",
-
-  //"admin.reports.collections.collections-report": "Collection Report",
-  "admin.reports.collections.collections-report": "Informe de Colecciones",
-
-  //"admin.reports.collections.item-results": "Item Results",
-  "admin.reports.collections.item-results": "Resultados de Ítem",
-
-  //"admin.reports.collections.community": "Community",
-  "admin.reports.collections.community": "Comunidad",
-
-  //"admin.reports.collections.collection": "Collection",
-  "admin.reports.collections.collection": "Colección",
-
-  //"admin.reports.collections.nb_items": "Nb. Items",
-  "admin.reports.collections.nb_items": "Nº Ítems",
-
-  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
-  "admin.reports.collections.match_all_selected_filters": "Coincidencia con todos los filtros seleccionados",
-
-  //"admin.reports.items.title": "Metadata Query Report",
-  "admin.reports.items.title": "Informe de Consulta de Metadatos",
-
-  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
-  "admin.reports.items.breadcrumbs": "Informe de Consulta de Metadatos",
-
-  //"admin.reports.items.head": "Metadata Query Report",
-  "admin.reports.items.head": "Informe de Consulta de Metadatos",
-
-  //"admin.reports.items.run": "Run Item Query",
-  "admin.reports.items.run": "Ejecutar Consulta de Ítems",
-
-  //"admin.reports.items.section.collectionSelector": "Collection Selector",
-  "admin.reports.items.section.collectionSelector": "Selección de Colecciones",
-
-  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
-  "admin.reports.items.section.metadataFieldQueries": "Consultas de Campos de Metadatos",
-
-  //"admin.reports.items.predefinedQueries": "Predefined Queries",
-  "admin.reports.items.predefinedQueries": "Consultas Predefinidas",
-
-  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
-  "admin.reports.items.section.limitPaginateQueries": "Limitar/Paginar Consultas",
-
-  //"admin.reports.items.limit": "Limit/",
-  "admin.reports.items.limit": "Límite/",
-
-  //"admin.reports.items.wholeRepo": "Whole Repository",
-  "admin.reports.items.wholeRepo": "Todo el repositorio",
-
-  //"admin.reports.items.anyField": "Any field",
-  "admin.reports.items.anyField": "Cualquier campo",
-
-  //"admin.reports.items.predicate.exists": "exists",
-  "admin.reports.items.predicate.exists": "existe",
-
-  //"admin.reports.items.predicate.doesNotExist": "does not exist",
-  "admin.reports.items.predicate.doesNotExist": "no existe",
-
-  //"admin.reports.items.predicate.equals": "equals",
-  "admin.reports.items.predicate.equals": "idéntico",
-
-  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
-  "admin.reports.items.predicate.doesNotEqual": "no es idéntico",
-
-  //"admin.reports.items.predicate.like": "like",
-  "admin.reports.items.predicate.like": "parecido",
-
-  //"admin.reports.items.predicate.notLike": "not like",
-  "admin.reports.items.predicate.notLike": "distinto",
-
-  //"admin.reports.items.predicate.contains": "contains",
-  "admin.reports.items.predicate.contains": "contiene",
-
-  //"admin.reports.items.predicate.doesNotContain": "does not contain",
-  "admin.reports.items.predicate.doesNotContain": "no contiene",
-
-  //"admin.reports.items.predicate.matches": "matches",
-  "admin.reports.items.predicate.matches": "coincide",
-
-  //"admin.reports.items.predicate.doesNotMatch": "does not match",
-  "admin.reports.items.predicate.doesNotMatch": "no coincide",
-
-  //"admin.reports.items.preset.new": "New Query",
-  "admin.reports.items.preset.new": "Nueva Consulta",
-
-  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
-  "admin.reports.items.preset.hasNoTitle": "Sin Título",
-
-  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
-  "admin.reports.items.preset.hasNoIdentifierUri": "Sin dc.identifier.uri",
-
-  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
-  "admin.reports.items.preset.hasCompoundSubject": "Tiene valores de subject concatenados",
-
-  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
-  "admin.reports.items.preset.hasCompoundAuthor": "Tiene valores de dc.contributor.author concatenados",
-
-  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
-  "admin.reports.items.preset.hasCompoundCreator": "Tiene valores de dc.creator concatenados",
-
-  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
-  "admin.reports.items.preset.hasUrlInDescription": "Tiene URL en dc.description",
-
-  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
-  "admin.reports.items.preset.hasFullTextInProvenance": "El metadato dc.description.provenance tiene referencias a ficheros textuales",
-
-  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
-  "admin.reports.items.preset.hasNonFullTextInProvenance": "El metadato dc.description.provenance no tiene referencias a ficheros textuales",
-
-  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
-  "admin.reports.items.preset.hasEmptyMetadata": "Tiene metadatos vacíos",
-
-  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
-  "admin.reports.items.preset.hasUnbreakingDataInDescription": "La descripción contiene metadatos sin rotura de línea",
-
-  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
-  "admin.reports.items.preset.hasXmlEntityInMetadata": "Los metadatos contienen entidades XML",
-
-  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
-  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Los metadatos contienen caracteres no-ascii",
-
-  //"admin.reports.items.number": "No.",
-  "admin.reports.items.number": "Nº.",
-
-  //"admin.reports.items.id": "UUID",
-  "admin.reports.items.id": "UUID",
-
-  //"admin.reports.items.collection": "Collection",
-  "admin.reports.items.collection": "Colección",
-
-  //"admin.reports.items.handle": "URI",
-  "admin.reports.items.handle": "URI",
-
-  //"admin.reports.items.title": "Title",
-  "admin.reports.items.title": "Título",
-
-  //"admin.reports.commons.filters": "Filters",
-  "admin.reports.commons.filters": "Filtros",
-
-  //"admin.reports.commons.additional-data": "Additional data to return",
-  "admin.reports.commons.additional-data": "Datos adicionales para incluir",
-
-  //"admin.reports.commons.previous-page": "Prev Page",
-  "admin.reports.commons.previous-page": "Pág. ant.",
-
-  //"admin.reports.commons.next-page": "Next Page",
-  "admin.reports.commons.next-page": "Pág. sig.",
-
-  //"admin.reports.commons.page": "Page",
-  "admin.reports.commons.page": "Página",
-
-  //"admin.reports.commons.of": "of",
-  "admin.reports.commons.of": "de",
-
-  //"admin.reports.commons.export": "Export for Metadata Update",
-  "admin.reports.commons.export": "Exportar para actualizar metadatos",
-
-  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
-  "admin.reports.commons.filters.deselect_all": "De-seleccionar todos los filtros",
-
-  //"admin.reports.commons.filters.select_all": "Select all filters",
-  "admin.reports.commons.filters.select_all": "seleccionar todos los filtros",
-
-  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
-  "admin.reports.commons.filters.matches_all": "Coincide con todos los filtros especificados",
-
-  //"admin.reports.commons.filters.property": "Item Property Filters",
-  "admin.reports.commons.filters.property": "Filtro de Propiedades de Ítem",
-
-  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
-  "admin.reports.commons.filters.property.is_item": "Es Ítem - siempre verdadero",
-
-  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
-  "admin.reports.commons.filters.property.is_withdrawn": "Ítems retirados",
-
-  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
-  "admin.reports.commons.filters.property.is_not_withdrawn": "Ítems disponibles - no retirados",
-
-  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
-  "admin.reports.commons.filters.property.is_discoverable": "Ítems encontrables - No Privados",
-
-  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
-  "admin.reports.commons.filters.property.is_not_discoverable": "Ítems Privados - no encontrables",
-
-  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
-  "admin.reports.commons.filters.property.all_filters.tooltip": "Este filtro incluye todos los Ítems que cumplen con TODOS los filtros especificados",
-
-  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
-  "admin.reports.commons.filters.bitstream": "Filtros Básicos de Ficheros",
-
-  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
-  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Ítem tiene múltiples ficheros (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
-  "admin.reports.commons.filters.bitstream.has_no_originals": "Ítem no tiene ficheros (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
-  "admin.reports.commons.filters.bitstream.has_one_original": "Ítem tiene un fichero (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
-  "admin.reports.commons.filters.bitstream_mime": "Filtros de Fichero por tipo MIME",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Ítem tiene documento (bloque Original)  PDF, Office, Text, HTML, XML, etc ",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Ítem tiene una Imagen (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
-  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Tiene otros tipos de fichero (ni Doc ni Imagen)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
-  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Ítem tiene múltiples ficheros (bloque Original) de varios tipos(Doc, Imagen, Otros)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Ítem tiene un fichero PDF (bloque Original) ",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
-  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Ítem tiene un fichero JPG (bloque Original)",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
-  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Tiene un PDF inusualmente pequeño",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
-  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Tiene un PDF inusualmente grande",
-
-  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
-  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Tiene fichero documetal sin fichero TEXT",
-
-  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
-  "admin.reports.commons.filters.mime": "Filtros de tipos MIME soportados",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
-  "admin.reports.commons.filters.mime.has_only_supp_image_type": "El ítem tiene ficheros de tipo imagen soportados",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
-  "admin.reports.commons.filters.mime.has_unsupp_image_type": "El ítem tiene ficheros de tipo imagen no soportados",
-
-  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
-  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "El ítem tiene ficheros de tipo documental soportados",
-
-  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
-  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "El ítem tiene ficheros de tipo documental no soportados",
-
-  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
-  "admin.reports.commons.filters.bundle": "Filtros de Bloques de Ficheros",
-
-  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
-  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Tiene ficheros en un bloque no soportado",
-
-  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
-  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Tiene miniatura inusualmente pequeña",
-
-  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
-  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Tiene ficheros (bloque Original) sin miniatura",
-
-  //"admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
-  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Tiene miniatura con nombre inválido (se supone una miniatura por cada fichero en el bloque Original)",
-
-  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
-  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Tiene miniatura no-generada",
-
-  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
-  "admin.reports.commons.filters.bundle.no_license": "No tiene licencia",
-
-  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
-  "admin.reports.commons.filters.bundle.has_license_documentation": "Tiene documentación en el bloque Licencia",
-
-  //"admin.reports.commons.filters.permission": "Permission Filters",
-  "admin.reports.commons.filters.permission": "Filtros de Permisos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
-  "admin.reports.commons.filters.permission.has_restricted_original": "Ítem con ficheros (bloque Original) restringidos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
-  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Ítem con al menos un fichero (bloque Original) no accesible por usuarios anónimos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Ítem con miniatura restringida",
-
-  //"admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
-  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Ítem con al menos una miniatura no accesible por usuarios anónimos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
-  "admin.reports.commons.filters.permission.has_restricted_metadata": "Ítem con metadatos restringidos",
-
-  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
-  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item con metadatos no accesibles a usuarios anónimos",
-
-  // "admin.search.breadcrumbs": "Administrative Search",
-  "admin.search.breadcrumbs": "Búsqueda administrativa",
-
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ name }}\"",
 
@@ -1062,14 +789,328 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Atrás",
 
+  // "admin.quality-assurance.breadcrumbs": "Quality Assurance",
+  "admin.quality-assurance.breadcrumbs": "Control de calidad",
+
+  // "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+  "admin.notifications.event.breadcrumbs": "Sugerencias para el control de calidad",
+
+  // "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+  "admin.notifications.event.page.title": "Sugerencias para el control de calidad",
+
+  // "admin.quality-assurance.page.title": "Quality Assurance",
+  "admin.quality-assurance.page.title": "Control de calidad",
+
+  // "admin.notifications.source.breadcrumbs": "Quality Assurance",
+  "admin.notifications.source.breadcrumbs": "Control de calidad",
+
   // "admin.access-control.groups.form.tooltip.editGroupPage": "On this page, you can modify the properties and members of a group. In the top section, you can edit the group name and description, unless this is an admin group for a collection or community, in which case the group name and description are auto-generated and cannot be edited. In the following sections, you can edit group membership. See [the wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group) for more details.",
   "admin.access-control.groups.form.tooltip.editGroupPage": "En esta página, puede modificar las propiedades y miembros de un grupo. En la sección superior, puede editar el nombre del grupo y la descripción, a menos que este sea un grupo de administración de una colección o comunidad, en cuyo caso el nombre y descripción del grupo fueron auto-generadas y no podrán ser editadas. En las secciones siguientes, puede editar la afiliación al grupo. Para más detalles ver [la wiki](https://wiki.lyrasis.org/display/DSDOC7x/Create+or+manage+a+user+group).",
 
-  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
-  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Para agregar o remover una persona en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar los usuario (Use el desplegable que se encuentra a la derecha de la barra de búsqueda para seleccionar entre buscar por metadato o por correo electrónico). Posteriormente pulse el botón con el icono más por cada usuario que desea agregar a la lista, o el icono de papelera por cada usuario que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas. Cuando haya finalizado, guarde sus cambios pulsando el botón ‘Guardar’ ubicado en la parte superior de la sección.",
+  // "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "To add or remove an EPerson to/from this group, either click the 'Browse All' button or use the search bar below to search for users (use the dropdown to the left of the search bar to choose whether to search by metadata or by email). Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addEpeople": "Para agregar o eliminar un usuario en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar usuarios (use el menú desplegable a la izquierda de la barra de búsqueda para elegir si buscar por metadatos o por correo electrónico). Posteriormente pulse el botón con el icono más por cada usuario que desea agregar a la lista, o el icono de papelera por cada usuario que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas.",
 
-  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for users. Then click the plus icon for each user you wish to add in the list below, or the trash can icon for each user you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages. Once you are ready, save your changes by clicking the 'Save' button in the top section.",
-  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para agregar o remover un sub-grupo en este grupo, pulse el botón 'Examinar todo' o utilice la barra de búsqueda de abajo para buscar los subgrupos- Posteriormente pulse el botón con el icono más por cada sub-grupo que desea agregar a la lista, o el icono de papelera por cada sub-grupo que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas. Cuando haya finalizado, guarde sus cambios pulsando el botón ‘Guardar’ ubicado en la parte superior de la sección.",
+  // "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "To add or remove a Subgroup to/from this group, either click the 'Browse All' button or use the search bar below to search for groups. Then click the plus icon for each group you wish to add in the list below, or the trash can icon for each group you wish to remove. The list below may have several pages: use the page controls below the list to navigate to the next pages.",
+  "admin.access-control.groups.form.tooltip.editGroup.addSubgroups": "Para agregar o remover un subgrupo en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar los grupos. Posteriormente pulse el botón con el icono más por cada grupo que desea agregar a la lista, o el icono de papelera por cada grupo que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas.",
+
+  // "admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Informe de Colecciones Filtradas",
+
+  // "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Informe de Colecciones Filtradas",
+
+  // "admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Informe de Colecciones Filtradas",
+
+  // "admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Mostrar Colecciones",
+
+  // "admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Informe de Colecciones",
+
+  // "admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Resultados de ítem",
+
+  // "admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Comunidad",
+
+  // "admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Colección",
+
+  // "admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "Nº Ítems",
+
+  // "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Coincidencia con todos los filtros seleccionados",
+
+  // "admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Informe de Consulta de Metadatos",
+
+  // "admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Informe de Consulta de Metadatos",
+
+  // "admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Ejecutar Consulta de Ítems",
+
+  // "admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Selección de Colecciones",
+
+  // "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Consultas de Campos de Metadatos",
+
+  // "admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Consultas Predefinidas",
+
+  // "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limitar/Paginar Consultas",
+
+  // "admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Límite/",
+
+  // "admin.reports.items.offset": "Offset",
+  "admin.reports.items.offset": "Desplazamiento",
+
+  // "admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Todo el repositorio",
+
+  // "admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Cualquier campo",
+
+  // "admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existe",
+
+  // "admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "no existe",
+
+  // "admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "idéntico",
+
+  // "admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "no es idéntico",
+
+  // "admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "parecido",
+
+  // "admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "distinto",
+
+  // "admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "contiene",
+
+  // "admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "no contiene",
+
+  // "admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "coincide",
+
+  // "admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "no coincide",
+
+  // "admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nueva Consulta",
+
+  // "admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "Sin Título",
+
+  // "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "Sin dc.identifier.uri",
+
+  // "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "Tiene valores de subject concatenados",
+
+  // "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "Tiene valores de dc.contributor.author concatenados",
+
+  // "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "Tiene valores de dc.creator concatenados",
+
+  // "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "Tiene URL en dc.description",
+
+  // "admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "El metadato dc.description.provenance tiene referencias a ficheros textuales",
+
+  // "admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "El metadato dc.description.provenance no tiene referencias a ficheros textuales",
+
+  // "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "Tiene metadatos vacíos",
+
+  // "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "La descripción contiene metadatos sin rotura de línea",
+
+  // "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Los metadatos contienen entidades XML",
+
+  // "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Los metadatos contienen caracteres no-ascii",
+
+  // "admin.reports.items.number": "No.",
+  "admin.reports.items.number": "Nº.",
+
+  // "admin.reports.items.id": "UUID",
+  "admin.reports.items.id": "UUID",
+
+  // "admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Colección",
+
+  // "admin.reports.items.handle": "URI",
+  "admin.reports.items.handle": "URI",
+
+  // "admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Título",
+
+
+  // "admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtros",
+
+  // "admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Datos adicionales para incluir",
+
+  // "admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Pág. ant.",
+
+  // "admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Pág. sig.",
+
+  // "admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Página",
+
+  // "admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
+
+  // "admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exportar para actualizar metadatos",
+
+  // "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "De-seleccionar todos los filtros",
+
+  // "admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "seleccionar todos los filtros",
+
+  // "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Coincide con todos los filtros especificados",
+
+
+  // "admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtro de Propiedades de Ítem",
+
+  // "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "Es Ítem - siempre verdadero",
+
+  // "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Ítems retirados",
+
+  // "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Ítems disponibles - no retirados",
+
+  // "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Ítems encontrables - No Privados",
+
+  // "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "Ítems Privados - no encontrables",
+
+  // "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtros Básicos de Ficheros",
+
+  // "admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "Ítem tiene múltiples ficheros (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "Ítem no tiene ficheros (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "Ítem tiene un fichero (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtros de Fichero por tipo MIME",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_original": "Ítem tiene documento (bloque Original)  PDF, Office, Text, HTML, XML, etc ",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "Ítem tiene una Imagen (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Tiene otros tipos de fichero (ni Doc ni Imagen)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Item has multiple types of Original Bitstreams (Doc, Image, Other)",
+  "admin.reports.commons.filters.bitstream_mime.has_mixed_original": "Ítem tiene múltiples ficheros (bloque Original) de varios tipos(Doc, Imagen, Otros)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Ítem tiene un fichero PDF (bloque Original) ",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Ítem tiene un fichero JPG (bloque Original)",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Tiene un PDF inusualmente pequeño",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Tiene un PDF inusualmente grande",
+
+  // "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Tiene fichero documetal sin fichero TEXT",
+
+  // "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtros de tipos MIME soportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "El ítem tiene ficheros de tipo imagen soportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "El ítem tiene ficheros de tipo imagen no soportados",
+
+  // "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "El ítem tiene ficheros de tipo documental soportados",
+
+  // "admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "El ítem tiene ficheros de tipo documental no soportados",
+
+  // "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtros de Bloques de Ficheros",
+
+  // "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "Tiene ficheros en un bloque no soportado",
+
+  // "admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "Tiene miniatura inusualmente pequeña",
+
+  // "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Tiene ficheros (bloque Original) sin miniatura",
+
+  // "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Has invalid thumbnail name (assumes one thumbnail for each original)",
+  "admin.reports.commons.filters.bundle.has_invalid_thumbnail_name": "Tiene miniatura con nombre inválido (se supone una miniatura por cada fichero en el bloque Original)",
+
+  // "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "Tiene miniatura no-generada",
+
+  // "admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "No tiene licencia",
+
+  // "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Tiene documentación en el bloque Licencia",
+
+  // "admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtros de Permisos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "Ítem con ficheros (bloque Original) restringidos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Item has at least one original bitstream that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_original.tooltip": "Ítem con al menos un fichero (bloque Original) no accesible por usuarios anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "Ítem con miniatura restringida",
+
+  // "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Item has at least one thumbnail that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail.tooltip": "Ítem con al menos una miniatura no accesible por usuarios anónimos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "Ítem con metadatos restringidos",
+
+  // "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item con metadatos no accesibles a usuarios anónimos",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Búsqueda administrativa",
@@ -1182,10 +1223,10 @@
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "¡Seleccione el archivo primero!",
 
-  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
   "admin.metadata-import.page.error.addFileUrl": "¡Seleccione primero la URL del archivo!",
 
-  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  // "admin.batch-import.page.error.addFile": "Select ZIP file first!",
   "admin.batch-import.page.error.addFile": "¡Seleccione el archivo ZIP primero!",
 
   // "admin.metadata-import.page.toggle.upload": "Upload",
@@ -1239,12 +1280,6 @@
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Miembros actuales",
 
-  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadata",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Metadatos",
-
-  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (exact)",
-  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "Correo electrónico (exacto)",
-
   // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
   "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Buscar",
 
@@ -1353,7 +1388,7 @@
   // "bitstream.edit.form.newFormat.hint": "The application you used to create the file, and the version number (for example, \"<i>ACMESoft SuperApp version 1.5</i>\").",
   "bitstream.edit.form.newFormat.hint": "La aplicación que usó para crear el archivo y el número de versión (por ejemplo, \"<i>ACMESoft SuperApp versión 1.5</i>\").",
 
-  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  // "bitstream.edit.form.primaryBitstream.label": "Primary File",
   "bitstream.edit.form.primaryBitstream.label": "Archivo principal",
 
   // "bitstream.edit.form.selectedFormat.hint": "If the format is not in the above list, <b>select \"format not in list\" above</b> and describe it under \"Describe new format\".",
@@ -1428,7 +1463,7 @@
   // "bitstream-request-a-copy.name.error": "The name is required",
   "bitstream-request-a-copy.name.error": "Se requiere un Nombre",
 
-  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  // "bitstream-request-a-copy.email.label": "Your email address *",
   "bitstream-request-a-copy.email.label": "Su dirección de correo electrónico *",
 
   // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
@@ -1476,6 +1511,9 @@
   // "browse.comcol.by.srsc": "By Subject Category",
   "browse.comcol.by.srsc": "Por categoría",
 
+  // "browse.comcol.by.nsi": "By Norwegian Science Index",
+  "browse.comcol.by.nsi": "Por Norwegian Science Index",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Por título",
 
@@ -1497,6 +1535,9 @@
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Título",
 
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "Categoría de materia",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Buscar por autor",
 
@@ -1509,6 +1550,15 @@
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
   "browse.metadata.srsc.breadcrumbs": "Examinar por categoría",
 
+  // "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Seleccione una materia para añadir como filtro de búsqueda",
+
+  // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
+  "browse.metadata.nsi.breadcrumbs": "Examinar por Norwegian Science Index",
+
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Seleccione un índice para añadir como filtro de búsqueda",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Examinar por título",
 
@@ -1519,7 +1569,10 @@
   "pagination.previous.button": "Anterior",
 
   // "pagination.next.button.disabled.tooltip": "No more pages of results",
-  "pagination.next.button.disabled.tooltip": "No hay mas páginas de resultados",
+  "pagination.next.button.disabled.tooltip": "No hay más páginas de resultados",
+
+  // "pagination.page-number-bar": "Control bar for page navigation, relative to element with ID: ",
+  "pagination.page-number-bar": "Barra de control para la navegación de páginas, relativa al elemento con ID: ",
 
   // "browse.startsWith": ", starting with {{ startsWith }}",
   "browse.startsWith": ", comenzando por {{ startsWith }}",
@@ -1596,11 +1649,11 @@
   // "browse.taxonomy.button": "Browse",
   "browse.taxonomy.button": "Examinar",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
-  "browse.title": "Examinando {{ collection }} por {{ field }} {{ value }}",
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Examinando por {{ field }} {{ value }}",
 
-  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Examinando {{ collection }} por {{ field }} {{ value }}",
+  // "browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Examinando por {{ field }} {{ value }}",
 
   // "search.browse.item-back": "Back to Results",
   "search.browse.item-back": "Volver a los resultados",
@@ -1617,6 +1670,12 @@
   // "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
   "claimed-declined-task-search-result-list-element.title": "Declinado, enviar de vuelta al Administrador de Revisión del flujo de trabajo",
 
+  // "collection.create.breadcrumbs": "Create collection",
+  "collection.create.breadcrumbs": "Crear colección",
+
+  // "collection.browse.logo": "Browse for a collection logo",
+  "collection.browse.logo": "Buscar un logotipo de colección",
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Crear una colección",
 
@@ -1911,11 +1970,11 @@
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Colección",
 
-  // "collection.page.browse.recent.head": "Recent Submissions",
-  "collection.page.browse.recent.head": "Envíos recientes",
+  // "collection.logo": "Collection logo",
+  "collection.logo": "Logotipo de la colección",
 
-  // "collection.page.browse.recent.empty": "No items to show",
-  "collection.page.browse.recent.empty": "No hay ítems para mostrar",
+  // "collection.page.browse.search.head": "Search",
+  "collection.page.browse.search.head": "Buscar",
 
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Editar esta colección",
@@ -1929,12 +1988,24 @@
   // "collection.page.news": "News",
   "collection.page.news": "Noticias",
 
+  // "collection.search.results.head": "Search Results",
+  "collection.search.results.head": "Resultados de la búsqueda",
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleccionado",
 
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "No hay colecciones para mostrar",
 
+  // "collection.select.table.selected": "Selected collections",
+  "collection.select.table.selected": "Colecciones seleccionadas",
+
+  // "collection.select.table.select": "Select collection",
+  "collection.select.table.select": "Seleccionar colección",
+
+  // "collection.select.table.deselect": "Deselect collection",
+  "collection.select.table.deselect": "Deseleccionar colección",
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
 
@@ -2025,6 +2096,21 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mostrar más",
 
+  // "communityList.expand": "Expand {{ name }}",
+  "communityList.expand": "Expandir {{ name }}",
+
+  // "communityList.collapse": "Collapse {{ name }}",
+  "communityList.collapse": "Colapsar {{ name }}",
+
+  // "community.browse.logo": "Browse for a community logo",
+  "community.browse.logo": "Buscar un logotipo de la comunidad",
+
+  // "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
+  "community.subcoms-cols.breadcrumbs": "Subcomunidades y colecciones",
+
+  // "community.create.breadcrumbs": "Create Community",
+  "community.create.breadcrumbs": "Crear comunidad",
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Crear una comunidad",
 
@@ -2070,17 +2156,23 @@
   // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "Eliminar logo",
 
+  // "community-collection.edit.logo.delete.title": "Confirm deletion",
+  "community-collection.edit.logo.delete.title": "Confirmar eliminación",
+
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Deshacer eliminación",
 
+  // "community-collection.edit.logo.delete-undo.title": "Undo delete",
+  "community-collection.edit.logo.delete-undo.title": "Deshacer eliminación",
+
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Logotipo de la comunidad",
 
-  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  // "community.edit.logo.notifications.add.error": "Uploading community logo failed. Please verify the content before retrying.",
   "community.edit.logo.notifications.add.error": "Error al cargar el logotipo de la comunidad. Verifique el contenido antes de volver a intentarlo.",
 
-  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  "community.edit.logo.notifications.add.success": "Subir el logotipo de la comunidad correctamente.",
+  // "community.edit.logo.notifications.add.success": "Upload community logo successful.",
+  "community.edit.logo.notifications.add.success": "Subida correcta del logotipo de la comunidad.",
 
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
   "community.edit.logo.notifications.delete.success.title": "Logotipo eliminado",
@@ -2091,7 +2183,7 @@
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "Error al eliminar el logotipo",
 
-  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  // "community.edit.logo.upload": "Drop a community logo to upload",
   "community.edit.logo.upload": "Suelta un logotipo de la comunidad para cargar",
 
   // "community.edit.notifications.success": "Successfully edited the Community",
@@ -2100,7 +2192,7 @@
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "No tienes privilegios para realizar este cambio",
 
-  // "community.edit.notifications.error": "An error occured while editing the Community",
+  // "community.edit.notifications.error": "An error occurred while editing the community",
   "community.edit.notifications.error": "Se produjo un error al editar la comunidad.",
 
   // "community.edit.return": "Back",
@@ -2139,6 +2231,9 @@
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Comunidad",
 
+  // "community.logo": "Community logo",
+  "community.logo": "Logotipo de la comunidad",
+
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Ninguno",
 
@@ -2187,8 +2282,8 @@
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Acceso de lectura predeterminado de archivos",
 
-  // "comcol-role.edit.bitstream_read.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
-  "comcol-role.edit.bitstream_read.description": "Los administradores de la comunidad pueden crear subcomunidades o colecciones y gestionar o asignar la gestión para esas subcomunidades o colecciones. Además, deciden quién puede enviar ítems a las subcolecciones, editar los metadatos del ítem (después del envío) y agregar (mapear) ítems existentes de otras colecciones (sujeto a autorización).",
+  // "comcol-role.edit.bitstream_read.description": "E-People and Groups that can read new bitstreams submitted to this collection. Changes to this role are not retroactive. Existing bitstreams in the system will still be viewable by those who had read access at the time of their addition.",
+  "comcol-role.edit.bitstream_read.description": "Usuarios y Grupos que pueden leer nuevos archivos enviados a esta colección. Los cambios en este rol no son retroactivos. Los archivos existentes en el sistema aún serán visibles para aquellos que tenían acceso de lectura en el momento de su adición.",
 
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "La lectura predeterminada para los archivos entrantes se establece actualmente en Anónimo.",
@@ -2250,6 +2345,9 @@
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Subcomunidades y colecciones",
 
+  // "community.search.results.head": "Search Results",
+  "community.search.results.head": "Resultados de la búsqueda",
+
   // "community.sub-collection-list.head": "Collections in this Community",
   "community.sub-collection-list.head": "Colecciones de esta comunidad",
 
@@ -2286,14 +2384,17 @@
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Rechazar",
 
+  // "cookies.consent.decline-all": "Decline all",
+  "cookies.consent.decline-all": "Rechazar todo",
+
   // "cookies.consent.ok": "That's ok",
   "cookies.consent.ok": "Aceptar",
 
   // "cookies.consent.save": "Save",
   "cookies.consent.save": "Guardar",
 
-  // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  "cookies.consent.content-notice.description": "Recopilamos y procesamos su información personal para los siguientes propósitos: <strong>Autenticación, Preferencias, Reconocimiento y Estadísticas</strong>. <br/> Para obtener más información, lea nuestra {privacyPolicy}.",
+  // "cookies.consent.content-notice.description": "We collect and process your personal information for the following purposes: {purposes}",
+  "cookies.consent.content-notice.description": "Recopilamos y procesamos su información personal para los siguientes propósitos: {purposes}",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Personalizar",
@@ -2307,6 +2408,9 @@
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "Para más información, lea por favor nuestra {privacyPolicy}.",
 
+  // "cookies.consent.content-modal.no-privacy-policy.text": "",
+  "cookies.consent.content-modal.no-privacy-policy.text": "",
+
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Información que recopilamos",
 
@@ -2391,7 +2495,7 @@
   // "curation.form.submit.error.head": "Running the curation task failed",
   "curation.form.submit.error.head": "Error al ejecutar la tarea de curación",
 
-  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  // "curation.form.submit.error.content": "An error occurred when trying to start the curation task.",
   "curation.form.submit.error.content": "Se produjo un error al intentar iniciar la tarea de curación.",
 
   // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
@@ -2421,6 +2525,12 @@
   // "deny-request-copy.success": "Successfully denied item request",
   "deny-request-copy.success": "Solicitud de copia de documento denegada",
 
+  // "dropdown.clear": "Clear selection",
+  "dropdown.clear": "Borrar selección",
+
+  // "dropdown.clear.tooltip": "Clear the selected option",
+  "dropdown.clear.tooltip": "Borrar la opción seleccionada",
+
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Sin título",
 
@@ -2481,6 +2591,15 @@
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Busque un {{ type }}",
 
+  // "dso-selector.placeholder.type.community": "community",
+  "dso-selector.placeholder.type.community": "comunidad",
+
+  // "dso-selector.placeholder.type.collection": "collection",
+  "dso-selector.placeholder.type.collection": "colección",
+
+  // "dso-selector.placeholder.type.item": "item",
+  "dso-selector.placeholder.type.item": "ítem",
+
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Seleccione una colección",
 
@@ -2586,6 +2705,9 @@
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Borrar",
 
+  // "confirmation-modal.delete-community-collection-logo.info": "Are you sure you want to delete the logo?",
+  "confirmation-modal.delete-community-collection-logo.info": "¿Está seguro de que desea eliminar el logotipo?",
+
   // "confirmation-modal.delete-profile.header": "Delete Profile",
   "confirmation-modal.delete-profile.header": "Borrar Perfil",
 
@@ -2664,6 +2786,9 @@
   // "error.validation.license.notgranted": "You must grant this license to complete your submission. If you are unable to grant this license at this time you may save your work and return later or remove the submission.",
   "error.validation.license.notgranted": "Debe conceder esta licencia de depósito para completar el envío. Si no puede conceder esta licencia en este momento, puede guardar su trabajo y regresar más tarde o bien eliminar el envío.",
 
+  // "error.validation.cclicense.required": "You must grant this cclicense to complete your submission. If you are unable to grant the cclicense at this time, you may save your work and return later or remove the submission.",
+  "error.validation.cclicense.required": "Debe conceder esta licencia CC para completar su envío. Si no puede conceder esta licencia CC en este momento, puede guardar su trabajo y regresar más tarde o bien eliminar el envío.",
+
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Esta entrada está restringida por este patrón: {{ pattern }}.",
 
@@ -2673,10 +2798,10 @@
   // "error.validation.required": "This field is required",
   "error.validation.required": "Se requiere este campo",
 
-  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  // "error.validation.NotValidEmail": "This is not a valid email",
   "error.validation.NotValidEmail": "Este no es un correo electrónico válido",
 
-  // "error.validation.emailTaken": "This E-mail is already taken",
+  // "error.validation.emailTaken": "This email is already taken",
   "error.validation.emailTaken": "Este correo electrónico ya está en uso",
 
   // "error.validation.groupExists": "This group already exists",
@@ -2706,6 +2831,9 @@
   // "feed.description": "Syndication feed",
   "feed.description": "Hilo de sindicación",
 
+  // "file-download-link.restricted": "Restricted bitstream",
+  "file-download-link.restricted": "Archivo restringido",
+
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Error al obtener archivos para este ítem",
 
@@ -2730,6 +2858,9 @@
   // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Enviar Sugerencias",
 
+  // "footer.link.coar-notify-support": "COAR Notify",
+  "footer.link.coar-notify-support": "COAR Notify",
+
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Olvido de contraseña",
 
@@ -2760,8 +2891,8 @@
   // "forgot-email.form.error.head": "Error when trying to reset password",
   "forgot-email.form.error.head": "Error al intentar restablecer la contraseña",
 
-  // "forgot-email.form.error.content": "An error occured when attempting to reset the password for the account associated with the following email address: {{ email }}",
-  "forgot-email.form.error.content": "Ha ocurrido una error intentando restablecer la contraseña para la cuenta asociada al correo electrónico: {{ email }}",
+  // "forgot-email.form.error.content": "An error occurred when attempting to reset the password for the account associated with the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Se produjo un error al intentar restablecer la contraseña de la cuenta asociada con la siguiente dirección de correo electrónico: {{ email }}",
 
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Olvido de contraseña",
@@ -2787,7 +2918,7 @@
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Reescriba para confirmar",
 
-  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  // "forgot-password.form.error.empty-password": "Please enter a password in the boxes above.",
   "forgot-password.form.error.empty-password": "Introduzca una contraseña en el cuadro a continuación.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
@@ -2904,6 +3035,12 @@
   // "form.create": "Create",
   "form.create": "Crear",
 
+  // "form.number-picker.decrement": "Decrement {{field}}",
+  "form.number-picker.decrement": "Decrementar {{field}}",
+
+  // "form.number-picker.increment": "Increment {{field}}",
+  "form.number-picker.increment": "Incrementar {{field}}",
+
   // "form.repeatable.sort.tip": "Drop the item in the new position",
   "form.repeatable.sort.tip": "Suelte el ítem en la nueva posición",
 
@@ -3117,15 +3254,27 @@
   // "info.feedback.page-label": "Page",
   "info.feedback.page-label": "Página",
 
-  // "info.feedback.page_help": "Tha page related to your feedback",
+  // "info.feedback.page_help": "The page related to your feedback",
   "info.feedback.page_help": "La página relacionada con su sugerencia",
 
+  // "info.coar-notify-support.title": "COAR Notify Support",
+  "info.coar-notify-support.title": "Soporte COAR Notify",
+
+  // "info.coar-notify-support.breadcrumbs": "COAR Notify Support",
+  "info.coar-notify-support.breadcrumbs": "Soporte COAR Notify",
+
   // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Este ítem es privado",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Este ítem ha sido retirado",
 
+  // "item.alerts.reinstate-request": "Request reinstate",
+  "item.alerts.reinstate-request": "Solicitar reintegración",
+
+  // "quality-assurance.event.table.person-who-requested": "Requested by",
+  "quality-assurance.event.table.person-who-requested": "Solicitado por",
+
   // "item.edit.authorizations.heading": "With this editor you can view and alter the policies of an item, plus alter policies of individual item components: bundles and bitstreams. Briefly, an item is a container of bundles, and bundles are containers of bitstreams. Containers usually have ADD/REMOVE/READ/WRITE policies, while bitstreams only have READ/WRITE policies.",
   "item.edit.authorizations.heading": "Con este editor puede ver y modificar las políticas de un ítem, además de modificar las políticas de los componentes individuales del ítem: paquetes y archivos. Brevemente, un ítem es un contenedor de paquetes y los paquetes son contenedores de archivos. Los contenedores suelen tener políticas AGREGAR/ELIMINAR/LEER/ESCRIBIR, mientras que los archivos solo tienen políticas LEER/ESCRIBIR.",
 
@@ -3186,6 +3335,12 @@
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "BLOQUE: {{ name }}",
 
+  // "item.edit.bitstreams.bundle.table.aria-label": "Bitstreams in the  {{ bundle }} Bundle",
+  "item.edit.bitstreams.bundle.table.aria-label": "Archivos en el bloque {{ bundle }}",
+
+  // "item.edit.bitstreams.bundle.tooltip": "You can move a bitstream to a different page by dropping it on the page number.",
+  "item.edit.bitstreams.bundle.tooltip": "Puede mover un archivo a una página diferente soltándolo en el número de página.",
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Descartar",
 
@@ -3204,9 +3359,27 @@
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
   "item.edit.bitstreams.edit.buttons.undo": "Deshacer cambios",
 
+  // "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} was returned to position {{ toIndex }} and is no longer selected.",
+  "item.edit.bitstreams.edit.live.cancel": "{{ bitstream }} ha sido devuelto a la posición {{ toIndex }} y ya no está seleccionado.",
+
+  // "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} is no longer selected.",
+  "item.edit.bitstreams.edit.live.clear": "{{ bitstream }} ya no está seleccionado.",
+
+  // "item.edit.bitstreams.edit.live.loading": "Waiting for move to complete.",
+  "item.edit.bitstreams.edit.live.loading": "Esperando a que se complete el movimiento.",
+
+  // "item.edit.bitstreams.edit.live.select": "{{ bitstream }} is selected.",
+  "item.edit.bitstreams.edit.live.select": "{{ bitstream }} está seleccionado.",
+
+  // "item.edit.bitstreams.edit.live.move": "{{ bitstream }} is now in position {{ toIndex }}.",
+  "item.edit.bitstreams.edit.live.move": "{{ bitstream }} ahora está en la posición {{ toIndex }}.",
+
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "item.edit.bitstreams.empty": "Este ítem no contiene ningún archivo. Haga clic en el botón de carga para crear uno.",
 
+  // "item.edit.bitstreams.info-alert": "Bitstreams can be reordered within their bundles by holding the drag handle and moving the mouse. Alternatively, bitstreams can be moved using the keyboard in the following way: Select the bitstream by pressing enter when the bitstream's drag handle is in focus. Move the bitstream up or down using the arrow keys. Press enter again to confirm the current position of the bitstream.",
+  "item.edit.bitstreams.info-alert": "Los archivos pueden reordenarse dentro de sus bloques manteniendo el asa de arrastre y moviendo el ratón. Alternativamente, los archivos pueden moverse usando el teclado de la siguiente manera: Seleccione el archivo presionando enter cuando el asa de arrastre del archivo esté en foco. Mueva el archivo hacia arriba o hacia abajo usando las teclas de flecha. Presione enter nuevamente para confirmar la posición actual del archivo.",
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Acciones",
 
@@ -3417,6 +3590,15 @@
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Descartar",
 
+  // "item.edit.metadata.edit.language": "Edit language",
+  "item.edit.metadata.edit.language": "Editar idioma",
+
+  // "item.edit.metadata.edit.value": "Edit value",
+  "item.edit.metadata.edit.value": "Editar valor",
+
+  // "item.edit.metadata.edit.authority.key": "Edit authority key",
+  "item.edit.metadata.edit.authority.key": "Editar clave de autoridad",
+
   // "item.edit.metadata.edit.buttons.confirm": "Confirm",
   "item.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -3453,6 +3635,9 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield": "Edit field",
+  "item.edit.metadata.metadatafield": "Editar campo",
+
   // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "item.edit.metadata.metadatafield.error": "Un error ha ocurrido al validar el campo del metadato",
 
@@ -3495,6 +3680,15 @@
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
+  // "item.edit.metadata.authority.label": "Authority: ",
+  "item.edit.metadata.authority.label": "Autoridad: ",
+
+  // "item.edit.metadata.edit.buttons.open-authority-edition": "Unlock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.open-authority-edition": "Desbloquear el valor de la clave de autoridad para la edición manual",
+
+  // "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Bloquear el valor de la clave de autoridad para la edición manual",
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Campo",
 
@@ -3528,6 +3722,9 @@
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Heredar las políticas predeterminadas de la colección de destino",
 
+  // "item.edit.move.inheritpolicies.tooltip": "Warning: When enabled, the read access policy for the item and any files associated with the item will be replaced by the default read access policy of the collection. This cannot be undone.",
+  "item.edit.move.inheritpolicies.tooltip": "Advertencia: Cuando está habilitado, la política de acceso de lectura para el ítem y cualquier archivo asociado con el ítem será reemplazada por la política de acceso de lectura predeterminada de la colección. Esto no se puede deshacer.",
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Mover",
 
@@ -3819,6 +4016,18 @@
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Contraer",
 
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "item.qa-event-notification.check.notification-info": "Hay {{num}} sugerencias pendientes relacionadas con su cuenta",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  "item.qa-event-notification-info.check.button": "Ver",
+
+  // "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  "mydspace.qa-event-notification.check.notification-info": "Hay {{num}} sugerencias pendientes relacionadas con su cuenta",
+
+  // "mydspace.qa-event-notification-info.check.button": "View",
+  "mydspace.qa-event-notification-info.check.button": "Ver",
+
   // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
   "workflow-item.search.result.delete-supervision.modal.header": "Borrar Orden de Supervisión",
 
@@ -3843,6 +4052,33 @@
   // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
   "workflow-item.search.result.list.element.supervised.remove-tooltip": "Borrar grupo de supervisión",
 
+  // "confidence.indicator.help-text.accepted": "This authority value has been confirmed as accurate by an interactive user",
+  "confidence.indicator.help-text.accepted": "Este valor de autoridad ha sido confirmado como preciso por un usuario interactivo",
+
+  // "confidence.indicator.help-text.uncertain": "Value is singular and valid but has not been seen and accepted by a human so it is still uncertain",
+  "confidence.indicator.help-text.uncertain": "El valor es singular y válido, pero no ha sido visto y aceptado por un humano, por lo que aún es incierto",
+
+  // "confidence.indicator.help-text.ambiguous": "There are multiple matching authority values of equal validity",
+  "confidence.indicator.help-text.ambiguous": "Hay múltiples valores de autoridad coincidentes de igual validez",
+
+  // "confidence.indicator.help-text.notfound": "There are no matching answers in the authority",
+  "confidence.indicator.help-text.notfound": "No hay respuestas coincidentes en la autoridad",
+
+  // "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+  "confidence.indicator.help-text.failed": "La autoridad encontró una falla interna",
+
+  // "confidence.indicator.help-text.rejected": "The authority recommends this submission be rejected",
+  "confidence.indicator.help-text.rejected": "La autoridad recomienda que se rechace esta presentación",
+
+  // "confidence.indicator.help-text.novalue": "No reasonable confidence value was returned from the authority",
+  "confidence.indicator.help-text.novalue": "La autoridad no devolvió un valor de confianza razonable",
+
+  // "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+  "confidence.indicator.help-text.unset": "Nunca se registró la confianza para este valor",
+
+  // "confidence.indicator.help-text.unknown": "Unknown confidence value",
+  "confidence.indicator.help-text.unknown": "Valor de confianza desconocido",
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumen",
 
@@ -3885,18 +4121,6 @@
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Tamaño:",
 
-  // "menu.section.reports": "Reports",
-  "menu.section.reports": "Informes",
-
-  // "menu.section.reports.collections": "Filtered Collections",
-  "menu.section.reports.collections": "Colecciones filtradas",
-
-  // "menu.section.reports.queries": "Metadata Query",
-  "menu.section.reports.queries": "Consulta de metadatos",
-
-  // "menu.section.admin_search": "Admin Search",
-  "menu.section.admin_search": "Búsqueda de administrador",
-
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Ítems de esta revista",
 
@@ -3945,6 +4169,9 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Contraer",
 
+  // "item.page.bitstreams.primary": "Primary",
+  "item.page.bitstreams.primary": "Principal",
+
   // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Bloque original",
 
@@ -3957,6 +4184,12 @@
   // "item.page.version.create": "Create new version",
   "item.page.version.create": "Crear una nueva version",
 
+  // "item.page.withdrawn": "Request a withdrawal for this item",
+  "item.page.withdrawn": "Solicitar la retirada de este ítem",
+
+  // "item.page.reinstate": "Request reinstatement",
+  "item.page.reinstate": "Solicitar la reintegración",
+
   // "item.page.version.hasDraft": "A new version cannot be created because there is an in-progress submission in the version history",
   "item.page.version.hasDraft": "No se puede crear una nueva versión porque en el historial de versiones hay un envío en curso",
 
@@ -3966,6 +4199,9 @@
   // "item.page.claim.tooltip": "Claim this item as profile",
   "item.page.claim.tooltip": "Reclame este item como perfil",
 
+  // "item.page.image.alt.ROR": "ROR logo",
+  "item.page.image.alt.ROR": "Logotipo de ROR",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identificador:",
 
@@ -4044,12 +4280,45 @@
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Línea de financiación:",
 
+  // "item.preview.oairecerif.identifier.url": "URL",
+  "item.preview.oairecerif.identifier.url": "URL",
+
+  // "item.preview.organization.address.addressCountry": "Country",
+  "item.preview.organization.address.addressCountry": "País",
+
+  // "item.preview.organization.foundingDate": "Founding Date",
+  "item.preview.organization.foundingDate": "Fecha de fundación",
+
+  // "item.preview.organization.identifier.crossrefid": "Crossref ID",
+  "item.preview.organization.identifier.crossrefid": "ID de Crossref",
+
+  // "item.preview.organization.identifier.isni": "ISNI",
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  // "item.preview.organization.identifier.ror": "ROR ID",
+  "item.preview.organization.identifier.ror": "ID de ROR",
+
+  // "item.preview.organization.legalName": "Legal Name",
+  "item.preview.organization.legalName": "Nombre legal",
+
+  // "item.preview.dspace.entity.type": "Entity Type:",
+  "item.preview.dspace.entity.type": "Tipo de entidad:",
+
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmar seleccionado",
 
   // "item.select.empty": "No items to show",
   "item.select.empty": "No hay ítems para mostrar",
 
+  // "item.select.table.selected": "Selected items",
+  "item.select.table.selected": "Ítems seleccionados",
+
+  // "item.select.table.select": "Select item",
+  "item.select.table.select": "Seleccionar ítem",
+
+  // "item.select.table.deselect": "Deselect item",
+  "item.select.table.deselect": "Deseleccionar ítem",
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
 
@@ -4125,6 +4394,15 @@
   // "item.version.create.modal.header": "New version",
   "item.version.create.modal.header": "Nueva versión",
 
+  // "item.qa.withdrawn.modal.header": "Request withdrawal",
+  "item.qa.withdrawn.modal.header": "Solicitar retirada",
+
+  // "item.qa.reinstate.modal.header": "Request reinstate",
+  "item.qa.reinstate.modal.header": "Solicitar reintegración",
+
+  // "item.qa.reinstate.create.modal.header": "New version",
+  "item.qa.reinstate.create.modal.header": "Nueva versión",
+
   // "item.version.create.modal.text": "Create a new version for this item",
   "item.version.create.modal.text": "Crear una nueva versión de este ítem",
 
@@ -4137,21 +4415,63 @@
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
   "item.version.create.modal.button.confirm.tooltip": "Crear nueva versión",
 
+  // "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Enviar solicitud",
+
+  // "qa-withdrown.create.modal.button.confirm": "Withdraw",
+  "qa-withdrown.create.modal.button.confirm": "Retirar",
+
+  // "qa-reinstate.create.modal.button.confirm": "Reinstate",
+  "qa-reinstate.create.modal.button.confirm": "Reintegrar",
+
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancelar",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancelar",
+
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
   "item.version.create.modal.button.cancel.tooltip": "No crear una nueva versión",
 
+  // "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "No enviar solicitud",
+
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Resumen",
 
+  // "qa-withdrawn.create.modal.form.summary.label": "You are requesting to withdraw this item",
+  "qa-withdrawn.create.modal.form.summary.label": "Está solicitando retirar este ítem",
+
+  // "qa-withdrawn.create.modal.form.summary2.label": "Please enter the reason for the withdrawal",
+  "qa-withdrawn.create.modal.form.summary2.label": "Por favor, introduzca la razón para la retirada",
+
+  // "qa-reinstate.create.modal.form.summary.label": "You are requesting to reinstate this item",
+  "qa-reinstate.create.modal.form.summary.label": "Está solicitando reintegrar este ítem",
+
+  // "qa-reinstate.create.modal.form.summary2.label": "Please enter the reason for the reinstatment",
+  "qa-reinstate.create.modal.form.summary2.label": "Por favor, introduzca la razón para la reintegración",
+
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
   "item.version.create.modal.form.summary.placeholder": "Introduzca el resumen de esta nueva versión",
 
+  // "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+  "qa-withdrown.modal.form.summary.placeholder": "Introduzca la razón para la retirada",
+
+  // "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+  "qa-reinstate.modal.form.summary.placeholder": "Introduzca la razón para la reintegración",
+
   // "item.version.create.modal.submitted.header": "Creating new version...",
   "item.version.create.modal.submitted.header": "Creando nueva versión...",
 
+  // "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+  "item.qa.withdrawn.modal.submitted.header": "Enviando solicitud de retirada...",
+
+  // "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+  "correction-type.manage-relation.action.notification.reinstate": "Solicitud de reintegración enviada.",
+
+  // "correction-type.manage-relation.action.notification.withdrawn": "Withdraw request sent.",
+  "correction-type.manage-relation.action.notification.withdrawn": "Solicitud de retirada enviada.",
+
   // "item.version.create.modal.submitted.text": "The new version is being created. This may take some time if the item has a lot of relationships.",
   "item.version.create.modal.submitted.text": "Se está creando la nueva versión. Si el ítem tiene muchas relaciones, este proceso podría tardar.",
 
@@ -4200,6 +4520,12 @@
   // "itemtemplate.edit.metadata.discard-button": "Discard",
   "itemtemplate.edit.metadata.discard-button": "Descartar",
 
+  // "itemtemplate.edit.metadata.edit.language": "Edit language",
+  "itemtemplate.edit.metadata.edit.language": "Editar idioma",
+
+  // "itemtemplate.edit.metadata.edit.value": "Edit value",
+  "itemtemplate.edit.metadata.edit.value": "Editar valor",
+
   // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
   "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
 
@@ -4233,6 +4559,9 @@
   // "itemtemplate.edit.metadata.headers.value": "Value",
   "itemtemplate.edit.metadata.headers.value": "Valor",
 
+  // "itemtemplate.edit.metadata.metadatafield": "Edit field",
+  "itemtemplate.edit.metadata.metadatafield": "Editar campo",
+
   // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
   "itemtemplate.edit.metadata.metadatafield.error": "Un error ha ocurrido al validar el campo del metadato",
 
@@ -4332,6 +4661,9 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Número de la revista: ",
 
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Resultados de la búsqueda de números de revistas",
+
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volumen de la revista",
 
@@ -4350,6 +4682,9 @@
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volumen",
 
+  // "journalvolume.search.results.head": "Journal Volume Search Results",
+  "journalvolume.search.results.head": "Resultados de la búsqueda de volúmenes de revistas",
+
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Soporte (media) del documento",
 
@@ -4449,9 +4784,6 @@
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "¿Nuevo Usuario? Pulse aquí para registrarse",
 
-  // "login.form.or-divider": "or",
-  "login.form.or-divider": "o",
-
   // "login.form.oidc": "Log in with OIDC",
   "login.form.oidc": "Iniciar sesión con OIDC",
 
@@ -4482,6 +4814,9 @@
   // "logout.title": "Logout",
   "logout.title": "Cerrar sesión",
 
+  // "menu.header.nav.description": "Admin navigation bar",
+  "menu.header.nav.description": "Barra de navegación de administración",
+
   // "menu.header.admin": "Management",
   "menu.header.admin": "Gestión",
 
@@ -4506,6 +4841,15 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Usuarios",
 
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Informes",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Colecciones filtradas",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Consulta de metadatos",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Búsqueda de administrador",
 
@@ -4536,6 +4880,9 @@
   // "menu.section.browse_global_by_srsc": "By Subject Category",
   "menu.section.browse_global_by_srsc": "Por categoría",
 
+  // "menu.section.browse_global_by_nsi": "By Norwegian Science Index",
+  "menu.section.browse_global_by_nsi": "Por Norwegian Science Index",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Por titulo",
 
@@ -4581,7 +4928,7 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Sección del menú de control de acceso",
 
-  //"menu.section.icon.reports": "Reports menu section",
+  // "menu.section.icon.reports": "Reports menu section",
   "menu.section.icon.reports": "Sección del menú de informes",
 
   // "menu.section.icon.admin_search": "Admin search menu section",
@@ -4629,6 +4976,9 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Desanclar la barra lateral",
 
+  // "menu.section.icon.notifications": "Notifications menu section",
+  "menu.section.icon.notifications": "Sección del menú de notificaciones",
+
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
 
@@ -4656,6 +5006,15 @@
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Proceso",
 
+  // "menu.section.notifications": "Notifications",
+  "menu.section.notifications": "Notificaciones",
+
+  // "menu.section.quality-assurance": "Quality Assurance",
+  "menu.section.quality-assurance": "Control de calidad",
+
+  // "menu.section.notifications_publication-claim": "Publication Claim",
+  "menu.section.notifications_publication-claim": "Reclamo de publicación",
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Anclar barra lateral",
 
@@ -4683,12 +5042,12 @@
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarea de estadísticas",
 
-  //"menu.section.toggle.reports": "Toggle Reports section",
-  "menu.section.toggle.reports": "Alternar sección de informes",
-
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar sección de control de acceso",
 
+  // "menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Alternar sección de informes",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Alternar la sección del Panel de control",
 
@@ -4806,16 +5165,16 @@
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Sin título",
 
-  // "mydspace.results.no-uri": "No Uri",
+  // "mydspace.results.no-uri": "No URI",
   "mydspace.results.no-uri": "Sin URI",
 
-  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  // "mydspace.search-form.placeholder": "Search in MyDSpace...",
   "mydspace.search-form.placeholder": "Buscar en Mi DSpace...",
 
   // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "Tareas del flujo de trabajo",
 
-  // "mydspace.show.workspace": "Your Submissions",
+  // "mydspace.show.workspace": "Your submissions",
   "mydspace.show.workspace": "Sus envíos",
 
   // "mydspace.show.supervisedWorkspace": "Supervised items",
@@ -4854,6 +5213,18 @@
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Ver",
 
+  // "nav.expandable-navbar-section-suffix": "(submenu)",
+  "nav.expandable-navbar-section-suffix": "(submenú)",
+
+  // "notification.suggestion": "We found <b>{{count}} publications</b> in the {{source}} that seems to be related to your profile.<br>",
+  "notification.suggestion": "Hemos encontrado <b>{{count}} publicaciones</b> en el {{source}} que parecen estar relacionadas con su perfil.<br>",
+
+  // "notification.suggestion.review": "review the suggestions",
+  "notification.suggestion.review": "revisar sugerencias",
+
+  // "notification.suggestion.please": "Please",
+  "notification.suggestion.please": "Por favor",
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Todo DSpace",
 
@@ -4869,7 +5240,7 @@
   // "nav.login": "Log In",
   "nav.login": "Iniciar sesión",
 
-  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  // "nav.user-profile-menu-and-logout": "User profile menu and log out",
   "nav.user-profile-menu-and-logout": "Menú de perfil de usuario y cierre de sesión",
 
   // "nav.logout": "Log Out",
@@ -4908,6 +5279,216 @@
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "Ítem",
 
+  // "quality-assurance.title": "Quality Assurance",
+  "quality-assurance.title": "Control de calidad",
+
+  // "quality-assurance.topics.description": "Below you can see all the topics received from the subscriptions to {{source}}.",
+  "quality-assurance.topics.description": "A continuación podrá ver todos los temas recibidos de las suscripciones a {{source}}.",
+
+  // "quality-assurance.source.description": "Below you can see all the notification's sources.",
+  "quality-assurance.source.description": "A continuación podrá ver todas las fuentes de la notificación.",
+
+  // "quality-assurance.topics": "Current Topics",
+  "quality-assurance.topics": "Temas actuales",
+
+  // "quality-assurance.source": "Current Sources",
+  "quality-assurance.source": "Fuentes actuales",
+
+  // "quality-assurance.table.topic": "Topic",
+  "quality-assurance.table.topic": "Tema",
+
+  // "quality-assurance.table.source": "Source",
+  "quality-assurance.table.source": "Fuente",
+
+  // "quality-assurance.table.last-event": "Last Event",
+  "quality-assurance.table.last-event": "Último acontecimiento",
+
+  // "quality-assurance.table.actions": "Actions",
+  "quality-assurance.table.actions": "Acciones",
+
+  // "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+  "quality-assurance.source-list.button.detail": "Mostrar temas para {{param}}",
+
+  // "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+  "quality-assurance.topics-list.button.detail": "Mostrar sugerencias para {{param}}",
+
+  // "quality-assurance.noTopics": "No topics found.",
+  "quality-assurance.noTopics": "No se han encontrado temas.",
+
+  // "quality-assurance.noSource": "No sources found.",
+  "quality-assurance.noSource": "No se han encontrado fuentes.",
+
+  // "notifications.events.title": "Quality Assurance Suggestions",
+  "notifications.events.title": "Sugerencias para el control de calidad",
+
+  // "quality-assurance.topic.error.service.retrieve": "An error occurred while loading the Quality Assurance topics",
+  "quality-assurance.topic.error.service.retrieve": "Se ha producido un error al cargar los temas de control de calidad",
+
+  // "quality-assurance.source.error.service.retrieve": "An error occurred while loading the Quality Assurance source",
+  "quality-assurance.source.error.service.retrieve": "Se ha producido un error al cargar la fuente de control de calidad",
+
+  // "quality-assurance.loading": "Loading ...",
+  "quality-assurance.loading": "Cargando ...",
+
+  // "quality-assurance.events.topic": "Topic:",
+  "quality-assurance.events.topic": "Tema:",
+
+  // "quality-assurance.noEvents": "No suggestions found.",
+  "quality-assurance.noEvents": "No se han encontrado sugerencias.",
+
+  // "quality-assurance.event.table.trust": "Trust",
+  "quality-assurance.event.table.trust": "Confíe en",
+
+  // "quality-assurance.event.table.publication": "Publication",
+  "quality-assurance.event.table.publication": "Publicación",
+
+  // "quality-assurance.event.table.details": "Details",
+  "quality-assurance.event.table.details": "Detalles",
+
+  // "quality-assurance.event.table.project-details": "Project details",
+  "quality-assurance.event.table.project-details": "Detalles del proyecto",
+
+  // "quality-assurance.event.table.reasons": "Reasons",
+  "quality-assurance.event.table.reasons": "Razones",
+
+  // "quality-assurance.event.table.actions": "Actions",
+  "quality-assurance.event.table.actions": "Acciones",
+
+  // "quality-assurance.event.action.accept": "Accept suggestion",
+  "quality-assurance.event.action.accept": "Aceptar sugerencia",
+
+  // "quality-assurance.event.action.ignore": "Ignore suggestion",
+  "quality-assurance.event.action.ignore": "Ignorar sugerencia",
+
+  // "quality-assurance.event.action.undo": "Delete",
+  "quality-assurance.event.action.undo": "Borrar",
+
+  // "quality-assurance.event.action.reject": "Reject suggestion",
+  "quality-assurance.event.action.reject": "Rechazar la sugerencia",
+
+  // "quality-assurance.event.action.import": "Import project and accept suggestion",
+  "quality-assurance.event.action.import": "Importar proyecto y aceptar sugerencia",
+
+  // "quality-assurance.event.table.pidtype": "PID Type:",
+  "quality-assurance.event.table.pidtype": "Tipo de PID:",
+
+  // "quality-assurance.event.table.pidvalue": "PID Value:",
+  "quality-assurance.event.table.pidvalue": "Valor del PID:",
+
+  // "quality-assurance.event.table.subjectValue": "Subject Value:",
+  "quality-assurance.event.table.subjectValue": "Valor del tema:",
+
+  // "quality-assurance.event.table.abstract": "Abstract:",
+  "quality-assurance.event.table.abstract": "Resumen:",
+
+  // "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+  "quality-assurance.event.table.suggestedProject": "Datos del proyecto sugeridos por OpenAIRE",
+
+  // "quality-assurance.event.table.project": "Project title:",
+  "quality-assurance.event.table.project": "Título del proyecto:",
+
+  // "quality-assurance.event.table.acronym": "Acronym:",
+  "quality-assurance.event.table.acronym": "Acrónimo:",
+
+  // "quality-assurance.event.table.code": "Code:",
+  "quality-assurance.event.table.code": "Código:",
+
+  // "quality-assurance.event.table.funder": "Funder:",
+  "quality-assurance.event.table.funder": "Financiador:",
+
+  // "quality-assurance.event.table.fundingProgram": "Funding program:",
+  "quality-assurance.event.table.fundingProgram": "Programa de financiación:",
+
+  // "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+  "quality-assurance.event.table.jurisdiction": "Jurisdicción:",
+
+  // "quality-assurance.events.back": "Back to topics",
+  "quality-assurance.events.back": "Volver a los temas",
+
+  // "quality-assurance.events.back-to-sources": "Back to sources",
+  "quality-assurance.events.back-to-sources": "Volver a las fuentes",
+
+  // "quality-assurance.event.table.less": "Show less",
+  "quality-assurance.event.table.less": "Mostrar menos",
+
+  // "quality-assurance.event.table.more": "Show more",
+  "quality-assurance.event.table.more": "Mostrar más",
+
+  // "quality-assurance.event.project.found": "Bound to the local record:",
+  "quality-assurance.event.project.found": "Vinculado al registro local:",
+
+  // "quality-assurance.event.project.notFound": "No local record found",
+  "quality-assurance.event.project.notFound": "No se ha encontrado ningún registro local",
+
+  // "quality-assurance.event.sure": "Are you sure?",
+  "quality-assurance.event.sure": "¿Seguro?",
+
+  // "quality-assurance.event.ignore.description": "This operation can't be undone. Ignore this suggestion?",
+  "quality-assurance.event.ignore.description": "Esta operación no se puede deshacer. ¿Ignorar esta sugerencia?",
+
+  // "quality-assurance.event.undo.description": "This operation can't be undone!",
+  "quality-assurance.event.undo.description": "¡Esta operación no se puede deshacer!",
+
+  // "quality-assurance.event.reject.description": "This operation can't be undone. Reject this suggestion?",
+  "quality-assurance.event.reject.description": "Esta operación no se puede deshacer. ¿Rechazas esta sugerencia?",
+
+  // "quality-assurance.event.accept.description": "No DSpace project selected. A new project will be created based on the suggestion data.",
+  "quality-assurance.event.accept.description": "No se ha seleccionado ningún proyecto DSpace. Se creará un nuevo proyecto basado en los datos de la sugerencia.",
+
+  // "quality-assurance.event.action.cancel": "Cancel",
+  "quality-assurance.event.action.cancel": "Cancelar",
+
+  // "quality-assurance.event.action.saved": "Your decision has been saved successfully.",
+  "quality-assurance.event.action.saved": "Su elección se ha guardado correctamente.",
+
+  // "quality-assurance.event.action.error": "An error has occurred. Your decision has not been saved.",
+  "quality-assurance.event.action.error": "Se ha producido un error. Su elección no se ha guardado.",
+
+  // "quality-assurance.event.modal.project.title": "Choose a project to bound",
+  "quality-assurance.event.modal.project.title": "Elija un proyecto para vincular",
+
+  // "quality-assurance.event.modal.project.publication": "Publication:",
+  "quality-assurance.event.modal.project.publication": "Publicación:",
+
+  // "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+  "quality-assurance.event.modal.project.bountToLocal": "Vinculado al registro local:",
+
+  // "quality-assurance.event.modal.project.select": "Project search",
+  "quality-assurance.event.modal.project.select": "Buscar proyectos",
+
+  // "quality-assurance.event.modal.project.search": "Search",
+  "quality-assurance.event.modal.project.search": "Buscar",
+
+  // "quality-assurance.event.modal.project.clear": "Clear",
+  "quality-assurance.event.modal.project.clear": "Limpiar",
+
+  // "quality-assurance.event.modal.project.cancel": "Cancel",
+  "quality-assurance.event.modal.project.cancel": "Cancelar",
+
+  // "quality-assurance.event.modal.project.bound": "Bound project",
+  "quality-assurance.event.modal.project.bound": "Proyecto vinculado",
+
+  // "quality-assurance.event.modal.project.remove": "Remove",
+  "quality-assurance.event.modal.project.remove": "Eliminar",
+
+  // "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+  "quality-assurance.event.modal.project.placeholder": "Introduzca el nombre del proyecto",
+
+  // "quality-assurance.event.modal.project.notFound": "No project found.",
+  "quality-assurance.event.modal.project.notFound": "No se ha encontrado ningún proyecto.",
+
+  // "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+  "quality-assurance.event.project.bounded": "El proyecto se ha vinculado con éxito.",
+
+  // "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+  "quality-assurance.event.project.removed": "El proyecto se ha desvinculado con éxito.",
+
+  // "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+  "quality-assurance.event.project.error": "Se ha producido un error. No se ha realizado ninguna operación.",
+
+  // "quality-assurance.event.reason": "Reason",
+  "quality-assurance.event.reason": "Motivo",
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unidad organizativa",
 
@@ -4935,6 +5516,12 @@
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Unidad organizativa: ",
 
+  // "orgunit.page.ror": "ROR Identifier",
+  "orgunit.page.ror": "Identificador ROR",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados de búsqueda de unidades organizativas",
+
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opciones de paginación",
 
@@ -5001,6 +5588,18 @@
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parámetros",
 
+  // "process.new.select-parameter": "Select parameter",
+  "process.new.select-parameter": "Seleccionar parámetro",
+
+  // "process.new.add-parameter": "Add a parameter...",
+  "process.new.add-parameter": "Agregar un parámetro...",
+
+  // "process.new.delete-parameter": "Delete parameter",
+  "process.new.delete-parameter": "Eliminar parámetro",
+
+  // "process.new.parameter.label": "Parameter value",
+  "process.new.parameter.label": "Valor del parámetro",
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Cancelar",
 
@@ -5089,7 +5688,6 @@
   "process.detail.script": "Secuencia de comandos",
 
   // "process.detail.title": "Process: {{ id }} - {{ name }}",
-
   "process.detail.title": "Proceso: {{ id }} - {{ name }}",
 
   // "process.detail.start-time": "Start time",
@@ -5128,6 +5726,24 @@
   // "process.detail.delete.error": "Something went wrong when deleting the process",
   "process.detail.delete.error": "Algo falló eliminando el proceso",
 
+  // "process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Actualización automática…",
+
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Hora de finalización (UTC)",
+
+  // "process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Procesos exitosos",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "No se encontraron procesos coincidentes.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Hora de finalización (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Procesos fallidos",
+
   // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Hora de finalización (UTC)",
 
@@ -5137,6 +5753,18 @@
   // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nombre",
 
+  // "process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Hora de inicio (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Procesos en ejecución",
+
+  // "process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Hora de creación (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Procesos programados",
+
   // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Hora de inicio (UTC)",
 
@@ -5161,6 +5789,9 @@
   // "process.overview.delete": "Delete {{count}} processes",
   "process.overview.delete": "Eliminar {{count}} procesos",
 
+  // "process.overview.delete-process": "Delete process",
+  "process.overview.delete-process": "Eliminar proceso",
+
   // "process.overview.delete.clear": "Clear delete selection",
   "process.overview.delete.clear": "Limpiar la selección",
 
@@ -5171,7 +5802,10 @@
   "process.overview.delete.body": "¿Está seguro de que desea eliminar {{count}} proceso(s)?",
 
   // "process.overview.delete.header": "Delete processes",
-  "process.overview.delete.header": "Elimina procesos",
+  "process.overview.delete.header": "Eliminar procesos",
+
+  // "process.overview.unknown.user": "Unknown",
+  "process.overview.unknown.user": "Desconocido",
 
   // "process.bulk.delete.error.head": "Error on deleteing process",
   "process.bulk.delete.error.head": "Error eliminando proceso",
@@ -5200,9 +5834,6 @@
   // "profile.special.groups.head": "Authorization special groups you belong to",
   "profile.special.groups.head": "Grupos especiales de autorización a los que pertenece",
 
-  // "profile.head": "Update Profile",
-  "profile.head": "Actualización del perfil",
-
   // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "Se requiere el nombre",
 
@@ -5353,6 +5984,105 @@
   // "media-viewer.playlist": "Playlist",
   "media-viewer.playlist": "Lista de reproducción",
 
+  // "suggestion.loading": "Loading ...",
+  "suggestion.loading": "Cargando ...",
+
+  // "suggestion.title": "Publication Claim",
+  "suggestion.title": "Reclamo de publicación",
+
+  // "suggestion.title.breadcrumbs": "Publication Claim",
+  "suggestion.title.breadcrumbs": "Reclamo de publicación",
+
+  // "suggestion.targets.description": "Below you can see all the suggestions ",
+  "suggestion.targets.description": "A continuación puede ver todas las sugerencias ",
+
+  // "suggestion.targets": "Current Suggestions",
+  "suggestion.targets": "Sugerencias actuales",
+
+  // "suggestion.table.name": "Researcher Name",
+  "suggestion.table.name": "Nombre del investigador",
+
+  // "suggestion.table.actions": "Actions",
+  "suggestion.table.actions": "Acciones",
+
+  // "suggestion.button.review": "Review {{ total }} suggestion(s)",
+  "suggestion.button.review": "Revisar {{ total }} sugerencia(s)",
+
+  // "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+  "suggestion.button.review.title": "Revisar {{ total }} sugerencia(s) para ",
+
+  // "suggestion.noTargets": "No target found.",
+  "suggestion.noTargets": "Ningún destino encontrado.",
+
+  // "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+  "suggestion.target.error.service.retrieve": "Se ha producido un error al cargar los destinos de las sugerencias",
+
+  // "suggestion.evidence.type": "Type",
+  "suggestion.evidence.type": "Tipo",
+
+  // "suggestion.evidence.score": "Score",
+  "suggestion.evidence.score": "Puntuación",
+
+  // "suggestion.evidence.notes": "Notes",
+  "suggestion.evidence.notes": "Notas",
+
+  // "suggestion.approveAndImport": "Approve & import",
+  "suggestion.approveAndImport": "Aprobar e importar",
+
+  // "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+  "suggestion.approveAndImport.success": "La sugerencia se ha importado correctamente. <a href='{{ url }}'>Ver.</a>",
+
+  // "suggestion.approveAndImport.bulk": "Approve & import Selected",
+  "suggestion.approveAndImport.bulk": "Aprobar e importar Seleccionado",
+
+  // "suggestion.approveAndImport.bulk.success": "{{ count }} suggestions have been imported successfully ",
+  "suggestion.approveAndImport.bulk.success": "{{ count }} las sugerencias se han importado correctamente ",
+
+  // "suggestion.approveAndImport.bulk.error": "{{ count }} suggestions haven't been imported due to unexpected server errors",
+  "suggestion.approveAndImport.bulk.error": "{{ count }} las sugerencias no se han importado debido a errores inesperados del servidor",
+
+  // "suggestion.ignoreSuggestion": "Ignore Suggestion",
+  "suggestion.ignoreSuggestion": "Ignorar sugerencia",
+
+  // "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+  "suggestion.ignoreSuggestion.success": "La sugerencia ha sido descartada",
+
+  // "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+  "suggestion.ignoreSuggestion.bulk": "Ignorar sugerencia seleccionada",
+
+  // "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} sugerencias descartadas ",
+
+  // "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} las sugerencias no se han descartado debido a errores inesperados del servidor",
+
+  // "suggestion.seeEvidence": "See evidence",
+  "suggestion.seeEvidence": "Ver pruebas",
+
+  // "suggestion.hideEvidence": "Hide evidence",
+  "suggestion.hideEvidence": "Ocultar pruebas",
+
+  // "suggestion.suggestionFor": "Suggestions for",
+  "suggestion.suggestionFor": "Sugerencias para",
+
+  // "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+  "suggestion.suggestionFor.breadcrumb": "Sugerencias para {{ name }}",
+
+  // "suggestion.source.openaire": "OpenAIRE Graph",
+  "suggestion.source.openaire": "Gráfico OpenAIRE",
+
+  // "suggestion.from.source": "from the ",
+  "suggestion.from.source": "del ",
+
+  // "suggestion.count.missing": "You have no publication claims left",
+  "suggestion.count.missing": "Ya no tiene reclamaciones de publicación",
+
+  // "suggestion.totalScore": "Total Score",
+  "suggestion.totalScore": "Puntuación total",
+
+  // "suggestion.type.openaire": "OpenAIRE",
+  "suggestion.type.openaire": "OpenAIRE",
+
   // "register-email.title": "New user registration",
   "register-email.title": "Registro de nuevo usuario",
 
@@ -5449,7 +6179,7 @@
   // "register-page.registration.error.head": "Error when trying to register email",
   "register-page.registration.error.head": "Error al intentar registrar el correo electrónico",
 
-  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  // "register-page.registration.error.content": "An error occurred when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Se produjo un error al registrar la siguiente dirección de correo electrónico: {{ email }}",
 
   // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
@@ -5497,12 +6227,18 @@
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Números de revista",
 
+  // "relationships.isIssueOf.JournalIssue": "Journal Issue",
+  "relationships.isIssueOf.JournalIssue": "Número de la revista",
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Número de la revista",
 
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Revistas",
 
+  // "relationships.isJournalVolumeOf": "Journal Volume",
+  "relationships.isJournalVolumeOf": "Volumen de la revista",
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Unidades organizativas",
 
@@ -5527,6 +6263,9 @@
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Volúmenes de revistas",
 
+  // "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+  "relationships.isVolumeOf.JournalVolume": "Volumen de la revista",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Colaboradores",
 
@@ -5665,7 +6404,7 @@
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nombre",
 
-  //"resource-policies.form.name.hint": "Max 30 characters",
+  // "resource-policies.form.name.hint": "Max 30 characters",
   "resource-policies.form.name.hint": "Máximo 30 caracteres",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
@@ -5698,6 +6437,18 @@
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grupo",
 
+  // "resource-policies.table.headers.select-all": "Select all",
+  "resource-policies.table.headers.select-all": "Seleccionar todo",
+
+  // "resource-policies.table.headers.deselect-all": "Deselect all",
+  "resource-policies.table.headers.deselect-all": "Deseleccionar todo",
+
+  // "resource-policies.table.headers.select": "Select",
+  "resource-policies.table.headers.select": "Seleccionar",
+
+  // "resource-policies.table.headers.deselect": "Deselect",
+  "resource-policies.table.headers.deselect": "Deseleccionar",
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
 
@@ -5722,6 +6473,9 @@
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Políticas para la colección",
 
+  // "root.skip-to-content": "Skip to main content",
+  "root.skip-to-content": "Saltar al contenido principal",
+
   // "search.description": "",
   "search.description": "",
 
@@ -5737,6 +6491,12 @@
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Buscar en el repositorio ...",
 
+  // "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
+  "search.filters.remove": "Eliminar filtro de tipo {{ type }} con valor {{ value }}",
+
+  // "search.filters.applied.f.title": "Title",
+  "search.filters.applied.f.title": "Título",
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor",
 
@@ -5758,6 +6518,12 @@
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Tiene archivos",
 
+  // "search.filters.applied.f.original_bundle_filenames": "File name",
+  "search.filters.applied.f.original_bundle_filenames": "Nombre del archivo",
+
+  // "search.filters.applied.f.original_bundle_descriptions": "File description",
+  "search.filters.applied.f.original_bundle_descriptions": "Descripción del archivo",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipo",
 
@@ -5785,6 +6551,36 @@
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
+  // "search.filters.applied.operator.equals": "",
+  "search.filters.applied.operator.equals": "",
+
+  // "search.filters.applied.operator.notequals": " not equals",
+  "search.filters.applied.operator.notequals": " no es igual a",
+
+  // "search.filters.applied.operator.authority": "",
+  "search.filters.applied.operator.authority": "",
+
+  // "search.filters.applied.operator.notauthority": " not authority",
+  "search.filters.applied.operator.notauthority": " sin autoridad",
+
+  // "search.filters.applied.operator.contains": " contains",
+  "search.filters.applied.operator.contains": " contiene",
+
+  // "search.filters.applied.operator.notcontains": " not contains",
+  "search.filters.applied.operator.notcontains": " no contiene",
+
+  // "search.filters.applied.operator.query": "",
+  "search.filters.applied.operator.query": "",
+
+  // "search.filters.filter.title.head": "Title",
+  "search.filters.filter.title.head": "Título",
+
+  // "search.filters.filter.title.placeholder": "Title",
+  "search.filters.filter.title.placeholder": "Título",
+
+  // "search.filters.filter.title.label": "Search Title",
+  "search.filters.filter.title.label": "Buscar por título",
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
 
@@ -5887,6 +6683,24 @@
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Tiene archivos",
 
+  // "search.filters.filter.original_bundle_filenames.head": "File name",
+  "search.filters.filter.original_bundle_filenames.head": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.placeholder": "File name",
+  "search.filters.filter.original_bundle_filenames.placeholder": "Nombre del archivo",
+
+  // "search.filters.filter.original_bundle_filenames.label": "Search File name",
+  "search.filters.filter.original_bundle_filenames.label": "Buscar por nombre del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.head": "File description",
+  "search.filters.filter.original_bundle_descriptions.head": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.placeholder": "File description",
+  "search.filters.filter.original_bundle_descriptions.placeholder": "Descripción del archivo",
+
+  // "search.filters.filter.original_bundle_descriptions.label": "Search File description",
+  "search.filters.filter.original_bundle_descriptions.label": "Buscar por descripción del archivo",
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tipo",
 
@@ -5995,6 +6809,12 @@
   // "search.filters.filter.show-tree": "Browse {{ name }} tree",
   "search.filters.filter.show-tree": "Examinar árbol {{ name }}",
 
+  // "search.filters.filter.funding.head": "Funding",
+  "search.filters.filter.funding.head": "Financiación",
+
+  // "search.filters.filter.funding.placeholder": "Funding",
+  "search.filters.filter.funding.placeholder": "Financiación",
+
   // "search.filters.filter.supervisedBy.head": "Supervised By",
   "search.filters.filter.supervisedBy.head": "Supervisado Por",
 
@@ -6013,6 +6833,15 @@
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Unidad organizativa",
 
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Persona",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Proyecto",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicación",
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sí",
 
@@ -6025,6 +6854,21 @@
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sí",
 
+  // "search.filters.namedresourcetype.Archived": "Archived",
+  "search.filters.namedresourcetype.Archived": "Archivado",
+
+  // "search.filters.namedresourcetype.Validation": "Validation",
+  "search.filters.namedresourcetype.Validation": "Validación",
+
+  // "search.filters.namedresourcetype.Waiting for Controller": "Waiting for reviewer",
+  "search.filters.namedresourcetype.Waiting for Controller": "A la espera del revisor",
+
+  // "search.filters.namedresourcetype.Workflow": "Workflow",
+  "search.filters.namedresourcetype.Workflow": "Flujo de trabajo",
+
+  // "search.filters.namedresourcetype.Workspace": "Workspace",
+  "search.filters.namedresourcetype.Workspace": "Espacio de trabajo",
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Sí",
 
@@ -6040,6 +6884,27 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
+  // "search.filters.operator.equals.text": "Equals",
+  "search.filters.operator.equals.text": "Es igual a",
+
+  // "search.filters.operator.notequals.text": "Not Equals",
+  "search.filters.operator.notequals.text": "No es igual a",
+
+  // "search.filters.operator.authority.text": "Authority",
+  "search.filters.operator.authority.text": "Autoridad",
+
+  // "search.filters.operator.notauthority.text": "Not Authority",
+  "search.filters.operator.notauthority.text": "Sin autoridad",
+
+  // "search.filters.operator.contains.text": "Contains",
+  "search.filters.operator.contains.text": "Contiene",
+
+  // "search.filters.operator.notcontains.text": "Not Contains",
+  "search.filters.operator.notcontains.text": "No contiene",
+
+  // "search.filters.operator.query.text": "Query",
+  "search.filters.operator.query.text": "Consulta",
+
   // "search.form.search": "Search",
   "search.form.search": "Buscar",
 
@@ -6091,6 +6956,21 @@
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Ordenar por",
 
+  // "search.sidebar.advanced-search.title": "Advanced Search",
+  "search.sidebar.advanced-search.title": "Búsqueda Avanzada",
+
+  // "search.sidebar.advanced-search.filter-by": "Filter by",
+  "search.sidebar.advanced-search.filter-by": "Filtrar por",
+
+  // "search.sidebar.advanced-search.filters": "Filters",
+  "search.sidebar.advanced-search.filters": "Filtros",
+
+  // "search.sidebar.advanced-search.operators": "Operators",
+  "search.sidebar.advanced-search.operators": "Operadores",
+
+  // "search.sidebar.advanced-search.add": "Add",
+  "search.sidebar.advanced-search.add": "Añadir",
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Ajustes",
 
@@ -6103,6 +6983,12 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostrar como lista",
 
+  // "selectable-list-item-control.deselect": "Deselect item",
+  "selectable-list-item-control.deselect": "Deseleccionar ítem",
+
+  // "selectable-list-item-control.select": "Select item",
+  "selectable-list-item-control.select": "Seleccionar ítem",
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",
 
@@ -6139,6 +7025,24 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última modificación Descendente",
 
+  // "sorting.person.familyName.ASC": "Surname Ascending",
+  "sorting.person.familyName.ASC": "Apellido Ascendente",
+
+  // "sorting.person.familyName.DESC": "Surname Descending",
+  "sorting.person.familyName.DESC": "Apellido Descendente",
+
+  // "sorting.person.givenName.ASC": "Name Ascending",
+  "sorting.person.givenName.ASC": "Nombre Ascendente",
+
+  // "sorting.person.givenName.DESC": "Name Descending",
+  "sorting.person.givenName.DESC": "Nombre Descendente",
+
+  // "sorting.person.birthDate.ASC": "Birth Date Ascending",
+  "sorting.person.birthDate.ASC": "Fecha de nacimiento Ascendente",
+
+  // "sorting.person.birthDate.DESC": "Birth Date Descending",
+  "sorting.person.birthDate.DESC": "Fecha de nacimiento Descendente",
+
   // "statistics.title": "Statistics",
   "statistics.title": "Estadísticas",
 
@@ -6205,6 +7109,9 @@
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Descartar",
 
+  // "submission.general.back.submit": "Back",
+  "submission.general.back.submit": "Atrás",
+
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Guardado",
 
@@ -6280,6 +7187,9 @@
   // "submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite",
 
+  // "submission.import-external.source.doi": "DOI",
+  "submission.import-external.source.doi": "DOI",
+
   // "submission.import-external.source.scielo": "SciELO",
   "submission.import-external.source.scielo": "SciELO",
 
@@ -6310,8 +7220,14 @@
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "Editores SHERPA",
 
-  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-  "submission.import-external.source.openAIREFunding": "API de Financiamiento de OpenAIRE",
+  // "submission.import-external.source.openaire": "OpenAIRE Search by Authors",
+  "submission.import-external.source.openaire": "Búsqueda de OpenAIRE por autores",
+
+  // "submission.import-external.source.openaireTitle": "OpenAIRE Search by Title",
+  "submission.import-external.source.openaireTitle": "Búsqueda de OpenAIRE por título",
+
+  // "submission.import-external.source.openaireFunding": "OpenAIRE Search by Funder",
+  "submission.import-external.source.openaireFunding": "Búsqueda de OpenAIRE por financiador",
 
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
@@ -6325,6 +7241,9 @@
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Nombres de la Biblioteca del Congreso",
 
+  // "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Vista previa del ítem",
 
@@ -6415,9 +7334,6 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Proyecto",
 
-  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "API OpenAIRE de Financiamiento",
-
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Import Remote Author",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importación remota de autor",
 
@@ -6451,6 +7367,15 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importing from ORCID",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importando desde ORCID",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaire": "Importando desde OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireTitle": "Importando desde OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importing from OpenAIRE",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openaireFunding": "Importando desde OpenAIRE",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importing from Sherpa Journal",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importar desde Sherpa Journal",
 
@@ -6463,6 +7388,9 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importing from arXiv",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importando desde arXiv",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Import from ROR",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.ror": "Importar desde ROR",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
 
@@ -6496,6 +7424,15 @@
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccione una coincidencia local:",
 
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Import Remote Organization",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.title": "Importación remota de organización",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Successfully added local organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.local-entity": "Organización local agregada con éxito a la selección",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Successfully imported and added external organization to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfProject.added.new-entity": "Organización externa importada y agregada con éxito a la selección",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar todo",
 
@@ -6580,6 +7517,30 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.ror": "ROR ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidWorks": "ORCID ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.crossref": "Crossref ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.scopus": "Scopus ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaire": "OpenAIRE Search by Authors ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireTitle": "OpenAIRE Search by Title ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "OpenAIRE Search by Funder ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openaireFunding": "Búsqueda por financiador OpenAIRE ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Sherpa Journals by ISSN ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournalIssn": "Revistas Sherpa por ISSN ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Search for Funding Agencies",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Búsqueda de agencias de financiación",
 
@@ -6589,9 +7550,6 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Búsqueda de unidades organizativas",
 
-  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "API OpenAire de Financiamiento",
-
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Proyectos",
 
@@ -6601,8 +7559,8 @@
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicación del Autor",
 
-  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "API OpenAIRE de Financiamiento",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "Unidad organizativa del proyecto",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Proyecto",
@@ -6619,6 +7577,9 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selección actual ({{ count }})",
 
+  // "submission.sections.describe.relationship-lookup.title.Journal": "Journal",
+  "submission.sections.describe.relationship-lookup.title.Journal": "Revista",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Números de revista",
 
@@ -6670,6 +7631,9 @@
   // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
   "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicación",
 
+  // "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "Unidad organizativa",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
 
@@ -6739,6 +7703,15 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados de la búsqueda",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaire": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireTitle": "Resultados de la búsqueda",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openaireFundin": "Resultados de la búsqueda",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados de la búsqueda",
 
@@ -6763,6 +7736,9 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Resultados de la búsqueda",
 
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.ror": "Resultados de la búsqueda",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultados de la búsqueda",
 
@@ -6826,6 +7802,9 @@
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "No se encontró ninguna colección",
 
+  // "submission.sections.general.no-entity": "No entity types found",
+  "submission.sections.general.no-entity": "No se encontraron tipos de entidad",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "No hay opciones disponibles",
 
@@ -6877,8 +7856,8 @@
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Describir",
 
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  "submission.sections.submit.progressbar.detect-duplicate": "Posibles duplicados",
+  // "submission.sections.submit.progressbar.duplicates": "Potential duplicates",
+  "submission.sections.submit.progressbar.duplicates": "Posibles duplicados",
 
   // "submission.sections.submit.progressbar.identifiers": "Identifiers",
   "submission.sections.submit.progressbar.identifiers": "Identificadores",
@@ -6934,6 +7913,12 @@
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
   "submission.sections.toggle.aria.close": "Contraer sección {{sectionHeader}}",
 
+  // "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+  "submission.sections.upload.primary.make": "Hacer {{fileName}} el archivo principal",
+
+  // "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+  "submission.sections.upload.primary.remove": "Eliminar {{fileName}} como el archivo principal",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancelar",
 
@@ -7069,6 +8054,18 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Hasta",
 
+  // "submission.sections.duplicates.none": "No duplicates were detected.",
+  "submission.sections.duplicates.none": "No se detectaron duplicados.",
+
+  // "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+  "submission.sections.duplicates.detected": "Se detectaron posibles duplicados. Por favor, revise la lista a continuación.",
+
+  // "submission.sections.duplicates.in-workspace": "This item is in workspace",
+  "submission.sections.duplicates.in-workspace": "Este ítem está en el espacio de trabajo",
+
+  // "submission.sections.duplicates.in-workflow": "This item is in workflow",
+  "submission.sections.duplicates.in-workflow": "Este ítem está en el flujo de trabajo",
+
   // "submission.sections.license.granted-label": "I confirm the license above",
   "submission.sections.license.granted-label": "Confirmo la licencia",
 
@@ -7258,6 +8255,9 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalle",
 
+  // "submission.workflow.tasks.duplicates": "potential duplicates were detected for this item. Claim and edit this item to see details.",
+  "submission.workflow.tasks.duplicates": "se detectaron posibles duplicados para este ítem. Reclame y edite este ítem para ver los detalles.",
+
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Ver",
 
@@ -7411,6 +8411,9 @@
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Buscar",
 
+  // "vocabulary-treeview.search.form.search-placeholder": "Filter results by typing the first few letters",
+  "vocabulary-treeview.search.form.search-placeholder": "Filtrar resultados escribiendo las primeras letras",
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "No había ítems para mostrar",
 
@@ -7465,6 +8468,9 @@
   // "supervision.search.results.head": "Workflow and Workspace tasks",
   "supervision.search.results.head": "Tareas del flujo de trabajo y del espacio de trabajo",
 
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados de búsqueda de unidades organizativas",
+
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Editar ítem del flujo de trabajo",
 
@@ -8035,6 +9041,9 @@
   // "system-wide-alert.form.label.countdownTo.hint": "Hint: Set a countdown timer. When enabled, a date can be set in the future and the system-wide alert banner will perform a countdown to the set date. When this timer ends, it will disappear from the alert. The server will NOT be automatically stopped.",
   "system-wide-alert.form.label.countdownTo.hint": "Sugerencia: Configure un temporizador. Cuando esté habilitado, se puede establecer una fecha en el futuro y el banner del sistema de alerta realizara una cuenta regresiva hasta la fecha establecida. Cuando finalice el temporizador, este desaparecerá de la alerta. El servidor NO se detendrá automáticamente..",
 
+  // "system-wide-alert-form.select-date-by-calendar": "Select date using calendar",
+  "system-wide-alert-form.select-date-by-calendar": "Seleccionar fecha usando el calendario",
+
   // "system-wide-alert.form.label.preview": "System-wide alert preview",
   "system-wide-alert.form.label.preview": "Vista preliminar de la alerta del sistema",
 
@@ -8056,6 +9065,9 @@
   // "admin.system-wide-alert.title": "System-wide Alerts",
   "admin.system-wide-alert.title": "Alertas del sistema",
 
+  // "discover.filters.head": "Discover",
+  "discover.filters.head": "Descubrir",
+
   // "item-access-control-title": "This form allows you to perform changes to the access conditions of the item's metadata or its bitstreams.",
   "item-access-control-title": "Esta pantalla le permite realizar cambios en las condiciones de acceso a los metadatos o a los archivos del ítem.",
 
@@ -8068,9 +9080,21 @@
   // "access-control-item-header-toggle": "Item's Metadata",
   "access-control-item-header-toggle": "Metadatos del ítem",
 
+  // "access-control-item-toggle.enable": "Enable option to perform changes on the item's metadata",
+  "access-control-item-toggle.enable": "Habilitar opción para realizar cambios en los metadatos del ítem",
+
+  // "access-control-item-toggle.disable": "Disable option to perform changes on the item's metadata",
+  "access-control-item-toggle.disable": "Deshabilitar opción para realizar cambios en los metadatos del ítem",
+
   // "access-control-bitstream-header-toggle": "Bitstreams",
   "access-control-bitstream-header-toggle": "Archivos",
 
+  // "access-control-bitstream-toggle.enable": "Enable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.enable": "Habilitar opción para realizar cambios en los archivos",
+
+  // "access-control-bitstream-toggle.disable": "Disable option to perform changes on the bitstreams",
+  "access-control-bitstream-toggle.disable": "Deshabilitar opción para realizar cambios en los archivos",
+
   // "access-control-mode": "Mode",
   "access-control-mode": "Modo",
 
@@ -8095,6 +9119,9 @@
   // "access-control-bitstreams-selected": "bitstreams selected",
   "access-control-bitstreams-selected": "archivos seleccionados",
 
+  // "access-control-bitstreams-select": "Select bitstreams",
+  "access-control-bitstreams-select": "Seleccionar archivos",
+
   // "access-control-cancel": "Cancel",
   "access-control-cancel": "Cancelar",
 
@@ -8104,6 +9131,9 @@
   // "access-control-add-more": "Add more",
   "access-control-add-more": "Añadir mas",
 
+  // "access-control-remove": "Remove access condition",
+  "access-control-remove": "Eliminar condición de acceso",
+
   // "access-control-select-bitstreams-modal.title": "Select bitstreams",
   "access-control-select-bitstreams-modal.title": "Seleccionar archivos",
 
@@ -8131,14 +9161,1037 @@
   // "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
   "access-control-option-end-date-note": "Escoja la fecha hasta la cuál se aplicarán las condiciones de acceso especificadas",
 
-  //"browse.search-form.placeholder": "Search the repository",
+  // "vocabulary-treeview.search.form.add": "Add",
+  "vocabulary-treeview.search.form.add": "Añadir",
+
+  // "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+  "admin.notifications.publicationclaim.breadcrumbs": "Reclamo de publicación",
+
+  // "admin.notifications.publicationclaim.page.title": "Publication Claim",
+  "admin.notifications.publicationclaim.page.title": "Reclamo de publicación",
+
+  // "coar-notify-support.title": "COAR Notify Protocol",
+  "coar-notify-support.title": "Protocolo COAR Notify",
+
+  // "coar-notify-support-title.content": "Here, we fully support the COAR Notify protocol, which is designed to enhance the communication between repositories. To learn more about the COAR Notify protocol, visit the <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">COAR Notify website</a>.",
+  "coar-notify-support-title.content": "Aquí, apoyamos completamente el protocolo COAR Notify, que está diseñado para mejorar la comunicación entre repositorios. Para obtener más información sobre el protocolo COAR Notify, visite el <a href=\"https://notify.coar-repositories.org/\" rel=\"noopener noreferrer\">sitio web de COAR Notify</a>.",
+
+  // "coar-notify-support.ldn-inbox.title": "LDN InBox",
+  "coar-notify-support.ldn-inbox.title": "Buzón LDN",
+
+  // "coar-notify-support.ldn-inbox.content": "For your convenience, our LDN (Linked Data Notifications) InBox is easily accessible at {{ ldnInboxUrl }}. The LDN InBox enables seamless communication and data exchange, ensuring efficient and effective collaboration.",
+  "coar-notify-support.ldn-inbox.content": "Para su conveniencia, nuestro Buzón LDN (Linked Data Notifications) es fácilmente accesible en {{ ldnInboxUrl }}. El Buzón LDN permite una comunicación e intercambio de datos sin problemas, asegurando una colaboración eficiente y efectiva.",
+
+  // "coar-notify-support.message-moderation.title": "Message Moderation",
+  "coar-notify-support.message-moderation.title": "Moderación de mensajes",
+
+  // "coar-notify-support.message-moderation.content": "To ensure a secure and productive environment, all incoming LDN messages are moderated. If you are planning to exchange information with us, kindly reach out via our dedicated",
+  "coar-notify-support.message-moderation.content": "Para asegurar un entorno seguro y productivo, todos los mensajes LDN entrantes son moderados. Si planea intercambiar información con nosotros, por favor contáctenos a través de nuestro",
+
+  // "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+  "coar-notify-support.message-moderation.feedback-form": " Formulario de comentarios.",
+
+  // "service.overview.delete.header": "Delete Service",
+  "service.overview.delete.header": "Eliminar Servicio",
+
+  // "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.title": "Servicios Registrados",
+  // "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.name": "Nombre",
+  // "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.description": "Descripción",
+  // "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.status": "Estado",
+  // "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.table.action": "Acción",
+  // "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new": "NUEVO",
+  // "ldn-registered-services.new.breadcrumbs": "Registered Services",
+  "ldn-registered-services.new.breadcrumbs": "Servicios Registrados",
+
+  // "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.enabled": "Habilitado",
+  // "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.disabled": "Deshabilitado",
+  // "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToEnable": "Haga clic para habilitar",
+  // "ldn-service.overview.table.clickToDisable": "Click to disable",
+  "ldn-service.overview.table.clickToDisable": "Haga clic para deshabilitar",
+
+  // "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-edit-registered-service.title": "Editar Servicio",
+  // "ldn-create-service.title": "Create service",
+  "ldn-create-service.title": "Crear servicio",
+  // "service.overview.create.modal": "Create Service",
+  "service.overview.create.modal": "Crear Servicio",
+  // "service.overview.create.body": "Please confirm the creation of this service.",
+  "service.overview.create.body": "Por favor confirme la creación de este servicio.",
+  // "ldn-service-status": "Status",
+  "ldn-service-status": "Estado",
+  // "service.confirm.create": "Create",
+  "service.confirm.create": "Crear",
+  // "service.refuse.create": "Cancel",
+  "service.refuse.create": "Cancelar",
+  // "ldn-register-new-service.title": "Register a new service",
+  "ldn-register-new-service.title": "Registrar un nuevo servicio",
+  // "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.submit": "Guardar",
+  // "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.name": "Nombre",
+  // "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.description": "Descripción",
+  // "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.url": "URL del Servicio",
+  // "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.ip-range": "Rango de IP del Servicio",
+  // "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.score": "Nivel de confianza",
+  // "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.label.ldnUrl": "URL del Buzón LDN",
+  // "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "ldn-new-service.form.placeholder.name": "Por favor proporcione el nombre del servicio",
+  // "ldn-new-service.form.placeholder.description": "Please provide a description regarding your service",
+  "ldn-new-service.form.placeholder.description": "Por favor proporcione una descripción sobre su servicio",
+  // "ldn-new-service.form.placeholder.url": "Please input the URL for users to check out more information about the service",
+  "ldn-new-service.form.placeholder.url": "Por favor ingrese la URL para que los usuarios puedan obtener más información sobre el servicio",
+  // "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.lowerIp": "Límite inferior del rango IPv4",
+  // "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "ldn-new-service.form.placeholder.upperIp": "Límite superior del rango IPv4",
+  // "ldn-new-service.form.placeholder.ldnUrl": "Please specify the URL of the LDN Inbox",
+  "ldn-new-service.form.placeholder.ldnUrl": "Por favor especifique la URL del Buzón LDN",
+  // "ldn-new-service.form.placeholder.score": "Please enter a value between 0 and 1. Use the “.” as decimal separator",
+  "ldn-new-service.form.placeholder.score": "Por favor ingrese un valor entre 0 y 1. Use el “.” como separador decimal",
+  // "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+  "ldn-service.form.label.placeholder.default-select": "Seleccione un patrón",
+
+  // "ldn-service.form.pattern.ack-accept.label": "Acknowledge and Accept",
+  "ldn-service.form.pattern.ack-accept.label": "Reconocer y aceptar",
+  // "ldn-service.form.pattern.ack-accept.description": "This pattern is used to acknowledge and accept a request (offer). It implies an intention to act on the request.",
+  "ldn-service.form.pattern.ack-accept.description": "Este patrón se usa para reconocer y aceptar una solicitud (oferta). Implica una intención de actuar sobre la solicitud.",
+  // "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-accept.category": "Reconocimientos",
+
+  // "ldn-service.form.pattern.ack-reject.label": "Acknowledge and Reject",
+  "ldn-service.form.pattern.ack-reject.label": "Reconocer y rechazar",
+  // "ldn-service.form.pattern.ack-reject.description": "This pattern is used to acknowledge and reject a request (offer). It signifies no further action regarding the request.",
+  "ldn-service.form.pattern.ack-reject.description": "Este patrón se usa para reconocer y rechazar una solicitud (oferta). Significa que no habrá más acciones con respecto a la solicitud.",
+  // "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-reject.category": "Reconocimientos",
+
+  // "ldn-service.form.pattern.ack-tentative-accept.label": "Acknowledge and Tentatively Accept",
+  "ldn-service.form.pattern.ack-tentative-accept.label": "Reconocer y Aceptar Tentativamente",
+  // "ldn-service.form.pattern.ack-tentative-accept.description": "This pattern is used to acknowledge and tentatively accept a request (offer). It implies an intention to act, which may change.",
+  "ldn-service.form.pattern.ack-tentative-accept.description": "Este patrón se usa para reconocer y aceptar tentativamente una solicitud (oferta). Implica una intención de actuar, que puede cambiar.",
+  // "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Reconocimientos",
+
+  // "ldn-service.form.pattern.ack-tentative-reject.label": "Acknowledge and Tentatively Reject",
+  "ldn-service.form.pattern.ack-tentative-reject.label": "Reconocer y rechazar tentativamente",
+  // "ldn-service.form.pattern.ack-tentative-reject.description": "This pattern is used to acknowledge and tentatively reject a request (offer). It signifies no further action, subject to change.",
+  "ldn-service.form.pattern.ack-tentative-reject.description": "Este patrón se usa para reconocer y rechazar tentativamente una solicitud (oferta). Significa que no habrá más acciones, sujeto a cambios.",
+  // "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Reconocimientos",
+
+  // "ldn-service.form.pattern.announce-endorsement.label": "Announce Endorsement",
+  "ldn-service.form.pattern.announce-endorsement.label": "Anunciar aprobación",
+  // "ldn-service.form.pattern.announce-endorsement.description": "This pattern is used to announce the existence of an endorsement, referencing the endorsed resource.",
+  "ldn-service.form.pattern.announce-endorsement.description": "Este patrón se usa para anunciar la existencia de una aprobación, haciendo referencia al recurso aprobado.",
+  // "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+  "ldn-service.form.pattern.announce-endorsement.category": "Anuncios",
+
+  // "ldn-service.form.pattern.announce-ingest.label": "Announce Ingest",
+  "ldn-service.form.pattern.announce-ingest.label": "Anunciar ingestión",
+  // "ldn-service.form.pattern.announce-ingest.description": "This pattern is used to announce that a resource has been ingested.",
+  "ldn-service.form.pattern.announce-ingest.description": "Este patrón se usa para anunciar que un recurso ha sido ingerido.",
+  // "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+  "ldn-service.form.pattern.announce-ingest.category": "Anuncios",
+
+  // "ldn-service.form.pattern.announce-relationship.label": "Announce Relationship",
+  "ldn-service.form.pattern.announce-relationship.label": "Anunciar relación",
+  // "ldn-service.form.pattern.announce-relationship.description": "This pattern is used to announce a relationship between two resources.",
+  "ldn-service.form.pattern.announce-relationship.description": "Este patrón se usa para anunciar una relación entre dos recursos.",
+  // "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+  "ldn-service.form.pattern.announce-relationship.category": "Anuncios",
+
+  // "ldn-service.form.pattern.announce-review.label": "Announce Review",
+  "ldn-service.form.pattern.announce-review.label": "Anunciar revisión",
+  // "ldn-service.form.pattern.announce-review.description": "This pattern is used to announce the existence of a review, referencing the reviewed resource.",
+  "ldn-service.form.pattern.announce-review.description": "Este patrón se usa para anunciar la existencia de una revisión, haciendo referencia al recurso revisado.",
+  // "ldn-service.form.pattern.announce-review.category": "Announcements",
+  "ldn-service.form.pattern.announce-review.category": "Anuncios",
+
+  // "ldn-service.form.pattern.announce-service-result.label": "Announce Service Result",
+  "ldn-service.form.pattern.announce-service-result.label": "Anunciar resultado del servicio",
+  // "ldn-service.form.pattern.announce-service-result.description": "This pattern is used to announce the existence of a 'service result', referencing the relevant resource.",
+  "ldn-service.form.pattern.announce-service-result.description": "Este patrón se usa para anunciar la existencia de un 'resultado del servicio', haciendo referencia al recurso relevante.",
+  // "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+  "ldn-service.form.pattern.announce-service-result.category": "Anuncios",
+
+  // "ldn-service.form.pattern.request-endorsement.label": "Request Endorsement",
+  "ldn-service.form.pattern.request-endorsement.label": "Solicitar aprobación",
+  // "ldn-service.form.pattern.request-endorsement.description": "This pattern is used to request endorsement of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-endorsement.description": "Este patrón se usa para solicitar la aprobación de un recurso propiedad del sistema de origen.",
+  // "ldn-service.form.pattern.request-endorsement.category": "Requests",
+  "ldn-service.form.pattern.request-endorsement.category": "Solicitudes",
+
+  // "ldn-service.form.pattern.request-ingest.label": "Request Ingest",
+  "ldn-service.form.pattern.request-ingest.label": "Solicitar ingestión",
+  // "ldn-service.form.pattern.request-ingest.description": "This pattern is used to request that the target system ingest a resource.",
+  "ldn-service.form.pattern.request-ingest.description": "Este patrón se usa para solicitar que el sistema de destino ingiera un recurso.",
+  // "ldn-service.form.pattern.request-ingest.category": "Requests",
+  "ldn-service.form.pattern.request-ingest.category": "Solicitudes",
+
+  // "ldn-service.form.pattern.request-review.label": "Request Review",
+  "ldn-service.form.pattern.request-review.label": "Solicitar revisión",
+  // "ldn-service.form.pattern.request-review.description": "This pattern is used to request a review of a resource owned by the origin system.",
+  "ldn-service.form.pattern.request-review.description": "Este patrón se usa para solicitar una revisión de un recurso propiedad del sistema de origen.",
+  // "ldn-service.form.pattern.request-review.category": "Requests",
+  "ldn-service.form.pattern.request-review.category": "Solicitudes",
+
+  // "ldn-service.form.pattern.undo-offer.label": "Undo Offer",
+  "ldn-service.form.pattern.undo-offer.label": "Deshacer oferta",
+  // "ldn-service.form.pattern.undo-offer.description": "This pattern is used to undo (retract) an offer previously made.",
+  "ldn-service.form.pattern.undo-offer.description": "Este patrón se usa para deshacer (retractar) una oferta previamente realizada.",
+  // "ldn-service.form.pattern.undo-offer.category": "Undo",
+  "ldn-service.form.pattern.undo-offer.category": "Deshacer",
+
+  // "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No se seleccionó filtro de ítem",
+  // "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.ItemFilter": "Filtro de ítem",
+  // "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.label.automatic": "Automático",
+  // "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.name": "Se requiere el nombre",
+  // "ldn-new-service.form.error.url": "URL is required",
+  "ldn-new-service.form.error.url": "Se requiere la URL",
+  // "ldn-new-service.form.error.ipRange": "Please enter a valid IP range",
+  "ldn-new-service.form.error.ipRange": "Por favor, ingrese un rango de IP válido",
+  // "ldn-new-service.form.hint.ipRange": "Please enter a valid IpV4 in both range bounds (note: for single IP, please enter the same value in both fields)",
+  "ldn-new-service.form.hint.ipRange": "Por favor, ingrese un IpV4 válido en ambos límites del rango (nota: para una sola IP, ingrese el mismo valor en ambos campos)",
+  // "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "ldn-new-service.form.error.ldnurl": "Se requiere la URL de LDN",
+  // "ldn-new-service.form.error.patterns": "At least a pattern is required",
+  "ldn-new-service.form.error.patterns": "Se requiere al menos un patrón",
+  // "ldn-new-service.form.error.score": "Please enter a valid score (between 0 and 1). Use the “.” as decimal separator",
+  "ldn-new-service.form.error.score": "Por favor, ingrese una puntuación válida (entre 0 y 1). Use el “.” como separador decimal",
+
+  // "ldn-new-service.form.label.inboundPattern": "Supported Pattern",
+  "ldn-new-service.form.label.inboundPattern": "Patrón soportado",
+  // "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.addPattern": "+ Añadir más",
+  // "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-new-service.form.label.removeItemFilter": "Eliminar",
+  // "ldn-register-new-service.breadcrumbs": "New Service",
+  "ldn-register-new-service.breadcrumbs": "Nuevo servicio",
+  // "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.delete.body": "¿Está seguro de que desea eliminar este servicio?",
+  // "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.body": "¿Confirma los cambios?",
+  // "service.overview.edit.modal": "Edit Service",
+  "service.overview.edit.modal": "Editar servicio",
+  // "service.detail.update": "Confirm",
+  "service.detail.update": "Confirmar",
+  // "service.detail.return": "Cancel",
+  "service.detail.return": "Cancelar",
+  // "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.body": "¿Está seguro de que desea descartar los cambios y salir?",
+  // "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.modal": "Descartar cambios",
+  // "service.overview.reset-form.reset-confirm": "Discard",
+  "service.overview.reset-form.reset-confirm": "Descartar",
+  // "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.head": "Edición exitosa",
+  // "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.success.content": "El servicio ha sido editado",
+  // "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.head": "Edición fallida",
+  // "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "admin.registries.services-formats.modify.failure.content": "El servicio no ha sido editado",
+  // "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.title": "Creación exitosa",
+  // "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.success.body": "El servicio ha sido creado",
+  // "ldn-service-notification.created.failure.title": "Failed Create",
+  "ldn-service-notification.created.failure.title": "Creación fallida",
+  // "ldn-service-notification.created.failure.body": "The service has not been created",
+  "ldn-service-notification.created.failure.body": "El servicio no ha sido creado",
+  // "ldn-service-notification.created.warning.title": "Please select at least one Inbound Pattern",
+  "ldn-service-notification.created.warning.title": "Por favor, seleccione al menos un patrón de entrada",
+  // "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.title": "Estado actualizado con éxito",
+  // "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-enable-service.notification.success.content": "El estado del servicio ha sido actualizado",
+  // "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.title": "Eliminación exitosa",
+  // "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.success.content": "El servicio ha sido eliminado",
+  // "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.title": "Eliminación fallida",
+  // "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "ldn-service-delete.notification.error.content": "El servicio no ha sido eliminado",
+  // "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.reset-form.reset-return": "Cancelar",
+  // "service.overview.delete": "Delete service",
+  "service.overview.delete": "Eliminar servicio",
+  // "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.title": "Editar servicio",
+  // "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.name": "Nombre",
+  // "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.description": "Descripción",
+  // "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.url": "URL del servicio",
+  // "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.ldnUrl": "URL del buzón LDN",
+  // "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.inboundPattern": "Patrón de entrada",
+  // "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "Sin patrón de entrada",
+  // "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectedItemFilter": "Filtro de ítem seleccionado",
+  // "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "Sin filtro de ítem",
+  // "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.automatic": "Automático",
+  // "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Añadir más",
+  // "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.form.label.submit": "Guardar",
+  // "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-edit-service.breadcrumbs": "Editar servicio",
+  // "ldn-service.control-constaint-select-none": "Select none",
+  "ldn-service.control-constaint-select-none": "Seleccionar ninguno",
+
+  // "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.title": "Error",
+  // "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.error.content": "Ocurrió un error al crear este proceso",
+  // "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.title": "Éxito",
+  // "ldn-register-new-service.notification.success.content": "The process was successfully created",
+  "ldn-register-new-service.notification.success.content": "El proceso se creó con éxito",
+
+  // "submission.sections.notify.info": "The selected service is compatible with the item according to its current status. {{ service.name }}: {{ service.description }}",
+  "submission.sections.notify.info": "El servicio seleccionado es compatible con el ítem según su estado actual. {{ service.name }}: {{ service.description }}",
+
+  // "item.page.endorsement": "Endorsement",
+  "item.page.endorsement": "Aprobación",
+
+  // "item.page.review": "Review",
+  "item.page.review": "Revisión",
+
+  // "item.page.referenced": "Referenced By",
+  "item.page.referenced": "Referenciado por",
+
+  // "item.page.supplemented": "Supplemented By",
+  "item.page.supplemented": "Complementado por",
+
+  // "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.icon.ldn_services": "Visión general de Servicios LDN",
+
+  // "menu.section.services": "LDN Services",
+  "menu.section.services": "Servicios LDN",
+
+  // "menu.section.services_new": "LDN Service",
+  "menu.section.services_new": "Servicio LDN",
+
+  // "quality-assurance.topics.description-with-target": "Below you can see all the topics received from the subscriptions to {{source}} in regards to the",
+  "quality-assurance.topics.description-with-target": "A continuación puede ver todos los temas recibidos de las suscripciones a {{source}} en relación con el",
+  // "quality-assurance.events.description": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b>.",
+  "quality-assurance.events.description": "A continuación, la lista de todas las sugerencias para el tema seleccionado <b>{{topic}}</b>, relacionado con <b>{{source}}</b>.",
+
+  // "quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
+  "quality-assurance.events.description-with-topic-and-target": "A continuación, la lista de todas las sugerencias para el tema seleccionado <b>{{topic}}</b>, relacionado con <b>{{source}}</b> y ",
+
+  // "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+  "quality-assurance.event.table.event.message.serviceUrl": "URL del servicio:",
+
+  // "quality-assurance.event.table.event.message.link": "Link:",
+  "quality-assurance.event.table.event.message.link": "Enlace:",
+
+  // "service.detail.delete.cancel": "Cancel",
+  "service.detail.delete.cancel": "Cancelar",
+
+  // "service.detail.delete.button": "Delete service",
+  "service.detail.delete.button": "Eliminar servicio",
+
+  // "service.detail.delete.header": "Delete service",
+  "service.detail.delete.header": "Eliminar servicio",
+
+  // "service.detail.delete.body": "Are you sure you want to delete the current service?",
+  "service.detail.delete.body": "¿Está seguro de que desea eliminar el servicio actual?",
+
+  // "service.detail.delete.confirm": "Delete service",
+  "service.detail.delete.confirm": "Eliminar servicio",
+
+  // "service.detail.delete.success": "The service was successfully deleted.",
+  "service.detail.delete.success": "El servicio se eliminó con éxito.",
+
+  // "service.detail.delete.error": "Something went wrong when deleting the service",
+  "service.detail.delete.error": "Algo salió mal al eliminar el servicio",
+
+  // "service.overview.table.id": "Services ID",
+  "service.overview.table.id": "ID de servicios",
+
+  // "service.overview.table.name": "Name",
+  "service.overview.table.name": "Nombre",
+
+  // "service.overview.table.start": "Start time (UTC)",
+  "service.overview.table.start": "Hora de inicio (UTC)",
+
+  // "service.overview.table.status": "Status",
+  "service.overview.table.status": "Estado",
+
+  // "service.overview.table.user": "User",
+  "service.overview.table.user": "Usuario",
+
+  // "service.overview.title": "Services Overview",
+  "service.overview.title": "Visión general de servicios",
+
+  // "service.overview.breadcrumbs": "Services Overview",
+  "service.overview.breadcrumbs": "Visión general de servicios",
+
+  // "service.overview.table.actions": "Actions",
+  "service.overview.table.actions": "Acciones",
+
+  // "service.overview.table.description": "Description",
+  "service.overview.table.description": "Descripción",
+
+  // "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+  "submission.sections.submit.progressbar.coarnotify": "COAR Notify",
+
+  // "submission.section.section-coar-notify.control.request-review.label": "You can request a review to one of the following services",
+  "submission.section.section-coar-notify.control.request-review.label": "Puede solicitar una revisión a uno de los siguientes servicios",
+
+  // "submission.section.section-coar-notify.control.request-endorsement.label": "You can request an Endorsement to one of the following overlay journals",
+  "submission.section.section-coar-notify.control.request-endorsement.label": "Puede solicitar una aprobación a una de las siguientes revistas superpuestas",
+
+  // "submission.section.section-coar-notify.control.request-ingest.label": "You can request to ingest a copy of your submission to one of the following services",
+  "submission.section.section-coar-notify.control.request-ingest.label": "Puede solicitar la ingestión de una copia de su envío a uno de los siguientes servicios",
+
+  // "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+  "submission.section.section-coar-notify.dropdown.no-data": "No hay datos disponibles",
+
+  // "submission.section.section-coar-notify.dropdown.select-none": "Select none",
+  "submission.section.section-coar-notify.dropdown.select-none": "Seleccionar ninguno",
+
+  // "submission.section.section-coar-notify.small.notification": "Select a service for {{ pattern }} of this item",
+  "submission.section.section-coar-notify.small.notification": "Seleccione un servicio para {{ pattern }} de este ítem",
+
+  // "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+  "submission.section.section-coar-notify.selection.description": "Descripción del servicio seleccionado:",
+
+  // "submission.section.section-coar-notify.selection.no-description": "No further information is available",
+  "submission.section.section-coar-notify.selection.no-description": "No hay más información disponible",
+
+  // "submission.section.section-coar-notify.notification.error": "The selected service is not suitable for the current item. Please check the description for details about which record can be managed by this service.",
+  "submission.section.section-coar-notify.notification.error": "El servicio seleccionado no es adecuado para el ítem actual. Por favor, consulte la descripción para obtener detalles sobre qué registro puede ser gestionado por este servicio.",
+
+  // "submission.section.section-coar-notify.info.no-pattern": "No configurable patterns found.",
+  "submission.section.section-coar-notify.info.no-pattern": "No se encontraron patrones configurables.",
+
+  // "error.validation.coarnotify.invalidfilter": "Invalid filter, try to select another service or none.",
+  "error.validation.coarnotify.invalidfilter": "Filtro inválido, intente seleccionar otro servicio o ninguno.",
+
+  // "request-status-alert-box.accepted": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been taken in charge.",
+  "request-status-alert-box.accepted": "La solicitud de {{ offerType }} para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha sido aceptada.",
+
+  // "request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> has been rejected.",
+  "request-status-alert-box.rejected": "La solicitud de {{ offerType }} para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> ha sido rechazada.",
+
+  // "request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> is pending.",
+  "request-status-alert-box.requested": "La solicitud de {{ offerType }} para <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }}  </a> está pendiente.",
+
+  // "ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",
+  "ldn-service-button-mark-inbound-deletion": "Marcar patrón soportado para eliminación",
+
+  // "ldn-service-button-unmark-inbound-deletion": "Unmark supported pattern for deletion",
+  "ldn-service-button-unmark-inbound-deletion": "Desmarcar patrón soportado para eliminación",
+
+  // "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for the pattern",
+  "ldn-service-input-inbound-item-filter-dropdown": "Seleccione filtro de ítem para el patrón",
+
+  // "ldn-service-input-inbound-pattern-dropdown": "Select a pattern for service",
+  "ldn-service-input-inbound-pattern-dropdown": "Seleccione un patrón para el servicio",
+
+  // "ldn-service-overview-select-delete": "Select service for deletion",
+  "ldn-service-overview-select-delete": "Seleccione servicio para eliminación",
+
+  // "ldn-service-overview-select-edit": "Edit LDN service",
+  "ldn-service-overview-select-edit": "Editar servicio LDN",
+
+  // "ldn-service-overview-close-modal": "Close modal",
+  "ldn-service-overview-close-modal": "Cerrar modal",
+
+  // "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+  "a-common-or_statement.label": "El tipo de ítem es Artículo de revista o Dataset",
+
+  // "always_true_filter.label": "Always true",
+  "always_true_filter.label": "Siempre verdadero",
+
+  // "automatic_processing_collection_filter_16.label": "Automatic processing",
+  "automatic_processing_collection_filter_16.label": "Procesamiento automático",
+
+  // "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+  "dc-identifier-uri-contains-doi_condition.label": "URI contiene DOI",
+
+  // "doi-filter.label": "DOI filter",
+  "doi-filter.label": "Filtro DOI",
+
+  // "driver-document-type_condition.label": "Document type equals driver",
+  "driver-document-type_condition.label": "El tipo de documento es igual a driver",
+
+  // "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+  "has-at-least-one-bitstream_condition.label": "Tiene al menos un archivo",
+
+  // "has-bitstream_filter.label": "Has Bitstream",
+  "has-bitstream_filter.label": "Tiene archivo",
+
+  // "has-one-bitstream_condition.label": "Has one Bitstream",
+  "has-one-bitstream_condition.label": "Tiene un archivo",
+
+  // "is-archived_condition.label": "Is archived",
+  "is-archived_condition.label": "Está archivado",
+
+  // "is-withdrawn_condition.label": "Is withdrawn",
+  "is-withdrawn_condition.label": "Está retirado",
+
+  // "item-is-public_condition.label": "Item is public",
+  "item-is-public_condition.label": "El ítem es público",
+
+  // "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+  "journals_ingest_suggestion_collection_filter_18.label": "Ingestión de revistas",
+
+  // "title-starts-with-pattern_condition.label": "Title starts with pattern",
+  "title-starts-with-pattern_condition.label": "El título comienza con el patrón",
+
+  // "type-equals-dataset_condition.label": "Type equals Dataset",
+  "type-equals-dataset_condition.label": "El tipo es igual a Dataset",
+
+  // "type-equals-journal-article_condition.label": "Type equals Journal Article",
+  "type-equals-journal-article_condition.label": "El tipo es igual a Artículo de Revista",
+
+  // "ldn.no-filter.label": "None",
+  "ldn.no-filter.label": "Ninguno",
+
+  // "admin.notify.dashboard": "Dashboard",
+  "admin.notify.dashboard": "Dashboard",
+
+  // "menu.section.notify_dashboard": "Dashboard",
+  "menu.section.notify_dashboard": "Dashboard",
+
+  // "menu.section.coar_notify": "COAR Notify",
+  "menu.section.coar_notify": "COAR Notify",
+
+  // "admin-notify-dashboard.title": "Notify Dashboard",
+  "admin-notify-dashboard.title": "Dashboard de Notificaciones",
+
+  // "admin-notify-dashboard.description": "The Notify dashboard monitor the general usage of the COAR Notify protocol across the repository. In the “Metrics” tab are statistics about usage of the COAR Notify protocol. In the “Logs/Inbound” and “Logs/Outbound” tabs it’s possible to search and check the individual status of each LDN message, either received or sent.",
+  "admin-notify-dashboard.description": "El dashboard de Notificaciones monitorea el uso general del protocolo COAR Notify en todo el repositorio. En la pestaña “Métricas” hay estadísticas sobre el uso del protocolo COAR Notify. En las pestañas “Logs/Entrantes” y “Logs/Salientes” es posible buscar y verificar el estado individual de cada mensaje LDN, ya sea recibido o enviado.",
+
+  // "admin-notify-dashboard.metrics": "Metrics",
+  "admin-notify-dashboard.metrics": "Métricas",
+
+  // "admin-notify-dashboard.received-ldn": "Number of received LDN",
+  "admin-notify-dashboard.received-ldn": "Número de LDN recibidos",
+
+  // "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+  "admin-notify-dashboard.generated-ldn": "Número de LDN generados",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Aceptado",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Notificaciones entrantes aceptadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Mostrando actualmente: Notificaciones aceptadas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "LDN procesados",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Notificaciones entrantes procesadas",
+
+  // "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+  "admin-notify-logs.NOTIFY.incoming.processed": "Mostrando actualmente: LDN procesados",
+
+  // "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.incoming.failure": "Mostrando actualmente: Notificaciones fallidas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Fallido",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Notificaciones entrantes fallidas",
+
+  // "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Mostrando actualmente: Notificaciones fallidas",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Fallido",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Notificaciones salientes fallidas",
+
+  // "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Mostrando actualmente: Notificaciones no confiables",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "No confiable",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Notificaciones entrantes no confiables",
+
+  // "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Mostrando actualmente: Notificaciones entregadas",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Notificaciones entrantes entregadas con éxito",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Entregado",
+
+  // "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Mostrando actualmente: Notificaciones entregadas",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Notificaciones salientes entregadas con éxito",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Mostrando actualmente: Notificaciones en cola",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notificaciones actualmente en cola",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "En cola",
+
+  // "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Currently displaying: Queued for retry notifications",
+  "admin-notify-logs.NOTIFY.outgoing.queued_for_retry": "Mostrando actualmente: Notificaciones en cola para reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "Queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry": "En cola para reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notificaciones actualmente en cola para reintentar",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Ítems involucrados",
+
+  // "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Ítems relacionados con notificaciones entrantes",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Ítems involucrados",
+
+  // "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Ítems relacionados con notificaciones salientes",
+
+  // "admin.notify.dashboard.breadcrumbs": "Dashboard",
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  // "admin.notify.dashboard.inbound": "Inbound messages",
+  "admin.notify.dashboard.inbound": "Mensajes entrantes",
+
+  // "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+  "admin.notify.dashboard.inbound-logs": "Logs/Entrantes",
+
+  // "admin.notify.dashboard.filter": "Filter: ",
+  "admin.notify.dashboard.filter": "Filtro: ",
+
+  // "search.filters.applied.f.relateditem": "Related items",
+  "search.filters.applied.f.relateditem": "Ítems relacionados",
+
+  // "search.filters.applied.f.ldn_service": "LDN Service",
+  "search.filters.applied.f.ldn_service": "Servicio LDN",
+
+  // "search.filters.applied.f.notifyReview": "Notify Review",
+  "search.filters.applied.f.notifyReview": "Notificación de Revisión",
+
+  // "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+  "search.filters.applied.f.notifyEndorsement": "Notificación de Aprobación",
+
+  // "search.filters.applied.f.notifyRelation": "Notify Relation",
+  "search.filters.applied.f.notifyRelation": "Notificación de Relación",
+
+  // "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+  "search.filters.filter.queue_last_start_time.head": "Última hora de procesamiento ",
+
+  // "search.filters.filter.queue_last_start_time.min.label": "Min range",
+  "search.filters.filter.queue_last_start_time.min.label": "Alcance mínimo",
+
+  // "search.filters.filter.queue_last_start_time.max.label": "Max range",
+  "search.filters.filter.queue_last_start_time.max.label": "Alcance máximo",
+
+  // "search.filters.applied.f.queue_last_start_time.min": "Min range",
+  "search.filters.applied.f.queue_last_start_time.min": "Rango mínimo",
+
+  // "search.filters.applied.f.queue_last_start_time.max": "Max range",
+  "search.filters.applied.f.queue_last_start_time.max": "Rango máximo",
+
+  // "admin.notify.dashboard.outbound": "Outbound messages",
+  "admin.notify.dashboard.outbound": "Mensajes salientes",
+
+  // "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+  "admin.notify.dashboard.outbound-logs": "Logs/Salientes",
+
+  // "NOTIFY.incoming.search.results.head": "Incoming",
+  "NOTIFY.incoming.search.results.head": "Entrantes",
+
+  // "search.filters.filter.relateditem.head": "Related item",
+  "search.filters.filter.relateditem.head": "Ítem relacionado",
+
+  // "search.filters.filter.origin.head": "Origin",
+  "search.filters.filter.origin.head": "Origen",
+
+  // "search.filters.filter.ldn_service.head": "LDN Service",
+  "search.filters.filter.ldn_service.head": "Servicio LDN",
+
+  // "search.filters.filter.target.head": "Target",
+  "search.filters.filter.target.head": "Destino",
+
+  // "search.filters.filter.queue_status.head": "Queue status",
+  "search.filters.filter.queue_status.head": "Estado de la fila",
+
+  // "search.filters.filter.activity_stream_type.head": "Activity stream type",
+  "search.filters.filter.activity_stream_type.head": "Tipo de flujo de actividad",
+
+  // "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.head": "COAR Tipo de notificación",
+
+  // "search.filters.filter.notification_type.head": "Notification type",
+  "search.filters.filter.notification_type.head": "Tipo de notificación",
+
+  // "search.filters.filter.relateditem.label": "Search related items",
+  "search.filters.filter.relateditem.label": "Buscar ítems relacionados",
+
+  // "search.filters.filter.queue_status.label": "Search queue status",
+  "search.filters.filter.queue_status.label": "Estado de la fila de búsqueda",
+
+  // "search.filters.filter.target.label": "Search target",
+  "search.filters.filter.target.label": "Buscar por destino",
+
+  // "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+  "search.filters.filter.activity_stream_type.label": "Buscar por tipo de flujo de actividad",
+
+  // "search.filters.applied.f.queue_status": "Queue Status",
+  "search.filters.applied.f.queue_status": "Estado de la cola",
+
+  // "search.filters.queue_status.0,authority": "Untrusted Ip",
+  "search.filters.queue_status.0,authority": "Ip no confiable",
+
+  // "search.filters.queue_status.1,authority": "Queued",
+  "search.filters.queue_status.1,authority": "En cola",
+
+  // "search.filters.queue_status.2,authority": "Processing",
+  "search.filters.queue_status.2,authority": "Procesando",
+
+  // "search.filters.queue_status.3,authority": "Processed",
+  "search.filters.queue_status.3,authority": "Procesado",
+
+  // "search.filters.queue_status.4,authority": "Failed",
+  "search.filters.queue_status.4,authority": "Fallido",
+
+  // "search.filters.queue_status.5,authority": "Untrusted",
+  "search.filters.queue_status.5,authority": "No confiable",
+
+  // "search.filters.queue_status.6,authority": "Unmapped Action",
+  "search.filters.queue_status.6,authority": "Acción no mapeada",
+
+  // "search.filters.queue_status.7,authority": "Queued for retry",
+  "search.filters.queue_status.7,authority": "En cola para reintentar",
+
+  // "search.filters.applied.f.activity_stream_type": "Activity stream type",
+  "search.filters.applied.f.activity_stream_type": "Tipo de flujo de actividad",
+
+  // "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+  "search.filters.applied.f.coar_notify_type": "Tipo de notificación COAR",
+
+  // "search.filters.applied.f.notification_type": "Notification type",
+  "search.filters.applied.f.notification_type": "Tipo de notificación",
+
+  // "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+  "search.filters.filter.coar_notify_type.label": "Buscar por Tipo de notificación COAR",
+
+  // "search.filters.filter.notification_type.label": "Search notification type",
+  "search.filters.filter.notification_type.label": "Buscar por tipo de notificación",
+
+  // "search.filters.filter.relateditem.placeholder": "Related items",
+  "search.filters.filter.relateditem.placeholder": "Ítems relacionados",
+
+  // "search.filters.filter.target.placeholder": "Target",
+  "search.filters.filter.target.placeholder": "Destino",
+
+  // "search.filters.filter.origin.label": "Search source",
+  "search.filters.filter.origin.label": "Buscar fuente",
+
+  // "search.filters.filter.origin.placeholder": "Source",
+  "search.filters.filter.origin.placeholder": "Fuente",
+
+  // "search.filters.filter.ldn_service.label": "Search LDN Service",
+  "search.filters.filter.ldn_service.label": "Buscar por servicio LDN",
+
+  // "search.filters.filter.ldn_service.placeholder": "LDN Service",
+  "search.filters.filter.ldn_service.placeholder": "Servicio LDN",
+
+  // "search.filters.filter.queue_status.placeholder": "Queue status",
+  "search.filters.filter.queue_status.placeholder": "Estado de la fila",
+
+  // "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+  "search.filters.filter.activity_stream_type.placeholder": "Tipo de flujo de actividad",
+
+  // "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Tipo de notificación",
+
+  // "search.filters.filter.notification_type.placeholder": "Notification",
+  "search.filters.filter.notification_type.placeholder": "Notificación",
+
+  // "search.filters.filter.notifyRelation.head": "Notify Relation",
+  "search.filters.filter.notifyRelation.head": "Notificación de relación",
+
+  // "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+  "search.filters.filter.notifyRelation.label": "Buscar por notificación de relación",
+
+  // "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+  "search.filters.filter.notifyRelation.placeholder": "Notificación de relación",
+
+  // "search.filters.filter.notifyReview.head": "Notify Review",
+  "search.filters.filter.notifyReview.head": "Notificación de revisión",
+
+  // "search.filters.filter.notifyReview.label": "Search Notify Review",
+  "search.filters.filter.notifyReview.label": "Buscar por notificación de Revisión",
+
+  // "search.filters.filter.notifyReview.placeholder": "Notify Review",
+  "search.filters.filter.notifyReview.placeholder": "Notificación de revisión",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Acción de revisión",
+
+  // "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Acción de revisión",
+
+  // "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+  "notify-detail-modal.coar-notify:ReviewAction": "Acción de revisión",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Acción de aprobación",
+
+  // "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Acción de aprobación",
+
+  // "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+  "notify-detail-modal.coar-notify:EndorsementAction": "Acción de aprobación",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Acción de ingestión",
+
+  // "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Acción de ingestión",
+
+  // "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+  "notify-detail-modal.coar-notify:IngestAction": "Acción de ingestión",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Acción de relación",
+
+  // "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Acción de relación",
+
+  // "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+  "notify-detail-modal.coar-notify:RelationshipAction": "Acción de relación",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "En cola",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "En cola",
+
+  // "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cola para reintentar",
+
+  // "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "En cola para reintentar",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Procesando",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Procesando",
+
+  // "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Procesado",
+
+  // "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Procesado",
+
+  // "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Fallido",
+
+  // "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Fallido",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "No confiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Ip no confiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "No confiable",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Ip no confiable",
+
+  // "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Acción no mapeada",
+
+  // "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Acción no mapeada",
+
+  // "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+  "sorting.queue_last_start_time.DESC": "Última hora de procesamiento descendente",
+
+  // "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+  "sorting.queue_last_start_time.ASC": "Última hora de procesamiento ascendente",
+
+  // "sorting.queue_attempts.DESC": "Queue attempted Descending",
+  "sorting.queue_attempts.DESC": "Intentos de cola descendente",
+
+  // "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+  "sorting.queue_attempts.ASC": "Intentos de cola ascendente",
+
+  // "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+  "NOTIFY.incoming.involvedItems.search.results.head": "Ítems involucrados en LDN entrantes",
+
+  // "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Ítems involucrados en LDN salientes",
+
+  // "type.notify-detail-modal": "Type",
+  "type.notify-detail-modal": "Tipo",
+
+  // "id.notify-detail-modal": "Id",
+  "id.notify-detail-modal": "Id",
+
+  // "coarNotifyType.notify-detail-modal": "COAR Notify type",
+  "coarNotifyType.notify-detail-modal": "Tipo de notificación COAR",
+
+  // "activityStreamType.notify-detail-modal": "Activity stream type",
+  "activityStreamType.notify-detail-modal": "Tipo de flujo de actividad",
+
+  // "inReplyTo.notify-detail-modal": "In reply to",
+  "inReplyTo.notify-detail-modal": "En respuesta a",
+
+  // "object.notify-detail-modal": "Repository Item",
+  "object.notify-detail-modal": "Ítem del repositorio",
+
+  // "context.notify-detail-modal": "Repository Item",
+  "context.notify-detail-modal": "Ítem del repositorio",
+
+  // "queueAttempts.notify-detail-modal": "Queue attempts",
+  "queueAttempts.notify-detail-modal": "Intentos de cola",
+
+  // "queueLastStartTime.notify-detail-modal": "Queue last started",
+  "queueLastStartTime.notify-detail-modal": "Última vez que se inició la cola",
+
+  // "origin.notify-detail-modal": "LDN Service",
+  "origin.notify-detail-modal": "Servicio LDN",
+
+  // "target.notify-detail-modal": "LDN Service",
+  "target.notify-detail-modal": "Servicio LDN",
+
+  // "queueStatusLabel.notify-detail-modal": "Queue status",
+  "queueStatusLabel.notify-detail-modal": "Estado de la cola",
+
+  // "queueTimeout.notify-detail-modal": "Queue timeout",
+  "queueTimeout.notify-detail-modal": "Tiempo de espera de la cola",
+
+  // "notify-message-modal.title": "Message Detail",
+  "notify-message-modal.title": "Detalle del mensaje",
+
+  // "notify-message-modal.show-message": "Show message",
+  "notify-message-modal.show-message": "Mostrar mensaje",
+
+  // "notify-message-result.timestamp": "Timestamp",
+  "notify-message-result.timestamp": "Marca de tiempo",
+
+  // "notify-message-result.repositoryItem": "Repository Item",
+  "notify-message-result.repositoryItem": "Ítem del repositorio",
+
+  // "notify-message-result.ldnService": "LDN Service",
+  "notify-message-result.ldnService": "Servicio LDN",
+
+  // "notify-message-result.type": "Type",
+  "notify-message-result.type": "Tipo",
+
+  // "notify-message-result.status": "Status",
+  "notify-message-result.status": "Estado",
+
+  // "notify-message-result.action": "Action",
+  "notify-message-result.action": "Acción",
+
+  // "notify-message-result.detail": "Detail",
+  "notify-message-result.detail": "Detalle",
+
+  // "notify-message-result.reprocess": "Reprocess",
+  "notify-message-result.reprocess": "Reprocesar",
+
+  // "notify-queue-status.processed": "Processed",
+  "notify-queue-status.processed": "Procesado",
+
+  // "notify-queue-status.failed": "Failed",
+  "notify-queue-status.failed": "Fallido",
+
+  // "notify-queue-status.queue_retry": "Queued for retry",
+  "notify-queue-status.queue_retry": "En cola para reintentar",
+
+  // "notify-queue-status.unmapped_action": "Unmapped action",
+  "notify-queue-status.unmapped_action": "Acción no mapeada",
+
+  // "notify-queue-status.processing": "Processing",
+  "notify-queue-status.processing": "Procesando",
+
+  // "notify-queue-status.queued": "Queued",
+  "notify-queue-status.queued": "En cola",
+
+  // "notify-queue-status.untrusted": "Untrusted",
+  "notify-queue-status.untrusted": "No confiable",
+
+  // "ldnService.notify-detail-modal": "LDN Service",
+  "ldnService.notify-detail-modal": "Servicio LDN",
+
+  // "relatedItem.notify-detail-modal": "Related Item",
+  "relatedItem.notify-detail-modal": "Ítem relacionado",
+
+  // "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.head": "Notificación de aprobación",
+
+  // "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.placeholder": "Notificación de aprobación",
+
+  // "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
+  "search.filters.filter.notifyEndorsement.label": "Buscar por notificación de aprobación",
+
+  // "item.page.cc.license.title": "Creative Commons license",
+  "item.page.cc.license.title": "Licencia Creative Commons",
+
+  // "item.page.cc.license.disclaimer": "Except where otherwised noted, this item's license is described as",
+  "item.page.cc.license.disclaimer": "Excepto donde se indique lo contrario, la licencia de este ítem se describe como",
+
+  // "browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar en el repositorio",
 
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Descargar ",
+
   // "register-page.registration.aria.label": "Enter your e-mail address",
   "register-page.registration.aria.label": "Introduzca su dirección de correo electrónico",
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Introduzca su dirección de correo electrónico",
 
-
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "La página será recargada. Filtro {{ filter }} seleccionado.",
 }
diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5
index bee30294a9..b6cd2fc905 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -1471,11 +1471,11 @@
   // "browse.startsWith.type_text": "Type the first few letters and click on the Browse button",
   "browse.startsWith.type_text": "Ou saisir les premières lettres puis cliquer sur le bouton « Parcourir »",
 
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Parcourir la collection {{ collection }} par {{ field }} {{ value }}",
+  // "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Parcourir par {{ field }}{{ startsWith }} {{ value }}",
 
-  //"browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title.page": "Parcourir la collection {{ collection }} par {{ field }} {{ value }}",
+  //"browse.title.page": "Browsing by {{ field }} {{ value }}",
+  "browse.title.page": "Parcourir par {{ field }} {{ value }}",
 
   //"search.browse.item-back": "Back to Results",
   "search.browse.item-back": "Retour aux résultats",
@@ -2682,6 +2682,66 @@
   // "grant-request-copy.success": "Successfully granted item request",
   "grant-request-copy.success": "Demande de copie de document acceptée avec succès",
 
+  //"health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Santé du système",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "Santé",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "Info",
+
+  //"health-page.status-tab": "Status",
+  "health-page.status-tab": "Statut",
+
+  //"health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "Le service de vérification de la santé du système n'est pas disponible",
+
+  //"health-page.property.status": "Status code",
+  "health-page.property.status": "Code de statut",
+
+  //"health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Base de données",
+
+  // "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.geoIp.title": "GeoIp",
+
+  // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+
+  //"health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title": "Solr: oai core",
+
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrSearchCore.title": "Solr: search core",
+
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+
+  //"health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "Application Backend",
+
+  //"health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
+
+  //"health-page.status": "Status",
+  "health-page.status": "Statut",
+
+  //"health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Opérationnel",
+
+  //"health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Problèmes détectés",
+
+  //"health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Problèmes éventuels détectés",
+
+  // "health-page.title": "Health",
+  "health-page.title": "Santé du système",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "Aucun problème détecté",
+
   // "home.description": "",
   "home.description": "",
 
@@ -3972,6 +4032,9 @@
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorisations",
 
+  // "menu.section.access_control_bulk": "Bulk Access Management",
+  "menu.section.access_control_bulk": "Gestion des accès en lot",
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Groupes",
 
@@ -4521,6 +4584,27 @@
   // "process.detail.back": "Back",
   "process.detail.back": "Retour",
 
+  //"process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Êtes-vous sûr de vouloir supprimer ce processus?",
+
+  //"process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Supprimer le processus",
+
+  //"process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Annuler",
+
+  //"process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Supprimer le processus",
+
+  //"process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Une erreur s'est produite lors de la suppression du processus",
+
+  //"process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Supprimer un processus",
+
+  //"process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Le processus a bien été supprimé.",
+
   // "process.detail.output": "Process Output",
   "process.detail.output": "Sortie du processus",
 
@@ -4539,6 +4623,9 @@
   // "process.detail.output-files.empty": "This process doesn't contain any output files",
   "process.detail.output-files.empty": "Ce processus ne contient pas de fichiers de sortie",
 
+  //"process.detail.refreshing": "Auto-refreshing…",
+  "process.detail.refreshing": "Actualisation automatique...",
+
   // "process.detail.script": "Script",
   "process.detail.script": "Script",
 
@@ -4566,9 +4653,39 @@
   // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nom",
 
+  //"process.overview.table.running.info": "Start time (UTC)",
+  "process.overview.table.running.info": "Heure de fin (UTC)",
+
+  // "process.overview.table.running.title": "Running processes",
+  "process.overview.table.running.title": "Processus en cours",
+
+  //"process.overview.table.scheduled.info": "Creation time (UTC)",
+  "process.overview.table.scheduled.info": "Heure de création (UTC)",
+
+  // "process.overview.table.scheduled.title": "Scheduled processes",
+  "process.overview.table.scheduled.title": "Processus planifiés",
+
   // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Heure de début (TUC)",
 
+  // "process.overview.table.completed.info": "Finish time (UTC)",
+  "process.overview.table.completed.info": "Heure de fin (UTC)",
+
+  //"process.overview.table.completed.title": "Succeeded processes",
+  "process.overview.table.completed.title": "Processus terminés",
+
+  // "process.overview.table.empty": "No matching processes found.",
+  "process.overview.table.empty": "Aucun processus trouvé.",
+
+  // "process.overview.table.failed.info": "Finish time (UTC)",
+  "process.overview.table.failed.info": "Heure de fin (UTC)",
+
+  // "process.overview.table.failed.title": "Failed processes",
+  "process.overview.table.failed.title": "Processus en échec",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Heure de fin (UTC)",
+
   // "process.overview.table.status": "Status",
   "process.overview.table.status": "Statut",
 
@@ -5624,6 +5741,9 @@
   // "submission.import-external.source.crossref": "Crossref",
   "submission.import-external.source.crossref": "Crossref (DOI)",
 
+  //"submission.import-external.source.doi": "DOI",
+  "submission.import-external.source.doi": "DOI",
+
   //"submission.import-external.source.datacite": "DataCite",
   "submission.import-external.source.datacite": "DataCite (DOI)",
 
@@ -6113,6 +6233,24 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Sections incomplètes.",
 
+  //"submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Les identifiants uniques suivants seront attribués à votre document :",
+
+  //"submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Aucun handle n'a été crée pour ce document.",
+
+  //"submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Aucun DOI n'a été créé pour ce document.",
+
+  //"submission.sections.identifiers.handle_label": "Handle: ",
+  "submission.sections.identifiers.handle_label": "Handle : ",
+
+  //"submission.sections.identifiers.doi_label": "DOI: ",
+  "submission.sections.identifiers.doi_label": "DOI : ",
+
+  //"submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
+  "submission.sections.identifiers.otherIdentifiers_label": "Autres identifiants : ",
+
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Autorisations d'accès à l'Item",
 
@@ -6134,6 +6272,9 @@
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Doublon(s) potentiel(s)",
 
+  //"submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identifiants",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Licence du dépôt",
 
@@ -6487,6 +6628,9 @@
   //"submitter.empty": "N/A",
   "submitter.empty": "S/O",
 
+  //"subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Abonnements",
+
   //"subscriptions.modal.title": "Subscriptions",
   "subscriptions.modal.title": "Abonnements",
 
@@ -8395,6 +8539,15 @@
   //"search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
   "search.filters.filter.notifyEndorsement.label": "Chercher l'approbation Notify",
 
+  // "form.date-picker.placeholder.year": "Year",
+  "form.date-picker.placeholder.year": "Année",
+
+  // "form.date-picker.placeholder.month": "Month",
+  "form.date-picker.placeholder.month": "Mois",
+
+  // "form.date-picker.placeholder.day": "Day",
+  "form.date-picker.placeholder.day": "Jour",
+
   //"item.page.cc.license.title": "Creative Commons license",
   "item.page.cc.license.title": "Licence Creative Commons",
 
diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5
index 951f988093..beb63bbebb 100644
--- a/src/assets/i18n/pt-BR.json5
+++ b/src/assets/i18n/pt-BR.json5
@@ -1547,14 +1547,14 @@
   // "browse.metadata.srsc.breadcrumbs": "Browse by Subject Category",
   "browse.metadata.srsc.breadcrumbs": "Navegue por Categoria de Assunto",
 
-  // "browse.metadata.srsc.tree.descrption": "Select a subject to add as search filter",
-  "browse.metadata.srsc.tree.descrption": "Selecione um assunto para adicionar como filtro de pesquisa",
+  // "browse.metadata.srsc.tree.description": "Select a subject to add as search filter",
+  "browse.metadata.srsc.tree.description": "Selecione um assunto para adicionar como filtro de pesquisa",
 
   // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   "browse.metadata.nsi.breadcrumbs": "Navegue pelo Índice de Ciência Norueguês",
 
-  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
-  "browse.metadata.nsi.tree.descrption": "Selecione um índice para adicionar como filtro de pesquisa",
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Selecione um índice para adicionar como filtro de pesquisa",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Pesquisar por Título",
@@ -10232,9 +10232,15 @@
   //"browse.search-form.placeholder": "Search the repository",
   "browse.search-form.placeholder": "Buscar no repositório",
 
+  // "file-download-link.download": "Download ",
+  "file-download-link.download": "Baixar ",
+
   // "register-page.registration.aria.label": "Enter your e-mail address",
   "register-page.registration.aria.label": "Digite seu e-mail",
 
   // "forgot-email.form.aria.label": "Enter your e-mail address",
   "forgot-email.form.aria.label": "Digite seu e-mail",
+
+  // "search-facet-option.update.announcement": "The page will be reloaded. Filter {{ filter }} is selected.",
+  "search-facet-option.update.announcement": "A página será recarregada. O filtro {{ filter }} foi selecionado.",
 }
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index 2db0996707..7a3d326eca 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1568,8 +1568,8 @@
   // "browse.metadata.nsi.breadcrumbs": "Browse by Norwegian Science Index",
   "browse.metadata.nsi.breadcrumbs": "Percorrer por 'Norwegian Science Index'",
 
-  // "browse.metadata.nsi.tree.descrption": "Select an index to add as search filter",
-  "browse.metadata.nsi.tree.descrption": "Selecionar um índice para adicionar como filtro de pesquisa",
+  // "browse.metadata.nsi.tree.description": "Select an index to add as search filter",
+  "browse.metadata.nsi.tree.description": "Selecionar um índice para adicionar como filtro de pesquisa",
 
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Percorrer por título",
diff --git a/src/config/config.server.ts b/src/config/config.server.ts
index 69825b6409..3cbce3a42b 100644
--- a/src/config/config.server.ts
+++ b/src/config/config.server.ts
@@ -236,6 +236,7 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => {
   appConfig.rest.port = isNotEmpty(ENV('REST_PORT', true)) ? getNumberFromString(ENV('REST_PORT', true)) : appConfig.rest.port;
   appConfig.rest.nameSpace = isNotEmpty(ENV('REST_NAMESPACE', true)) ? ENV('REST_NAMESPACE', true) : appConfig.rest.nameSpace;
   appConfig.rest.ssl = isNotEmpty(ENV('REST_SSL', true)) ? getBooleanFromString(ENV('REST_SSL', true)) : appConfig.rest.ssl;
+  appConfig.rest.ssrBaseUrl = isNotEmpty(ENV('REST_SSRBASEURL', true)) ? ENV('REST_SSRBASEURL', true) : appConfig.rest.ssrBaseUrl;
 
   // apply build defined production
   appConfig.production = env === 'production';
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index 3455ef5f92..3c5e0ef0da 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -516,6 +516,7 @@ export class DefaultAppConfig implements AppConfig {
       enabled: false,
       filter: ['title', 'author', 'subject', 'entityType'],
     },
+    filterPlaceholdersCount: 5,
   };
 
   notifyMetrics: AdminNotifyMetricsRow[] = [
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
index 699e3fd61f..55733c98e4 100644
--- a/src/config/search-page-config.interface.ts
+++ b/src/config/search-page-config.interface.ts
@@ -8,5 +8,11 @@ export interface SearchConfig extends Config {
      * Used by {@link UploadBitstreamComponent}.
      */
     advancedFilters: AdvancedSearchConfig;
-
+    /**
+     * Number used to render n UI elements called loading skeletons that act as placeholders.
+     * These elements indicate that some content will be loaded in their stead.
+     * Since we don't know how many filters will be loaded before we receive a response from the server we use this parameter for the skeletons count.
+     * For instance if we set 5 then 5 loading skeletons will be visualized before the actual filters are retrieved.
+     */
+    filterPlaceholdersCount?: number;
 }
diff --git a/src/config/server-config.interface.ts b/src/config/server-config.interface.ts
index 8797ea3d60..ad9fa0868a 100644
--- a/src/config/server-config.interface.ts
+++ b/src/config/server-config.interface.ts
@@ -6,4 +6,8 @@ export class ServerConfig implements Config {
   public port: number;
   public nameSpace: string;
   public baseUrl?: string;
+  public ssrBaseUrl?: string;
+  // This boolean will be automatically set on server startup based on whether "baseUrl" and "ssrBaseUrl"
+  // have different values.
+  public hasSsrBaseUrl?: boolean;
 }
diff --git a/src/config/ssr-config.interface.ts b/src/config/ssr-config.interface.ts
index 37b8b4a0d2..2ce626b47b 100644
--- a/src/config/ssr-config.interface.ts
+++ b/src/config/ssr-config.interface.ts
@@ -20,4 +20,36 @@ export interface SSRConfig extends Config {
    * For improved SSR performance, DSpace defaults this to false (disabled).
    */
   inlineCriticalCss: boolean;
+
+  /**
+   * Enable state transfer from the server-side application to the client-side application.
+   * Defaults to true.
+   *
+   * Note: When using an external application cache layer, it's recommended not to transfer the state to avoid caching it.
+   * Disabling it ensures that dynamic state information is not inadvertently cached, which can improve security and
+   * ensure that users always use the most up-to-date state.
+   */
+  transferState: boolean;
+
+  /**
+   * When a different REST base URL is used for the server-side application, the generated state contains references to
+   * REST resources with the internal URL configured. By default, these internal URLs are replaced with public URLs.
+   * Disable this setting to avoid URL replacement during SSR. In this the state is not transferred to avoid security issues.
+   */
+  replaceRestUrl: boolean;
+
+  /**
+   * Paths to enable SSR for. Defaults to the home page and paths in the sitemap.
+   */
+  paths: Array<string>;
+
+  /**
+   * Whether to enable rendering of search component on SSR
+   */
+  enableSearchComponent: boolean;
+
+  /**
+   * Whether to enable rendering of browse component on SSR
+   */
+  enableBrowseComponent: boolean;
 }
diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
index 90b219cdbd..9bd663922c 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -8,5 +8,10 @@ export const environment: Partial<BuildConfig> = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: true,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index c7146dfb07..40c5e8bc64 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -12,6 +12,11 @@ export const environment: BuildConfig = {
     enabled: true,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 
   // Angular express server settings.
@@ -37,7 +42,7 @@ export const environment: BuildConfig = {
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
     nameSpace: '/api',
-    baseUrl: 'https://rest.com/api',
+    baseUrl: 'https://rest.com/server',
   },
 
   actuators: {
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 0292c19200..39ab31de03 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -13,6 +13,11 @@ export const environment: Partial<BuildConfig> = {
     enabled: false,
     enablePerformanceProfiler: false,
     inlineCriticalCss: false,
+    transferState: true,
+    replaceRestUrl: false,
+    paths: [ '/home', '/items/', '/entities/', '/collections/', '/communities/', '/bitstream/', '/bitstreams/', '/handle/', '/reload/' ],
+    enableSearchComponent: false,
+    enableBrowseComponent: false,
   },
 };
 
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 525067da3a..3bbdf12b91 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -54,6 +54,7 @@ import {
   APP_CONFIG_STATE,
   AppConfig,
 } from '../../config/app-config.interface';
+import { BuildConfig } from '../../config/build-config.interface';
 import { extendEnvironmentWithAppConfig } from '../../config/config.util';
 import { DefaultAppConfig } from '../../config/default-app-config';
 import { environment } from '../../environments/environment';
@@ -70,7 +71,7 @@ export class BrowserInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -144,15 +145,20 @@ export class BrowserInitService extends InitService {
    * @private
    */
   private async loadAppState(): Promise<boolean> {
-    const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
-    this.transferState.remove(InitService.NGRX_STATE);
-    this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
-    return lastValueFrom(
-      this.store.select(coreSelector).pipe(
-        find((core: any) => isNotEmpty(core)),
-        map(() => true),
-      ),
-    );
+    // The app state can be transferred only when SSR and CSR are using the same base url for the REST API
+    if (this.appConfig.ssr.transferState) {
+      const state = this.transferState.get<any>(InitService.NGRX_STATE, null);
+      this.transferState.remove(InitService.NGRX_STATE);
+      this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
+      return lastValueFrom(
+        this.store.select(coreSelector).pipe(
+          find((core: any) => isNotEmpty(core)),
+          map(() => true),
+        ),
+      );
+    } else {
+      return Promise.resolve(true);
+    }
   }
 
   private trackAuthTokenExpiration(): void {
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index c4aa4ffba3..60c6cbe413 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -21,6 +21,10 @@ import { LocaleService } from '../../app/core/locale/locale.service';
 import { HeadTagService } from '../../app/core/metadata/head-tag.service';
 import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
 import { InitService } from '../../app/init.service';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../app/shared/empty.util';
 import { MenuService } from '../../app/shared/menu/menu.service';
 import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
@@ -29,6 +33,7 @@ import {
   APP_CONFIG_STATE,
   AppConfig,
 } from '../../config/app-config.interface';
+import { BuildConfig } from '../../config/build-config.interface';
 import { environment } from '../../environments/environment';
 
 /**
@@ -40,7 +45,7 @@ export class ServerInitService extends InitService {
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
     protected transferState: TransferState,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    @Inject(APP_CONFIG) protected appConfig: BuildConfig,
     protected translate: TranslateService,
     protected localeService: LocaleService,
     protected angulartics2DSpace: Angulartics2DSpace,
@@ -89,17 +94,27 @@ export class ServerInitService extends InitService {
    * @private
    */
   private saveAppState() {
-    this.transferState.onSerialize(InitService.NGRX_STATE, () => {
-      let state;
-      this.store.pipe(take(1)).subscribe((saveState: any) => {
-        state = saveState;
-      });
+    if (this.appConfig.ssr.transferState && (isEmpty(this.appConfig.rest.ssrBaseUrl) || this.appConfig.ssr.replaceRestUrl)) {
+      this.transferState.onSerialize(InitService.NGRX_STATE, () => {
+        let state;
+        this.store.pipe(take(1)).subscribe((saveState: any) => {
+          state = saveState;
+        });
 
-      return state;
-    });
+        return state;
+      });
+    }
   }
 
   private saveAppConfigForCSR(): void {
-    this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    if (isNotEmpty(environment.rest.ssrBaseUrl) && environment.rest.baseUrl !== environment.rest.ssrBaseUrl) {
+      // Avoid to transfer ssrBaseUrl in order to prevent security issues
+      const config: AppConfig = Object.assign({}, environment as AppConfig, {
+        rest: Object.assign({}, environment.rest, { ssrBaseUrl: '', hasSsrBaseUrl: true }),
+      });
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, config);
+    } else {
+      this.transferState.set<AppConfig>(APP_CONFIG_STATE, environment as AppConfig);
+    }
   }
 }
diff --git a/src/ngx-translate-loaders/translate-server.loader.ts b/src/ngx-translate-loaders/translate-server.loader.ts
index d86251e008..8950b91a6b 100644
--- a/src/ngx-translate-loaders/translate-server.loader.ts
+++ b/src/ngx-translate-loaders/translate-server.loader.ts
@@ -1,4 +1,4 @@
-import { TransferState } from '@angular/platform-browser';
+import { TransferState } from '@angular/core';
 import { TranslateLoader } from '@ngx-translate/core';
 import { readFileSync } from 'fs';
 import {
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 386b4b47fe..fc470e4490 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -26,8 +26,6 @@ $h6-font-size: $font-size-base !default;
 
 /*** BOOTSTRAP OPTIONS ***/
 
-// enable-responsive-font-sizes allows text to scale more naturally across device and viewport sizes
-$enable-responsive-font-sizes: true !default;
 $enable-shadows: true !default;
 
 
@@ -43,20 +41,38 @@ $danger:    #cf4444 !default;               // Red
 $light:     #f8f9fa !default;               // As Bootstrap $gray-100
 $dark:      darken(#2b4e72, 17%) !default;  // Blue gray (darker)
 
+// Add new semantic colors here (you don't need to add existing semantic colors)
+$global-custom-semantic-colors: (
+);
 
 /*** OTHER BOOTSTRAP VARIABLES ***/
 
-$link-color: #1F7293 !default;
+$link-color: $info !default;
 $link-hover-color: darken($link-color, 15%) !default;
 
-// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
-$yiq-contrasted-threshold: 165 !default;
 
 $navbar-dark-color: rgba(white, .5) !default;
 $navbar-light-color: rgba(black, .5) !default;
 $navbar-dark-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-dark-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 $navbar-light-toggler-icon-bg: url("data:image/svg+xml;charset=utf8,<svg+viewBox='0+0+30+30'+xmlns='http://www.w3.org/2000/svg'><path+stroke='#{$navbar-light-color}'+stroke-width='2'+stroke-linecap='round'+stroke-miterlimit='10'+d='M4+7h22M4+15h22M4+23h22'/></svg>") !default;
 
+$min-contrast-ratio: 2 !default;
+
+$link-decoration: none;
+$link-hover-decoration: underline;
+
+$pagination-disabled-bg: white;
+
+$icon-font-family: "Font Awesome 6 Free"; /* Define the font-family for icons */
+
+$border-radius: 0.25em;
+
+$bs-border-radius-lg: 0.3rem;
+
+$badge-padding-x: 0.4em;
+$badge-padding-y: 0.25em;
+
+$primary-bg-subtle: $light !default;
 
 /*** CUSTOM DSPACE VARIABLES ***/
 
@@ -101,3 +117,4 @@ $ds-danger-bg: #{lighten($danger, 30%)} !default;
 // Starting this url with a caret (^) allows it to be a relative path based on UI's deployment path
 // See https://github.com/angular/angular-cli/issues/12797#issuecomment-598534241
 $fa-font-path: "^assets/fonts" !default;
+
diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss
index 5a64be7e2a..0cfa811b00 100644
--- a/src/styles/_bootstrap_variables_mapping.scss
+++ b/src/styles/_bootstrap_variables_mapping.scss
@@ -6,821 +6,105 @@
   // Variables should follow the `$component-state-property-size` formula for
   // consistent naming. Ex: $nav-link-disabled-color and $modal-content-box-shadow-xs.
 
-  // Color system
-  --bs-white: #{$white};
-  --bs-gray-100: #{$gray-100};
-  --bs-gray-200: #{$gray-200};
-  --bs-gray-300: #{$gray-300};
-  --bs-gray-400: #{$gray-400};
-  --bs-gray-500: #{$gray-500};
-  --bs-gray-600: #{$gray-600};
-  --bs-gray-700: #{$gray-700};
-  --bs-gray-800: #{$gray-800};
-  --bs-gray-900: #{$gray-900};
-  --bs-black: #{$black};
-  --bs-blue: #{$blue};
-  --bs-indigo: #{$indigo};
-  --bs-purple: #{$purple};
-  --bs-pink: #{$pink};
-  --bs-red: #{$red};
-  --bs-orange: #{$orange};
-  --bs-yellow: #{$yellow};
-  --bs-green: #{$green};
-  --bs-teal: #{$teal};
-  --bs-cyan: #{$cyan};
-  --bs-primary: #{$primary};
-  --bs-secondary: #{$secondary};
-  --bs-success: #{$success};
-  --bs-info: #{$info};
-  --bs-warning: #{$warning};
-  --bs-danger: #{$danger};
-  --bs-light: #{$light};
-  --bs-dark: #{$dark};
-
-
-  // Set a specific jump point for requesting color jumps
-  --bs-theme-color-interval: #{$theme-color-interval};
-
-  // The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
-  --bs-yiq-contrasted-threshold: #{$yiq-contrasted-threshold};
-
-  // Customize the light and dark text colors for use in our YIQ color contrast function.
-  --bs-yiq-text-dark: #{$yiq-text-dark};
-  --bs-yiq-text-light: #{$yiq-text-light};
-
-
-  // Options
-  //
-  // Quickly modify global styling by enabling or disabling optional features.
-  --bs-enable-caret: #{$enable-caret};
-  --bs-enable-rounded: #{$enable-rounded};
-  --bs-enable-shadows: #{$enable-shadows};
-  --bs-enable-gradients: #{$enable-gradients};
-  --bs-enable-transitions: #{$enable-transitions};
-  --bs-enable-prefers-reduced-motion-media-query: #{$enable-prefers-reduced-motion-media-query};
-  --bs-enable-grid-classes: #{$enable-grid-classes};
-  --bs-enable-pointer-cursor-for-buttons: #{$enable-pointer-cursor-for-buttons};
-  --bs-enable-print-styles: #{$enable-print-styles};
-  --bs-enable-responsive-font-sizes: #{$enable-responsive-font-sizes};
-  --bs-enable-validation-icons: #{$enable-validation-icons};
-  --bs-enable-deprecation-messages: #{$enable-deprecation-messages};
-  --bs-spacer: #{$spacer};
-  --bs-spacer-0: #{map-get($spacers, 0)};
-  --bs-spacer-1: #{map-get($spacers, 1)};
-  --bs-spacer-2: #{map-get($spacers, 2)};
-  --bs-spacer-3: #{map-get($spacers, 3)};
-  --bs-spacer-4: #{map-get($spacers, 4)};
-  --bs-spacer-5: #{map-get($spacers, 5)};
-  --bs-sizes-25: #{map-get($sizes, 25)};
-  --bs-sizes-50: #{map-get($sizes, 50)};
-  --bs-sizes-75: #{map-get($sizes, 75)};
-  --bs-sizes-100: #{map-get($sizes, 100)};
-  --bs-sizes-auto: #{map-get($sizes, auto)};
-
-  // Body
-  //
-  // Settings for the `<body>` element.
-  --bsbody-bg: #{$body-bg};
-  --bs-body-color: #{$body-color};
-
-
-  // Links
-  //
-  // Style anchor elements.
-  --bs-link-color: #{$link-color};
-  --bs-link-decoration: #{$link-decoration};
-  --bs-link-hover-color: #{$link-hover-color};
-  --bs-link-hover-decoration: #{$link-hover-decoration};
-  // Darken percentage for links with `.text-*` class (e.g. `.text-success`)
-  --bs-emphasized-link-hover-darken-percentage: #{$emphasized-link-hover-darken-percentage};
-
-  // Paragraphs
-  //
-  // Style p element.
-  --bs-paragraph-margin-bottom: #{$paragraph-margin-bottom};
-
-
-  // Grid breakpoints
-  //
-  // Define the minimum dimensions at which your layout will change,
-  // adapting to different screen sizes, for use in media queries.
-
-  --bs-xs-min: #{map-get($grid-breakpoints, xs)};
-  --bs-sm-min: #{map-get($grid-breakpoints, sm)};
-  --bs-md-min: #{map-get($grid-breakpoints, md)};
-  --bs-lg-min: #{map-get($grid-breakpoints, lg)};
-  --bs-xl-min: #{map-get($grid-breakpoints, xl)};
-
-  --bs-xs-max: #{map-get($container-max-widths, xs)};
-  --bs-sm-max: #{map-get($container-max-widths, sm)};
-  --bs-md-max: #{map-get($container-max-widths, md)};
-  --bs-lg-max: #{map-get($container-max-widths, lg)};
-  --bs-xl-max: #{map-get($container-max-widths, xl)};
-
-  // Grid columns
-  //
-  // Set the number of columns and specify the width of the gutters.
-  --bs-grid-columns: #{$grid-columns};
-  --bs-grid-gutter-width: #{$grid-gutter-width};
-
-
-  // Components
-  //
-  // Define common padding and border radius sizes and more.
-  --bs-line-height-lg: #{$line-height-lg};
-  --bs-line-height-sm: #{$line-height-sm};
-  --bs-border-width: #{$border-width};
-  --bs-border-color: #{$border-color};
-  --bs-border-radius: #{$border-radius};
-  --bs-border-radius-lg: #{$border-radius-lg};
-  --bs-border-radius-sm: #{$border-radius-sm};
-  --bs-rounded-pill: #{$rounded-pill};
-  --bs-box-shadow-sm: #{$box-shadow-sm};
-  --bs-box-shadow: #{$box-shadow};
-  --bs-box-shadow-lg: #{$box-shadow-lg};
-  --bs-component-active-color: #{$component-active-color};
-  --bs-component-active-bg: #{$component-active-bg};
-  --bs-caret-width: #{$caret-width};
-  --bs-caret-vertical-align: #{$caret-vertical-align};
-  --bs-caret-spacing: #{$caret-spacing};
-  --bs-transition-base: #{$transition-base};
-  --bs-transition-fade: #{$transition-fade};
-  --bs-transition-collapse: #{$transition-collapse};
-
-  --bs-font-family-sans-serif: #{$font-family-sans-serif};
-  --bs-font-family-monospace: #{$font-family-monospace};
-  --bs-font-family-base: #{$font-family-base};
-  // stylelint-enable value-keyword-case
-  --bs-font-size-base: #{$font-size-base};
-  --bs-font-size-lg: #{$font-size-lg};
-  --bs-font-size-sm: #{$font-size-sm};
-  --bs-font-weight-lighter: #{$font-weight-lighter};
-  --bs-font-weight-light: #{$font-weight-light};
-  --bs-font-weight-normal: #{$font-weight-normal};
-  --bs-font-weight-bold: #{$font-weight-bold};
-  --bs-font-weight-bolder: #{$font-weight-bolder};
-  --bs-font-weight-base: #{$font-weight-base};
-  --bs-line-height-base: #{$line-height-base};
-  --bs-h1-font-size: #{$h1-font-size};
-  --bs-h2-font-size: #{$h2-font-size};
-  --bs-h3-font-size: #{$h3-font-size};
-  --bs-h4-font-size: #{$h4-font-size};
-  --bs-h5-font-size: #{$h5-font-size};
-  --bs-h6-font-size: #{$h6-font-size};
-  --bs-headings-margin-bottom: #{$headings-margin-bottom};
-  --bs-headings-font-family: #{$headings-font-family};
-  --bs-headings-font-weight: #{$headings-font-weight};
-  --bs-headings-line-height: #{$headings-line-height};
-  --bs-headings-color: #{$headings-color};
-  --bs-display1-size: #{$display1-size};
-  --bs-display2-size: #{$display2-size};
-  --bs-display3-size: #{$display3-size};
-  --bs-display4-size: #{$display4-size};
-  --bs-display1-weight: #{$display1-weight};
-  --bs-display2-weight: #{$display2-weight};
-  --bs-display3-weight: #{$display3-weight};
-  --bs-display4-weight: #{$display4-weight};
-  --bs-display-line-height: #{$display-line-height};
-  --bs-lead-font-size: #{$lead-font-size};
-  --bs-lead-font-weight: #{$lead-font-weight};
-  --bs-small-font-size: #{$small-font-size};
-  --bs-text-muted: #{$text-muted};
-  --bs-blockquote-small-color: #{$blockquote-small-color};
-  --bs-blockquote-small-font-size: #{$blockquote-small-font-size};
-  --bs-blockquote-font-size: #{$blockquote-font-size};
-  --bs-hr-border-color: #{$hr-border-color};
-  --bs-hr-border-width: #{$hr-border-width};
-  --bs-mark-padding: #{$mark-padding};
-  --bs-dt-font-weight: #{$dt-font-weight};
-  --bs-kbd-box-shadow: #{$kbd-box-shadow};
-  --bs-nested-kbd-font-weight: #{$nested-kbd-font-weight};
-  --bs-list-inline-padding: #{$list-inline-padding};
-  --bs-mark-bg: #{$mark-bg};
-  --bs-hr-margin-y: #{$hr-margin-y};
-
-
-  // Tables
-  //
-  // Customizes the `.table` component with basic values, each used across all table variations.
-  --bs-table-cell-padding: #{$table-cell-padding};
-  --bs-table-cell-padding-sm: #{$table-cell-padding-sm};
-  --bs-table-color: #{$table-color};
-  --bs-table-bg: #{$table-bg};
-  --bs-table-accent-bg: #{$table-accent-bg};
-  --bs-table-hover-color: #{$table-hover-color};
-  --bs-table-hover-bg: #{$table-hover-bg};
-  --bs-table-active-bg: #{$table-active-bg};
-  --bs-table-border-width: #{$table-border-width};
-  --bs-table-border-color: #{$table-border-color};
-  --bs-table-head-bg: #{$table-head-bg};
-  --bs-table-head-color: #{$table-head-color};
-  --bs-table-dark-color: #{$table-dark-color};
-  --bs-table-dark-bg: #{$table-dark-bg};
-  --bs-table-dark-accent-bg: #{$table-dark-accent-bg};
-  --bs-table-dark-hover-color: #{$table-dark-hover-color};
-  --bs-table-dark-hover-bg: #{$table-dark-hover-bg};
-  --bs-table-dark-border-color: #{$table-dark-border-color};
-  --bs-table-dark-color: #{$table-dark-color};
-  --bs-table-striped-order: #{$table-striped-order};
-  --bs-table-caption-color: #{$table-caption-color};
-  --bs-table-bg-level: #{$table-bg-level};
-  --bs-table-border-level: #{$table-border-level};
-
-
-  // Buttons + Forms
-  //
-  // Shared variables that are reassigned to `$input-` and `$btn-` specific variables.
-  --bs-input-btn-padding-y: #{$input-btn-padding-y};
-  --bs-input-btn-padding-x: #{$input-btn-padding-x};
-  --bs-input-btn-font-family: #{$input-btn-font-family};
-  --bs-input-btn-font-size: #{$input-btn-font-size};
-  --bs-input-btn-line-height: #{$input-btn-line-height};
-  --bs-input-btn-focus-width: #{$input-btn-focus-width};
-  --bs-input-btn-focus-color: #{$input-btn-focus-color};
-  --bs-input-btn-focus-box-shadow: #{$input-btn-focus-box-shadow};
-  --bs-input-btn-padding-y-sm: #{$input-btn-padding-y-sm};
-  --bs-input-btn-padding-x-sm: #{$input-btn-padding-x-sm};
-  --bs-input-btn-font-size-sm: #{$input-btn-font-size-sm};
-  --bs-input-btn-line-height-sm: #{$input-btn-line-height-sm};
-  --bs-input-btn-padding-y-lg: #{$input-btn-padding-y-lg};
-  --bs-input-btn-padding-x-lg: #{$input-btn-padding-x-lg};
-  --bs-input-btn-font-size-lg: #{$input-btn-font-size-lg};
-  --bs-input-btn-line-height-lg: #{$input-btn-line-height-lg};
-  --bs-input-btn-border-width: #{$input-btn-border-width};
-
-
-  // Buttons
-  //
-  // For each of Bootstrap's buttons, define text, background, and border color.
-  --bs-btn-padding-y: #{$btn-padding-y};
-  --bs-btn-padding-x: #{$btn-padding-x};
-  --bs-btn-font-family: #{$btn-font-family};
-  --bs-btn-font-size: #{$btn-font-size};
-  --bs-btn-line-height: #{$btn-line-height};
-  --bs-btn-padding-y-sm: #{$btn-padding-y-sm};
-  --bs-btn-padding-x-sm: #{$btn-padding-x-sm};
-  --bs-btn-font-size-sm: #{$btn-font-size-sm};
-  --bs-btn-line-height-sm: #{$btn-line-height-sm};
-  --bs-btn-padding-y-lg: #{$btn-padding-y-lg};
-  --bs-btn-padding-x-lg: #{$btn-padding-x-lg};
-  --bs-btn-font-size-lg: #{$btn-font-size-lg};
-  --bs-btn-line-height-lg: #{$btn-line-height-lg};
-  --bs-btn-border-width: #{$btn-border-width};
-  --bs-btn-font-weight: #{$btn-font-weight};
-  --bs-btn-box-shadow: #{$btn-box-shadow};
-  --bs-btn-focus-width: #{$btn-focus-width};
-  --bs-btn-focus-box-shadow: #{$btn-focus-box-shadow};
-  --bs-btn-disabled-opacity: #{$btn-disabled-opacity};
-  --bs-btn-active-box-shadow: #{$btn-active-box-shadow};
-  --bs-btn-link-disabled-color: #{$btn-link-disabled-color};
-  --bs-btn-block-spacing-y: #{$btn-block-spacing-y};
-
-  // Allows for customizing button radius independently from global border radius
-  --bs-btn-border-radius: #{$btn-border-radius};
-  --bs-btn-border-radius-lg: #{$btn-border-radius-lg};
-  --bs-btn-border-radius-sm: #{$btn-border-radius-sm};
-  --bs-btn-transition: #{$btn-transition};
-
-
-  // Forms
-  --bs-label-margin-bottom: #{$label-margin-bottom};
-  --bs-input-padding-y: #{$input-padding-y};
-  --bs-input-padding-x: #{$input-padding-x};
-  --bs-input-font-family: #{$input-font-family};
-  --bs-input-font-size: #{$input-font-size};
-  --bs-input-font-weight: #{$input-font-weight};
-  --bs-input-line-height: #{$input-line-height};
-  --bs-input-padding-y-sm: #{$input-padding-y-sm};
-  --bs-input-padding-x-sm: #{$input-padding-x-sm};
-  --bs-input-font-size-sm: #{$input-font-size-sm};
-  --bs-input-line-height-sm: #{$input-line-height-sm};
-  --bs-input-padding-y-lg: #{$input-padding-y-lg};
-  --bs-input-padding-x-lg: #{$input-padding-x-lg};
-  --bs-input-font-size-lg: #{$input-font-size-lg};
-  --bs-input-line-height-lg: #{$input-line-height-lg};
-  --bs-input-bg: #{$input-bg};
-  --bs-input-disabled-bg: #{$input-disabled-bg};
-  --bs-input-color: #{$input-color};
-  --bs-input-border-color: #{$input-border-color};
-  --bs-input-border-width: #{$input-border-width};
-  --bs-input-box-shadow: #{$input-box-shadow};
-  --bs-input-border-radius: #{$input-border-radius};
-  --bs-input-border-radius-lg: #{$input-border-radius-lg};
-  --bs-input-border-radius-sm: #{$input-border-radius-sm};
-  --bs-input-focus-bg: #{$input-focus-bg};
-  --bs-input-focus-border-color: #{$input-focus-border-color};
-  --bs-input-focus-color: #{$input-focus-color};
-  --bs-input-focus-width: #{$input-focus-width};
-  --bs-input-focus-box-shadow: #{$input-focus-box-shadow};
-  --bs-input-placeholder-color: #{$input-placeholder-color};
-  --bs-input-plaintext-color: #{$input-plaintext-color};
-  --bs-input-height-border: #{$input-height-border};
-  --bs-input-height-inner: #{$input-height-inner};
-  --bs-input-height-inner-half: #{$input-height-inner-half};
-  --bs-input-height-inner-quarter: #{$input-height-inner-quarter};
-  --bs-input-height: #{$input-height};
-  --bs-input-height-sm: #{$input-height-sm};
-  --bs-input-height-lg: #{$input-height-lg};
-  --bs-input-transition: #{$input-transition};
-  --bs-form-text-margin-top: #{$form-text-margin-top};
-  --bs-form-check-input-gutter: #{$form-check-input-gutter};
-  --bs-form-check-input-margin-y: #{$form-check-input-margin-y};
-  --bs-form-check-input-margin-x: #{$form-check-input-margin-x};
-  --bs-form-check-inline-margin-x: #{$form-check-inline-margin-x};
-  --bs-form-check-inline-input-margin-x: #{$form-check-inline-input-margin-x};
-  --bs-form-grid-gutter-width: #{$form-grid-gutter-width};
-  --bs-form-group-margin-bottom: #{$form-group-margin-bottom};
-  --bs-input-group-addon-color: #{$input-group-addon-color};
-  --bs-input-group-addon-bg: #{$input-group-addon-bg};
-  --bs-input-group-addon-border-color: #{$input-group-addon-border-color};
-  --bs-custom-forms-transition: #{$custom-forms-transition};
-  --bs-custom-control-gutter: #{$custom-control-gutter};
-  --bs-custom-control-spacer-x: #{$custom-control-spacer-x};
-  --bs-custom-control-indicator-size: #{$custom-control-indicator-size};
-  --bs-custom-control-indicator-bg: #{$custom-control-indicator-bg};
-  --bs-custom-control-indicator-bg-size: #{$custom-control-indicator-bg-size};
-  --bs-custom-control-indicator-box-shadow: #{$custom-control-indicator-box-shadow};
-  --bs-custom-control-indicator-border-color: #{$custom-control-indicator-border-color};
-  --bs-custom-control-indicator-border-width: #{$custom-control-indicator-border-width};
-  --bs-custom-control-indicator-disabled-bg: #{$custom-control-indicator-disabled-bg};
-  --bs-custom-control-label-disabled-color: #{$custom-control-label-disabled-color};
-  --bs-custom-control-indicator-checked-color: #{$custom-control-indicator-checked-color};
-  --bs-custom-control-indicator-checked-bg: #{$custom-control-indicator-checked-bg};
-  --bs-custom-control-indicator-checked-disabled-bg: #{$custom-control-indicator-checked-disabled-bg};
-  --bs-custom-control-indicator-checked-box-shadow: #{$custom-control-indicator-checked-box-shadow};
-  --bs-custom-control-indicator-checked-border-color: #{$custom-control-indicator-checked-border-color};
-  --bs-custom-control-indicator-focus-box-shadow: #{$custom-control-indicator-focus-box-shadow};
-  --bs-custom-control-indicator-focus-border-color: #{$custom-control-indicator-focus-border-color};
-  --bs-custom-control-indicator-active-color: #{$custom-control-indicator-active-color};
-  --bs-custom-control-indicator-active-bg: #{$custom-control-indicator-active-bg};
-  --bs-custom-control-indicator-active-box-shadow: #{$custom-control-indicator-active-box-shadow};
-  --bs-custom-control-indicator-active-border-color: #{$custom-control-indicator-active-border-color};
-  --bs-custom-checkbox-indicator-border-radius: #{$custom-checkbox-indicator-border-radius};
-  --bs-custom-checkbox-indicator-icon-checked: #{$custom-checkbox-indicator-icon-checked};
-  --bs-custom-checkbox-indicator-indeterminate-bg: #{$custom-checkbox-indicator-indeterminate-bg};
-  --bs-custom-checkbox-indicator-indeterminate-color: #{$custom-checkbox-indicator-indeterminate-color};
-  --bs-custom-checkbox-indicator-icon-indeterminate: #{$custom-checkbox-indicator-icon-indeterminate};
-  --bs-custom-checkbox-indicator-indeterminate-box-shadow: #{$custom-checkbox-indicator-indeterminate-box-shadow};
-  --bs-custom-checkbox-indicator-indeterminate-border-color: #{$custom-checkbox-indicator-indeterminate-border-color};
-  --bs-custom-radio-indicator-border-radius: #{$custom-radio-indicator-border-radius};
-  --bs-custom-radio-indicator-icon-checked: #{$custom-radio-indicator-icon-checked};
-  --bs-custom-switch-width: #{$custom-switch-width};
-  --bs-custom-switch-indicator-border-radius: #{$custom-switch-indicator-border-radius};
-  --bs-custom-switch-indicator-size: #{$custom-switch-indicator-size};
-  --bs-custom-select-padding-y: #{$custom-select-padding-y};
-  --bs-custom-select-padding-x: #{$custom-select-padding-x};
-  --bs-custom-select-font-family: #{$custom-select-font-family};
-  --bs-custom-select-font-size: #{$custom-select-font-size};
-  --bs-custom-select-height: #{$custom-select-height};
-  --bs-custom-select-indicator-padding: #{$custom-select-indicator-padding};
-  --bs-custom-select-font-weight: #{$custom-select-font-weight};
-  --bs-custom-select-line-height: #{$custom-select-line-height};
-  --bs-custom-select-color: #{$custom-select-color};
-  --bs-custom-select-disabled-color: #{$custom-select-disabled-color};
-  --bs-custom-select-bg: #{$custom-select-bg};
-  --bs-custom-select-disabled-bg: #{$custom-select-disabled-bg};
-  --bs-custom-select-bg-size: #{$custom-select-bg-size};
-  --bs-custom-select-indicator-color: #{$custom-select-indicator-color};
-  --bs-custom-select-indicator: #{$custom-select-indicator};
-  --bs-custom-select-background: #{$custom-select-background};
-  --bs-custom-select-feedback-icon-padding-right: #{$custom-select-feedback-icon-padding-right};
-  --bs-custom-select-feedback-icon-position: #{$custom-select-feedback-icon-position};
-  --bs-custom-select-feedback-icon-size: #{$custom-select-feedback-icon-size};
-  --bs-custom-select-border-width: #{$custom-select-border-width};
-  --bs-custom-select-border-color: #{$custom-select-border-color};
-  --bs-custom-select-border-radius: #{$custom-select-border-radius};
-  --bs-custom-select-box-shadow: #{$custom-select-box-shadow};
-  --bs-custom-select-focus-border-color: #{$custom-select-focus-border-color};
-  --bs-custom-select-focus-width: #{$custom-select-focus-width};
-  --bs-custom-select-focus-box-shadow: #{$custom-select-focus-box-shadow};
-  --bs-custom-select-padding-y-sm: #{$custom-select-padding-y-sm};
-  --bs-custom-select-padding-x-sm: #{$custom-select-padding-x-sm};
-  --bs-custom-select-font-size-sm: #{$custom-select-font-size-sm};
-  --bs-custom-select-height-sm: #{$custom-select-height-sm};
-  --bs-custom-select-padding-y-lg: #{$custom-select-padding-y-lg};
-  --bs-custom-select-padding-x-lg: #{$custom-select-padding-x-lg};
-  --bs-custom-select-font-size-lg: #{$custom-select-font-size-lg};
-  --bs-custom-select-height-lg: #{$custom-select-height-lg};
-  --bs-custom-range-track-width: #{$custom-range-track-width};
-  --bs-custom-range-track-height: #{$custom-range-track-height};
-  --bs-custom-range-track-cursor: #{$custom-range-track-cursor};
-  --bs-custom-range-track-bg: #{$custom-range-track-bg};
-  --bs-custom-range-track-border-radius: #{$custom-range-track-border-radius};
-  --bs-custom-range-track-box-shadow: #{$custom-range-track-box-shadow};
-  --bs-custom-range-thumb-width: #{$custom-range-thumb-width};
-  --bs-custom-range-thumb-height: #{$custom-range-thumb-height};
-  --bs-custom-range-thumb-bg: #{$custom-range-thumb-bg};
-  --bs-custom-range-thumb-border: #{$custom-range-thumb-border};
-  --bs-custom-range-thumb-border-radius: #{$custom-range-thumb-border-radius};
-  --bs-custom-range-thumb-box-shadow: #{$custom-range-thumb-box-shadow};
-  --bs-custom-range-thumb-focus-box-shadow: #{$custom-range-thumb-focus-box-shadow};
-  --bs-custom-range-thumb-focus-box-shadow-width: #{$custom-range-thumb-focus-box-shadow-width};
-  --bs-custom-range-thumb-active-bg: #{$custom-range-thumb-active-bg};
-  --bs-custom-range-thumb-disabled-bg: #{$custom-range-thumb-disabled-bg};
-  --bs-custom-file-height: #{$custom-file-height};
-  --bs-custom-file-height-inner: #{$custom-file-height-inner};
-  --bs-custom-file-focus-border-color: #{$custom-file-focus-border-color};
-  --bs-custom-file-focus-box-shadow: #{$custom-file-focus-box-shadow};
-  --bs-custom-file-disabled-bg: #{$custom-file-disabled-bg};
-  --bs-custom-file-padding-y: #{$custom-file-padding-y};
-  --bs-custom-file-padding-x: #{$custom-file-padding-x};
-  --bs-custom-file-line-height: #{$custom-file-line-height};
-  --bs-custom-file-font-family: #{$custom-file-font-family};
-  --bs-custom-file-font-weight: #{$custom-file-font-weight};
-  --bs-custom-file-color: #{$custom-file-color};
-  --bs-custom-file-bg: #{$custom-file-bg};
-  --bs-custom-file-border-width: #{$custom-file-border-width};
-  --bs-custom-file-border-color: #{$custom-file-border-color};
-  --bs-custom-file-border-radius: #{$custom-file-border-radius};
-  --bs-custom-file-box-shadow: #{$custom-file-box-shadow};
-  --bs-custom-file-button-color: #{$custom-file-button-color};
-  --bs-custom-file-button-bg: #{$custom-file-button-bg};
-  //--bs-custom-file-text: #{$custom-file-text}; //mapping doesn't work
-
-
-  // Form validation
-  --bs-form-feedback-margin-top: #{$form-feedback-margin-top};
-  --bs-form-feedback-font-size: #{$form-feedback-font-size};
-  --bs-form-feedback-valid-color: #{$form-feedback-valid-color};
-  --bs-form-feedback-invalid-color: #{$form-feedback-invalid-color};
-  --bs-form-feedback-icon-valid-color: #{$form-feedback-icon-valid-color};
-  --bs-form-feedback-icon-valid: #{$form-feedback-icon-valid};
-  --bs-form-feedback-icon-invalid-color: #{$form-feedback-icon-invalid-color};
-  --bs-form-feedback-icon-invalid: #{$form-feedback-icon-invalid};
-  // Z-index master list
-  //
-  // Warning: Avoid customizing these values. They're used for a bird's eye view
-  // of components dependent on the z-axis and are designed to all work together.
-  --bs-zindex-dropdown: #{$zindex-dropdown};
-  --bs-zindex-sticky: #{$zindex-sticky};
-  --bs-zindex-fixed: #{$zindex-fixed};
-  --bs-zindex-modal-backdrop: #{$zindex-modal-backdrop};
-  --bs-zindex-modal: #{$zindex-modal};
-  --bs-zindex-popover: #{$zindex-popover};
-  --bs-zindex-tooltip: #{$zindex-tooltip};
-
-
-  // Navs
-  --bs-nav-link-padding-y: #{$nav-link-padding-y};
-  --bs-nav-link-padding-x: #{$nav-link-padding-x};
-  --bs-nav-link-disabled-color: #{$nav-link-disabled-color};
-  --bs-nav-tabs-border-color: #{$nav-tabs-border-color};
-  --bs-nav-tabs-border-width: #{$nav-tabs-border-width};
-  --bs-nav-tabs-border-radius: #{$nav-tabs-border-radius};
-  --bs-nav-tabs-link-hover-border-color: #{$nav-tabs-link-hover-border-color};
-  --bs-nav-tabs-link-active-color: #{$nav-tabs-link-active-color};
-  --bs-nav-tabs-link-active-bg: #{$nav-tabs-link-active-bg};
-  --bs-nav-tabs-link-active-border-color: #{$nav-tabs-link-active-border-color};
-  --bs-nav-pills-border-radius: #{$nav-pills-border-radius};
-  --bs-nav-pills-link-active-color: #{$nav-pills-link-active-color};
-  --bs-nav-pills-link-active-bg: #{$nav-pills-link-active-bg};
-  --bs-nav-divider-color: #{$nav-divider-color};
-  --bs-nav-divider-margin-y: #{$nav-divider-margin-y};
-
-
-  // Navbar
-  --bs-navbar-padding-y: #{$navbar-padding-y};
-  --bs-navbar-padding-x: #{$navbar-padding-x};
-  --bs-navbar-nav-link-padding-x: #{$navbar-nav-link-padding-x};
-  --bs-navbar-brand-font-size: #{$navbar-brand-font-size};
-  // Compute the navbar-brand padding-y so the navbar-brand will have the same height as navbar-text and nav-link
-  --bs-nav-link-height: #{$nav-link-height};
-  --bs-navbar-brand-height: #{$navbar-brand-height};
-  --bs-navbar-brand-padding-y: #{$navbar-brand-padding-y};
-  --bs-navbar-toggler-padding-y: #{$navbar-toggler-padding-y};
-  --bs-navbar-toggler-padding-x: #{$navbar-toggler-padding-x};
-  --bs-navbar-toggler-font-size: #{$navbar-toggler-font-size};
-  --bs-navbar-toggler-border-radius: #{$navbar-toggler-border-radius};
-  --bs-navbar-dark-color: #{$navbar-dark-color};
-  --bs-navbar-dark-hover-color: #{$navbar-dark-hover-color};
-  --bs-navbar-dark-active-color: #{$navbar-dark-active-color};
-  --bs-navbar-dark-disabled-color: #{$navbar-dark-disabled-color};
-  --bs-navbar-dark-toggler-icon-bg: #{$navbar-dark-toggler-icon-bg};
-  --bs-navbar-dark-toggler-border-color: #{$navbar-dark-toggler-border-color};
-  --bs-navbar-light-color: #{$navbar-light-color};
-  --bs-navbar-light-hover-color: #{$navbar-light-hover-color};
-  --bs-navbar-light-active-color: #{$navbar-light-active-color};
-  --bs-navbar-light-disabled-color: #{$navbar-light-disabled-color};
-  --bs-navbar-light-toggler-icon-bg: #{$navbar-light-toggler-icon-bg};
-  --bs-navbar-light-toggler-border-color: #{$navbar-light-toggler-border-color};
-  --bs-navbar-light-brand-color: #{$navbar-light-brand-color};
-  --bs-navbar-light-brand-hover-color: #{$navbar-light-brand-hover-color};
-  --bs-navbar-dark-brand-color: #{$navbar-dark-brand-color};
-  --bs-navbar-dark-brand-hover-color: #{$navbar-dark-brand-hover-color};
-
-
-  // Dropdowns
-  //
-  // Dropdown menu container and contents.
-  --bs-dropdown-min-width: #{$dropdown-min-width};
-  --bs-dropdown-padding-y: #{$dropdown-padding-y};
-  --bs-dropdown-spacer: #{$dropdown-spacer};
-  --bs-dropdown-font-size: #{$dropdown-font-size};
-  --bs-dropdown-color: #{$dropdown-color};
-  --bs-dropdown-bg: #{$dropdown-bg};
-  --bs-dropdown-border-color: #{$dropdown-border-color};
-  --bs-dropdown-border-radius: #{$dropdown-border-radius};
-  --bs-dropdown-border-width: #{$dropdown-border-width};
-  --bs-dropdown-inner-border-radius: #{$dropdown-inner-border-radius};
-  --bs-dropdown-divider-bg: #{$dropdown-divider-bg};
-  --bs-dropdown-divider-margin-y: #{$dropdown-divider-margin-y};
-  --bs-dropdown-box-shadow: #{$dropdown-box-shadow};
-  --bs-dropdown-link-color: #{$dropdown-link-color};
-  --bs-dropdown-link-hover-color: #{$dropdown-link-hover-color};
-  --bs-dropdown-link-hover-bg: #{$dropdown-link-hover-bg};
-  --bs-dropdown-link-active-color: #{$dropdown-link-active-color};
-  --bs-dropdown-link-active-bg: #{$dropdown-link-active-bg};
-  --bs-dropdown-link-disabled-color: #{$dropdown-link-disabled-color};
-  --bs-dropdown-item-padding-y: #{$dropdown-item-padding-y};
-  --bs-dropdown-item-padding-x: #{$dropdown-item-padding-x};
-  --bs-dropdown-header-color: #{$dropdown-header-color};
-
-
-  // Pagination
-  --bs-pagination-padding-y: #{$pagination-padding-y};
-  --bs-pagination-padding-x: #{$pagination-padding-x};
-  --bs-pagination-padding-y-sm: #{$pagination-padding-y-sm};
-  --bs-pagination-padding-x-sm: #{$pagination-padding-x-sm};
-  --bs-pagination-padding-y-lg: #{$pagination-padding-y-lg};
-  --bs-pagination-padding-x-lg: #{$pagination-padding-x-lg};
-  --bs-pagination-line-height: #{$pagination-line-height};
-  --bs-pagination-color: #{$pagination-color};
-  --bs-pagination-bg: #{$pagination-bg};
-  --bs-pagination-border-width: #{$pagination-border-width};
-  --bs-pagination-border-color: #{$pagination-border-color};
-  --bs-pagination-focus-box-shadow: #{$pagination-focus-box-shadow};
-  --bs-pagination-focus-outline: #{$pagination-focus-outline};
-  --bs-pagination-hover-color: #{$pagination-hover-color};
-  --bs-pagination-hover-bg: #{$pagination-hover-bg};
-  --bs-pagination-hover-border-color: #{$pagination-hover-border-color};
-  --bs-pagination-active-color: #{$pagination-active-color};
-  --bs-pagination-active-bg: #{$pagination-active-bg};
-  --bs-pagination-active-border-color: #{$pagination-active-border-color};
-  --bs-pagination-disabled-color: #{$pagination-disabled-color};
-  --bs-pagination-disabled-bg: #{$pagination-disabled-bg};
-  --bs-pagination-disabled-border-color: #{$pagination-disabled-border-color};
-
-
-  // Jumbotron
-  --bs-jumbotron-padding: #{$jumbotron-padding};
-  --bs-jumbotron-color: #{$jumbotron-color};
-  --bs-jumbotron-bg: #{$jumbotron-bg};
-
-
-  // Cards
-  --bs-card-spacer-y: #{$card-spacer-y};
-  --bs-card-spacer-x: #{$card-spacer-x};
-  --bs-card-border-width: #{$card-border-width};
-  --bs-card-border-radius: #{$card-border-radius};
-  --bs-card-border-color: #{$card-border-color};
-  --bs-card-inner-border-radius: #{$card-inner-border-radius};
-  --bs-card-cap-bg: #{$card-cap-bg};
-  --bs-card-cap-color: #{$card-cap-color};
-  --bs-card-color: #{$card-color};
-  --bs-card-bg: #{$card-bg};
-  --bs-card-img-overlay-padding: #{$card-img-overlay-padding};
-  --bs-card-group-margin: #{$card-group-margin};
-  --bs-card-deck-margin: #{$card-deck-margin};
-  --bs-card-columns-count: #{$card-columns-count};
-  --bs-card-columns-gap: #{$card-columns-gap};
-  --bs-card-columns-margin: #{$card-columns-margin};
-
-
-  // Tooltips
-  --bs-tooltip-font-size: #{$tooltip-font-size};
-  --bs-tooltip-max-width: #{$tooltip-max-width};
-  --bs-tooltip-color: #{$tooltip-color};
-  --bs-tooltip-bg: #{$tooltip-bg};
-  --bs-tooltip-border-radius: #{$tooltip-border-radius};
-  --bs-tooltip-opacity: #{$tooltip-opacity};
-  --bs-tooltip-padding-y: #{$tooltip-padding-y};
-  --bs-tooltip-padding-x: #{$tooltip-padding-x};
-  --bs-tooltip-margin: #{$tooltip-margin};
-  --bs-tooltip-arrow-width: #{$tooltip-arrow-width};
-  --bs-tooltip-arrow-height: #{$tooltip-arrow-height};
-  --bs-tooltip-arrow-color: #{$tooltip-arrow-color};
-
-  // Form tooltips must come after regular tooltips
-  --bs-form-feedback-tooltip-padding-y: #{$form-feedback-tooltip-padding-y};
-  --bs-form-feedback-tooltip-padding-x: #{$form-feedback-tooltip-padding-x};
-  --bs-form-feedback-tooltip-font-size: #{$form-feedback-tooltip-font-size};
-  --bs-form-feedback-tooltip-line-height: #{$form-feedback-tooltip-line-height};
-  --bs-form-feedback-tooltip-opacity: #{$form-feedback-tooltip-opacity};
-  --bs-form-feedback-tooltip-border-radius: #{$form-feedback-tooltip-border-radius};
-
-
-  // Popovers
-  --bs-popover-font-size: #{$popover-font-size};
-  --bs-popover-bg: #{$popover-bg};
-  --bs-popover-max-width: #{$popover-max-width};
-  --bs-popover-border-width: #{$popover-border-width};
-  --bs-popover-border-color: #{$popover-border-color};
-  --bs-popover-border-radius: #{$popover-border-radius};
-  --bs-popover-box-shadow: #{$popover-box-shadow};
-  --bs-popover-header-bg: #{$popover-header-bg};
-  --bs-popover-header-color: #{$popover-header-color};
-  --bs-popover-header-padding-y: #{$popover-header-padding-y};
-  --bs-popover-header-padding-x: #{$popover-header-padding-x};
-  --bs-popover-body-color: #{$popover-body-color};
-  --bs-popover-body-padding-y: #{$popover-body-padding-y};
-  --bs-popover-body-padding-x: #{$popover-body-padding-x};
-  --bs-popover-arrow-width: #{$popover-arrow-width};
-  --bs-popover-arrow-height: #{$popover-arrow-height};
-  --bs-popover-arrow-color: #{$popover-arrow-color};
-  --bs-popover-arrow-outer-color: #{$popover-arrow-outer-color};
-
-
-  // Toasts
-  --bs-toast-max-width: #{$toast-max-width};
-  --bs-toast-padding-x: #{$toast-padding-x};
-  --bs-toast-padding-y: #{$toast-padding-y};
-  --bs-toast-font-size: #{$toast-font-size};
-  --bs-toast-color: #{$toast-color};
-  --bs-toast-background-color: #{$toast-background-color};
-  --bs-toast-border-width: #{$toast-border-width};
-  --bs-toast-border-color: #{$toast-border-color};
-  --bs-toast-border-radius: #{$toast-border-radius};
-  --bs-toast-box-shadow: #{$toast-box-shadow};
-  --bs-toast-header-color: #{$toast-header-color};
-  --bs-toast-header-background-color: #{$toast-header-background-color};
-  --bs-toast-header-border-color: #{$toast-header-border-color};
-
-
-  // Badges
-  --bs-badge-font-size: #{$badge-font-size};
-  --bs-badge-font-weight: #{$badge-font-weight};
-  --bs-badge-padding-y: #{$badge-padding-y};
-  --bs-badge-padding-x: #{$badge-padding-x};
-  --bs-badge-border-radius: #{$badge-border-radius};
-  --bs-badge-transition: #{$badge-transition};
-  --bs-badge-focus-width: #{$badge-focus-width};
-  --bs-badge-pill-padding-x: #{$badge-pill-padding-x};
-  // Use a higher than normal value to ensure completely rounded edges when
-  // customizing padding or font-size on labels.
-  --bs-badge-pill-border-radius: #{$badge-pill-border-radius};
-
-
-  // Modals
-
-  // Padding applied to the modal body
-  --bs-modal-inner-padding: #{$modal-inner-padding};
-  --bs-modal-dialog-margin: #{$modal-dialog-margin};
-  --bs-modal-dialog-margin-y-sm-up: #{$modal-dialog-margin-y-sm-up};
-  --bs-modal-title-line-height: #{$modal-title-line-height};
-  --bs-modal-content-color: #{$modal-content-color};
-  --bs-modal-content-bg: #{$modal-content-bg};
-  --bs-modal-content-border-color: #{$modal-content-border-color};
-  --bs-modal-content-border-width: #{$modal-content-border-width};
-  --bs-modal-content-border-radius: #{$modal-content-border-radius};
-  --bs-modal-content-box-shadow-xs: #{$modal-content-box-shadow-xs};
-  --bs-modal-content-box-shadow-sm-up: #{$modal-content-box-shadow-sm-up};
-  --bs-modal-backdrop-bg: #{$modal-backdrop-bg};
-  --bs-modal-backdrop-opacity: #{$modal-backdrop-opacity};
-  --bs-modal-header-border-color: #{$modal-header-border-color};
-  --bs-modal-footer-border-color: #{$modal-footer-border-color};
-  --bs-modal-header-border-width: #{$modal-header-border-width};
-  --bs-modal-footer-border-width: #{$modal-footer-border-width};
-  --bs-modal-header-padding-y: #{$modal-header-padding-y};
-  --bs-modal-header-padding-x: #{$modal-header-padding-x};
-  --bs-modal-header-padding: #{$modal-header-padding};
-  --bs-modal-xl: #{$modal-xl};
-  --bs-modal-lg: #{$modal-lg};
-  --bs-modal-md: #{$modal-md};
-  --bs-modal-sm: #{$modal-sm};
-  --bs-modal-fade-transform: #{$modal-fade-transform};
-  --bs-modal-show-transform: #{$modal-show-transform};
-  --bs-modal-transition: #{$modal-transition};
-
+  // Bootstrap 5.x maps many SCSS variables to CSS variables (for example the color system)
+  // Default mappings: https://getbootstrap.com/docs/5.3/customize/css-variables/#default
+  // Any Bootstrap SCSS variables that are used  within DSpace should be exposed as CSS variable in this file.
+  // These are no longer "all" variables, but only the ones that are actually used in DSpace.
 
   // Alerts
   //
   // Define alert colors, border radius, and padding.
   --bs-alert-padding-y: #{$alert-padding-y};
   --bs-alert-padding-x: #{$alert-padding-x};
-  --bs-alert-margin-bottom: #{$alert-margin-bottom};
-  --bs-alert-border-radius: #{$alert-border-radius};
-  --bs-alert-link-font-weight: #{$alert-link-font-weight};
-  --bs-alert-border-width: #{$alert-border-width};
-  --bs-alert-bg-level: #{$alert-bg-level};
-  --bs-alert-border-level: #{$alert-border-level};
-  --bs-alert-color-level: #{$alert-color-level};
 
 
-  // Progress bars
-  --bs-progress-height: #{$progress-height};
-  --bs-progress-font-size: #{$progress-font-size};
-  --bs-progress-bg: #{$progress-bg};
-  --bs-progress-border-radius: #{$progress-border-radius};
-  --bs-progress-box-shadow: #{$progress-box-shadow};
-  --bs-progress-bar-color: #{$progress-bar-color};
-  --bs-progress-bar-bg: #{$progress-bar-bg};
-  --bs-progress-bar-animation-timing: #{$progress-bar-animation-timing};
-  --bs-progress-bar-transition: #{$progress-bar-transition};
+  // Cards
+  --bs-card-border-color: #{$card-border-color};
+  --bs-card-border-radius: #{$card-border-radius};
+  --bs-card-border-width: #{$card-border-width};
 
 
-  // List group
-  --bs-list-group-color: #{$list-group-color};
-  --bs-list-group-bg: #{$list-group-bg};
-  --bs-list-group-border-color: #{$list-group-border-color};
-  --bs-list-group-border-width: #{$list-group-border-width};
-  --bs-list-group-border-radius: #{$list-group-border-radius};
-  --bs-list-group-item-padding-y: #{$list-group-item-padding-y};
-  --bs-list-group-item-padding-x: #{$list-group-item-padding-x};
-  --bs-list-group-hover-bg: #{$list-group-hover-bg};
-  --bs-list-group-active-color: #{$list-group-active-color};
-  --bs-list-group-active-bg: #{$list-group-active-bg};
-  --bs-list-group-active-border-color: #{$list-group-active-border-color};
-  --bs-list-group-disabled-color: #{$list-group-disabled-color};
-  --bs-list-group-disabled-bg: #{$list-group-disabled-bg};
-  --bs-list-group-action-color: #{$list-group-action-color};
-  --bs-list-group-action-hover-color: #{$list-group-action-hover-color};
-  --bs-list-group-action-active-color: #{$list-group-action-active-color};
-  --bs-list-group-action-active-bg: #{$list-group-action-active-bg};
+
+  // Buttons
+  //
+  // For each of Bootstrap's buttons, define text, background, and border color.
+  --bs-btn-padding-y: #{$btn-padding-y};
+  --bs-btn-focus-box-shadow: #{$btn-focus-box-shadow};
+  --bs-btn-line-height: #{$btn-line-height};
+  --bs-btn-link-disabled-color: #{$btn-link-disabled-color};
 
 
-  // Image thumbnails
-  --bs-thumbnail-padding: #{$thumbnail-padding};
-  --bs-thumbnail-bg: #{$thumbnail-bg};
-  --bs-thumbnail-border-width: #{$thumbnail-border-width};
-  --bs-thumbnail-border-color: #{$thumbnail-border-color};
-  --bs-thumbnail-border-radius: #{$thumbnail-border-radius};
-  --bs-thumbnail-box-shadow: #{$thumbnail-box-shadow};
+  // Dropdowns
+  //
+  // Dropdown menu container and contents.
+  --bs-dropdown-border-color: #{$dropdown-border-color};
+  --bs-dropdown-border-width: #{$dropdown-border-width};
+  --bs-dropdown-link-hover-bg: #{$dropdown-link-hover-bg};
+  --bs-dropdown-link-hover-color: #{$dropdown-link-hover-color};
 
 
-  // Figures
-  --bs-figure-caption-font-size: #{$figure-caption-font-size};
-  --bs-figure-caption-color: #{$figure-caption-color};
+  // Components
+  //
+  // Define common padding and border radius sizes and more.
+  --bs-small-font-size: #{$small-font-size};
+
+  // Tables
+  //
+  // Customizes the `.table` component with basic values, each used across all table variations.
+  --bs-table-accent-bg: #{$table-accent-bg};
+  --bs-table-bg: #{$table-bg};
+  --bs-table-border-color: #{$table-border-color};
+  --bs-table-color: #{$table-color};
 
 
-  // Breadcrumbs
-  --bs-breadcrumb-padding-y: #{$breadcrumb-padding-y};
-  --bs-breadcrumb-padding-x: #{$breadcrumb-padding-x};
-  --bs-breadcrumb-item-padding: #{$breadcrumb-item-padding};
-  --bs-breadcrumb-margin-bottom: #{$breadcrumb-margin-bottom};
-  --bs-breadcrumb-bg: #{$breadcrumb-bg};
-  --bs-breadcrumb-divider-color: #{$breadcrumb-divider-color};
-  --bs-breadcrumb-active-color: #{$breadcrumb-active-color};
-  --bs-breadcrumb-divider: #{$breadcrumb-divider};
-  --bs-breadcrumb-border-radius: #{$breadcrumb-border-radius};
+  --bs-xl: #{map-get($grid-breakpoints, xl)};
+  --bs-md: #{map-get($grid-breakpoints, md)};
+  --bs-lg: #{map-get($grid-breakpoints, lg)};
+  --bs-sm: #{map-get($grid-breakpoints, sm)};
+
+  --bs-spacer: #{$spacer};
+
+  --bs-navbar-dark-active-color: #{$navbar-dark-active-color};
+  --bs-navbar-dark-color: #{$navbar-dark-color};
+
+  --bs-line-height-base: #{$line-height-base};
+
+  --bs-font-size-base: #{$font-size-base};
+  --bs-font-size-lg: #{$font-size-lg};
 
 
-  // Carousel
-  --bs-carousel-control-color: #{$carousel-control-color};
-  --bs-carousel-control-width: #{$carousel-control-width};
-  --bs-carousel-control-opacity: #{$carousel-control-opacity};
-  --bs-carousel-control-hover-opacity: #{$carousel-control-hover-opacity};
-  --bs-carousel-control-transition: #{$carousel-control-transition};
-  --bs-carousel-indicator-width: #{$carousel-indicator-width};
-  --bs-carousel-indicator-height: #{$carousel-indicator-height};
-  --bs-carousel-indicator-hit-area-height: #{$carousel-indicator-hit-area-height};
-  --bs-carousel-indicator-spacer: #{$carousel-indicator-spacer};
-  --bs-carousel-indicator-active-bg: #{$carousel-indicator-active-bg};
-  --bs-carousel-indicator-transition: #{$carousel-indicator-transition};
-  --bs-carousel-caption-width: #{$carousel-caption-width};
-  --bs-carousel-caption-color: #{$carousel-caption-color};
-  --bs-carousel-control-icon-width: #{$carousel-control-icon-width};
-  --bs-carousel-control-prev-icon-bg: #{$carousel-control-prev-icon-bg};
-  --bs-carousel-control-next-icon-bg: #{$carousel-control-next-icon-bg};
-  --bs-carousel-transition-duration: #{$carousel-transition-duration};
-  --bs-carousel-transition: #{$carousel-transition};
 
+  --bs-input-btn-border-width: #{$input-btn-border-width};
+  --bs-input-border-color: #{$input-border-color};
+  --bs-input-padding-y: #{$input-padding-y};
+  --bs-input-padding-x: #{$input-padding-x};
+  --bs-input-btn-focus-box-shadow: #{$input-btn-focus-box-shadow};
+  --bs-input-bg: #{$input-bg};
+  --bs-input-color: #{$input-color};
 
-  // Spinners
-  --bs-spinner-width: #{$spinner-width};
-  --bs-spinner-height: #{$spinner-height};
-  --bs-spinner-border-width: #{$spinner-border-width};
-  --bs-spinner-width-sm: #{$spinner-width-sm};
-  --bs-spinner-height-sm: #{$spinner-height-sm};
-  --bs-spinner-border-width-sm: #{$spinner-border-width-sm};
+  --bs-table-border-width: #{$table-border-width};
 
+  --bs-modal-sm: #{$modal-sm};
 
-  // Close
-  --bs-close-font-size: #{$close-font-size};
-  --bs-close-font-weight: #{$close-font-weight};
-  --bs-close-color: #{$close-color};
-  --bs-close-text-shadow: #{$close-text-shadow};
+  --bs-zindex-popover: #{$zindex-popover};
+  --bs-zindex-sticky: #{$zindex-sticky};
 
-
-  // Code
-  --bs-code-font-size: #{$code-font-size};
-  --bs-code-color: #{$code-color};
-  --bs-kbd-padding-y: #{$kbd-padding-y};
-  --bs-kbd-padding-x: #{$kbd-padding-x};
-  --bs-kbd-font-size: #{$kbd-font-size};
-  --bs-kbd-color: #{$kbd-color};
-  --bs-kbd-bg: #{$kbd-bg};
-  --bs-pre-color: #{$pre-color};
-  --bs-pre-scrollable-max-height: #{$pre-scrollable-max-height};
-
-
-  // Utilities
-  --bs-displays: #{$displays};
-  --bs-overflows: #{$overflows};
-  --bs-positions: #{$positions};
-
-
-  // Printing
-  --bs-print-page-size: #{$print-page-size};
-  --bs-print-body-min-width: #{$print-body-min-width};
+  --bs-border-radius-lg: #{$bs-border-radius-lg};
 
 }
+
+// Some Bootstrap CSS variables are tied to classes
+
+.accordion {
+  --bs-accordion-btn-bg: #{$light};
+}
+
+.table {
+  --bs-table-striped-bg: #{$light};
+}
+
+.btn-transparent  {
+  --bs-btn-box-shadow: none;
+  --bs-btn-focus-box-shadow: none;
+  --bs-btn-active-border-color: transparent;
+}
diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss
index 6bddfd58e9..5bc8a54ae9 100644
--- a/src/styles/_custom_variables.scss
+++ b/src/styles/_custom_variables.scss
@@ -1,7 +1,7 @@
 :root {
   --ds-content-spacing: #{$spacer}; // equivalent to Bootstrap spaces of size 3
 
-  --ds-button-height: #{$input-btn-padding-y * 2 + $input-btn-line-height + calculateRem($input-btn-border-width*2)};
+    --ds-button-height: #{$input-btn-padding-y * 2 + $input-btn-line-height + calculateRem(calc($input-btn-border-width*2))};
 
   --ds-card-height-percentage:98%;
   --ds-card-thumbnail-height:240px;
@@ -21,6 +21,8 @@
   --ds-sidebar-z-index: 20;
 
   --ds-header-bg: #{$ds-header-bg};
+  --ds-header-logo-height: 50px;
+  --ds-header-logo-height-xs: 50px;
   --ds-header-icon-color: #{$ds-header-icon-color};
   --ds-header-icon-color-hover: #{$ds-header-icon-color-hover};
 
@@ -92,7 +94,7 @@
   --ds-notification-bg-warning: #{darken(adjust-hue($warning, -10), 10%)};
 
   --ds-top-footer-bg: #{$gray-200};
-  --ds-footer-bg: #{theme-color('primary')};
+    --ds-footer-bg: #{$primary};
   --ds-footer-border: 1px solid var(--bs-gray-400);
   --ds-footer-padding: 0;
   --ds-footer-padding-bottom: 0;
@@ -150,4 +152,16 @@
 
   --green1: #1c710a;  // This variable represents the success color for the Orejime cookie banner
   --button-text-color-cookie: #fff; // This variable represents the text color for buttons in the Orejime cookie banner
+
+  --ds-search-skeleton-text-height: 20px;
+  --ds-search-skeleton-badge-height: 18px;
+  --ds-search-skeleton-thumbnail-margin: 1em;
+  --ds-search-skeleton-text-line-count: 2;
+  --ds-search-skeleton-badge-width: 75px;
+  --ds-search-skeleton-filter-badge-width: 200px;
+  --ds-search-skeleton-info-width: 200px;
+  --ds-search-skeleton-card-height: 435px;
+
+  --ds-filters-skeleton-height: 40px;
+  --ds-filters-skeleton-spacing: 12px;
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 4934ec3d35..5fc005c797 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -125,11 +125,11 @@ ngb-modal-backdrop {
 }
 
 /* Complement .space-children-mr when spaced elements are not on the same level */
-.mr-gap {
+.me-gap {
     margin-right: var(--ds-gap);
 }
 
-.ml-gap {
+.ms-gap {
     margin-left: var(--ds-gap);
 }
 
@@ -238,27 +238,27 @@ ds-dynamic-form-control-container.d-none {
 }
 
 .badge-validation {
-    background-color: #{map-get($theme-colors, warning)};
+  background-color: #{$warning};
 }
 
 .badge-waiting-controller {
-    background-color: #{map-get($theme-colors, info)};
+  background-color: #{$info};
 }
 
 .badge-workspace {
-    background-color: #{map-get($theme-colors, primary)};
+  background-color: #{$primary};
 }
 
 .badge-archived {
-    background-color: darken($green, 25);
+  background-color: #{$success};
 }
 
 .badge-workflow {
-    background-color: #{map-get($theme-colors, info)};
+  background-color: #{$info};
 }
 
 .badge-item-type {
-    background-color: #{map-get($theme-colors, info)};
+  background-color: #{$info};
 }
 
 .visually-hidden {
@@ -463,6 +463,17 @@ ngb-accordion {
     color: darken($danger, 22%);
 }
 
+// An element that is disabled should not have focus styles to avoid confusion
+// It however is still focusable for screen readers and keyboard navigation
+.disabled {
+    pointer-events: none;
+}
+
+.disabled:focus {
+    outline: none;
+    box-shadow: none;
+}
+
 // Margin utility classes based on DSpace content spacing
 .mt-cs { margin-top: var(--ds-content-spacing); }
 .mb-cs { margin-bottom: var(--ds-content-spacing); }
@@ -471,6 +482,60 @@ ngb-accordion {
 .mb-ncs { margin-bottom: calc(var(--ds-content-spacing) * -1); }
 .my-ncs { margin-top: calc(var(--ds-content-spacing) * -1); margin-bottom: calc(var(--ds-content-spacing) * -1); }
 
+/* form-check-input Changed from Bootstrap 5's form-check-input to ensure that we keep the default checkboxes */
+.form-check-input {
+  border-color: unset;
+  appearance: auto; /* Reset to browser's default appearance */
+}
+
+/* Custom fas font-family; Makes it so that BootStrap classes don't override it (Typically used for icons) */
+.btn.fas {
+  font-family: $icon-font-family;
+}
+
+/* btn-close Changed from Bootstrap 5's .btn-close to ensure the button close button has the original size */
+.btn-close {
+  transform: scale(0.6);
+}
+
+/* Make sure every element of a single drag-item is on the same line */
+.drag-item-container > * {
+  width: auto;
+}
+
+
+.btn.btn-success {
+  color: #fff;
+}
+
+.btn.btn-success:hover {
+  color: #fff;
+}
+
+.table {
+  --bs-table-accent-bg: #fff;
+}
+
+ngb-tooltip-window {
+  margin-bottom: 0.25rem !important;
+  &> .tooltip-inner > .text-muted {
+    color: #{$gray-600} !important;
+  }
+}
+
+.table thead th {
+  border-bottom: 2px solid #{$gray-300};
+  border-top: 1px solid #{$gray-300};
+}
+
+.custom-alignment {
+  --bs-gutter-x: 1.5rem;
+  --bs-gutter-y: 0;
+  width: 100%;
+  padding-right: calc(var(--bs-gutter-x) * 0.5);
+  padding-left: calc(var(--bs-gutter-x) * 0.5);
+}
+
 
 .link-contrast {
   // Rules for accessibility to meet minimum contrast and have an identifiable link between other texts
diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss
index badc159747..7a321c9364 100644
--- a/src/styles/_variables.scss
+++ b/src/styles/_variables.scss
@@ -1,5 +1,7 @@
-@import '_functions.scss';
+@import './functions.scss';
 @import '../../node_modules/bootstrap/scss/functions.scss';
 
-@import '_bootstrap_variables.scss';
+@import './bootstrap_variables.scss';
 @import '../../node_modules/bootstrap/scss/variables.scss';
+
+$theme-colors: map-merge($theme-colors, $global-custom-semantic-colors);
diff --git a/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.html b/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.scss b/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.ts b/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.ts
new file mode 100644
index 0000000000..f09e8a2340
--- /dev/null
+++ b/src/themes/custom/app/admin/admin-search-page/admin-search-page.component.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+
+import { AdminSearchPageComponent as BaseComponent } from '../../../../../app/admin/admin-search-page/admin-search-page.component';
+import { ThemedConfigurationSearchPageComponent } from '../../../../../app/search-page/themed-configuration-search-page.component';
+
+@Component({
+  selector: 'ds-themed-admin-search-page',
+  // styleUrls: ['./admin-search-page.component.scss'],
+  styleUrls: ['../../../../../app/admin/admin-search-page/admin-search-page.component.scss'],
+  // templateUrl: './admin-search-page.component.html',
+  templateUrl: '../../../../../app/admin/admin-search-page/admin-search-page.component.html',
+  standalone: true,
+  imports: [ThemedConfigurationSearchPageComponent],
+})
+export class AdminSearchPageComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
index 66e66e86e6..237d107083 100644
--- a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -22,7 +20,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   // styleUrls: ['./admin-sidebar.component.scss']
   styleUrls: ['../../../../../app/admin/admin-sidebar/admin-sidebar.component.scss'],
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgClass, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [ NgbDropdownModule, NgClass, NgComponentOutlet, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AdminSidebarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.html b/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.scss b/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.ts b/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.ts
new file mode 100644
index 0000000000..b337d8dbb4
--- /dev/null
+++ b/src/themes/custom/app/admin/admin-workflow-page/admin-workflow-page.component.ts
@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+
+import { AdminWorkflowPageComponent as BaseComponent } from '../../../../../app/admin/admin-workflow-page/admin-workflow-page.component';
+import { ThemedConfigurationSearchPageComponent } from '../../../../../app/search-page/themed-configuration-search-page.component';
+
+@Component({
+  selector: 'ds-themed-admin-workflow-page',
+  // styleUrls: ['./admin-workflow-page.component.scss'],
+  styleUrls: ['../../../../../app/admin/admin-workflow-page/admin-workflow-page.component.scss'],
+  // templateUrl: './admin-workflow-page.component.html',
+  templateUrl: '../../../../../app/admin/admin-workflow-page/admin-workflow-page.component.html',
+  standalone: true,
+  imports: [
+    ThemedConfigurationSearchPageComponent,
+  ],
+})
+export class AdminWorkflowPageComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
index 1fc23a1bd0..989e6535aa 100644
--- a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
+++ b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -27,7 +24,6 @@ import { ThemedThumbnailComponent } from '../../../../../app/thumbnail/themed-th
   standalone: true,
   imports: [
     FormComponent,
-    NgIf,
     VarDirective,
     ThemedThumbnailComponent,
     AsyncPipe,
diff --git a/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts b/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
index c71caf9f02..e2589ba238 100644
--- a/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,7 +1,5 @@
 import {
   AsyncPipe,
-  NgFor,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -22,7 +20,7 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
   // styleUrls: ['./breadcrumbs.component.scss']
   styleUrls: ['../../../../app/breadcrumbs/breadcrumbs.component.scss'],
   standalone: true,
-  imports: [VarDirective, NgIf, NgTemplateOutlet, NgFor, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule],
+  imports: [VarDirective, NgTemplateOutlet, RouterLink, NgbTooltipModule, AsyncPipe, TranslateModule],
 })
 export class BreadcrumbsComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
index d4582dcf25..e6f40363da 100644
--- a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -1,20 +1,10 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-browse-by-date',
@@ -24,15 +14,7 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
-    NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index d2894fce3a..2d3137541e 100644
--- a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,20 +1,10 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-browse-by-metadata',
@@ -24,15 +14,7 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
-    NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
index edf2a35c74..4c4dc0a332 100644
--- a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -30,7 +27,6 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
     AsyncPipe,
     ComcolPageHeaderComponent,
     ComcolPageLogoComponent,
-    NgIf,
     ThemedComcolPageHandleComponent,
     ThemedComcolPageContentComponent,
     DsoEditMenuComponent,
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
index 578663c43c..96e3dec322 100644
--- a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
+++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -1,20 +1,10 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component';
 import { ThemedBrowseByComponent } from '../../../../../app/shared/browse-by/themed-browse-by.component';
-import { ThemedComcolPageBrowseByComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ThemedComcolPageContentComponent } from '../../../../../app/shared/comcol/comcol-page-content/themed-comcol-page-content.component';
-import { ThemedComcolPageHandleComponent } from '../../../../../app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component';
-import { ComcolPageHeaderComponent } from '../../../../../app/shared/comcol/comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from '../../../../../app/shared/comcol/comcol-page-logo/comcol-page-logo.component';
-import { DsoEditMenuComponent } from '../../../../../app/shared/dso-page/dso-edit-menu/dso-edit-menu.component';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
 
 @Component({
   selector: 'ds-browse-by-title',
@@ -24,15 +14,7 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
   standalone: true,
   imports: [
-    VarDirective,
     AsyncPipe,
-    ComcolPageHeaderComponent,
-    ComcolPageLogoComponent,
-    NgIf,
-    ThemedComcolPageHandleComponent,
-    ThemedComcolPageContentComponent,
-    DsoEditMenuComponent,
-    ThemedComcolPageBrowseByComponent,
     TranslateModule,
     ThemedLoadingComponent,
     ThemedBrowseByComponent,
diff --git a/src/themes/custom/app/collection-page/collection-page.component.ts b/src/themes/custom/app/collection-page/collection-page.component.ts
index 4b2f9e3245..0439149373 100644
--- a/src/themes/custom/app/collection-page/collection-page.component.ts
+++ b/src/themes/custom/app/collection-page/collection-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -41,7 +38,6 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
   imports: [
     ThemedComcolPageContentComponent,
     ErrorComponent,
-    NgIf,
     ThemedLoadingComponent,
     TranslateModule,
     ViewTrackerComponent,
diff --git a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index f69fcc868c..e33ee21978 100644
--- a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -23,7 +20,6 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
     RouterLink,
     AsyncPipe,
     VarDirective,
-    NgIf,
     TranslateModule,
     ThemedLoadingComponent,
     AlertComponent,
diff --git a/src/themes/custom/app/community-list-page/community-list/community-list.component.ts b/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
index 8a48901634..334829942a 100644
--- a/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
+++ b/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
@@ -2,7 +2,6 @@ import { CdkTreeModule } from '@angular/cdk/tree';
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -26,7 +25,7 @@ import { TruncatablePartComponent } from '../../../../../app/shared/truncatable/
   // templateUrl: './community-list.component.html'
   templateUrl: '../../../../../app/community-list-page/community-list/community-list.component.html',
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
+  imports: [ ThemedLoadingComponent, CdkTreeModule, NgClass, RouterLink, TruncatableComponent, TruncatablePartComponent, AsyncPipe, TranslateModule],
 })
 export class CommunityListComponent extends BaseComponent {}
 
diff --git a/src/themes/custom/app/community-page/community-page.component.ts b/src/themes/custom/app/community-page/community-page.component.ts
index 5aa7e85527..b4ff1d0453 100644
--- a/src/themes/custom/app/community-page/community-page.component.ts
+++ b/src/themes/custom/app/community-page/community-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -40,7 +37,6 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
     ThemedComcolPageContentComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     ThemedCommunityPageSubCommunityListComponent,
     ThemedCollectionPageSubCollectionListComponent,
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
index ab2d49b920..0f890f3a32 100644
--- a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -21,7 +18,6 @@ import { VarDirective } from '../../../../../../../app/shared/utils/var.directiv
     ObjectCollectionComponent,
     ErrorComponent,
     ThemedLoadingComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
     VarDirective,
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
index 3b48efcb0e..fb68aa911e 100644
--- a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -22,7 +19,6 @@ import { VarDirective } from '../../../../../../../app/shared/utils/var.directiv
     ErrorComponent,
     ThemedLoadingComponent,
     VarDirective,
-    NgIf,
     ObjectCollectionComponent,
     AsyncPipe,
     TranslateModule,
diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
index a7437c0408..fbafb647bb 100644
--- a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
+++ b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -13,6 +9,7 @@ import { DsoEditMetadataValueComponent } from '../../../../../app/dso-shared/dso
 import { DsoEditMetadataValueHeadersComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
 import { MetadataFieldSelectorComponent } from '../../../../../app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
 import { AlertComponent } from '../../../../../app/shared/alert/alert.component';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed-loading.component';
 
 @Component({
@@ -22,7 +19,7 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   // templateUrl: './dso-edit-metadata.component.html',
   templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html',
   standalone: true,
-  imports: [NgIf, DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, NgFor, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [ DsoEditMetadataHeadersComponent, MetadataFieldSelectorComponent, DsoEditMetadataValueHeadersComponent, DsoEditMetadataValueComponent, DsoEditMetadataFieldValuesComponent, AlertComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class DsoEditMetadataComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index 66803ffd84..237a457b0a 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -26,7 +23,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   // templateUrl: './journal-issue.component.html',
   templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index c63f68bd70..c370c7afa9 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -26,7 +23,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   // templateUrl: './journal-volume.component.html',
   templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index 104f1b40b0..5389f75d43 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -27,7 +24,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   // templateUrl: './journal.component.html',
   templateUrl: '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
+  imports: [ ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal
diff --git a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
index f1a60957ed..c537835117 100644
--- a/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
+++ b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -27,7 +24,7 @@ import { listableObjectComponent } from '../../../../../../../app/shared/object-
   // templateUrl: './person.component.html',
   templateUrl: '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component.html',
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
+  imports: [ ThemedResultsBackButtonComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, GenericItemPageFieldComponent, RelatedItemsComponent, RouterLink, TabbedRelatedEntitiesSearchComponent, AsyncPipe, TranslateModule],
 })
 export class PersonComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/footer/footer.component.ts b/src/themes/custom/app/footer/footer.component.ts
index a2e782a0db..04b4f69f14 100644
--- a/src/themes/custom/app/footer/footer.component.ts
+++ b/src/themes/custom/app/footer/footer.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   DatePipe,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -16,7 +15,7 @@ import { FooterComponent as BaseComponent } from '../../../../app/footer/footer.
   // templateUrl: './footer.component.html'
   templateUrl: '../../../../app/footer/footer.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe, DatePipe, TranslateModule],
+  imports: [ RouterLink, AsyncPipe, DatePipe, TranslateModule],
 })
 export class FooterComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index 9656e7b85c..21169b8797 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -1,12 +1,10 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component';
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pipe';
 
 @Component({
@@ -21,7 +19,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
     BrowserOnlyPipe,
     ProfilePageSecurityFormComponent,
     AsyncPipe,
-    NgIf,
+    BtnDisabledDirective,
   ],
 })
 /**
diff --git a/src/themes/custom/app/header/header.component.ts b/src/themes/custom/app/header/header.component.ts
index f6ae52de4f..b337939ecd 100644
--- a/src/themes/custom/app/header/header.component.ts
+++ b/src/themes/custom/app/header/header.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -24,7 +21,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n
   // templateUrl: 'header.component.html',
   templateUrl: '../../../../app/header/header.component.html',
   standalone: true,
-  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe, NgIf],
+  imports: [RouterLink, ThemedLangSwitchComponent, NgbDropdownModule, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, TranslateModule, AsyncPipe],
 })
 export class HeaderComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/home-page/home-page.component.ts b/src/themes/custom/app/home-page/home-page.component.ts
index 2b45f69754..0be74993f0 100644
--- a/src/themes/custom/app/home-page/home-page.component.ts
+++ b/src/themes/custom/app/home-page/home-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -25,7 +24,7 @@ import { ViewTrackerComponent } from '../../../../app/statistics/angulartics/dsp
   // templateUrl: './home-page.component.html'
   templateUrl: '../../../../app/home-page/home-page.component.html',
   standalone: true,
-  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, NgIf, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
+  imports: [ThemedHomeNewsComponent, NgTemplateOutlet, ViewTrackerComponent, ThemedSearchFormComponent, ThemedTopLevelCommunityListComponent, RecentItemListComponent, AsyncPipe, TranslateModule, NgClass, SuggestionsPopupComponent, ThemedConfigurationSearchPageComponent, PageWithSidebarComponent, HomeCoarComponent],
 })
 export class HomePageComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
index 0613377e14..18ec70e0bf 100644
--- a/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -18,7 +15,7 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   // templateUrl: './top-level-community-list.component.html'
   templateUrl: '../../../../../app/home-page/top-level-community-list/top-level-community-list.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ObjectCollectionComponent, ErrorComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 
 export class TopLevelCommunityListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
index 05f2252216..2b78006f65 100644
--- a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -4,6 +4,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
 import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement.component';
 import { EndUserAgreementContentComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-end-user-agreement',
@@ -12,7 +13,7 @@ import { EndUserAgreementContentComponent } from '../../../../../app/info/end-us
   // templateUrl: './end-user-agreement.component.html'
   templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html',
   standalone: true,
-  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule],
+  imports: [EndUserAgreementContentComponent, FormsModule, TranslateModule, BtnDisabledDirective],
 })
 
 /**
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
index b3cd90e73e..27365901d1 100644
--- a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   FormsModule,
@@ -7,6 +6,7 @@ import {
 import { TranslateModule } from '@ngx-translate/core';
 
 import { FeedbackFormComponent as BaseComponent } from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
+import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.directive';
 import { ErrorComponent } from '../../../../../../app/shared/error/error.component';
 
 @Component({
@@ -16,7 +16,7 @@ import { ErrorComponent } from '../../../../../../app/shared/error/error.compone
   // styleUrls: ['./feedback-form.component.scss'],
   styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'],
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgIf, ErrorComponent, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, ErrorComponent, TranslateModule, BtnDisabledDirective],
 })
 export class FeedbackFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/alerts/item-alerts.component.ts b/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
index 4cfa632f02..bf8396e7c0 100644
--- a/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
+++ b/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -18,7 +15,6 @@ import { AlertComponent } from '../../../../../app/shared/alert/alert.component'
   standalone: true,
   imports: [
     AlertComponent,
-    NgIf,
     TranslateModule,
     RouterLink,
     AsyncPipe,
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
index a39d2e4cda..07b3d28e14 100644
--- a/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -30,9 +28,7 @@ import {
   standalone: true,
   imports: [
     TranslateModule,
-    NgForOf,
     AsyncPipe,
-    NgIf,
     RouterLink,
     ItemOperationComponent,
     NgClass,
diff --git a/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
index 1475cd04ee..4c71a9eb23 100644
--- a/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -23,12 +19,10 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   standalone: true,
   imports: [
     PaginationComponent,
-    NgIf,
     TranslateModule,
     AsyncPipe,
     VarDirective,
     ThemedThumbnailComponent,
-    NgForOf,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
     MetadataFieldWrapperComponent,
diff --git a/src/themes/custom/app/item-page/full/full-item-page.component.ts b/src/themes/custom/app/item-page/full/full-item-page.component.ts
index c1bad7ba89..00b69192b7 100644
--- a/src/themes/custom/app/item-page/full/full-item-page.component.ts
+++ b/src/themes/custom/app/item-page/full/full-item-page.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   KeyValuePipe,
-  NgForOf,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -46,8 +44,6 @@ import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/
     ThemedFullFileSectionComponent,
     CollectionsComponent,
     ItemVersionsComponent,
-    NgIf,
-    NgForOf,
     AsyncPipe,
     KeyValuePipe,
     RouterLink,
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 5c6c7f3507..bb50876c97 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -1,12 +1,9 @@
-import {
-  NgForOf,
-  NgIf,
-} from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
+import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-media-viewer-video',
@@ -16,10 +13,9 @@ import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../ap
   styleUrls: ['../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss'],
   standalone: true,
   imports: [
-    NgForOf,
     NgbDropdownModule,
     TranslateModule,
-    NgIf,
+    BtnDisabledDirective,
   ],
 })
 export class MediaViewerVideoComponent extends BaseComponent {
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
index 35336e6086..b74e9abb2c 100644
--- a/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -23,7 +20,6 @@ import { ThemedThumbnailComponent } from '../../../../../app/thumbnail/themed-th
     ThemedMediaViewerImageComponent,
     ThemedThumbnailComponent,
     AsyncPipe,
-    NgIf,
     ThemedMediaViewerVideoComponent,
     TranslateModule,
     ThemedLoadingComponent,
diff --git a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
index 4b0bfa4c91..f710884d48 100644
--- a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
+++ b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -9,7 +8,7 @@ import { ItemPageTitleFieldComponent as BaseComponent } from '../../../../../../
   // templateUrl: './item-page-title-field.component.html',
   templateUrl: '../../../../../../../../app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [ TranslateModule],
 })
 export class ItemPageTitleFieldComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/simple/item-page.component.ts b/src/themes/custom/app/item-page/simple/item-page.component.ts
index 7daa65287a..9a9551012a 100644
--- a/src/themes/custom/app/item-page/simple/item-page.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -46,7 +43,6 @@ import { ViewTrackerComponent } from '../../../../../app/statistics/angulartics/
     ThemedLoadingComponent,
     TranslateModule,
     AsyncPipe,
-    NgIf,
     NotifyRequestsStatusComponent,
     QaEventNotificationComponent,
   ],
diff --git a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
index ce56724e4a..fec0873c6a 100644
--- a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -42,7 +39,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   templateUrl: '../../../../../../../app/item-page/simple/item-types/publication/publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [NgIf, ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
+  imports: [ThemedResultsBackButtonComponent, MiradorViewerComponent, ThemedItemPageTitleFieldComponent, DsoEditMenuComponent, MetadataFieldWrapperComponent, ThemedThumbnailComponent, ThemedMediaViewerComponent, ThemedFileSectionComponent, ItemPageDateFieldComponent, ThemedMetadataRepresentationListComponent, GenericItemPageFieldComponent, RelatedItemsComponent, ItemPageAbstractFieldComponent, ItemPageUriFieldComponent, CollectionsComponent, RouterLink, AsyncPipe, TranslateModule],
 })
 export class PublicationComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index 6fbb035d2f..57d7c1598c 100644
--- a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -46,7 +43,6 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
   imports: [
-    NgIf,
     ThemedResultsBackButtonComponent,
     MiradorViewerComponent,
     ThemedItemPageTitleFieldComponent,
diff --git a/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
index 6d2ddb8f1f..919930dc11 100644
--- a/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
+++ b/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -17,7 +13,7 @@ import { VarDirective } from '../../../../../../app/shared/utils/var.directive';
   // templateUrl: './metadata-representation-list.component.html'
   templateUrl: '../../../../../../app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html',
   standalone: true,
-  imports: [MetadataFieldWrapperComponent, NgFor, VarDirective, MetadataRepresentationLoaderComponent, NgIf, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [MetadataFieldWrapperComponent, VarDirective, MetadataRepresentationLoaderComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class MetadataRepresentationListComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
index 39156a0ac7..64d93c41b4 100644
--- a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -42,7 +39,6 @@ import { ThemedSearchComponent } from '../../../../app/shared/search/themed-sear
     MyDSpaceNewSubmissionComponent,
     AsyncPipe,
     RoleDirective,
-    NgIf,
     SuggestionsNotificationComponent,
     MyDspaceQaEventsNotificationsComponent,
   ],
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index f0e2ebd502..b30da7e365 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,19 +1,14 @@
 import {
   AsyncPipe,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLinkActive } from '@angular/router';
 
 import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
-import { VarDirective } from '../../../../../app/shared/utils/var.directive';
+import { HoverOutsideDirective } from '../../../../../app/shared/utils/hover-outside.directive';
 
-/**
- * Represents an expandable section in the navbar
- */
 @Component({
   selector: 'ds-themed-expandable-navbar-section',
   // templateUrl: './expandable-navbar-section.component.html',
@@ -22,7 +17,12 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'],
   animations: [slide],
   standalone: true,
-  imports: [VarDirective, RouterLinkActive, NgComponentOutlet, NgIf, NgFor, AsyncPipe],
+  imports: [
+    AsyncPipe,
+    HoverOutsideDirective,
+    NgComponentOutlet,
+    RouterLinkActive,
+  ],
 })
 export class ExpandableNavbarSectionComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/navbar/navbar.component.ts b/src/themes/custom/app/navbar/navbar.component.ts
index 9a5ee91b60..09bed20ad4 100644
--- a/src/themes/custom/app/navbar/navbar.component.ts
+++ b/src/themes/custom/app/navbar/navbar.component.ts
@@ -2,8 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -24,7 +22,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   templateUrl: '../../../../app/navbar/navbar.component.html',
   animations: [slideMobileNav],
   standalone: true,
-  imports: [NgbDropdownModule, NgClass, NgIf, ThemedUserMenuComponent, NgFor, NgComponentOutlet, AsyncPipe, TranslateModule],
+  imports: [NgbDropdownModule, NgClass, ThemedUserMenuComponent, NgComponentOutlet, AsyncPipe, TranslateModule],
 })
 export class NavbarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts b/src/themes/custom/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
index 9a3994172d..10d02e7196 100644
--- a/src/themes/custom/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { ProfilePageMetadataFormComponent as BaseComponent } from '../../../../../app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component';
@@ -10,7 +9,6 @@ import { FormComponent } from '../../../../../app/shared/form/form.component';
   // templateUrl: './profile-page-metadata-form.component.html',
   imports: [
     FormComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts
index 74a88fdba6..e5953f5ff2 100644
--- a/src/themes/custom/app/profile-page/profile-page.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
-  NgForOf,
-  NgIf,
+  NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -11,6 +10,9 @@ import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-p
 import { ThemedProfilePageMetadataFormComponent } from '../../../../app/profile-page/profile-page-metadata-form/themed-profile-page-metadata-form.component';
 import { ProfilePageResearcherFormComponent } from '../../../../app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component';
 import { ProfilePageSecurityFormComponent } from '../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
+import { ErrorComponent } from '../../../../app/shared/error/error.component';
+import { ThemedLoadingComponent } from '../../../../app/shared/loading/themed-loading.component';
+import { PaginationComponent } from '../../../../app/shared/pagination/pagination.component';
 import { VarDirective } from '../../../../app/shared/utils/var.directive';
 
 @Component({
@@ -27,9 +29,11 @@ import { VarDirective } from '../../../../app/shared/utils/var.directive';
     TranslateModule,
     ProfilePageResearcherFormComponent,
     VarDirective,
-    NgIf,
-    NgForOf,
     SuggestionsNotificationComponent,
+    NgTemplateOutlet,
+    PaginationComponent,
+    ThemedLoadingComponent,
+    ErrorComponent,
   ],
 })
 /**
diff --git a/src/themes/custom/app/register-email-form/register-email-form.component.ts b/src/themes/custom/app/register-email-form/register-email-form.component.ts
index 44426c527f..4819880ff3 100644
--- a/src/themes/custom/app/register-email-form/register-email-form.component.ts
+++ b/src/themes/custom/app/register-email-form/register-email-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   FormsModule,
@@ -12,13 +9,14 @@ import { AlertComponent } from 'src/app/shared/alert/alert.component';
 import { GoogleRecaptchaComponent } from 'src/app/shared/google-recaptcha/google-recaptcha.component';
 
 import { RegisterEmailFormComponent as BaseComponent } from '../../../../app/register-email-form/register-email-form.component';
+import { BtnDisabledDirective } from '../../../../app/shared/btn-disabled.directive';
 
 @Component({
   selector: 'ds-themed-register-email-form',
   // templateUrl: './register-email-form.component.html',
   templateUrl: '../../../../app/register-email-form/register-email-form.component.html',
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule],
+  imports: [ FormsModule, ReactiveFormsModule, AlertComponent, GoogleRecaptchaComponent, AsyncPipe, TranslateModule, BtnDisabledDirective],
 })
 export class RegisterEmailFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
index ac2491cc4e..893afb50d2 100644
--- a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
+++ b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
@@ -1,14 +1,11 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { ProfilePageSecurityFormComponent } from '../../../../../app/profile-page/profile-page-security-form/profile-page-security-form.component';
 import { CreateProfileComponent as BaseComponent } from '../../../../../app/register-page/create-profile/create-profile.component';
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
 
 /**
  * Component that renders the create profile page to be used by a user registering through a token
@@ -23,10 +20,9 @@ import { CreateProfileComponent as BaseComponent } from '../../../../../app/regi
   imports: [
     ProfilePageSecurityFormComponent,
     TranslateModule,
-    NgIf,
     AsyncPipe,
     ReactiveFormsModule,
-    NgForOf,
+    BtnDisabledDirective,
   ],
 })
 export class CreateProfileComponent extends BaseComponent {
diff --git a/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
index f15193dd43..b885bcd06a 100644
--- a/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { DenyRequestCopyComponent as BaseComponent } from 'src/app/request-copy/deny-request-copy/deny-request-copy.component';
@@ -17,7 +14,7 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   // templateUrl: './deny-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/deny-request-copy/deny-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ThemedEmailRequestCopyComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ThemedEmailRequestCopyComponent, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class DenyRequestCopyComponent
   extends BaseComponent {
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
index 1876b134a2..e3fd757ea7 100644
--- a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -1,12 +1,11 @@
-import {
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy/email-request-copy/email-request-copy.component';
 
+import { BtnDisabledDirective } from '../../../../../app/shared/btn-disabled.directive';
+
 @Component({
   selector: 'ds-themed-email-request-copy',
   // styleUrls: ['./email-request-copy.component.scss'],
@@ -14,7 +13,7 @@ import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy
   // templateUrl: './email-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
   standalone: true,
-  imports: [FormsModule, NgClass, NgIf, TranslateModule],
+  imports: [FormsModule, NgClass, TranslateModule, BtnDisabledDirective],
 })
 export class EmailRequestCopyComponent
   extends BaseComponent {
diff --git a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
index b121c09cdb..e7ed8935c3 100644
--- a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
@@ -18,6 +15,6 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   // templateUrl: './grant-request-copy.component.html',
   templateUrl: './../../../../../app/request-copy/grant-request-copy/grant-request-copy.component.html',
   standalone: true,
-  imports: [VarDirective, NgIf, ThemedEmailRequestCopyComponent, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [VarDirective, ThemedEmailRequestCopyComponent, FormsModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class GrantRequestCopyComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/root/root.component.ts b/src/themes/custom/app/root/root.component.ts
index 4894746e52..a3e75ad630 100644
--- a/src/themes/custom/app/root/root.component.ts
+++ b/src/themes/custom/app/root/root.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
@@ -32,7 +31,6 @@ import { SystemWideAlertBannerComponent } from '../../../../app/system-wide-aler
     SystemWideAlertBannerComponent,
     ThemedHeaderNavbarWrapperComponent,
     ThemedBreadcrumbsComponent,
-    NgIf,
     NgClass,
     ThemedLoadingComponent,
     RouterOutlet,
diff --git a/src/themes/custom/app/search-page/configuration-search-page.component.ts b/src/themes/custom/app/search-page/configuration-search-page.component.ts
index 8635cd2edb..5fe918703e 100644
--- a/src/themes/custom/app/search-page/configuration-search-page.component.ts
+++ b/src/themes/custom/app/search-page/configuration-search-page.component.ts
@@ -1,6 +1,5 @@
 import {
   AsyncPipe,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -35,7 +34,7 @@ import { ViewModeSwitchComponent } from '../../../../app/shared/view-mode-switch
     },
   ],
   standalone: true,
-  imports: [NgIf, NgTemplateOutlet, PageWithSidebarComponent, ViewModeSwitchComponent, ThemedSearchResultsComponent, ThemedSearchSidebarComponent, ThemedSearchFormComponent, SearchLabelsComponent, AsyncPipe, TranslateModule],
+  imports: [ NgTemplateOutlet, PageWithSidebarComponent, ViewModeSwitchComponent, ThemedSearchResultsComponent, ThemedSearchSidebarComponent, ThemedSearchFormComponent, SearchLabelsComponent, AsyncPipe, TranslateModule],
 })
 
 /**
diff --git a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
index bddca78604..627c0582a5 100644
--- a/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
+++ b/src/themes/custom/app/shared/auth-nav-menu/auth-nav-menu.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -31,7 +30,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   styleUrls: ['../../../../../app/shared/auth-nav-menu/auth-nav-menu.component.scss'],
   animations: [fadeInOut, fadeOut],
   standalone: true,
-  imports: [NgClass, NgIf, NgbDropdownModule, ThemedLogInComponent, RouterLink, RouterLinkActive, ThemedUserMenuComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [NgClass, NgbDropdownModule, ThemedLogInComponent, RouterLink, RouterLinkActive, ThemedUserMenuComponent, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class AuthNavMenuComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index 80df685729..b230b53a3c 100644
--- a/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import {
@@ -24,7 +23,7 @@ import { UserMenuComponent as BaseComponent } from '../../../../../../app/shared
   // styleUrls: ['user-menu.component.scss'],
   styleUrls: ['../../../../../../app/shared/auth-nav-menu/user-menu/user-menu.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, RouterLinkActive, NgClass, RouterLink, LogOutComponent, AsyncPipe, TranslateModule],
+  imports: [ ThemedLoadingComponent, RouterLinkActive, NgClass, RouterLink, LogOutComponent, AsyncPipe, TranslateModule],
 
 })
 export class UserMenuComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/browse-by/browse-by.component.ts b/src/themes/custom/app/shared/browse-by/browse-by.component.ts
index 34c0bf965a..929b7721f3 100644
--- a/src/themes/custom/app/shared/browse-by/browse-by.component.ts
+++ b/src/themes/custom/app/shared/browse-by/browse-by.component.ts
@@ -2,7 +2,6 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -30,7 +29,7 @@ import { StartsWithLoaderComponent } from '../../../../../app/shared/starts-with
     fadeInOut,
   ],
   standalone: true,
-  imports: [VarDirective, NgClass, NgComponentOutlet, NgIf, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
+  imports: [VarDirective, NgClass, NgComponentOutlet, ThemedResultsBackButtonComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, AsyncPipe, TranslateModule, StartsWithLoaderComponent],
 })
 export class BrowseByComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
index 0217a309f6..88c7fea4ad 100644
--- a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
+++ b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   FormsModule,
@@ -21,7 +17,7 @@ import { ThemedLoadingComponent } from '../../../../../app/shared/loading/themed
   styleUrls: ['../../../../../app/shared/collection-dropdown/collection-dropdown.component.scss'],
   // styleUrls: ['./collection-dropdown.component.scss']
   standalone: true,
-  imports: [NgIf, FormsModule, ReactiveFormsModule, InfiniteScrollModule, NgFor, ThemedLoadingComponent, AsyncPipe, TranslateModule],
+  imports: [ FormsModule, ReactiveFormsModule, InfiniteScrollModule, ThemedLoadingComponent, AsyncPipe, TranslateModule],
 })
 export class CollectionDropdownComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
index 9495ae45d5..bf5a5005d5 100644
--- a/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgForOf,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import {
@@ -22,12 +18,10 @@ import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../../
   standalone: true,
   imports: [
     FormsModule,
-    NgForOf,
     RouterLink,
     RouterLinkActive,
     TranslateModule,
     AsyncPipe,
-    NgIf,
   ],
 })
 export class ComcolPageBrowseByComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
index 1d98892e33..758e24bb51 100644
--- a/src/themes/custom/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
+++ b/src/themes/custom/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -12,7 +11,6 @@ import { ComcolPageContentComponent as BaseComponent } from '../../../../../../a
   templateUrl: '../../../../../../app/shared/comcol/comcol-page-content/comcol-page-content.component.html',
   imports: [
     TranslateModule,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
index 7609879f78..45b27a0c78 100644
--- a/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -12,7 +11,6 @@ import { ComcolPageHandleComponent as BaseComponent } from '../../../../../../ap
   styleUrls: ['../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss'],
   standalone: true,
   imports: [
-    NgIf,
     TranslateModule,
   ],
 })
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
index 54044f5d79..b858b6dc2c 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
@@ -1,11 +1,12 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 4b7ee16d68..19a5eb8f19 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +10,7 @@ import { CreateCollectionParentSelectorComponent as BaseComponent } from '../../
   // templateUrl: './create-collection-parent-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class CreateCollectionParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index a13be63880..e75cf05c5a 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -1,12 +1,11 @@
 <div>
     <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-        <button type="button" class="close" (click)="close()" aria-label="Close">
-            <span aria-hidden="true">×</span>
+        <button type="button" class="btn-close" (click)="close()" aria-label="Close">
         </button>
     </div>
     <div class="modal-body">
-        <button class="btn btn-outline-primary btn-lg btn-block" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
-        <h3 class="position-relative py-1 my-3 font-weight-normal">
+        <button class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
+        <h3 class="position-relative py-1 my-3 fw-normal">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
                 <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 6c4aa8082c..7d0b39b9e7 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,3 +1,4 @@
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +12,11 @@ import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../.
   // templateUrl: './create-community-parent-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html',
   standalone: true,
-  imports: [DSOSelectorComponent, TranslateModule],
+  imports: [
+    AsyncPipe,
+    DSOSelectorComponent,
+    TranslateModule,
+  ],
 })
 export class CreateCommunityParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
index 664aef95c0..88d3051d8b 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html
@@ -1,12 +1,13 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
     <div [innerHTML]="'dso-selector.create.item.intro' | translate"></div>
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-authorized-collection-selector [currentDSOId]="dsoRD?.payload.uuid"
                                        [entityType]="entityType"
                                        [types]="selectorTypes"
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index 8b7867e362..c04d9ccbdb 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +10,7 @@ import { CreateItemParentSelectorComponent as BaseComponent } from '../../../../
   // templateUrl: './create-item-parent-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html',
   standalone: true,
-  imports: [NgIf, AuthorizedCollectionSelectorComponent, TranslateModule],
+  imports: [AuthorizedCollectionSelectorComponent, TranslateModule],
 })
 export class CreateItemParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
index 54044f5d79..b858b6dc2c 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
@@ -1,11 +1,12 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index 89616d560a..b53cf4fac0 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +10,7 @@ import { EditCollectionSelectorComponent as BaseComponent } from '../../../../..
   // templateUrl: './edit-collection-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class EditCollectionSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
index 54044f5d79..b858b6dc2c 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
@@ -1,11 +1,12 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index 491a99aae3..63428a021b 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -11,7 +10,7 @@ import { EditCommunitySelectorComponent as BaseComponent } from '../../../../../
   // templateUrl: './edit-community-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class EditCommunitySelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
index 85d8797e66..7a7611da4f 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -1,11 +1,12 @@
 <div>
   <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
-    <button type="button" class="close" (click)="close()" aria-label="Close">
-      <span aria-hidden="true">×</span>
+    <button type="button" class="btn-close" (click)="close()" aria-label="Close">
     </button>
   </div>
   <div class="modal-body">
-    <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
+    @if (header) {
+      <h5 class="px-2">{{header | translate}}</h5>
+    }
     <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index fa65ffd691..6a069bd5fa 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { EditItemSelectorComponent as BaseComponent } from 'src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
@@ -11,7 +10,7 @@ import { DSOSelectorComponent } from '../../../../../../../app/shared/dso-select
   // templateUrl: './edit-item-selector.component.html',
   templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.html',
   standalone: true,
-  imports: [NgIf, DSOSelectorComponent, TranslateModule],
+  imports: [DSOSelectorComponent, TranslateModule],
 })
 export class EditItemSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts b/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
index 491d20e79c..fe11b5e6b7 100644
--- a/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
+++ b/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -17,7 +16,7 @@ import { FileDownloadLinkComponent as BaseComponent } from '../../../../../app/s
   // styleUrls: ['./file-download-link.component.scss'],
   styleUrls: ['../../../../../app/shared/file-download-link/file-download-link.component.scss'],
   standalone: true,
-  imports: [RouterLink, NgClass, NgIf, NgTemplateOutlet, AsyncPipe, TranslateModule],
+  imports: [RouterLink, NgClass, NgTemplateOutlet, AsyncPipe, TranslateModule],
 })
 export class FileDownloadLinkComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
index ff1f3d9c5e..d85a4130fc 100644
--- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -44,7 +41,6 @@ import { VarDirective } from '../../../../../../../../../app/shared/utils/var.di
     AsyncPipe,
     TranslateModule,
     ErrorComponent,
-    NgIf,
     ThemedLoadingComponent,
   ],
 })
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
index 424adb7942..fb29b8f526 100644
--- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component.ts
@@ -1,10 +1,8 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { BtnDisabledDirective } from '../../../../../../../../../../app/shared/btn-disabled.directive';
 import { ExternalSourceEntryImportModalComponent as BaseComponent } from '../../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
 import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/shared/search/search-results/themed-search-results.component';
 
@@ -17,8 +15,8 @@ import { ThemedSearchResultsComponent } from '../../../../../../../../../../app/
   imports: [
     TranslateModule,
     ThemedSearchResultsComponent,
-    NgIf,
     AsyncPipe,
+    BtnDisabledDirective,
   ],
 })
 export class ExternalSourceEntryImportModalComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
index 3843c95811..e010faafac 100644
--- a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -30,7 +27,6 @@ import { VarDirective } from '../../../../../../../../../app/shared/utils/var.di
     VarDirective,
     TranslateModule,
     NgbDropdownModule,
-    NgIf,
     ThemedSearchComponent,
   ],
 })
diff --git a/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts b/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
index ce9c192723..0568c5fc73 100644
--- a/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
+++ b/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
@@ -1,7 +1,3 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
 import { Component } from '@angular/core';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
@@ -15,7 +11,7 @@ import { LangSwitchComponent as BaseComponent } from '../../../../../app/shared/
   // templateUrl: './lang-switch.component.html',
   templateUrl: '../../../../../app/shared/lang-switch/lang-switch.component.html',
   standalone: true,
-  imports: [NgIf, NgbDropdownModule, NgFor, TranslateModule],
+  imports: [NgbDropdownModule, TranslateModule],
 })
 export class LangSwitchComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/loading/loading.component.ts b/src/themes/custom/app/shared/loading/loading.component.ts
index 891381e77e..8bd9dba45a 100644
--- a/src/themes/custom/app/shared/loading/loading.component.ts
+++ b/src/themes/custom/app/shared/loading/loading.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component';
@@ -10,7 +9,6 @@ import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loa
   templateUrl: '../../../../../app/shared/loading/loading.component.html',
   // templateUrl: './loading.component.html'
   standalone: true,
-  imports: [NgIf],
 })
 export class LoadingComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/shared/log-in/log-in.component.ts b/src/themes/custom/app/shared/log-in/log-in.component.ts
index 1af5505835..0790a9f14d 100644
--- a/src/themes/custom/app/shared/log-in/log-in.component.ts
+++ b/src/themes/custom/app/shared/log-in/log-in.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { ThemedLoadingComponent } from 'src/app/shared/loading/themed-loading.component';
 import { LogInContainerComponent } from 'src/app/shared/log-in/container/log-in-container.component';
@@ -16,7 +12,7 @@ import { LogInComponent as BaseComponent } from '../../../../../app/shared/log-i
   // styleUrls: ['./log-in.component.scss'],
   styleUrls: ['../../../../../app/shared/log-in/log-in.component.scss'],
   standalone: true,
-  imports: [NgIf, ThemedLoadingComponent, NgFor, LogInContainerComponent, AsyncPipe],
+  imports: [ ThemedLoadingComponent, LogInContainerComponent, AsyncPipe],
 })
 export class LogInComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
index 24e0006b88..c1684a7689 100644
--- a/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { AccessStatusBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
@@ -12,7 +9,7 @@ import { AccessStatusBadgeComponent as BaseComponent } from 'src/app/shared/obje
   // templateUrl: './access-status-badge.component.html',
   templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html',
   standalone: true,
-  imports: [NgIf, AsyncPipe, TranslateModule],
+  imports: [AsyncPipe, TranslateModule],
 })
 export class AccessStatusBadgeComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
index f374a9707c..2ae0161c27 100644
--- a/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { BadgesComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/badges.component';
 
@@ -14,7 +13,7 @@ import { ThemedTypeBadgeComponent } from '../../../../../../../app/shared/object
   // templateUrl: './badges.component.html',
   templateUrl: '../../../../../../../app/shared/object-collection/shared/badges/badges.component.html',
   standalone: true,
-  imports: [ThemedStatusBadgeComponent, NgIf, ThemedMyDSpaceStatusBadgeComponent, ThemedTypeBadgeComponent, ThemedAccessStatusBadgeComponent],
+  imports: [ThemedStatusBadgeComponent, ThemedMyDSpaceStatusBadgeComponent, ThemedTypeBadgeComponent, ThemedAccessStatusBadgeComponent],
 })
 export class BadgesComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
index c39b0849ba..7af7de024e 100644
--- a/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { StatusBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/status-badge/status-badge.component';
@@ -9,7 +8,7 @@ import { StatusBadgeComponent as BaseComponent } from 'src/app/shared/object-col
   // templateUrl: './status-badge.component.html',
   templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/status-badge/status-badge.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [ TranslateModule],
 })
 export class StatusBadgeComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
index 5f7d87f706..4d3a5a01dd 100644
--- a/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { TypeBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/type-badge/type-badge.component';
@@ -9,7 +8,7 @@ import { TypeBadgeComponent as BaseComponent } from 'src/app/shared/object-colle
   // templateUrl: './type-badge.component.html',
   templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/type-badge/type-badge.component.html',
   standalone: true,
-  imports: [NgIf, TranslateModule],
+  imports: [TranslateModule],
 })
 export class TypeBadgeComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts b/src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
index 241ac0289a..951d10bb3d 100644
--- a/src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
+++ b/src/themes/custom/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
@@ -1,7 +1,3 @@
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -15,8 +11,6 @@ import { ItemDetailPreviewFieldComponent as BaseComponent } from '../../../../..
   standalone: true,
   imports: [
     MetadataFieldWrapperComponent,
-    NgFor,
-    NgIf,
     TranslateModule,
   ],
 })
diff --git a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
index 5391c51624..faf006518f 100644
--- a/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -18,7 +15,7 @@ import { BrowseEntryListElementComponent as BaseComponent } from '../../../../..
   // templateUrl: './browse-entry-list-element.component.html',
   templateUrl: '../../../../../../app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, AsyncPipe],
+  imports: [RouterLink, AsyncPipe],
 })
 @listableObjectComponent(BrowseEntry, ViewMode.ListElement, Context.Any, 'custom')
 export class BrowseEntryListElementComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index d7db69198b..a0e8ecb542 100644
--- a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -17,7 +16,7 @@ import { CollectionListElementComponent as BaseComponent } from '../../../../../
   // templateUrl: './collection-list-element.component.html'
   templateUrl: '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [ RouterLink],
 })
 /**
  * Component representing list element for a collection
diff --git a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
index 50f24ae91a..32be7bc306 100644
--- a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 
@@ -17,7 +16,7 @@ import { CommunityListElementComponent as BaseComponent } from '../../../../../.
   // templateUrl: './community-list-element.component.html'
   templateUrl: '../../../../../../app/shared/object-list/community-list-element/community-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink],
+  imports: [ RouterLink],
 })
 /**
  * Component representing a list element for a community
diff --git a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 54634fd952..cf3cbbabe6 100644
--- a/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/themes/custom/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -29,8 +27,6 @@ import { ThemedThumbnailComponent } from '../../../../../../../app/thumbnail/the
     ItemCollectionComponent,
     ItemSubmitterComponent,
     NgClass,
-    NgFor,
-    NgIf,
     ThemedBadgesComponent,
     ThemedThumbnailComponent,
     TranslateModule,
diff --git a/src/themes/custom/app/shared/object-list/object-list.component.ts b/src/themes/custom/app/shared/object-list/object-list.component.ts
index f94c31aeb0..10a83d02ec 100644
--- a/src/themes/custom/app/shared/object-list/object-list.component.ts
+++ b/src/themes/custom/app/shared/object-list/object-list.component.ts
@@ -1,8 +1,4 @@
-import {
-  NgClass,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { ImportableListItemControlComponent } from '../../../../../app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component';
@@ -22,7 +18,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   styleUrls: ['../../../../../app/shared/object-list/object-list.component.scss'],
   // templateUrl: './object-list.component.html'
   templateUrl: '../../../../../app/shared/object-list/object-list.component.html',
-  imports: [PaginationComponent, NgIf, NgClass, NgFor, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
+  imports: [PaginationComponent,  NgClass, SelectableListItemControlComponent, ImportableListItemControlComponent, ListableObjectComponentLoaderComponent, BrowserOnlyPipe],
   standalone: true,
 })
 
diff --git a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index 7d2913dc1f..cf81cc62ea 100644
--- a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -1,8 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
@@ -26,7 +24,7 @@ import { ThemedThumbnailComponent } from '../../../../../../../../../app/thumbna
   // templateUrl: './item-search-result-list-element.component.html',
   templateUrl: '../../../../../../../../../app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html',
   standalone: true,
-  imports: [NgIf, RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, NgFor, AsyncPipe],
+  imports: [ RouterLink, ThemedThumbnailComponent, NgClass, ThemedBadgesComponent, TruncatableComponent, TruncatablePartComponent, AsyncPipe],
 
 })
 export class ItemSearchResultListElementComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
index dbb4526a9a..a31bcc80c3 100644
--- a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   NgClass,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -22,7 +21,7 @@ import { TruncatablePartComponent } from '../../../../../../../../app/shared/tru
   // templateUrl: './publication-sidebar-search-list-element.component.html',
   templateUrl: '../../../../../../../../app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
   standalone: true,
-  imports: [TruncatablePartComponent, NgClass, NgIf, AsyncPipe, TranslateModule],
+  imports: [TruncatablePartComponent, NgClass, AsyncPipe, TranslateModule],
 })
 export class PublicationSidebarSearchListElementComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/search-form/search-form.component.ts b/src/themes/custom/app/shared/search-form/search-form.component.ts
index 729a001f61..f9c5b1d910 100644
--- a/src/themes/custom/app/shared/search-form/search-form.component.ts
+++ b/src/themes/custom/app/shared/search-form/search-form.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
@@ -17,7 +14,7 @@ import { BrowserOnlyPipe } from '../../../../../app/shared/utils/browser-only.pi
   // templateUrl: './search-form.component.html',
   templateUrl: '../../../../../app/shared/search-form/search-form.component.html',
   standalone: true,
-  imports: [FormsModule, NgIf, NgbTooltipModule, AsyncPipe, TranslateModule, BrowserOnlyPipe],
+  imports: [FormsModule, NgbTooltipModule, AsyncPipe, TranslateModule, BrowserOnlyPipe],
 })
 export class SearchFormComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
index 5b10c84145..3e86e16c01 100644
--- a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
@@ -5,18 +5,14 @@
  *
  * https://www.atmire.com/software-license/
  */
-import {
-  AsyncPipe,
-  NgFor,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-configuration.service';
-import { AdvancedSearchComponent } from '../../../../../../app/shared/search/advanced-search/advanced-search.component';
 import { SearchFilterComponent } from '../../../../../../app/shared/search/search-filters/search-filter/search-filter.component';
 import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/shared/search/search-filters/search-filters.component';
 
@@ -34,7 +30,7 @@ import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/s
     },
   ],
   standalone: true,
-  imports: [NgIf, NgFor, SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, AdvancedSearchComponent],
+  imports: [SearchFilterComponent, RouterLink, AsyncPipe, TranslateModule, NgxSkeletonLoaderModule],
 })
 
 export class SearchFiltersComponent extends BaseComponent {
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
index b72297f32f..0c831f7520 100644
--- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -1,29 +1,39 @@
-import { NgIf } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import {
   fadeIn,
   fadeInOut,
 } from '../../../../../../app/shared/animations/fade';
 import { ErrorComponent } from '../../../../../../app/shared/error/error.component';
-import { ThemedLoadingComponent } from '../../../../../../app/shared/loading/themed-loading.component';
 import { ObjectCollectionComponent } from '../../../../../../app/shared/object-collection/object-collection.component';
 import { SearchExportCsvComponent } from '../../../../../../app/shared/search/search-export-csv/search-export-csv.component';
 import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component';
+import { SearchResultsSkeletonComponent } from '../../../../../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component';
 
 @Component({
   selector: 'ds-themed-search-results',
   // templateUrl: './search-results.component.html',
   templateUrl: '../../../../../../app/shared/search/search-results/search-results.component.html',
-  // styleUrls: ['./search-results.component.scss'],
+  styleUrls: ['../../../../../../app/shared/search/search-results/search-results.component.scss'],
   animations: [
     fadeIn,
     fadeInOut,
   ],
   standalone: true,
-  imports: [NgIf, SearchExportCsvComponent, ObjectCollectionComponent, ThemedLoadingComponent, ErrorComponent, RouterLink, TranslateModule],
+  imports: [
+    AsyncPipe,
+    ErrorComponent,
+    NgxSkeletonLoaderModule,
+    ObjectCollectionComponent,
+    RouterLink,
+    SearchExportCsvComponent,
+    SearchResultsSkeletonComponent,
+    TranslateModule,
+  ],
 })
 export class SearchResultsComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
index 111b7b0c7c..2f1455f33d 100644
--- a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
@@ -5,10 +5,6 @@
  *
  * https://www.atmire.com/software-license/
  */
-import {
-  NgFor,
-  NgIf,
-} from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
@@ -33,7 +29,7 @@ import { SidebarDropdownComponent } from '../../../../../../app/shared/sidebar/s
     },
   ],
   standalone: true,
-  imports: [NgIf, SidebarDropdownComponent, NgFor, FormsModule, PageSizeSelectorComponent, TranslateModule],
+  imports: [ SidebarDropdownComponent, FormsModule, PageSizeSelectorComponent, TranslateModule],
 })
 
 export class SearchSettingsComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
index 94892ad57b..3281359f30 100644
--- a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
+++ b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -5,10 +5,7 @@
  *
  * https://www.atmire.com/software-license/
  */
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -35,7 +32,7 @@ import { ViewModeSwitchComponent } from '../../../../../../app/shared/view-mode-
     },
   ],
   standalone: true,
-  imports: [NgIf, ViewModeSwitchComponent, SearchSwitchConfigurationComponent, ThemedSearchFiltersComponent, ThemedSearchSettingsComponent, TranslateModule, AdvancedSearchComponent, AsyncPipe],
+  imports: [ ViewModeSwitchComponent, SearchSwitchConfigurationComponent, ThemedSearchFiltersComponent, ThemedSearchSettingsComponent, TranslateModule, AdvancedSearchComponent, AsyncPipe],
 })
 export class SearchSidebarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/search/search.component.ts b/src/themes/custom/app/shared/search/search.component.ts
index 85a453c16c..4b2810ad73 100644
--- a/src/themes/custom/app/shared/search/search.component.ts
+++ b/src/themes/custom/app/shared/search/search.component.ts
@@ -1,6 +1,5 @@
 import {
   AsyncPipe,
-  NgIf,
   NgTemplateOutlet,
 } from '@angular/common';
 import {
@@ -29,7 +28,6 @@ import { ViewModeSwitchComponent } from '../../../../../app/shared/view-mode-swi
   standalone: true,
   imports: [
     AsyncPipe,
-    NgIf,
     NgTemplateOutlet,
     PageWithSidebarComponent,
     ThemedSearchFormComponent,
diff --git a/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
index 3f57274d36..f14d1f39c5 100644
--- a/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
+++ b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
@@ -1,4 +1,3 @@
-import { NgFor } from '@angular/common';
 import { Component } from '@angular/core';
 import {
   FormsModule,
@@ -15,7 +14,7 @@ import { StartsWithDateComponent as BaseComponent } from '../../../../../../app/
   // templateUrl: './starts-with-date.component.html',
   templateUrl: '../../../../../../app/shared/starts-with/date/starts-with-date.component.html',
   standalone: true,
-  imports: [FormsModule, ReactiveFormsModule, NgFor, TranslateModule],
+  imports: [FormsModule, ReactiveFormsModule, TranslateModule],
 })
 export class StartsWithDateComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/themes/custom/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index 9c479cb129..a8fe3f19db 100644
--- a/src/themes/custom/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/themes/custom/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -1,4 +1,3 @@
-import { NgIf } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { UploaderComponent } from '../../../../../../app/shared/upload/uploader/uploader.component';
@@ -10,7 +9,6 @@ import { SubmissionUploadFilesComponent as BaseComponent } from '../../../../../
   templateUrl: '../../../../../../app/submission/form/submission-upload-files/submission-upload-files.component.html',
   imports: [
     UploaderComponent,
-    NgIf,
   ],
   standalone: true,
 })
diff --git a/src/themes/custom/app/submission/import-external/submission-import-external.component.ts b/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
index cda5c207bf..9222fbd5c3 100644
--- a/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
+++ b/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
@@ -29,7 +26,6 @@ import { SubmissionImportExternalComponent as BaseComponent } from '../../../../
     ObjectCollectionComponent,
     ThemedLoadingComponent,
     AlertComponent,
-    NgIf,
     AsyncPipe,
     SubmissionImportExternalSearchbarComponent,
     TranslateModule,
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
index 13f5f97650..c8440ccf72 100644
--- a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -1,11 +1,9 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 import { SubmissionSectionUploadFileComponent as BaseComponent } from 'src/app/submission/sections/upload/file/section-upload-file.component';
 
+import { BtnDisabledDirective } from '../../../../../../../app/shared/btn-disabled.directive';
 import { ThemedFileDownloadLinkComponent } from '../../../../../../../app/shared/file-download-link/themed-file-download-link.component';
 import { FileSizePipe } from '../../../../../../../app/shared/utils/file-size-pipe';
 import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../app/submission/sections/upload/file/view/section-upload-file-view.component';
@@ -23,10 +21,10 @@ import { SubmissionSectionUploadFileViewComponent } from '../../../../../../../a
   imports: [
     TranslateModule,
     SubmissionSectionUploadFileViewComponent,
-    NgIf,
     AsyncPipe,
     ThemedFileDownloadLinkComponent,
     FileSizePipe,
+    BtnDisabledDirective,
   ],
 })
 export class SubmissionSectionUploadFileComponent
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index cb80948daf..cd677847ce 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -1,6 +1,9 @@
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
@@ -12,8 +15,11 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 
 import { RootModule } from '../../app/root.module';
+import { SearchResultsSkeletonComponent } from '../../app/shared/search/search-results/search-results-skeleton/search-results-skeleton.component';
 import { MetadataImportPageComponent } from './app/admin/admin-import-metadata-page/metadata-import-page.component';
+import { AdminSearchPageComponent } from './app/admin/admin-search-page/admin-search-page.component';
 import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
+import { AdminWorkflowPageComponent } from './app/admin/admin-workflow-page/admin-workflow-page.component';
 import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
 import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
 import { BrowseByDateComponent } from './app/browse-by/browse-by-date/browse-by-date.component';
@@ -103,6 +109,7 @@ import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workf
 import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
 import { WorkspaceItemsDeletePageComponent } from './app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component';
 
+
 const DECLARATIONS = [
   FileSectionComponent,
   HomePageComponent,
@@ -194,15 +201,16 @@ const DECLARATIONS = [
   ProfilePageMetadataFormComponent,
   SubmissionUploadFilesComponent,
   ComcolPageContentComponent,
+  AdminSearchPageComponent,
+  AdminWorkflowPageComponent,
+  SearchResultsSkeletonComponent,
 ];
 
 @NgModule({
-  imports: [
-    RootModule,
+  imports: [RootModule,
     CommonModule,
     DragDropModule,
     FormsModule,
-    HttpClientModule,
     NgbModule,
     RouterModule,
     ScrollToModule,
@@ -211,7 +219,9 @@ const DECLARATIONS = [
     TranslateModule,
     FormsModule,
     NgxGalleryModule,
-    ...DECLARATIONS,
+    ...DECLARATIONS],
+  providers: [
+    provideHttpClient(withInterceptorsFromDi()),
   ],
 })
 
diff --git a/src/themes/custom/styles/_theme_sass_variable_overrides.scss b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
index f1387aa619..1ded6bbb60 100644
--- a/src/themes/custom/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/custom/styles/_theme_sass_variable_overrides.scss
@@ -15,15 +15,19 @@
 // $red:    #CF4444 !default;
 // $dark:   darken($blue, 17%) !default;
 //
-// $theme-colors: (
-//   primary: $blue,
-//   secondary: $gray-700,
-//   success: $green,
-//   info: $cyan,
-//   warning: $yellow,
-//   danger: $red,
-//   light: $gray-100,
-//   dark: $dark
-// ) !default;
+// $primary: $blue !default;
+// $secondary: $gray-700 !default;
+// $success: $green !default;
+// $info: $cyan !default;
+// $warning: $yellow !default;
+// $danger: $red !default;
+// $light: $gray-100 !default;
+// $dark: $dark !default;
 //
-// $link-color: map-get($theme-colors, info) !default;
+// $link-color: $info !default;
+
+// Add new semantic colors here (you don't need to add existing semantic colors)
+@import '../../../styles/_variables.scss';
+$theme-custom-semantic-colors: (
+);
+$theme-colors: map-merge($theme-colors, $theme-custom-semantic-colors);
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
index d2b977ff84..4fa423d1ef 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.html
@@ -1,9 +1,11 @@
 <div id="header-navbar-wrapper"><!-- [class.open]="!(isNavBarCollapsed$ | async)" -->
   <ds-header></ds-header>
   <!-- Collapsible navbar (mobile only) -->
-  <div *ngIf="(isMobile$ | async)" id="mobile-navbar-wrapper" [@slideMobileNav]="(isNavBarCollapsed$ | async) ? 'collapsed' : 'expanded'">
-    <nav class="px-3" id="collapsible-mobile-navbar" [attr.aria-hidden]="(isNavBarCollapsed$ | async)" [attr.aria-label]="'nav.main.description' | translate">
-      <ds-navbar></ds-navbar>
-    </nav>
-  </div>
+  @if ((isMobile$ | async)) {
+    <div id="mobile-navbar-wrapper" [@slideMobileNav]="(isNavBarCollapsed$ | async) ? 'collapsed' : 'expanded'">
+      <nav class="px-3" id="collapsible-mobile-navbar" [attr.aria-hidden]="(isNavBarCollapsed$ | async)" [attr.aria-label]="'nav.main.description' | translate">
+        <ds-navbar></ds-navbar>
+      </nav>
+    </div>
+  }
 </div>
diff --git a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
index cc9a3d727e..18de5dae5a 100644
--- a/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/themes/dspace/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,8 +1,4 @@
-import {
-  AsyncPipe,
-  NgClass,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -19,7 +15,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   styleUrls: ['header-navbar-wrapper.component.scss'],
   templateUrl: 'header-navbar-wrapper.component.html',
   standalone: true,
-  imports: [NgClass, ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule, NgIf],
+  imports: [ThemedHeaderComponent, ThemedNavbarComponent, AsyncPipe, TranslateModule],
   animations: [slideMobileNav],
 })
 export class HeaderNavbarWrapperComponent extends BaseComponent {
diff --git a/src/themes/dspace/app/header/header.component.html b/src/themes/dspace/app/header/header.component.html
index e78d19053d..7007954e7d 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -2,18 +2,20 @@
   <div class="container h-100 d-flex flex-row flex-wrap align-items-center justify-content-between gapx-3 gapy-2" id="main-site-header-container">
     <!-- Logo and navbar wrapper -->
     <div id="header-left"
-         [attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
-         [attr.aria-label]="(isMobile$ | async) ? ('nav.main.description' | translate) : null"
-         class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3">
+      [attr.role]="(isMobile$ | async) ? 'navigation' : 'presentation'"
+      [attr.aria-label]="(isMobile$ | async) ? ('nav.main.description' | translate) : null"
+      class="h-100 flex-fill d-flex flex-row flex-nowrap justify-content-start align-items-center gapx-3">
       <a class="d-block my-2 my-md-0" routerLink="/home" [attr.aria-label]="'home.title' | translate">
         <img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
-      <nav *ngIf="(isMobile$ | async) !== true" class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
-        <ds-navbar></ds-navbar>
-      </nav>
+      @if ((isMobile$ | async) !== true) {
+        <nav class="navbar navbar-expand p-0 align-items-stretch align-self-stretch" id="desktop-navbar" [attr.aria-label]="'nav.main.description' | translate">
+          <ds-navbar></ds-navbar>
+        </nav>
+      }
     </div>
     <!-- Search bar and other menus -->
-    <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1 ml-auto">
+    <div id="header-right" class="h-100 d-flex flex-row flex-nowrap justify-content-end align-items-center gapx-1 ms-auto">
       <ds-search-navbar></ds-search-navbar>
       <div role="menubar" class="h-100 d-flex flex-row flex-nowrap align-items-center gapx-1">
         <ds-lang-switch></ds-lang-switch>
@@ -22,13 +24,14 @@
         <ds-auth-nav-menu></ds-auth-nav-menu>
       </div>
 
-      <div id="mobile-navbar-toggler" class="d-block d-lg-none ml-3" *ngIf="(isMobile$ | async)">
-        <button id="navbar-toggler" class="btn" type="button" (click)="toggleNavbar()"
-                [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="(isNavBarCollapsed$ | async) !== true">
-          <span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
-        </button>
-      </div>
-
+      @if ((isMobile$ | async)) {
+        <div id="mobile-navbar-toggler" class="d-block d-lg-none ms-3">
+          <button id="navbar-toggler" class="btn btn-transparent" type="button" (click)="toggleNavbar()"
+            [attr.aria-label]="'nav.toggle' | translate" aria-controls="collapsible-mobile-navbar" [attr.aria-expanded]="(isNavBarCollapsed$ | async) !== true">
+            <span class="fas fa-bars fa-fw fa-xl toggler-icon" aria-hidden="true"></span>
+          </button>
+        </div>
+      }
     </div>
   </div>
 </header>
diff --git a/src/themes/dspace/app/header/header.component.ts b/src/themes/dspace/app/header/header.component.ts
index 1931838923..791959dd9c 100644
--- a/src/themes/dspace/app/header/header.component.ts
+++ b/src/themes/dspace/app/header/header.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -27,7 +24,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n
   styleUrls: ['header.component.scss'],
   templateUrl: 'header.component.html',
   standalone: true,
-  imports: [NgbDropdownModule, ThemedLangSwitchComponent, RouterLink, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, ThemedNavbarComponent, TranslateModule, AsyncPipe, NgIf],
+  imports: [NgbDropdownModule, ThemedLangSwitchComponent, RouterLink, ThemedSearchNavbarComponent, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, ThemedNavbarComponent, TranslateModule, AsyncPipe],
 })
 export class HeaderComponent extends BaseComponent implements OnInit {
   public isNavBarCollapsed$: Observable<boolean>;
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html
index ca053fc662..a29239dff1 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.html
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.html
@@ -1,9 +1,9 @@
 <div class="background-image-container mt-ncs">
   <div class="container">
-    <div class="jumbotron jumbotron-fluid">
+    <div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-0 mb-4">
       <div class="d-flex flex-wrap">
         <div>
-          <h1 class="display-3">DSpace 9</h1>
+          <h1 class="display-2">DSpace 9</h1>
           <p class="lead">DSpace is the world leading open source repository platform that enables
             organisations to:</p>
         </div>
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
index 3c3aa8b445..ba9d31a85b 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
@@ -4,6 +4,7 @@
   div.background-image-container {
     color: white;
     position: relative;
+    font-weight: 600;
 
     .background-image > img {
       background-color: var(--bs-info);
@@ -64,10 +65,15 @@
   a {
     color: var(--ds-home-news-link-color);
 
-    @include hover {
+    &:hover {
       color: var(--ds-home-news-link-hover-color);
     }
   }
+
+  .lead {
+    font-size: 1.25rem;
+    font-weight: 400;
+  }
 }
 
 
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index d828206e7a..8ecb8c5667 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,9 +1,9 @@
-<ng-container *ngIf="(isMobile$ | async) && (isAuthenticated$ | async)">
+@if ((isMobile$ | async) && (isAuthenticated$ | async)) {
   <ds-user-menu [inExpandableNavbar]="true"></ds-user-menu>
-</ng-container>
+}
 <div class="navbar-nav h-100 align-items-md-stretch gapx-3" role="menubar" id="main-site-navigation" [ngClass]="(isMobile$ | async) ? 'navbar-nav-mobile' : 'navbar-nav-desktop'">
-  <ng-container *ngFor="let section of (sections | async)">
+  @for (section of (sections | async); track section) {
     <ng-container
-      *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
-  </ng-container>
+    *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+  }
 </div>
diff --git a/src/themes/dspace/app/navbar/navbar.component.ts b/src/themes/dspace/app/navbar/navbar.component.ts
index 5713a161e1..50ef8e21cf 100644
--- a/src/themes/dspace/app/navbar/navbar.component.ts
+++ b/src/themes/dspace/app/navbar/navbar.component.ts
@@ -2,22 +2,14 @@ import {
   AsyncPipe,
   NgClass,
   NgComponentOutlet,
-  NgFor,
-  NgIf,
 } from '@angular/common';
 import { Component } from '@angular/core';
-import { RouterLink } from '@angular/router';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { ThemedSearchNavbarComponent } from 'src/app/search-navbar/themed-search-navbar.component';
-import { ThemedLangSwitchComponent } from 'src/app/shared/lang-switch/themed-lang-switch.component';
 
-import { ContextHelpToggleComponent } from '../../../../app/header/context-help-toggle/context-help-toggle.component';
 import { NavbarComponent as BaseComponent } from '../../../../app/navbar/navbar.component';
 import { slideMobileNav } from '../../../../app/shared/animations/slide';
-import { ThemedAuthNavMenuComponent } from '../../../../app/shared/auth-nav-menu/themed-auth-nav-menu.component';
 import { ThemedUserMenuComponent } from '../../../../app/shared/auth-nav-menu/user-menu/themed-user-menu.component';
-import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-navbar/impersonate-navbar.component';
 
 /**
  * Component representing the public navbar
@@ -28,7 +20,7 @@ import { ImpersonateNavbarComponent } from '../../../../app/shared/impersonate-n
   templateUrl: './navbar.component.html',
   animations: [slideMobileNav],
   standalone: true,
-  imports: [NgbDropdownModule, ThemedLangSwitchComponent, ThemedSearchNavbarComponent, NgClass, RouterLink, NgIf, NgFor, NgComponentOutlet, ContextHelpToggleComponent, ThemedAuthNavMenuComponent, ImpersonateNavbarComponent, AsyncPipe, TranslateModule, ThemedUserMenuComponent],
+  imports: [NgbDropdownModule, NgClass, ThemedUserMenuComponent, NgComponentOutlet, AsyncPipe, TranslateModule],
 })
 export class NavbarComponent extends BaseComponent {
 }
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index 9d26b19536..8de71d14c8 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -1,6 +1,9 @@
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
+import {
+  provideHttpClient,
+  withInterceptorsFromDi,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
@@ -16,12 +19,12 @@ const DECLARATIONS = [
 ];
 
 @NgModule({
+  declarations: DECLARATIONS,
   imports: [
     RootModule,
     CommonModule,
     DragDropModule,
     FormsModule,
-    HttpClientModule,
     NgbModule,
     RouterModule,
     ScrollToModule,
@@ -30,7 +33,9 @@ const DECLARATIONS = [
     TranslateModule,
     FormsModule,
   ],
-  declarations: DECLARATIONS,
+  providers: [
+    provideHttpClient(withInterceptorsFromDi()),
+  ],
 })
 
 /**
diff --git a/src/themes/dspace/styles/_global-styles.scss b/src/themes/dspace/styles/_global-styles.scss
index d225819326..ffca3cda13 100644
--- a/src/themes/dspace/styles/_global-styles.scss
+++ b/src/themes/dspace/styles/_global-styles.scss
@@ -13,7 +13,7 @@
     padding-bottom: 0.5rem !important;
   }
 
-  .badge-secondary {
+  .bg-secondary {
     background-color: var(--bs-primary);
   }
 
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index 63a5535d95..5763979e94 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -11,13 +11,14 @@
     --ds-header-height: 90px;
   }
 
-  --ds-banner-text-background: rgba(0, 0, 0, 0.45);
+  --ds-banner-text-background: rgba(0, 0, 0, 0.58);
   --ds-banner-background-gradient-width: 300px;
 
   --ds-header-navbar-border-bottom-height: 5px;
 
   /* set the next two properties as `--ds-header-navbar-border-bottom-*`
   in order to keep the bottom border of the header when navbar is expanded */
+
   --ds-expandable-navbar-border-top-color: #{$white};
   --ds-expandable-navbar-border-top-height: 0;
   --ds-expandable-navbar-padding-top: 0;
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index a9231d37e5..8bce1c4a61 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -44,9 +44,6 @@ $font-family-sans-serif: 'Nunito', -apple-system, BlinkMacSystemFont, "Segoe UI"
 //$teal:    #20c997 !default;
 //$cyan:    #17a2b8 !default;
 
-// Define or override other colors here
-// ...
-
 // Override semantic colors here
 $primary:   #43515f;  // Gray
 $secondary: #495057;  // As Bootstrap $gray-700
@@ -55,18 +52,15 @@ $info:      #1e6f90;  // Light blue
 $warning:   #ec9433;  // Orange
 $danger:    #cf4444;  // Red
 $light:     #f8f9fa;  // As Bootstrap $gray-100
-$dark:      #43515f;  // Gray
+$dark:      #43515f;  // Dark blue
 
 // Add new semantic colors here (you don't need to add existing semantic colors)
-$theme-colors: (
-  // ...
+$theme-custom-semantic-colors: (
 );
 
-
 /*** OTHER BOOTSTRAP VARIABLES ***/
 
-// The yiq lightness value that determines when the lightness of color changes from "dark" to "light". Acceptable values are between 0 and 255.
-$yiq-contrasted-threshold: 170;
+$min-contrast-ratio: 2.06 !default;
 
 $body-color: #343a40;       // As Bootstrap $gray-800
 
@@ -83,7 +77,7 @@ $navbar-dark-color: #fff;
 
 /*** CUSTOM DSPACE VARIABLES ***/
 
-$ds-home-news-link-color: #92c642;
+$ds-home-news-link-color: #D2FC93;
 $ds-header-navbar-border-bottom-color: #92c642;
 
 $ds-breadcrumb-link-color: #154E66 !default;
diff --git a/src/themes/dspace/styles/theme.scss b/src/themes/dspace/styles/theme.scss
index 05c96f3372..dfa8274cf6 100644
--- a/src/themes/dspace/styles/theme.scss
+++ b/src/themes/dspace/styles/theme.scss
@@ -2,6 +2,9 @@
 
 @import './_theme_sass_variable_overrides.scss';
 @import '../../../styles/_variables.scss';
+
+$theme-colors: map-merge($theme-colors, $theme-custom-semantic-colors);
+
 @import '../../../styles/_mixins.scss';
 @import '../../../styles/helpers/font_awesome_imports.scss';
 @import '../../../styles/_vendor.scss';
diff --git a/tsconfig.json b/tsconfig.json
index afd00f8568..2603ba05ef 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,8 +8,8 @@
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "declaration": false,
-    "downlevelIteration": true,
     "emitDecoratorMetadata": true,
+    "esModuleInterop": true,
     "experimentalDecorators": true,
     "sourceMap": true,
     "module": "es2020",
@@ -20,7 +20,6 @@
     "strictNullChecks": false,
     "skipDefaultLibCheck": true,
     "pretty": true,
-    "allowSyntheticDefaultImports": true,
     "target": "ES2022",
     "typeRoots": [
       "node_modules/@types",
diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index 8d433edf39..b1c42df8ad 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -66,10 +66,6 @@ const SCSS_LOADERS = [
     loader: 'sass-loader',
     options: {
       sourceMap: true,
-      // sass >1.33 complains about deprecation warnings in Bootstrap 4
-      // After upgrading to Angular 12 we need to explicitly use an older version here
-      // todo: remove after upgrading to Bootstrap 5
-      implementation: sass,
       sassOptions: {
         includePaths: [projectRoot('./')]
       }