diff --git a/.husky/pre-commit b/.husky/pre-commit
index 4785620..6debdee 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 echo "[Husky] Running lint check:"
 npm run lint
 echo "[Husky] Running prettier check:"
-npx prettier -c .
+npx prettier --cache -c .
diff --git a/package-lock.json b/package-lock.json
index d37d3ce..d546fc1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,17 +27,17 @@
         "@ngrx/router-store": "^18.0.1",
         "@ngx-translate/core": "^15.0.0",
         "@ngx-translate/http-loader": "^8.0.0",
-        "@onecx/accelerator": "^5.3.0",
-        "@onecx/angular-accelerator": "^5.3.0",
-        "@onecx/angular-auth": "^5.3.0",
-        "@onecx/angular-integration-interface": "^5.3.0",
-        "@onecx/angular-remote-components": "^5.3.0",
-        "@onecx/angular-testing": "^5.3.0",
-        "@onecx/angular-webcomponents": "^5.3.0",
-        "@onecx/integration-interface": "^5.3.0",
-        "@onecx/keycloak-auth": "^5.3.0",
-        "@onecx/portal-integration-angular": "^5.3.0",
-        "@onecx/portal-layout-styles": "^5.3.0",
+        "@onecx/accelerator": "^5.3.1",
+        "@onecx/angular-accelerator": "^5.3.1",
+        "@onecx/angular-auth": "^5.3.1",
+        "@onecx/angular-integration-interface": "^5.3.1",
+        "@onecx/angular-remote-components": "^5.3.1",
+        "@onecx/angular-testing": "^5.3.1",
+        "@onecx/angular-webcomponents": "^5.3.1",
+        "@onecx/integration-interface": "^5.3.1",
+        "@onecx/keycloak-auth": "^5.3.1",
+        "@onecx/portal-integration-angular": "^5.3.1",
+        "@onecx/portal-layout-styles": "^5.3.1",
         "@webcomponents/webcomponentsjs": "^2.8.0",
         "file-saver": "^2.0.5",
         "i18n-iso-countries": "^7.11.3",
@@ -83,7 +83,7 @@
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",
         "eslint-plugin-prettier": "^5.2.1",
-        "husky": "^9.1.2",
+        "husky": "^9.1.4",
         "jasmine-core": "~5.2.0",
         "jasmine-spec-reporter": "^7.0.0",
         "karma": "^6.4.4",
@@ -6422,18 +6422,18 @@
       }
     },
     "node_modules/@onecx/accelerator": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-5.3.0.tgz",
-      "integrity": "sha512-5KKPm9+w+2zdujgpmM5HeCUSgtTjbZHCS7Z4Zl2vLUON+3ttOQ5v36nHDUI/QZpsYC35DsmAaMfI73SpSaSACg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/accelerator/-/accelerator-5.3.1.tgz",
+      "integrity": "sha512-pNWO/sV5JekZasxhU2E/3IzQSZQzc0S4CorDUQ+ecUhwMVF6e2R20DPSKyRaAbhvs8ZJRqy4tU0KTHPLAZ0yuQ==",
       "peerDependencies": {
         "rxjs": "7.8.1",
         "tslib": "^2.6.3"
       }
     },
     "node_modules/@onecx/angular-accelerator": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-5.3.0.tgz",
-      "integrity": "sha512-h6hb1ZdYMnqBEQItH9xwiydDsIIK0S+Jr3fBBdhJJCdAyOjOyrlrsO+JLNYpldvTfCG25FitOLKvaC48VdnIog==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/angular-accelerator/-/angular-accelerator-5.3.1.tgz",
+      "integrity": "sha512-s7DF882nWVepVv68V4c/MXUOaGh2T4N836kMOMo0S1i/Ja6vU4vHhljOK1DP+IQVRUeu/vYueG+h/quEG0dSeg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -6455,9 +6455,9 @@
       }
     },
     "node_modules/@onecx/angular-auth": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-5.3.0.tgz",
