diff --git a/src/Toolkit/kits/shadcn/templates/components/Alert.html.twig b/src/Toolkit/kits/shadcn/templates/components/Alert.html.twig
index 36ae0d2a9ed..d5ae97b9894 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Alert.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Alert.html.twig
@@ -12,7 +12,7 @@
 <div
     class="{{ style.apply({variant}, attributes.render('class'))|tailwind_merge }}"
     role="alert"
-    {{ attributes.defaults({role: 'alert'}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Alert/Description.html.twig b/src/Toolkit/kits/shadcn/templates/components/Alert/Description.html.twig
index 159efda191c..712d8722850 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Alert/Description.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Alert/Description.html.twig
@@ -1,6 +1,6 @@
 <p
     class="{{ 'text-sm [&_p]:leading-relaxed ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </p>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Alert/Title.html.twig b/src/Toolkit/kits/shadcn/templates/components/Alert/Title.html.twig
index d2585502353..5a47394168a 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Alert/Title.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Alert/Title.html.twig
@@ -1,6 +1,6 @@
 <h5
     class="{{ 'mb-1 font-medium leading-none tracking-tight ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </h5>
diff --git a/src/Toolkit/kits/shadcn/templates/components/AspectRatio.html.twig b/src/Toolkit/kits/shadcn/templates/components/AspectRatio.html.twig
index 93c3d1a4a5d..f10b04ff765 100644
--- a/src/Toolkit/kits/shadcn/templates/components/AspectRatio.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/AspectRatio.html.twig
@@ -1,7 +1,7 @@
 {%- props ratio, style = '' -%}
 <div
     style="aspect-ratio: {{ ratio }}; {{ style }}"
-    {{ attributes.defaults({}).without('style') }}
+    {{ attributes.without('style') }}
 >
     {%- block content %}{% endblock -%}
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Avatar.html.twig b/src/Toolkit/kits/shadcn/templates/components/Avatar.html.twig
index 3ce5a9ae4cb..40fd86e29fa 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Avatar.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Avatar.html.twig
@@ -1,6 +1,6 @@
 <span
     class="{{ 'relative flex h-10 w-10 shrink-0 overflow-hidden rounded-full ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </span>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Avatar/Image.html.twig b/src/Toolkit/kits/shadcn/templates/components/Avatar/Image.html.twig
index 2863553f8df..0b1dcac2e93 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Avatar/Image.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Avatar/Image.html.twig
@@ -1,4 +1,4 @@
 <img
     class="{{ 'aspect-square h-full w-full ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({alt: ''}).without('class') }}
+    {{ attributes.defaults({alt: ''}) }}
 />
diff --git a/src/Toolkit/kits/shadcn/templates/components/Avatar/Text.html.twig b/src/Toolkit/kits/shadcn/templates/components/Avatar/Text.html.twig
index 553e1de92af..0422495a095 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Avatar/Text.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Avatar/Text.html.twig
@@ -1,6 +1,6 @@
 <span
     class="{{ 'flex h-full w-full items-center justify-center rounded-full bg-muted ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </span>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Badge.html.twig b/src/Toolkit/kits/shadcn/templates/components/Badge.html.twig
index a5a9386658d..aa53c0920aa 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Badge.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Badge.html.twig
@@ -12,7 +12,7 @@
 ) -%}
 <div
     class="{{ style.apply({variant, outline}, attributes.render('class'))|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Ellipsis.html.twig b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Ellipsis.html.twig
index 02152b1baa2..32aa63b39eb 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Ellipsis.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Ellipsis.html.twig
@@ -1,6 +1,6 @@
 <span
     class="{{ 'flex h-9 w-9 items-center justify-center ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
     role="presentation"
     aria-hidden="true"
 >
diff --git a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Item.html.twig b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Item.html.twig
index 02f1ac29c9e..e3e28dedda9 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Item.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Item.html.twig
@@ -1,6 +1,6 @@
 <li
     class="{{ 'inline-flex items-center gap-1.5 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </li>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Link.html.twig b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Link.html.twig
index 0f352f93357..42cfe143bb2 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Link.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Link.html.twig
@@ -1,6 +1,6 @@
 <a
     class="{{ 'transition-colors hover:text-foreground ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </a>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/List.html.twig b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/List.html.twig
index 7faad650f4e..f21230fc2c9 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/List.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/List.html.twig
@@ -1,6 +1,6 @@
 <ol
     class="{{ 'flex flex-wrap items-center gap-1.5 break-words text-sm text-muted-foreground sm:gap-2.5 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </ol>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Page.html.twig b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Page.html.twig
index 4336acb6253..a1c8da7102e 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Page.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Page.html.twig
@@ -1,6 +1,6 @@
 <span
     class="{{ 'font-normal text-foreground ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
     role="link"
     aria-disabled="true"
     aria-current="page"
diff --git a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Separator.html.twig b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Separator.html.twig
index cbfc3f5e6e6..2e11b3871f5 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Separator.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Breadcrumb/Separator.html.twig
@@ -1,6 +1,6 @@
 <li
     class="{{ '[&>svg]:w-3.5 [&>svg]:h-3.5 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
     role="presentation"
     aria-hidden="true"
 >
diff --git a/src/Toolkit/kits/shadcn/templates/components/Button.html.twig b/src/Toolkit/kits/shadcn/templates/components/Button.html.twig
index ca3065ff762..45592a2f6cf 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Button.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Button.html.twig
@@ -21,7 +21,7 @@
 
 <{{ as }}
     class="{{ style.apply({variant, outline, size}, attributes.render('class'))|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </{{ as }}>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Card.html.twig b/src/Toolkit/kits/shadcn/templates/components/Card.html.twig
index badee926be3..96ef038885d 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Card.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Card.html.twig
@@ -1,6 +1,6 @@
 <div
     class="{{ 'rounded-lg border bg-card text-card-foreground shadow-sm ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Card/Content.html.twig b/src/Toolkit/kits/shadcn/templates/components/Card/Content.html.twig
index bfa3277b3d7..8e73fefbc9d 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Card/Content.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Card/Content.html.twig
@@ -1,6 +1,6 @@
 <div
     class="{{ 'p-6 pt-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Card/Description.html.twig b/src/Toolkit/kits/shadcn/templates/components/Card/Description.html.twig
index 445a6c69922..4b8c5e669cb 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Card/Description.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Card/Description.html.twig
@@ -1,6 +1,6 @@
 <div
     class="{{ 'text-sm text-muted-foreground ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Card/Footer.html.twig b/src/Toolkit/kits/shadcn/templates/components/Card/Footer.html.twig
index 055fd3e6f2c..a8e9cdc0999 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Card/Footer.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Card/Footer.html.twig
@@ -1,6 +1,6 @@
 <div
     class="{{ 'flex items-center p-6 pt-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Card/Header.html.twig b/src/Toolkit/kits/shadcn/templates/components/Card/Header.html.twig
index 53c65ea4ae0..171ad5752b9 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Card/Header.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Card/Header.html.twig
@@ -1,6 +1,6 @@
 <div
     class="{{ 'flex flex-col space-y-1.5 p-6 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Card/Title.html.twig b/src/Toolkit/kits/shadcn/templates/components/Card/Title.html.twig
index d1b5ebd105d..e7460a85df8 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Card/Title.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Card/Title.html.twig
@@ -1,6 +1,6 @@
 <div
     class="{{ 'text-2xl font-semibold leading-none tracking-tight ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Checkbox.html.twig b/src/Toolkit/kits/shadcn/templates/components/Checkbox.html.twig
index 7c9208ed188..69730f09be1 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Checkbox.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Checkbox.html.twig
@@ -1,5 +1,5 @@
 <input
     type="checkbox"
     class="{{ 'peer size-4 inline-block align-middle accent-primary ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
diff --git a/src/Toolkit/kits/shadcn/templates/components/Input.html.twig b/src/Toolkit/kits/shadcn/templates/components/Input.html.twig
index 5c0dd260ebc..cc3c21c4305 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Input.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Input.html.twig
@@ -2,5 +2,5 @@
 <input
     type="{{ type }}"
     class="{{ 'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
diff --git a/src/Toolkit/kits/shadcn/templates/components/Label.html.twig b/src/Toolkit/kits/shadcn/templates/components/Label.html.twig
index 661d333d0e3..be0d3058264 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Label.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Label.html.twig
@@ -1,6 +1,6 @@
 <label
     class="{{ ('text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 ' ~ attributes.render('class'))|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </label>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Pagination.html.twig b/src/Toolkit/kits/shadcn/templates/components/Pagination.html.twig
index 3eaf0911b78..3c746f7669d 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Pagination.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Pagination.html.twig
@@ -1,7 +1,7 @@
 <nav
     class="{{ 'mx-auto flex w-full justify-center ' ~ attributes.render('class')|tailwind_merge }}"
     role="navigation"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </nav>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Progress.html.twig b/src/Toolkit/kits/shadcn/templates/components/Progress.html.twig
index 2d62f6c7e82..8f9bcc5ba79 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Progress.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Progress.html.twig
@@ -6,7 +6,7 @@
     aria-valuemin="0"
     aria-valuemax="100"
     aria-valuenow="{{ value }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     <div class="h-full w-full flex-1 bg-primary transition-all" style="transform: translateX(-{{ 100 - value }}%)"></div>
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Select.html.twig b/src/Toolkit/kits/shadcn/templates/components/Select.html.twig
index aad4affc10b..b3c11aa0d8a 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Select.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Select.html.twig
@@ -1,6 +1,6 @@
 <select
     class="{{ 'flex h-10 w-full items-center justify-between rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background data-[placeholder]:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </select>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Separator.html.twig b/src/Toolkit/kits/shadcn/templates/components/Separator.html.twig
index b85e39e0408..666c858cb7e 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Separator.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Separator.html.twig
@@ -13,6 +13,6 @@
     {{ attributes.defaults({
         role: decorative ? 'none' : 'separator',
         'aria-orientation': decorative ? false : orientation,
-    }).without('class') }}
+    }) }}
 >
 </div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Skeleton.html.twig b/src/Toolkit/kits/shadcn/templates/components/Skeleton.html.twig
