diff --git a/resources/views/components/pagination.blade.php b/resources/views/components/pagination.blade.php
index dedf4507d..4a9ffca95 100644
--- a/resources/views/components/pagination.blade.php
+++ b/resources/views/components/pagination.blade.php
@@ -1,4 +1,4 @@
-@aware(['component','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@aware(['isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 
 @includeWhen(
     $this->hasConfigurableAreaFor('before-pagination'), 
diff --git a/resources/views/components/table.blade.php b/resources/views/components/table.blade.php
index 331c0b25f..87d0c3c05 100644
--- a/resources/views/components/table.blade.php
+++ b/resources/views/components/table.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap'])
+@aware([ 'tableName','isTailwind','isBootstrap'])
 
 @php
     $customAttributes = [
diff --git a/resources/views/components/table/collapsed-columns.blade.php b/resources/views/components/table/collapsed-columns.blade.php
index 46223a64b..f773bd8ae 100644
--- a/resources/views/components/table/collapsed-columns.blade.php
+++ b/resources/views/components/table/collapsed-columns.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName', 'primaryKey','isTailwind','isBootstrap'])
+@aware([ 'tableName', 'primaryKey','isTailwind','isBootstrap'])
 @props(['row', 'rowIndex'])
 
 @php
diff --git a/resources/views/components/table/empty.blade.php b/resources/views/components/table/empty.blade.php
index a5f1b5d22..705f93d48 100644
--- a/resources/views/components/table/empty.blade.php
+++ b/resources/views/components/table/empty.blade.php
@@ -1,4 +1,4 @@
-@aware(['component','isTailwind','isBootstrap'])
+@aware(['isTailwind','isBootstrap'])
 
 @php($attributes = $attributes->merge(['wire:key' => 'empty-message-'.$this->getId()]))
 
diff --git a/resources/views/components/table/td.blade.php b/resources/views/components/table/td.blade.php
index 0ce20238b..546bf33fe 100644
--- a/resources/views/components/table/td.blade.php
+++ b/resources/views/components/table/td.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'row', 'rowIndex', 'tableName', 'primaryKey','isTailwind','isBootstrap'])
+@aware([ 'row', 'rowIndex', 'tableName', 'primaryKey','isTailwind','isBootstrap'])
 @props(['column', 'colIndex'])
 
 @php
diff --git a/resources/views/components/table/td/bulk-actions.blade.php b/resources/views/components/table/td/bulk-actions.blade.php
index 918743395..df5338f7f 100644
--- a/resources/views/components/table/td/bulk-actions.blade.php
+++ b/resources/views/components/table/td/bulk-actions.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','primaryKey'])
+@aware([ 'tableName','primaryKey'])
 @props(['row', 'rowIndex'])
 
 @php
diff --git a/resources/views/components/table/td/collapsed-columns.blade.php b/resources/views/components/table/td/collapsed-columns.blade.php
index 166a62138..3bf65e170 100644
--- a/resources/views/components/table/td/collapsed-columns.blade.php
+++ b/resources/views/components/table/td/collapsed-columns.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap'])
+@aware([ 'tableName','isTailwind','isBootstrap'])
 @props(['rowIndex', 'hidden' => false])
 
 @if ($this->collapsingColumnsAreEnabled() && $this->hasCollapsedColumns())
diff --git a/resources/views/components/table/td/plain.blade.php b/resources/views/components/table/td/plain.blade.php
index ff1506dbe..417f6c6b6 100644
--- a/resources/views/components/table/td/plain.blade.php
+++ b/resources/views/components/table/td/plain.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'rowIndex', 'rowID','isTailwind','isBootstrap'])
+@aware([ 'rowIndex', 'rowID','isTailwind','isBootstrap'])
 @props(['column' => null, 'customAttributes' => [], 'displayMinimisedOnReorder' => false, 'hideUntilReorder' => false])
 
 
diff --git a/resources/views/components/table/td/reorder.blade.php b/resources/views/components/table/td/reorder.blade.php
index d47b4629e..cda94f5f5 100644
--- a/resources/views/components/table/td/reorder.blade.php
+++ b/resources/views/components/table/td/reorder.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName'])
+@aware([ 'tableName'])
 @props(['rowID', 'rowIndex'])
 
 @php($theme = $this->getTheme())
diff --git a/resources/views/components/table/th.blade.php b/resources/views/components/table/th.blade.php
index d928dbb25..525833fe7 100644
--- a/resources/views/components/table/th.blade.php
+++ b/resources/views/components/table/th.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap'])
+@aware([ 'tableName','isTailwind','isBootstrap'])
 @props(['column', 'index'])
 
 @php