-      "integrity": "sha512-UZZtn8Y1DOiBPYEsiu41Kbx/NomFEWyB0BDrtgprnLT4HlEKNXhplFndk7mo6Tn86rOvGrI8vr3hMpOmXU7gXw==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/angular-auth/-/angular-auth-5.3.1.tgz",
+      "integrity": "sha512-GAT75Ya/lKwOBcnkwdOBMpqBooeEQn3Ol1a9xWHitEkXohGqoKki2RuCdRYEbRcdYselAf29LD/QvXvItj5b8Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -6473,9 +6473,9 @@
       }
     },
     "node_modules/@onecx/angular-integration-interface": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-5.3.0.tgz",
-      "integrity": "sha512-5bZd9DNDjFGhFjxMqNCfbuLVtf8bQJo7qQ77fKfK8JoiJegqXsR0L+ixf4UdAKKf/ZB3Br0SZycsDP72PYhleQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/angular-integration-interface/-/angular-integration-interface-5.3.1.tgz",
+      "integrity": "sha512-wiK4dJFY83GlT75wWFqLsSnkpnlGoy72/zxwgUpIQucEuc1xH4CPZOxCnADZagzMfJLE6mZ/6OEjL4pgBe0Apg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -6486,9 +6486,9 @@
       }
     },
     "node_modules/@onecx/angular-remote-components": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-5.3.0.tgz",
-      "integrity": "sha512-k6LtLLw4ojsHjcm+8HO4/ubWdib7FfilmPvireVtjSZvJrdQKVO4mXlWee2wgk1cG5LICFiHdES55AJXM4A1lQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/angular-remote-components/-/angular-remote-components-5.3.1.tgz",
+      "integrity": "sha512-e4UyRDp6gPxulqISNDhdWEphzgj0fLQZbIGhqlzklw/OR93wB2QGBkdX2yf04zfGyEOhmyilgN10EdCo68/dkA==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -6503,9 +6503,9 @@
       }
     },
     "node_modules/@onecx/angular-testing": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-5.3.0.tgz",
-      "integrity": "sha512-x9XgCZRPOcr10j9bCCp7F/8TTZv0f5xG7Rk5pACVzozuitJvJ1C3D+BFOnB7ZPxbsPmm1R+rKaR2Uw4GPWmNlA==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/angular-testing/-/angular-testing-5.3.1.tgz",
+      "integrity": "sha512-EsR62UvDdKy4YYnMc8Ng2IjKls2rb2jG9gVofmqsEpWXNYbN1OrvtLBVxPXtnzH9AOrqMx6/Sc19nbkhBS5MMg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -6515,9 +6515,9 @@
       }
     },
     "node_modules/@onecx/angular-webcomponents": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-5.3.0.tgz",
-      "integrity": "sha512-yipqZmy3vcTSZkkefluPOaRs6p5iJlBlJi5lv6qkp4zNw2RT9Xbj/w0dNaO9LBuqgMdwOXHn7Gw7e2Qa9pt+Gw==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/angular-webcomponents/-/angular-webcomponents-5.3.1.tgz",
+      "integrity": "sha512-8hPPOHP7SEXO5lcwt06+IUic7+aYjl/4VkfCZWJVAeZY+ianTsjFxhO/SiZ3Y5JlzDjjbuciwPqmXorXxyH30Q==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -6532,9 +6532,9 @@
       }
     },
     "node_modules/@onecx/integration-interface": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-5.3.0.tgz",
-      "integrity": "sha512-r3Mu5x9reuUwbH1NaNRzJzyyjR7yg7n/eNIICkx5PEgDsyZyZIU0euNnaN9y5P2k0S63ITpbxBWk4ivbMtE4hw==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/integration-interface/-/integration-interface-5.3.1.tgz",
+      "integrity": "sha512-f7K3Wo+eJiN0acVX5CZfa6fS++RWGxhQZXr5KDDLF7lZzp+xyZPnBBScbAWSdgrjMbTjPzu5GiReaOiCARiD3g==",
       "peerDependencies": {
         "@onecx/accelerator": "^5",
         "rxjs": "7.8.1",
@@ -6542,9 +6542,9 @@
       }
     },
     "node_modules/@onecx/keycloak-auth": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-5.3.0.tgz",