index 0e1301616a7..22e0e3612c8 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Skeleton.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Skeleton.html.twig
@@ -1,4 +1,4 @@
 <div
     class="{{ 'animate-pulse rounded-full bg-muted ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 ></div>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Switch.html.twig b/src/Toolkit/kits/shadcn/templates/components/Switch.html.twig
index dac0998fb52..d228265d0fe 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Switch.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Switch.html.twig
@@ -1,4 +1,4 @@
 <label class="{{ 'relative inline-flex items-center cursor-pointer ' ~ attributes.render('class')|tailwind_merge }}">
-    <input type="checkbox" class="sr-only peer absolute inset-0 w-full h-full cursor-pointer" {{ attributes.defaults({}).without('class') }}>
+    <input type="checkbox" class="sr-only peer absolute inset-0 w-full h-full cursor-pointer" {{ attributes }}>
     <div class="pointer-events-none w-11 h-6 bg-input rounded-full peer peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-primary peer-disabled:opacity-50 peer-disabled:cursor-not-allowed"></div>
 </label>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Table.html.twig b/src/Toolkit/kits/shadcn/templates/components/Table.html.twig
index 48c55aa2d93..b9f3399d446 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Table.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Table.html.twig
@@ -1,7 +1,7 @@
 <div class="relative w-full overflow-auto">
     <table
         class="{{ 'w-full caption-bottom text-sm ' ~ attributes.render('class')|tailwind_merge }}"