diff --git a/resources/views/components/table/th/bulk-actions.blade.php b/resources/views/components/table/th/bulk-actions.blade.php
index c5c6d3e6c..d15f5a728 100644
--- a/resources/views/components/table/th/bulk-actions.blade.php
+++ b/resources/views/components/table/th/bulk-actions.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName'])
+@aware([ 'tableName'])
 @php
     $customAttributes = $this->hasBulkActionsThAttributes ? $this->getBulkActionsThAttributes : $this->getAllThAttributes($this->getBulkActionsColumn())['customAttributes'];
 
diff --git a/resources/views/components/table/th/collapsed-columns.blade.php b/resources/views/components/table/th/collapsed-columns.blade.php
index 4965c2dd2..eebc53e70 100644
--- a/resources/views/components/table/th/collapsed-columns.blade.php
+++ b/resources/views/components/table/th/collapsed-columns.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap'])
+@aware([ 'tableName','isTailwind','isBootstrap'])
 
 @if ($this->collapsingColumnsAreEnabled() && $this->hasCollapsedColumns())
     @if ($isTailwind)
diff --git a/resources/views/components/table/th/plain.blade.php b/resources/views/components/table/th/plain.blade.php
index 3a0a56d36..0b9c8326e 100644
--- a/resources/views/components/table/th/plain.blade.php
+++ b/resources/views/components/table/th/plain.blade.php
@@ -1,4 +1,4 @@
-@aware(['component','isTailwind','isBootstrap'])
+@aware(['isTailwind','isBootstrap'])
 @props(['displayMinimisedOnReorder' => false, 'hideUntilReorder' => false, 'customAttributes' => ['default' => true]])
 
 <th x-cloak {{ $attributes }} scope="col"
diff --git a/resources/views/components/table/tr.blade.php b/resources/views/components/table/tr.blade.php
index 40ccde560..9f5f84b20 100644
--- a/resources/views/components/table/tr.blade.php
+++ b/resources/views/components/table/tr.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','primaryKey','isTailwind','isBootstrap'])
+@aware([ 'tableName','primaryKey','isTailwind','isBootstrap'])
 @props(['row', 'rowIndex'])
 
 @php
diff --git a/resources/views/components/table/tr/bulk-actions.blade.php b/resources/views/components/table/tr/bulk-actions.blade.php
index a17062342..11ecc95a8 100644
--- a/resources/views/components/table/tr/bulk-actions.blade.php
+++ b/resources/views/components/table/tr/bulk-actions.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap'])
+@aware([ 'tableName','isTailwind','isBootstrap'])
 
 @if ($this->bulkActionsAreEnabled() && $this->hasBulkActions())
     @php
diff --git a/resources/views/components/table/tr/footer.blade.php b/resources/views/components/table/tr/footer.blade.php
index ba0ecc51e..d9681d779 100644
--- a/resources/views/components/table/tr/footer.blade.php
+++ b/resources/views/components/table/tr/footer.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName'])
+@aware([ 'tableName'])
 
 <x-livewire-tables::table.tr.plain
     :customAttributes="$this->getFooterTrAttributes($this->getRows)"
diff --git a/resources/views/components/table/tr/plain.blade.php b/resources/views/components/table/tr/plain.blade.php
index d04879c87..f299b3c0a 100644
--- a/resources/views/components/table/tr/plain.blade.php
+++ b/resources/views/components/table/tr/plain.blade.php
@@ -1,4 +1,4 @@
-@aware(['component','isTailwind','isBootstrap'])
+@aware(['isTailwind','isBootstrap'])
 @props(['customAttributes' => [], 'displayMinimisedOnReorder' => true])
 
 @if ($isTailwind)
diff --git a/resources/views/components/table/tr/secondary-header.blade.php b/resources/views/components/table/tr/secondary-header.blade.php
index a6a7cc5f3..6e3ca28c0 100644
--- a/resources/views/components/table/tr/secondary-header.blade.php
+++ b/resources/views/components/table/tr/secondary-header.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName'])
+@aware([ 'tableName'])
 
 <x-livewire-tables::table.tr.plain
     :customAttributes="$this->getSecondaryHeaderTrAttributes($this->getRows)"
