diff --git a/packages/bbui/src/Typography/Body.svelte b/packages/bbui/src/Typography/Body.svelte
index 3b690fd1b9..f8e15d9d78 100644
--- a/packages/bbui/src/Typography/Body.svelte
+++ b/packages/bbui/src/Typography/Body.svelte
@@ -1,11 +1,13 @@
 <script>
-    import "@spectrum-css/typography/dist/index-vars.css"
-    
-    export let size = "M";
-    export let serif = false;
+  import "@spectrum-css/typography/dist/index-vars.css"
+
+  export let size = "M"
+  export let serif = false
 </script>
 
-<p class="spectrum-Body class:spectrum-Body--size{size}"
-    class:spectrum-Body--serif={serif}
-    <slot />
-</p>
\ No newline at end of file
+<p
+  class="spectrum-Body class:spectrum-Body--size{size}"
+  class:spectrum-Body--serif={serif}
+>
+  <slot />
+</p>
diff --git a/packages/bbui/src/Typography/Heading.svelte b/packages/bbui/src/Typography/Heading.svelte
index 8c7723dd54..6e0c158708 100644
--- a/packages/bbui/src/Typography/Heading.svelte
+++ b/packages/bbui/src/Typography/Heading.svelte
@@ -2,27 +2,9 @@
   import "@spectrum-css/typography/dist/index-vars.css"
 
   // Sizes
-  export let xxxl = false
-  export let xxl = false
-  export let xl = false
-  export let l = false
-  export let m = false
-  export let s = false
-  export let xs = false
-  export let xxs = false
-
-  $: useDefault = ![xxxl, xxl, xl, l, m, s, xs, xxs].includes(true)
+  export let size = "M"
 </script>
 
-<h1
-  class="spectrum-Heading"
-  class:spectrum-Heading--sizeXXXL={xxxl}
-  class:spectrum-Heading--sizeXXL={xxl}
-  class:spectrum-Heading--sizeXL={xl}
-  class:spectrum-Heading--sizeL={l}
-  class:spectrum-Heading--sizeM={m || useDefault}
-  class:spectrum-Heading--sizeS={s}
-  class:spectrum-Heading--sizeXS={xs}
-  class:spectrum-Heading--sizeXXS={xxs}>
+<h1 class="spectrum-Heading spectrum-Heading--size{size}">
   <slot />
 </h1>