-      "integrity": "sha512-4dXJQ8IWNa11CGvxFnHmN/xphcNJSczOsIF79wt6Y72nW9LNEVNOv07+wZYwpknm5aLNX9ig7Zh6kEVB9QGgiQ==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/keycloak-auth/-/keycloak-auth-5.3.1.tgz",
+      "integrity": "sha512-qVFLMiNozy63kYvAcS7P4RovWADG7AbHgr8kWPeFMFA1KHgnP3lYiznVsqe6Fa6d9fTVxEfw2XLk5UZPozUjgg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -6559,9 +6559,9 @@
       }
     },
     "node_modules/@onecx/portal-integration-angular": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-5.3.0.tgz",
-      "integrity": "sha512-48XqCdqHFfnMjRlf8H80pV9Qbe5TBxpVVmDMV4E22K5VQ9tVOcRmK1RvBxXodoRivg8dSNL23Qtf0lk0Cu0TOA==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/portal-integration-angular/-/portal-integration-angular-5.3.1.tgz",
+      "integrity": "sha512-K2NV3K5fZ6g5BZoKENRtpRf9F8L8DiTaHOmXKFu4I4ZX9GDWcjUo7Mpw87aRmEXIFn27rVOrQfTDuQWvyiIDFw==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -6593,9 +6593,9 @@
       }
     },
     "node_modules/@onecx/portal-layout-styles": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-5.3.0.tgz",
-      "integrity": "sha512-n0Bc9DUXy2p0ECaf8mgW3iCZxpyAiqJgJEjjrXf71Bur4BoDpER3B3e0JOp0T/xD5r6n88o6EaVju3l9mES77g==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@onecx/portal-layout-styles/-/portal-layout-styles-5.3.1.tgz",
+      "integrity": "sha512-pohgWxQgCVCJ2EZTAzqdBFur6AJF8NOf/6Cr24xTxHE24cOaDkoOu5vEkgYyGKn3UU5m7/WY2pDziJPrnVrSuw==",
       "peerDependencies": {
         "tslib": "^2.6.3"
       }