diff --git a/resources/views/components/tools.blade.php b/resources/views/components/tools.blade.php
index d40efaed3..38b80037c 100644
--- a/resources/views/components/tools.blade.php
+++ b/resources/views/components/tools.blade.php
@@ -1,4 +1,4 @@
-@aware(['component','isTailwind','isBootstrap'])
+@aware(['isTailwind','isBootstrap'])
 @php($toolsAttributes = $this->getToolsAttributesBag())
 
 <div {{
diff --git a/resources/views/components/tools/filter-label.blade.php b/resources/views/components/tools/filter-label.blade.php
index c3dbc72ea..f6993c8f9 100644
--- a/resources/views/components/tools/filter-label.blade.php
+++ b/resources/views/components/tools/filter-label.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName'])
+@aware([ 'tableName'])
 @props(['filter', 'filterLayout' => 'popover', 'tableName' => 'table', 'isTailwind' => false, 'isBootstrap' => false, 'isBootstrap4' => false, 'isBootstrap5' => false, 'for' => null])
 
 @php
diff --git a/resources/views/components/tools/filter-pills.blade.php b/resources/views/components/tools/filter-pills.blade.php
index 9e04fa0e0..c0817ea97 100644
--- a/resources/views/components/tools/filter-pills.blade.php
+++ b/resources/views/components/tools/filter-pills.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@aware([ 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 
 @if ($this->filtersAreEnabled() && $this->filterPillsAreEnabled() && $this->hasAppliedVisibleFiltersForPills())
     <div>
diff --git a/resources/views/components/tools/sorting-pills.blade.php b/resources/views/components/tools/sorting-pills.blade.php
index 7c688be86..6e4266583 100644
--- a/resources/views/components/tools/sorting-pills.blade.php
+++ b/resources/views/components/tools/sorting-pills.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@aware([ 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 
 @if ($this->isTailwind)
     <div>
diff --git a/resources/views/components/tools/toolbar.blade.php b/resources/views/components/tools/toolbar.blade.php
index bb3d57e97..36a78e787 100644
--- a/resources/views/components/tools/toolbar.blade.php
+++ b/resources/views/components/tools/toolbar.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap'])
+@aware([ 'tableName','isTailwind','isBootstrap'])
 @props([])
 @php($toolBarAttributes = $this->getToolBarAttributesBag())
 
diff --git a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
index e4c9b9b25..92180299c 100644
--- a/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
+++ b/resources/views/components/tools/toolbar/items/bulk-actions.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@aware([ 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 <div
     x-data="{ open: false, childElementOpen: false, isTailwind: @js($isTailwind), isBootstrap: @js($isBootstrap) }"
     x-cloak x-show="(selectedItems.length > 0 || hideBulkActionsWhenEmpty == false)"
diff --git a/resources/views/components/tools/toolbar/items/column-select.blade.php b/resources/views/components/tools/toolbar/items/column-select.blade.php
index 7fb2bb957..e239fb211 100644
--- a/resources/views/components/tools/toolbar/items/column-select.blade.php
+++ b/resources/views/components/tools/toolbar/items/column-select.blade.php
@@ -1,6 +1,6 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@aware([ 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 @if ($isTailwind)
-    <div class="@if ($component->getColumnSelectIsHiddenOnMobile()) hidden sm:block @elseif ($component->getColumnSelectIsHiddenOnTablet()) hidden md:block @endif mb-4 w-full md:w-auto md:mb-0 md:ml-2">
+    <div class="@if ($this->getColumnSelectIsHiddenOnMobile()) hidden sm:block @elseif ($this->getColumnSelectIsHiddenOnTablet()) hidden md:block @endif mb-4 w-full md:w-auto md:mb-0 md:ml-2">
         <div
             x-data="{ open: false, childElementOpen: false }"
             @keydown.window.escape="if (!childElementOpen) { open = false }"
@@ -48,14 +48,14 @@ class="inline-flex items-center px-2 py-1 disabled:opacity-50 disabled:cursor-wa
                                     class="text-indigo-600 transition duration-150 ease-in-out border-gray-300 rounded shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600 disabled:opacity-50 disabled:cursor-wait"
                                     wire:loading.attr="disabled"
                                     type="checkbox"
-                                    @checked($component->getSelectableSelectedColumns()->count() === $component->getSelectableColumns()->count())
-                                    @if($component->getSelectableSelectedColumns()->count() === $component->getSelectableColumns()->count())  wire:click="deselectAllColumns" @else wire:click="selectAllColumns" @endif
+                                    @checked($this->getSelectableSelectedColumns()->count() === $this->getSelectableColumns()->count())
+                                    @if($this->getSelectableSelectedColumns()->count() === $this->getSelectableColumns()->count())  wire:click="deselectAllColumns" @else wire:click="selectAllColumns" @endif
                                 >
                                 <span class="ml-2">{{ __($this->getLocalisationPath.'All Columns') }}</span>
                             </label>
                         </div>
 
-                        @foreach ($component->getColumnsForColumnSelect() as $columnSlug => $columnTitle)
+                        @foreach ($this->getColumnsForColumnSelect() as $columnSlug => $columnTitle)
                             <div
                                 wire:key="{{ $tableName }}-columnSelect-{{ $loop->index }}"
                             >
@@ -81,10 +81,10 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
 @elseif ($isBootstrap)
     <div
         @class([
-            'd-none d-sm mb-3 mb-md-0 pl-0 pl-md-2' => $component->getColumnSelectIsHiddenOnMobile() && $isBootstrap4,
-            'd-none d-md-block mb-3 mb-md-0 pl-0 pl-md-2' => $component->getColumnSelectIsHiddenOnTablet() && $isBootstrap4,
-            'd-none d-sm-block mb-3 mb-md-0 md-0 ms-md-2' => $component->getColumnSelectIsHiddenOnMobile() && $isBootstrap5,
-            'd-none d-md-block mb-3 mb-md-0 md-0 ms-md-2' => $component->getColumnSelectIsHiddenOnTablet() && $isBootstrap5,
+            'd-none d-sm mb-3 mb-md-0 pl-0 pl-md-2' => $this->getColumnSelectIsHiddenOnMobile() && $isBootstrap4,
+            'd-none d-md-block mb-3 mb-md-0 pl-0 pl-md-2' => $this->getColumnSelectIsHiddenOnTablet() && $isBootstrap4,
+            'd-none d-sm-block mb-3 mb-md-0 md-0 ms-md-2' => $this->getColumnSelectIsHiddenOnMobile() && $isBootstrap5,
+            'd-none d-md-block mb-3 mb-md-0 md-0 ms-md-2' => $this->getColumnSelectIsHiddenOnTablet() && $isBootstrap5,
         ])
     >
         <div
@@ -121,7 +121,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
                             <input
                                 wire:loading.attr="disabled"
                                 type="checkbox"
-                                @if($component->getSelectableSelectedColumns()->count() == $component->getSelectableColumns()->count()) checked wire:click="deselectAllColumns" @else unchecked wire:click="selectAllColumns" @endif
+                                @if($this->getSelectableSelectedColumns()->count() == $this->getSelectableColumns()->count()) checked wire:click="deselectAllColumns" @else unchecked wire:click="selectAllColumns" @endif
                             />
 
                             <span class="ml-2">{{ __($this->getLocalisationPath.'All Columns') }}</span>
@@ -135,7 +135,7 @@ class="text-indigo-600 rounded border-gray-300 shadow-sm transition duration-150
                             wire:loading.attr="disabled"
                             type="checkbox"
                             class="form-check-input"
-                            @if($component->getSelectableSelectedColumns()->count() == $component->getSelectableColumns()->count()) checked wire:click="deselectAllColumns" @else unchecked wire:click="selectAllColumns" @endif
+                            @if($this->getSelectableSelectedColumns()->count() == $this->getSelectableColumns()->count()) checked wire:click="deselectAllColumns" @else unchecked wire:click="selectAllColumns" @endif
                         />
 
                         <label wire:loading.attr="disabled" class="form-check-label">
@@ -144,7 +144,7 @@ class="form-check-input"
                     </div>
                 @endif
 
-                @foreach ($component->getColumnsForColumnSelect() as $columnSlug => $columnTitle)
+                @foreach ($this->getColumnsForColumnSelect() as $columnSlug => $columnTitle)
                     <div
                         wire:key="{{ $tableName }}-columnSelect-{{ $loop->index }}"
                         @class([
diff --git a/resources/views/components/tools/toolbar/items/filter-button.blade.php b/resources/views/components/tools/toolbar/items/filter-button.blade.php
index 01dd9ba48..452c0d2e9 100644
--- a/resources/views/components/tools/toolbar/items/filter-button.blade.php
+++ b/resources/views/components/tools/toolbar/items/filter-button.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@aware([ 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 @props([])
 
 <div 
diff --git a/resources/views/components/tools/toolbar/items/filter-popover.blade.php b/resources/views/components/tools/toolbar/items/filter-popover.blade.php
index 03b8dbca0..a12755277 100644
--- a/resources/views/components/tools/toolbar/items/filter-popover.blade.php
+++ b/resources/views/components/tools/toolbar/items/filter-popover.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isBootstrap','isBootstrap4','isBootstrap5'])
+@aware([ 'tableName','isBootstrap','isBootstrap4','isBootstrap5'])
 @if($this->isBootstrap)
     <ul
         x-cloak
diff --git a/resources/views/components/tools/toolbar/items/filter-slidedown.blade.php b/resources/views/components/tools/toolbar/items/filter-slidedown.blade.php
index 927461b10..be507404b 100644
--- a/resources/views/components/tools/toolbar/items/filter-slidedown.blade.php
+++ b/resources/views/components/tools/toolbar/items/filter-slidedown.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName'])
+@aware([ 'tableName'])
 @props([])
 
 <div x-cloak x-show="filtersOpen"
diff --git a/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php b/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php
index 38b03c22f..009dcf671 100644
--- a/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php
+++ b/resources/views/components/tools/toolbar/items/pagination-dropdown.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@aware([ 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 <div @class([
         'ml-0 ml-md-2' => $this->isBootstrap4,
         'ms-0 ms-md-2' => $this->isBootstrap5,
@@ -6,17 +6,17 @@
 >
     <select wire:model.live="perPage" id="{{ $tableName }}-perPage"
         {{ 
-            $attributes->merge($component->getPerPageFieldAttributes())
+            $attributes->merge($this->getPerPageFieldAttributes())
             ->class([
-                'form-control' => $this->isBootstrap4 && $component->getPerPageFieldAttributes()['default-styling'],
-                'form-select' => $this->isBootstrap5 && $component->getPerPageFieldAttributes()['default-styling'],
-                'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 focus:ring focus:ring-opacity-50' => $this->isTailwind && $component->getPerPageFieldAttributes()['default-styling'],
-                'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-700 dark:text-white dark:border-gray-600' => $this->isTailwind && $component->getPerPageFieldAttributes()['default-colors'],
+                'form-control' => $this->isBootstrap4 && $this->getPerPageFieldAttributes()['default-styling'],
+                'form-select' => $this->isBootstrap5 && $this->getPerPageFieldAttributes()['default-styling'],
+                'block w-full rounded-md shadow-sm transition duration-150 ease-in-out sm:text-sm sm:leading-5 focus:ring focus:ring-opacity-50' => $this->isTailwind && $this->getPerPageFieldAttributes()['default-styling'],
+                'border-gray-300 focus:border-indigo-300 focus:ring-indigo-200 dark:bg-gray-700 dark:text-white dark:border-gray-600' => $this->isTailwind && $this->getPerPageFieldAttributes()['default-colors'],
             ])
             ->except(['default','default-styling','default-colors']) 
         }}
     >
-        @foreach ($component->getPerPageAccepted() as $item)
+        @foreach ($this->getPerPageAccepted() as $item)
             <option
                 value="{{ $item }}"
                 wire:key="{{ $tableName }}-per-page-{{ $item }}"
diff --git a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
index 2d5d86a26..d98695006 100644
--- a/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
+++ b/resources/views/components/tools/toolbar/items/reorder-buttons.blade.php
@@ -1,4 +1,4 @@
-@aware(['component', 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
+@aware([ 'tableName','isTailwind','isBootstrap','isBootstrap4','isBootstrap5'])
 <div x-data x-cloak x-show="reorderStatus"
     @class([
         'mr-0 mr-md-2 mb-3 mb-md-0' => $this->isBootstrap4,
diff --git a/resources/views/components/wrapper.blade.php b/resources/views/components/wrapper.blade.php
index 788e0d3e7..f1bd3fab5 100644
--- a/resources/views/components/wrapper.blade.php
+++ b/resources/views/components/wrapper.blade.php
@@ -1,4 +1,4 @@
-@props(['component', 'tableName', 'primaryKey', 'isTailwind', 'isBootstrap','isBootstrap4', 'isBootstrap5'])
+@props(['tableName', 'primaryKey', 'isTailwind', 'isBootstrap','isBootstrap4', 'isBootstrap5'])
 <div wire:key="{{ $tableName }}-wrapper" >
     <div {{ $attributes->merge($this->getComponentWrapperAttributes()) }}
         @if ($this->hasRefresh()) wire:poll{{ $this->getRefreshOptions() }} @endif
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index 7b90b7734..b3bcb720a 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -15,7 +15,7 @@
             $this->getParametersForConfigurableArea('before-wrapper')
         )
 
-        <x-livewire-tables::wrapper :component="$this" :tableName="$tableName" :$primaryKey :$isTailwind :$isBootstrap :$isBootstrap4 :$isBootstrap5>
+        <x-livewire-tables::wrapper :tableName="$tableName" :$primaryKey :$isTailwind :$isBootstrap :$isBootstrap4 :$isBootstrap5>
             @if($this->hasActions && !$this->showActionsInToolbar)
                 <x-livewire-tables::includes.actions/>
             @endif