-        {{ attributes.defaults({}).without('class') }}
+        {{ attributes }}
     >
         {%- block content %}{% endblock -%}
     </table>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Table/Body.html.twig b/src/Toolkit/kits/shadcn/templates/components/Table/Body.html.twig
index f7efc6bc957..a9c34280da5 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Table/Body.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Table/Body.html.twig
@@ -1,6 +1,6 @@
 <tbody
     class="{{ '[&_tr:last-child]:border-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </tbody>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Table/Caption.html.twig b/src/Toolkit/kits/shadcn/templates/components/Table/Caption.html.twig
index aa41d4be8ba..e737398c135 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Table/Caption.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Table/Caption.html.twig
@@ -1,6 +1,6 @@
 <caption
     class="{{ 'mt-4 text-sm text-muted-foreground ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </caption>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Table/Cell.html.twig b/src/Toolkit/kits/shadcn/templates/components/Table/Cell.html.twig
index 9a01544a0e9..51fe7c95af0 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Table/Cell.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Table/Cell.html.twig
@@ -1,6 +1,6 @@
 <td
     class="{{ 'p-4 align-middle [&:has([role=checkbox])]:pr-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </td>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Table/Footer.html.twig b/src/Toolkit/kits/shadcn/templates/components/Table/Footer.html.twig
index 07503fbe3aa..5e4a5628e6e 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Table/Footer.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Table/Footer.html.twig
@@ -1,6 +1,6 @@
 <tfoot
     class="{{ 'border-t bg-muted/50 font-medium [&>tr]:last:border-b-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </tfoot>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Table/Head.html.twig b/src/Toolkit/kits/shadcn/templates/components/Table/Head.html.twig
index 33273f96ea6..bfa630a91f3 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Table/Head.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Table/Head.html.twig
@@ -1,6 +1,6 @@
 <th
     class="{{ 'h-12 px-4 text-left align-middle font-medium text-muted-foreground [&:has([role=checkbox])]:pr-0 ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </th>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Table/Header.html.twig b/src/Toolkit/kits/shadcn/templates/components/Table/Header.html.twig
index 610756b8c59..94aee678f4b 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Table/Header.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Table/Header.html.twig
@@ -1,6 +1,6 @@
 <thead
     class="{{ '[&_tr]:border-b ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </thead>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Table/Row.html.twig b/src/Toolkit/kits/shadcn/templates/components/Table/Row.html.twig
index 4e01c5c8850..e58858a2053 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Table/Row.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Table/Row.html.twig
@@ -1,6 +1,6 @@
 <tr
     class="{{ 'border-b transition-colors hover:bg-muted/50 data-[state=selected]:bg-muted ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 >
     {%- block content %}{% endblock -%}
 </tr>
diff --git a/src/Toolkit/kits/shadcn/templates/components/Textarea.html.twig b/src/Toolkit/kits/shadcn/templates/components/Textarea.html.twig
index 399593a0e8a..317a57e1774 100644
--- a/src/Toolkit/kits/shadcn/templates/components/Textarea.html.twig
+++ b/src/Toolkit/kits/shadcn/templates/components/Textarea.html.twig
@@ -1,4 +1,4 @@
 <textarea
     class="{{ 'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm ' ~ attributes.render('class')|tailwind_merge }}"
-    {{ attributes.defaults({}).without('class') }}
+    {{ attributes }}
 ></textarea>