diff --git a/packages/materialdesign-components/src/Datatable/Datatable.svelte b/packages/materialdesign-components/src/Datatable/Datatable.svelte
index a355e23b4..3e7e2c7b1 100644
--- a/packages/materialdesign-components/src/Datatable/Datatable.svelte
+++ b/packages/materialdesign-components/src/Datatable/Datatable.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { onMount, setContext } from "svelte"
+  import { onMount } from "svelte"
   import { MDCDataTable } from "@material/data-table"
   import Row from "./DatatableRow.svelte"
   import Cell from "./DatatableCell.svelte"
@@ -10,13 +10,14 @@
   export let onLoad
 
   const cb = new ClassBuilder("data-table")
-  setContext("BBMD:data-table:cb", cb)
 
   let datatable = null
   let instance = null
   let tableElement
   let initialied = false
 
+  
+
   $: {
     if(tableElement && datatable && !initialied) {
       const children = _bb.attachChildren(tableElement)
diff --git a/packages/materialdesign-components/src/Datatable/DatatableBody.svelte b/packages/materialdesign-components/src/Datatable/DatatableBody.svelte
index 409d4828e..ad7108ff9 100644
--- a/packages/materialdesign-components/src/Datatable/DatatableBody.svelte
+++ b/packages/materialdesign-components/src/Datatable/DatatableBody.svelte
@@ -4,7 +4,7 @@ import ClassBuilder from "../ClassBuilder.js"
 
 export let _bb
 
-const cb = getContext("BBMD:data-table:cb")
+const cb = new ClassBuilder("data-table")
 
 let tbody
 
diff --git a/packages/materialdesign-components/src/Datatable/DatatableCell.svelte b/packages/materialdesign-components/src/Datatable/DatatableCell.svelte
index 3cea365f9..d0685f695 100644
--- a/packages/materialdesign-components/src/Datatable/DatatableCell.svelte
+++ b/packages/materialdesign-components/src/Datatable/DatatableCell.svelte
@@ -1,11 +1,12 @@
 <script>
   import { getContext } from "svelte"
-
+  import ClassBuilder from "../ClassBuilder.js"
+  
   export let isHeader = false
   export let numeric = false
   export let _bb
 
-  const cb = getContext("BBMD:data-table:cb")
+  const cb = new ClassBuilder("data-table")
 
   let elementName = isHeader ? "header-cell" : "cell"
   let modifiers = { numeric }
diff --git a/packages/materialdesign-components/src/Datatable/DatatableHead.svelte b/packages/materialdesign-components/src/Datatable/DatatableHead.svelte
index f50a5cca0..82f260ed5 100644
--- a/packages/materialdesign-components/src/Datatable/DatatableHead.svelte
+++ b/packages/materialdesign-components/src/Datatable/DatatableHead.svelte
@@ -1,7 +1,11 @@
 <script>
 
+import ClassBuilder from "../ClassBuilder.js"
+
 export let _bb
 
+const cb = new ClassBuilder("data-table")
+
 let thead
 
 $: thead && _bb.attachChildren(thead)
diff --git a/packages/materialdesign-components/src/Datatable/DatatableRow.svelte b/packages/materialdesign-components/src/Datatable/DatatableRow.svelte
index 08b0fd104..520b66677 100644
--- a/packages/materialdesign-components/src/Datatable/DatatableRow.svelte
+++ b/packages/materialdesign-components/src/Datatable/DatatableRow.svelte
@@ -1,6 +1,7 @@
 <script>
   import { getContext } from "svelte";
-
+  import ClassBuilder from "../ClassBuilder.js"
+  
   export let onSelect = () => {};
   export let isHeader = false;
 
@@ -9,7 +10,7 @@
   let row = null;
   let selected = false;
 
-  const cb = getContext("BBMD:data-table:cb");
+  const cb = new ClassBuilder("data-table")
 
   let elementName = isHeader ? "header-row" : "row";
   let modifiers = {};