diff --git a/apps/trust/src/components/VendorRow.tsx b/apps/trust/src/components/VendorRow.tsx
index bfadf5e42..cb52c7b05 100644
--- a/apps/trust/src/components/VendorRow.tsx
+++ b/apps/trust/src/components/VendorRow.tsx
@@ -45,6 +45,7 @@ export function VendorRow(props: { vendor: VendorRowFragment$key; hasAnyCountrie
                 href={vendor.privacyPolicyUrl}
                 target="_blank"
                 className={`flex gap-1 text-txt-info items-center hover:underline ${!props.hasAnyCountries ? "md:justify-end" : ""}`}
+                rel="noreferrer"
               >
                 <IconShield size={16} className="flex-none" />
                 <span>{__("Privacy")}</span>
diff --git a/apps/trust/src/pages/auth/ConnectPageLoader.tsx b/apps/trust/src/pages/auth/ConnectPageLoader.tsx
index 300b57e49..1da5325ea 100644
--- a/apps/trust/src/pages/auth/ConnectPageLoader.tsx
+++ b/apps/trust/src/pages/auth/ConnectPageLoader.tsx
@@ -6,7 +6,7 @@ import { RelayProvider } from "#/providers/RelayProviders";
 import type { ConnectPageQuery } from "./__generated__/ConnectPageQuery.graphql";
 import { ConnectPage, connectPageQuery } from "./ConnectPage";
 
-function ConnectPageLoader() {
+function ConnectPageQueryLoader() {
   const [queryRef, loadQuery]
     = useQueryLoader<ConnectPageQuery>(connectPageQuery);
 
@@ -25,10 +25,10 @@ function ConnectPageLoader() {
   );
 }
 
-export default function () {
+export default function ConnectPageLoader() {
   return (
     <RelayProvider>
-      <ConnectPageLoader />
+      <ConnectPageQueryLoader />
     </RelayProvider>
   );
 }
diff --git a/packages/ui/src/Atoms/Breadcrumb/Breadcrumb.tsx b/packages/ui/src/Atoms/Breadcrumb/Breadcrumb.tsx
index 712a3397b..300077718 100644
--- a/packages/ui/src/Atoms/Breadcrumb/Breadcrumb.tsx
+++ b/packages/ui/src/Atoms/Breadcrumb/Breadcrumb.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 import { Fragment } from "react/jsx-runtime";
 import { Link } from "react-router";
 
diff --git a/packages/ui/src/Atoms/DataTable/DataTable.tsx b/packages/ui/src/Atoms/DataTable/DataTable.tsx
index 5fe06b591..88ec53f4d 100644
--- a/packages/ui/src/Atoms/DataTable/DataTable.tsx
+++ b/packages/ui/src/Atoms/DataTable/DataTable.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 import {
   type ComponentPropsWithRef,
   type FC,
diff --git a/packages/ui/src/Atoms/FrameworkLogo/FrameworkLogo.tsx b/packages/ui/src/Atoms/FrameworkLogo/FrameworkLogo.tsx
index 2bbd2f48c..5c0e6bdd8 100644
--- a/packages/ui/src/Atoms/FrameworkLogo/FrameworkLogo.tsx
+++ b/packages/ui/src/Atoms/FrameworkLogo/FrameworkLogo.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 
 import { Avatar } from "../Avatar/Avatar";
 
diff --git a/packages/ui/src/Atoms/Frameworks/CASA.tsx b/packages/ui/src/Atoms/Frameworks/CASA.tsx
index 5becb54b5..7b6529374 100644
--- a/packages/ui/src/Atoms/Frameworks/CASA.tsx
+++ b/packages/ui/src/Atoms/Frameworks/CASA.tsx
@@ -11,7 +11,7 @@ export function CASA(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/CCPA.tsx b/packages/ui/src/Atoms/Frameworks/CCPA.tsx
index 50afcbbfe..eba86594f 100644
--- a/packages/ui/src/Atoms/Frameworks/CCPA.tsx
+++ b/packages/ui/src/Atoms/Frameworks/CCPA.tsx
@@ -11,7 +11,7 @@ export function CCPA(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <rect
@@ -23,7 +23,7 @@ export function CCPA(props: { className?: string }) {
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linecap="round"
+        strokeLinecap="round"
         d="M37.612999,33.953899l3.472099,3.064301c0.019501,0.019299,0.032101,0.044498,0.035801,0.071602l0.495399,5.054699c0.002003,0.028198-0.006298,0.056099-0.0233,0.078598c-0.016998,0.022503-0.041599,0.038101-0.069199,0.0438l-7.0364,1.338802c-0.013599,0.002598-0.0275,0.003899-0.041401,0.003899c-0.0186-0.000599-0.0368-0.005901-0.052998-0.015301C34.3769,43.584999,34.3633,43.5718,34.3535,43.555901L32.8601,41.1959c-0.225998-0.356998-0.559101-0.633301-0.951799-0.7892l-6.157301-2.445599c-0.017899-0.008102-0.0336-0.0205-0.045599-0.036102c-0.0119-0.015598-0.019901-0.034-0.023001-0.053398l-0.252199-2.0219c-0.051401-0.412201-0.2299-0.798203-0.510801-1.104401l-3.2414-3.533701c-0.0149-0.017799-0.0242-0.039598-0.026899-0.0627l-0.3354-2.535c-0.0536-0.4049-0.2299-0.783699-0.5051-1.0854l-2.396999-2.6278c-0.018501-0.0205-0.029001-0.046999-0.0298-0.0746v-8.324999c0-0.014801,0.002899-0.0294,0.008699-0.043001c0.005699-0.013599,0.014101-0.0259,0.0247-0.0362c0.0105-0.0103,0.0231-0.018299,0.0368-0.023701c0.0138-0.0054,0.0284-0.007898,0.0432-0.0075h9.25c0.014799-0.000399,0.0294,0.0021,0.0432,0.0075c0.0137,0.005402,0.026201,0.013401,0.0368,0.023701s0.019001,0.0226,0.0247,0.0362c0.005699,0.013601,0.008699,0.0282,0.008699,0.043001V24.2633c0,0.548,0.2248,1.071899,0.622,1.449499L29.0972,26.2971"
       />
       <rect
@@ -35,8 +35,8 @@ export function CCPA(props: { className?: string }) {
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linecap="round"
-        stroke-linejoin="round"
+        strokeLinecap="round"
+        strokeLinejoin="round"
         d="M34.121101,28.5574l0.980297,0.980301l2.287502-2.2875"
       />
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/DORA.tsx b/packages/ui/src/Atoms/Frameworks/DORA.tsx
index 62a9e6edb..08ab544db 100644
--- a/packages/ui/src/Atoms/Frameworks/DORA.tsx
+++ b/packages/ui/src/Atoms/Frameworks/DORA.tsx
@@ -11,7 +11,7 @@ export function DORA(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/FERPA.tsx b/packages/ui/src/Atoms/Frameworks/FERPA.tsx
index 3adadac7a..e9952c8b3 100644
--- a/packages/ui/src/Atoms/Frameworks/FERPA.tsx
+++ b/packages/ui/src/Atoms/Frameworks/FERPA.tsx
@@ -8,7 +8,7 @@ export function FERPA() {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <rect
@@ -29,47 +29,47 @@ export function FERPA() {
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linejoin="round"
+        strokeLinejoin="round"
         d="M39.9837,31.1087c-2.278999,0.845301-4.780701-0.233-4.780701-0.233s1.193302-2.4489,3.472301-3.2943c2.278999-0.845301,4.780598,0.233,4.780598,0.233S42.262699,30.2633,39.9837,31.1087z"
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linejoin="round"
+        strokeLinejoin="round"
         d="M36.877399,38.512798c-2.544899,0.164001-4.714298-1.354-4.714298-1.354s1.9566-1.783897,4.501499-1.947998c2.5448-0.164001,4.714298,1.354,4.714298,1.354S39.422298,38.348701,36.877399,38.512798z"
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linejoin="round"
+        strokeLinejoin="round"
         d="M33.2052,28.852501C32.822399,31.2246,30.2953,32.865898,30.2953,32.865898s-1.906399-2.204597-1.5236-4.576698s2.909901-4.013399,2.909901-4.013399S33.588001,26.4804,33.2052,28.852501z"
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linejoin="round"
+        strokeLinejoin="round"
         d="M24.9828,35.002602c2.383701,0.302898,4.672001-1.657703,4.672001-1.657703s-1.5763-2.451498-3.9599-2.754299c-2.383701-0.302898-4.672001,1.6577-4.672001,1.6577S22.599199,34.699799,24.9828,35.002602z"
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linejoin="round"
+        strokeLinejoin="round"
         d="M25.849501,41.308998c1.8536,0.048302,3.400999-1.636497,3.400999-1.636497s-1.4578-1.762802-3.3113-1.811001c-1.8536-0.048199-3.400999,1.636501-3.400999,1.636501S23.995899,41.260799,25.849501,41.308998z"
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linejoin="round"
+        strokeLinejoin="round"
         d="M34.430401,23.423201c0.451698,2.0844,2.318699,3.4489,2.318699,3.4489s1.134701-2.015001,0.682999-4.099401c-0.451698-2.0844-2.318699-3.4489-2.318699-3.4489S33.978699,21.3388,34.430401,23.423201z"
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linejoin="round"
+        strokeLinejoin="round"
         d="M28.4242,22.279499c-0.067101,2.361101-2.3174,4.212702-2.3174,4.212702s-2.141399-1.976601-2.0742-4.337702S26.3501,17.9419,26.3501,17.9419S28.4914,19.9184,28.4242,22.279499z"
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linejoin="round"
+        strokeLinejoin="round"
         d="M21.2068,29.0975c2.361099,0.0672,4.3377-2.0742,4.3377-2.0742s-1.851601-2.2502-4.2127-2.3174s-4.337601,2.0741-4.337601,2.0741S18.845699,29.0303,21.2068,29.0975z"
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linecap="round"
+        strokeLinecap="round"
         d="M24.527901,45.939899c1.3981-0.696499,4.033499-3.188499,5.056-5.462601 M20.4883,20.946501c0,0,9.6497,7.2514,9.907299,15.638998c0.0434,1.4137-0.288399,2.727802-0.811699,3.8918 M29.5839,40.477299c6.179401-6.8633,6.518799-16.037098,11.2883-18.222399"
       />
       <rect
diff --git a/packages/ui/src/Atoms/Frameworks/GDPR.tsx b/packages/ui/src/Atoms/Frameworks/GDPR.tsx
index d3db49160..43751b148 100644
--- a/packages/ui/src/Atoms/Frameworks/GDPR.tsx
+++ b/packages/ui/src/Atoms/Frameworks/GDPR.tsx
@@ -11,7 +11,7 @@ export function GDPR(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/HIPAA.tsx b/packages/ui/src/Atoms/Frameworks/HIPAA.tsx
index f83a94d29..51c0994f0 100644
--- a/packages/ui/src/Atoms/Frameworks/HIPAA.tsx
+++ b/packages/ui/src/Atoms/Frameworks/HIPAA.tsx
@@ -11,7 +11,7 @@ export function HIPAA(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <circle
@@ -22,12 +22,12 @@ export function HIPAA(props: { className?: string }) {
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linecap="round"
+        strokeLinecap="round"
         d="M6,30c0,9.285099,5.2727,17.338699,12.987301,21.3298 M30,6c-7.1101,0-13.497999,3.0918-17.8927,8.0043"
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linecap="round"
+        strokeLinecap="round"
         d="M53.494099,30c0,9.285099-5.272697,17.338699-12.987297,21.3298M29.494101,6c7.110098,0,13.497999,3.0918,17.892698,8.0043"
       />
       <circle
@@ -42,8 +42,8 @@ export function HIPAA(props: { className?: string }) {
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linecap="round"
-        stroke-linejoin="round"
+        strokeLinecap="round"
+        strokeLinejoin="round"
         d="M29.8696,25.396c-6.1423,0.2393-5.6989-9.0175-11.4363-9.017599c-3.2858,0-5.1936,4.928598-10.33418,4.928598c0.37099,3.179701,8.61708,9.9102,13.61988,9.4862"
       />
       <path
@@ -52,8 +52,8 @@ export function HIPAA(props: { className?: string }) {
       />
       <path
         className="fill-none stroke-txt-primary"
-        stroke-linecap="round"
-        stroke-linejoin="round"
+        strokeLinecap="round"
+        strokeLinejoin="round"
         d="M30,25.396c6.1423,0.2393,5.698898-9.0175,11.436401-9.017599c3.285698,0,5.193501,4.928598,10.334099,4.928598c-0.370998,3.179701-8.6171,9.9102-13.6199,9.4862"
       />
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/ISO27001.tsx b/packages/ui/src/Atoms/Frameworks/ISO27001.tsx
index 655bf254e..1b678820c 100644
--- a/packages/ui/src/Atoms/Frameworks/ISO27001.tsx
+++ b/packages/ui/src/Atoms/Frameworks/ISO27001.tsx
@@ -11,7 +11,7 @@ export function ISO27001(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/ISO27701.tsx b/packages/ui/src/Atoms/Frameworks/ISO27701.tsx
index ea0d0c3eb..36b913fa0 100644
--- a/packages/ui/src/Atoms/Frameworks/ISO27701.tsx
+++ b/packages/ui/src/Atoms/Frameworks/ISO27701.tsx
@@ -11,7 +11,7 @@ export function ISO27701(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/ISO42001.tsx b/packages/ui/src/Atoms/Frameworks/ISO42001.tsx
index 699f62b4c..ad3c4cea5 100644
--- a/packages/ui/src/Atoms/Frameworks/ISO42001.tsx
+++ b/packages/ui/src/Atoms/Frameworks/ISO42001.tsx
@@ -10,7 +10,7 @@ export function ISO42001(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
       className={className}
     >
diff --git a/packages/ui/src/Atoms/Frameworks/NIS2.tsx b/packages/ui/src/Atoms/Frameworks/NIS2.tsx
index ab1bd7cd6..331a1b655 100644
--- a/packages/ui/src/Atoms/Frameworks/NIS2.tsx
+++ b/packages/ui/src/Atoms/Frameworks/NIS2.tsx
@@ -11,7 +11,7 @@ export function NIS2(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/SOC2.tsx b/packages/ui/src/Atoms/Frameworks/SOC2.tsx
index a0c1fed1e..8efc14779 100644
--- a/packages/ui/src/Atoms/Frameworks/SOC2.tsx
+++ b/packages/ui/src/Atoms/Frameworks/SOC2.tsx
@@ -11,7 +11,7 @@ export function SOC2(props: { className?: string }) {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/SOC2_TYPE1.tsx b/packages/ui/src/Atoms/Frameworks/SOC2_TYPE1.tsx
index 99aa6c7af..77555eb01 100644
--- a/packages/ui/src/Atoms/Frameworks/SOC2_TYPE1.tsx
+++ b/packages/ui/src/Atoms/Frameworks/SOC2_TYPE1.tsx
@@ -8,7 +8,7 @@ export function SOC2_TYPE1() {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/SOC2_TYPE2.tsx b/packages/ui/src/Atoms/Frameworks/SOC2_TYPE2.tsx
index 4d7d24f59..1710f3473 100644
--- a/packages/ui/src/Atoms/Frameworks/SOC2_TYPE2.tsx
+++ b/packages/ui/src/Atoms/Frameworks/SOC2_TYPE2.tsx
@@ -8,7 +8,7 @@ export function SOC2_TYPE2() {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Frameworks/SOC3.tsx b/packages/ui/src/Atoms/Frameworks/SOC3.tsx
index 943f6baea..6494d9ef7 100644
--- a/packages/ui/src/Atoms/Frameworks/SOC3.tsx
+++ b/packages/ui/src/Atoms/Frameworks/SOC3.tsx
@@ -8,7 +8,7 @@ export function SOC3() {
       x="0px"
       y="0px"
       viewBox="0 0 60 60"
-      enable-background="new 0 0 60 60"
+      enableBackground="new 0 0 60 60"
       xmlSpace="preserve"
     >
       <path
diff --git a/packages/ui/src/Atoms/Logo/Logo.tsx b/packages/ui/src/Atoms/Logo/Logo.tsx
index cb8e1ddff..b6f6b6fc8 100644
--- a/packages/ui/src/Atoms/Logo/Logo.tsx
+++ b/packages/ui/src/Atoms/Logo/Logo.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 import { useId } from "react";
 
 type Props = {
@@ -13,7 +13,7 @@ export function Logo({ className, withPicto }: Props) {
       <svg
         xmlns="http://www.w3.org/2000/svg"
         fill="none"
-        className={clsx(className, "aspect-[88/24]")}
+        className={clsx(className, "aspect-88/24")}
         viewBox="0 0 90 24"
       >
         <g clipPath={`url(#${id}-a)`}>
diff --git a/packages/ui/src/Atoms/PriorityLevel/PriorityLevel.tsx b/packages/ui/src/Atoms/PriorityLevel/PriorityLevel.tsx
index 543840fa7..5a7f3b181 100644
--- a/packages/ui/src/Atoms/PriorityLevel/PriorityLevel.tsx
+++ b/packages/ui/src/Atoms/PriorityLevel/PriorityLevel.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 
 type Props = {
   level: number;
diff --git a/packages/ui/src/Atoms/Slot.tsx b/packages/ui/src/Atoms/Slot.tsx
index 9eda9a4ad..d3d17e75f 100644
--- a/packages/ui/src/Atoms/Slot.tsx
+++ b/packages/ui/src/Atoms/Slot.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 import type { PropsWithChildren, ReactNode } from "react";
 import { Children, cloneElement, isValidElement } from "react";
 
diff --git a/packages/ui/src/Atoms/Spinner/Spinner.tsx b/packages/ui/src/Atoms/Spinner/Spinner.tsx
index 7904ff400..c5467442b 100644
--- a/packages/ui/src/Atoms/Spinner/Spinner.tsx
+++ b/packages/ui/src/Atoms/Spinner/Spinner.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 
 type Props = { size?: number; className?: string; centered?: boolean };
 
diff --git a/packages/ui/src/Atoms/Table/Table.tsx b/packages/ui/src/Atoms/Table/Table.tsx
index 5f7cc0dbb..b3031a6f9 100644
--- a/packages/ui/src/Atoms/Table/Table.tsx
+++ b/packages/ui/src/Atoms/Table/Table.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 import {
   createContext,
   type FC,
diff --git a/packages/ui/src/Atoms/Textarea/Textarea.tsx b/packages/ui/src/Atoms/Textarea/Textarea.tsx
index b898d6529..18fceb71a 100644
--- a/packages/ui/src/Atoms/Textarea/Textarea.tsx
+++ b/packages/ui/src/Atoms/Textarea/Textarea.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 import {
   type RefCallback,
   type TextareaHTMLAttributes,
diff --git a/packages/ui/src/Foundation.stories.tsx b/packages/ui/src/Foundation.stories.tsx
index 8e23fce21..de640421e 100644
--- a/packages/ui/src/Foundation.stories.tsx
+++ b/packages/ui/src/Foundation.stories.tsx
@@ -98,9 +98,9 @@ export const Colors: Story = {
       ],
     ] as [string, string[]][];
     return (
-      <div className="divide-dashed divide-y-1 divide-border-low">
+      <div className="divide-dashed divide-y divide-border-low">
         {colors.map(([name, variants]) => (
-          <div className="space-y-10 py-10">
+          <div key={name} className="space-y-10 py-10">
             <h2 className="text-xl">{name}</h2>
             <div className="flex flex-wrap gap-8">
               {variants.map(variant => (
@@ -146,7 +146,7 @@ export const Typography: Story = {
       "text-xxs",
     ];
     return (
-      <div className="divide-dashed divide-y-1 divide-border-low">
+      <div className="divide-dashed divide-y divide-border-low">
         {textVariants.map(variant => (
           <div className="flex items-center py-4" key={variant}>
             <div className="opacity-50 w-50 flex-none">
@@ -168,6 +168,7 @@ export const Icons: Story = {
     return (
       <div className="flex flex-wrap gap-4">
         {objectKeys(icons).map((k) => {
+          /* eslint import-x/namespace: ['error', { allowComputed: true }] */
           const IconComponent = icons[k];
           return (
             <button
diff --git a/packages/ui/src/Layouts/Layout.tsx b/packages/ui/src/Layouts/Layout.tsx
index 7e5ecde86..90005a5c5 100644
--- a/packages/ui/src/Layouts/Layout.tsx
+++ b/packages/ui/src/Layouts/Layout.tsx
@@ -1,4 +1,4 @@
-import clsx from "clsx";
+import { clsx } from "clsx";
 import {
   createContext,
   type PropsWithChildren,
diff --git a/packages/ui/src/Molecules/Dialog/ConfirmDialog.tsx b/packages/ui/src/Molecules/Dialog/ConfirmDialog.tsx
index 432c7f150..58af3d206 100644
--- a/packages/ui/src/Molecules/Dialog/ConfirmDialog.tsx
+++ b/packages/ui/src/Molecules/Dialog/ConfirmDialog.tsx
@@ -128,9 +128,9 @@ function ConfirmDialogContent() {
         <Overlay className={dialogStyles.overlay} />
         <Content className={dialogStyles.content}>
           <header className={dialogStyles.header}>
-            <Title children={title} className={dialogStyles.title} />
+            <Title className={dialogStyles.title}>{title}</Title>
           </header>
-          <Description className="p-6" children={message} />
+          <Description className="p-6">{message}</Description>
           <footer className={dialogStyles.footer}>
             <Cancel asChild>
               <Button disabled={loading} variant="tertiary">
diff --git a/packages/ui/src/Molecules/Dialog/Dialog.tsx b/packages/ui/src/Molecules/Dialog/Dialog.tsx
index 475994ed3..542b20162 100644
--- a/packages/ui/src/Molecules/Dialog/Dialog.tsx
+++ b/packages/ui/src/Molecules/Dialog/Dialog.tsx
@@ -8,7 +8,7 @@ import {
   Title,
   Trigger,
 } from "@radix-ui/react-dialog";
-import clsx from "clsx";
+import { clsx } from "clsx";
 import {
   Children,
   cloneElement,
@@ -203,7 +203,6 @@ export function DialogContent({
   return (
     <div
       {...props}
-      children={children}
       className={clsx(
         "overflow-y-auto",
         props.className,
@@ -215,7 +214,9 @@ export function DialogContent({
           "maxHeight": "var(--maxHeight)",
         } as CSSProperties
       }
-    />
+    >
+      {children}
+    </div>
   );
 }
 
diff --git a/packages/ui/src/Molecules/MeasureImplementation/MeasureImplementation.tsx b/packages/ui/src/Molecules/MeasureImplementation/MeasureImplementation.tsx
index 11222fa89..51b960c4e 100644
--- a/packages/ui/src/Molecules/MeasureImplementation/MeasureImplementation.tsx
+++ b/packages/ui/src/Molecules/MeasureImplementation/MeasureImplementation.tsx
@@ -1,6 +1,6 @@
 import { getMeasureStateLabel, measureStates } from "@probo/helpers";
 import { useTranslate } from "@probo/i18n";
-import clsx from "clsx";
+import { clsx } from "clsx";
 import type { ComponentProps } from "react";
 
 import type { MeasureBadge } from "../Badge/MeasureBadge";
diff --git a/packages/ui/src/Molecules/Risks/RiskOverview.tsx b/packages/ui/src/Molecules/Risks/RiskOverview.tsx
index b503c5831..76df89f0c 100644
--- a/packages/ui/src/Molecules/Risks/RiskOverview.tsx
+++ b/packages/ui/src/Molecules/Risks/RiskOverview.tsx
@@ -4,7 +4,7 @@ import {
   getSeverity,
 } from "@probo/helpers";
 import { useTranslate } from "@probo/i18n";
-import clsx from "clsx";
+import { clsx } from "clsx";
 
 import { Card } from "../../Atoms/Card/Card";
 
diff --git a/packages/ui/src/Molecules/Risks/RisksChart.tsx b/packages/ui/src/Molecules/Risks/RisksChart.tsx
index f6b900723..06c8bb8bd 100644
--- a/packages/ui/src/Molecules/Risks/RisksChart.tsx
+++ b/packages/ui/src/Molecules/Risks/RisksChart.tsx
@@ -1,6 +1,6 @@
 import { getRiskImpacts, getRiskLikelihoods, groupBy } from "@probo/helpers";
 import { useTranslate } from "@probo/i18n";
-import clsx from "clsx";
+import { clsx } from "clsx";
 import { Fragment, useMemo } from "react";
 import { Link } from "react-router";