diff --git a/packages/bbui/src/ActionButton/ActionButton.svelte b/packages/bbui/src/ActionButton/ActionButton.svelte
index b68d7f72bf..df087dd627 100644
--- a/packages/bbui/src/ActionButton/ActionButton.svelte
+++ b/packages/bbui/src/ActionButton/ActionButton.svelte
@@ -3,19 +3,14 @@
     import { createEventDispatcher } from "svelte"
     const dispatch = createEventDispatcher()
 
-    export let disabled = false
-  
+    
     /** @type {('S', 'M', 'L', 'XL')} Size of button */
     export let size = "M";
-    /** @type {('cta','primary','secondary','warning', 'overBackground')} Type of button */
-    export let type = "primary"
-  
     export let quiet = false;
-
-    export let selected = false;
-
+    export let emphasized = false;
+    export let selected = false
     export let longPressable = false;
-    
+    export let disabled = false
     export let icon = '';
 
     function longPress(element) {
@@ -42,7 +37,10 @@
 
 <button 
     use:longPress
-    class="spectrum-ActionButton spectrum-ActionButton--size{size.toUpperCase()} spectrum-ActionButton--{type} {quiet && 'spectrum-ActionButton--quiet'}"
+    class:spectrum-ActionButton--quiet={quiet}
+    class:spectrum-ActionButton--emphasized={emphasized}
+    class:is-selected={selected}
+    class="spectrum-ActionButton spectrum-ActionButton--size{size.toUpperCase()}"
     {disabled}
     on:longPress
     on:click|preventDefault>
diff --git a/packages/bbui/src/ActionGroup/ActionGroup.svelte b/packages/bbui/src/ActionGroup/ActionGroup.svelte
index 62bbca7ab6..c4d0aeba79 100644
--- a/packages/bbui/src/ActionGroup/ActionGroup.svelte
+++ b/packages/bbui/src/ActionGroup/ActionGroup.svelte
@@ -14,10 +14,11 @@
     }
 </script>
 
-<div use:group class="spectrum-ActionGroup 
-    {vertical && 'spectrum-ActionGroup--vertical'} 
-    {justified && 'spectrum-ActionGroup--justified'} 
-    {quiet && 'spectrum-ActionGroup--quiet'} 
-    {compact && 'spectrum-ActionGroup--compact'}">
+<div use:group
+    class:spectrum-ActionGroup--vertical={vertical}
+    class:spectrum-ActionGroup--justified={justified}
+    class:spectrum-ActionGroup--quiet={quiet}
+    class:spectrum-ActionGroup--compact={compact}
+    class="spectrum-ActionGroup">
     <slot />
 </div>
\ No newline at end of file
diff --git a/packages/bbui/src/Link/Link.svelte b/packages/bbui/src/Link/Link.svelte
index 8e133ef1bf..49a7c2bf20 100644
--- a/packages/bbui/src/Link/Link.svelte
+++ b/packages/bbui/src/Link/Link.svelte
@@ -9,9 +9,9 @@
     export let overBackground = false
 </script>
 
-<a {href} class="spectrum-Link 
-    spectrum-Link--size{size}
-    {primary && 'spectrum-Link--primary'}
-    {secondary && 'spectrum-Link--secondary'}
-    {overBackground && 'spectrum-Link--overBackground'}
-    {quiet && 'spectrum-Link--quiet'}"><slot /></a>
\ No newline at end of file
+<a {href}
+    class:spectrum-Link--primary={primary}
+    class:spectrum-Link--secondary={secondary}
+    class:spectrum-Link--overBackground={overBackground}
+    class:spectrum-Link--quiet={quiet}
+class="spectrum-Link spectrum-Link--size{size}"><slot /></a>
\ No newline at end of file