@@ -16188,9 +16188,9 @@
       }
     },
     "node_modules/husky": {
-      "version": "9.1.3",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.3.tgz",
-      "integrity": "sha512-ET3TQmQgdIu0pt+jKkpo5oGyg/4MQZpG6xcam5J5JyNJV+CBT23OBpCF15bKHKycRyMH9k6ONy8g2HdGIsSkMQ==",
+      "version": "9.1.4",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.4.tgz",
+      "integrity": "sha512-bho94YyReb4JV7LYWRWxZ/xr6TtOTt8cMfmQ39MQYJ7f/YE268s3GdghGwi+y4zAeqewE5zYLvuhV0M0ijsDEA==",
       "dev": true,
       "license": "MIT",
       "bin": {
diff --git a/package.json b/package.json
index c319785..21171c7 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,7 @@
   },
   "scripts": {
     "build": "ng build",
-    "clean": "npm cache clean --force && npm run clean-angular && ng cache clean && rm .eslintcache",
-    "clean-angular": "ng cache clean",
+    "clean": "npm cache clean --force && ng cache clean && rm -f .eslintcache && rm -f ./node_modules/.cache/prettier/.prettier-cache",
     "start": "ng serve --configuration=development --proxy-config=proxy.conf.js",
     "prepare": "husky",
     "lint": "ng lint --cache=true",
@@ -53,17 +52,17 @@
     "@ngrx/router-store": "^18.0.1",
     "@ngx-translate/core": "^15.0.0",
     "@ngx-translate/http-loader": "^8.0.0",
-    "@onecx/accelerator": "^5.3.0",
-    "@onecx/angular-accelerator": "^5.3.0",
-    "@onecx/angular-auth": "^5.3.0",
-    "@onecx/angular-integration-interface": "^5.3.0",
-    "@onecx/angular-remote-components": "^5.3.0",
-    "@onecx/angular-webcomponents": "^5.3.0",
-    "@onecx/angular-testing": "^5.3.0",
-    "@onecx/integration-interface": "^5.3.0",
-    "@onecx/keycloak-auth": "^5.3.0",
-    "@onecx/portal-integration-angular": "^5.3.0",
-    "@onecx/portal-layout-styles": "^5.3.0",
+    "@onecx/accelerator": "^5.3.1",
+    "@onecx/angular-accelerator": "^5.3.1",
+    "@onecx/angular-auth": "^5.3.1",
+    "@onecx/angular-integration-interface": "^5.3.1",
+    "@onecx/angular-remote-components": "^5.3.1",
+    "@onecx/angular-webcomponents": "^5.3.1",
+    "@onecx/angular-testing": "^5.3.1",
+    "@onecx/integration-interface": "^5.3.1",
+    "@onecx/keycloak-auth": "^5.3.1",
+    "@onecx/portal-integration-angular": "^5.3.1",
+    "@onecx/portal-layout-styles": "^5.3.1",
     "@webcomponents/webcomponentsjs": "^2.8.0",
     "file-saver": "^2.0.5",
     "i18n-iso-countries": "^7.11.3",
@@ -109,7 +108,7 @@
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-prettier": "^5.2.1",
-    "husky": "^9.1.2",
+    "husky": "^9.1.4",
     "jasmine-core": "~5.2.0",
     "jasmine-spec-reporter": "^7.0.0",
     "karma": "^6.4.4",
diff --git a/src/_mixins.scss b/src/_mixins.scss
index 8794b59..5c1cd1f 100644
--- a/src/_mixins.scss
+++ b/src/_mixins.scss
@@ -101,7 +101,7 @@
 
 @mixin dataview-list-zebra-rows {
   :host ::ng-deep {
-    .p-dataview-list .p-dataview-content .p-grid > div {
+    .p-dataview-list .p-dataview-content > div {
       &:nth-child(odd) {
         background-color: #f8f9fa;
       }
diff --git a/src/app/shared/theme-color-box/theme-color-box.component.html b/src/app/shared/theme-color-box/theme-color-box.component.html
index 5d6c74b..c5ff3ce 100644
--- a/src/app/shared/theme-color-box/theme-color-box.component.html
+++ b/src/app/shared/theme-color-box/theme-color-box.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="properties" [class]="'p-inputtext theme-color-box flex p-0 w-14rem ' + styleClass">
+<div *ngIf="properties" [class]="'p-inputtext theme-color-box flex p-0 ' + styleClass">
   <div
     *ngIf="properties.general && properties.topbar"
     class="theme-color"
diff --git a/src/app/shared/theme-color-box/theme-color-box.component.ts b/src/app/shared/theme-color-box/theme-color-box.component.ts
index 1e8789a..f0f6c17 100644
--- a/src/app/shared/theme-color-box/theme-color-box.component.ts
+++ b/src/app/shared/theme-color-box/theme-color-box.component.ts
@@ -6,7 +6,7 @@ import { Component, Input } from '@angular/core'
   templateUrl: './theme-color-box.component.html'
 })
 export class ThemeColorBoxComponent {
-  @Input() public styleClass = 'h-1rem'
+  @Input() public styleClass = 'h-1rem w-14rem '
   @Input() public properties = {
     general: {
       'primary-color': 'lightgray',
diff --git a/src/app/theme/theme-search/theme-search.component.html b/src/app/theme/theme-search/theme-search.component.html
index 35a1ffc..39b45d6 100644
--- a/src/app/theme/theme-search/theme-search.component.html
+++ b/src/app/theme/theme-search/theme-search.component.html
@@ -43,32 +43,49 @@
         ></ng-template>
 
         <!-- LIST -->
-        <ng-template let-themes pTemplate="listItem">
-          <div class="p-grid p-nogutter grid grid-nogutter">
-            <div
-              *ngFor="let theme of themes"
-              class="col-12 grid grid-nogutter align-items-center row-gap-1 listview-row p-1 hover:bg-gray-200 cursor-pointer"
-              [routerLink]="['./', theme.name]"
-            >
-              <div class="col-12 md:col-2 lg:col-2 xl:col-2 text-center">
-                <div class="flex flex-column justify-content-center align-items-center gap-1 md:gap-2 h-full">
-                  <app-image-container
-                    id="theme_search_logo"
-                    [imageUrl]="getLogoUrl(theme)"
-                    [small]="true"
-                  ></app-image-container>
+        <ng-template let-themes let-row="rowIndex" pTemplate="listItem">
+          <div
+            *ngFor="let theme of themes"
+            class="flex flex-row flex-nowrap justify-content-start align-items-center column-gap-3 py-1 px-3 hover:bg-gray-200 cursor-pointer"
+            [routerLink]="['./', theme.name]"
+          >
+            <div class="p-0 col-3 sm:col-3 md:col-2 flex justify-content-around align-items-center">
+              <app-image-container
+                [id]="'theme_search_data_row_' + row + '_logo'"
+                [small]="true"
+                styleClass="h-2rem sm:h-3rem md:h-4rem max-h-2rem sm:max-h-3rem md:max-h-4rem max-w-4rem sm:max-w-8rem"
+                [imageUrl]="getLogoUrl(theme)"
+              ></app-image-container>
+            </div>
+            <div class="p-0 col-5 sm:col-6 xl:col-6">
+              <div class="flex flex-column row-gap-1 justify-content-center">
+                <div
+                  class="sm:font-bold word-break-all"
+                  [id]="'theme_search_data_row_' + row + '_display_name'"
+                  [pTooltip]="theme.displayName.length < 40 ? '' : theme.displayName"
+                  tooltipPosition="top"
+                  tooltipEvent="hover"
+                >
+                  {{ limitText(theme.displayName, 40) }}
                 </div>
-              </div>
-              <div class="col-12 md:col-5 lg:col-5 xl:col-6">
-                <div class="flex flex-column justify-content-center gap-1 text-center md:text-left">
-                  <div class="font-bold">{{ theme.displayName }}</div>
-                  <div>{{ limitText(theme.description, 75) }}</div>
+                <div
+                  class="hidden md:block"
+                  [id]="'theme_search_data_row_' + row + '_description'"
+                  [pTooltip]="theme.description.length < 75 ? '' : theme.description"
+                  tooltipPosition="top"
+                  tooltipEvent="hover"
+                >
+                  {{ limitText(theme.description, 75) }}
                 </div>
               </div>
-              <div class="col-12 md:col-5 lg:col-5 xl:col-4 text-center">
-                <div class="flex flex-column justify-content-center align-items-center h-full">
-                  <app-theme-color-box [properties]="theme.properties" styleClass="h-1rem md:h-2rem" />
-                </div>
+            </div>
+            <div class="p-0 sm:col-3 md:col-4 lg:col-4 xl:col-4">
+              <div class="flex flex-column justify-content-center align-items-center h-full">
+                <app-theme-color-box
+                  [id]="'theme_search_data_row_' + row + '_properties'"
+                  [properties]="theme.properties"
+                  styleClass="h-1rem md:h-1rem w-6rem sm:w-10rem md:w-14rem"
+                />
               </div>
             </div>
           </div>
diff --git a/src/app/theme/theme-search/theme-search.component.scss b/src/app/theme/theme-search/theme-search.component.scss
index 4a9744a..8cdd7b5 100644
--- a/src/app/theme/theme-search/theme-search.component.scss
+++ b/src/app/theme/theme-search/theme-search.component.scss
@@ -9,4 +9,7 @@
   .h-05rem {
     height: 0.5rem;
   }
+  .word-break-all {
+    word-break: break-all;
+  }
 }