diff --git a/packages/web-components/fast-components-msft/src/anchor/index.ts b/packages/web-components/fast-components-msft/src/anchor/index.ts
index 09f78a090c5..945b70b080e 100644
--- a/packages/web-components/fast-components-msft/src/anchor/index.ts
+++ b/packages/web-components/fast-components-msft/src/anchor/index.ts
@@ -1,7 +1,5 @@
 import { customElement } from "@microsoft/fast-element";
-import { Anchor } from "@microsoft/fast-components";
-// update the below once #3091 is merged
-import { AnchorTemplate as template } from "@microsoft/fast-components/dist/anchor/anchor.template";
+import { Anchor, AnchorTemplate as template } from "@microsoft/fast-components";
 import { AnchorStyles as styles } from "./anchor.styles";
 
 // Anchor
diff --git a/packages/web-components/fast-components-msft/src/button/button.styles.ts b/packages/web-components/fast-components-msft/src/button/button.styles.ts
index ce6afe63515..5ccad31cd72 100644
--- a/packages/web-components/fast-components-msft/src/button/button.styles.ts
+++ b/packages/web-components/fast-components-msft/src/button/button.styles.ts
@@ -9,6 +9,7 @@ import {
     accentForegroundRestBehavior,
     disabledCursor,
     focusVisible,
+    forcedColorsStylesheetBehavior,
     neutralFillActiveBehavior,
     neutralFillFocusBehavior,
     neutralFillHoverBehavior,
@@ -22,10 +23,8 @@ import {
     neutralOutlineActiveBehavior,
     neutralOutlineHoverBehavior,
     neutralOutlineRestBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
 import {
     AccentButtonStyles,
     BaseButtonStyles,
diff --git a/packages/web-components/fast-components-msft/src/button/index.ts b/packages/web-components/fast-components-msft/src/button/index.ts
index ae792519cba..77f5ef50ff0 100644
--- a/packages/web-components/fast-components-msft/src/button/index.ts
+++ b/packages/web-components/fast-components-msft/src/button/index.ts
@@ -1,7 +1,5 @@
 import { customElement } from "@microsoft/fast-element";
-import { Button } from "@microsoft/fast-components";
-// update the below once #3091 is merged
-import { ButtonTemplate as template } from "@microsoft/fast-components/dist/button/button.template";
+import { Button, ButtonTemplate as template } from "@microsoft/fast-components";
 import { ButtonStyles as styles } from "./button.styles";
 
 // Button
diff --git a/packages/web-components/fast-components-msft/src/card/card.styles.ts b/packages/web-components/fast-components-msft/src/card/card.styles.ts
index 788562fc36a..b145602c35a 100644
--- a/packages/web-components/fast-components-msft/src/card/card.styles.ts
+++ b/packages/web-components/fast-components-msft/src/card/card.styles.ts
@@ -1,8 +1,11 @@
 import { css } from "@microsoft/fast-element";
-import { display, elevation, neutralLayerCardBehavior } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
+import {
+    display,
+    elevation,
+    forcedColorsStylesheetBehavior,
+    neutralLayerCardBehavior,
+    SystemColors,
+} from "@microsoft/fast-components";
 
 export const CardStyles = css`
     ${display("block")} :host {
diff --git a/packages/web-components/fast-components-msft/src/checkbox/checkbox.styles.ts b/packages/web-components/fast-components-msft/src/checkbox/checkbox.styles.ts
index 781f854aa21..1de2cc8469e 100644
--- a/packages/web-components/fast-components-msft/src/checkbox/checkbox.styles.ts
+++ b/packages/web-components/fast-components-msft/src/checkbox/checkbox.styles.ts
@@ -3,16 +3,15 @@ import {
     disabledCursor,
     display,
     focusVisible,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
     neutralFillInputHoverBehavior,
     neutralFillInputRestBehavior,
     neutralForegroundRestBehavior,
     neutralOutlineHoverBehavior,
     neutralOutlineRestBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
 
 export const CheckboxStyles = css`
     ${display("inline-flex")} :host {
diff --git a/packages/web-components/fast-components-msft/src/flipper/flipper.styles.ts b/packages/web-components/fast-components-msft/src/flipper/flipper.styles.ts
index 2a3797255f3..13d500d3a63 100644
--- a/packages/web-components/fast-components-msft/src/flipper/flipper.styles.ts
+++ b/packages/web-components/fast-components-msft/src/flipper/flipper.styles.ts
@@ -3,6 +3,8 @@ import {
     disabledCursor,
     display,
     focusVisible,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
     neutralFillStealthActiveBehavior,
     neutralFillStealthHoverBehavior,
     neutralFillStealthRestBehavior,
@@ -11,11 +13,8 @@ import {
     neutralOutlineActiveBehavior,
     neutralOutlineHoverBehavior,
     neutralOutlineRestBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const FlipperStyles = css`
     ${display("inline-flex")} :host {
diff --git a/packages/web-components/fast-components-msft/src/progress/progress-ring/progress-ring.styles.ts b/packages/web-components/fast-components-msft/src/progress/progress-ring/progress-ring.styles.ts
index 4230e03aa78..b609ed67226 100644
--- a/packages/web-components/fast-components-msft/src/progress/progress-ring/progress-ring.styles.ts
+++ b/packages/web-components/fast-components-msft/src/progress/progress-ring/progress-ring.styles.ts
@@ -2,13 +2,12 @@ import { css } from "@microsoft/fast-element";
 import {
     accentFillRestBehavior,
     display,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
     neutralFillRestBehavior,
     neutralForegroundHintBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const ProgressRingStyles = css`
     ${display("flex")} :host {
diff --git a/packages/web-components/fast-components-msft/src/progress/progress/progress.styles.ts b/packages/web-components/fast-components-msft/src/progress/progress/progress.styles.ts
index 185375235de..f6f178729b5 100644
--- a/packages/web-components/fast-components-msft/src/progress/progress/progress.styles.ts
+++ b/packages/web-components/fast-components-msft/src/progress/progress/progress.styles.ts
@@ -2,12 +2,11 @@ import { css } from "@microsoft/fast-element";
 import {
     accentFillRestBehavior,
     display,
+    forcedColorsStylesheetBehavior,
     neutralFillRestBehavior,
     neutralForegroundHintBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const ProgressStyles = css`
     ${display("flex")} :host {
diff --git a/packages/web-components/fast-components-msft/src/radio-group/index.ts b/packages/web-components/fast-components-msft/src/radio-group/index.ts
index e4fa13e0bcc..34fc56211d9 100644
--- a/packages/web-components/fast-components-msft/src/radio-group/index.ts
+++ b/packages/web-components/fast-components-msft/src/radio-group/index.ts
@@ -1,9 +1,5 @@
 import { customElement } from "@microsoft/fast-element";
-// update the below imports once #3091 is merged
-import {
-    RadioGroup,
-    RadioGroupTemplate as template,
-} from "@microsoft/fast-components/dist/radio-group";
+import { RadioGroup, RadioGroupTemplate as template } from "@microsoft/fast-components";
 import { RadioGroupStyles as styles } from "./radio-group.styles";
 
 @customElement({
diff --git a/packages/web-components/fast-components-msft/src/radio/index.ts b/packages/web-components/fast-components-msft/src/radio/index.ts
index d7b30333d1d..01bf46cd4df 100644
--- a/packages/web-components/fast-components-msft/src/radio/index.ts
+++ b/packages/web-components/fast-components-msft/src/radio/index.ts
@@ -1,6 +1,5 @@
 import { customElement } from "@microsoft/fast-element";
-// update the below imports once #3091 is merged
-import { Radio, RadioTemplate as template } from "@microsoft/fast-components/dist/radio";
+import { Radio, RadioTemplate as template } from "@microsoft/fast-components";
 import { RadioStyles as styles } from "./radio.styles";
 
 @customElement({
diff --git a/packages/web-components/fast-components-msft/src/radio/radio.styles.ts b/packages/web-components/fast-components-msft/src/radio/radio.styles.ts
index c34b04ab719..c9b90a2bf14 100644
--- a/packages/web-components/fast-components-msft/src/radio/radio.styles.ts
+++ b/packages/web-components/fast-components-msft/src/radio/radio.styles.ts
@@ -3,16 +3,15 @@ import {
     disabledCursor,
     display,
     focusVisible,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
     neutralFillInputHoverBehavior,
     neutralFillInputRestBehavior,
     neutralForegroundRestBehavior,
     neutralOutlineHoverBehavior,
     neutralOutlineRestBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const RadioStyles = css`
     ${display("inline-flex")} :host {
diff --git a/packages/web-components/fast-components-msft/src/slider-label/index.ts b/packages/web-components/fast-components-msft/src/slider-label/index.ts
index 8d7543b6640..f632ec19d52 100644
--- a/packages/web-components/fast-components-msft/src/slider-label/index.ts
+++ b/packages/web-components/fast-components-msft/src/slider-label/index.ts
@@ -1,8 +1,5 @@
 import { customElement } from "@microsoft/fast-element";
-import {
-    SliderLabel,
-    SliderLabelTemplate as template,
-} from "@microsoft/fast-components/dist/slider-label";
+import { SliderLabel, SliderLabelTemplate as template } from "@microsoft/fast-components";
 import { SliderLabelStyles as styles } from "./slider-label.styles";
 
 @customElement({
diff --git a/packages/web-components/fast-components-msft/src/slider-label/slider-label.styles.ts b/packages/web-components/fast-components-msft/src/slider-label/slider-label.styles.ts
index 64930c54f67..f0d001d470a 100644
--- a/packages/web-components/fast-components-msft/src/slider-label/slider-label.styles.ts
+++ b/packages/web-components/fast-components-msft/src/slider-label/slider-label.styles.ts
@@ -1,9 +1,11 @@
 import { css } from "@microsoft/fast-element";
-import { display, neutralOutlineRestBehavior } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
+import {
+    display,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
+    neutralOutlineRestBehavior,
+    SystemColors,
+} from "@microsoft/fast-components";
 
 export const SliderLabelStyles = css`
     ${display("block")} :host {
diff --git a/packages/web-components/fast-components-msft/src/slider/index.ts b/packages/web-components/fast-components-msft/src/slider/index.ts
index 154af941b09..5181ad032d2 100644
--- a/packages/web-components/fast-components-msft/src/slider/index.ts
+++ b/packages/web-components/fast-components-msft/src/slider/index.ts
@@ -1,8 +1,5 @@
 import { customElement } from "@microsoft/fast-element";
-import {
-    Slider,
-    SliderTemplate as template,
-} from "@microsoft/fast-components/dist/slider";
+import { Slider, SliderTemplate as template } from "@microsoft/fast-components";
 import { SliderStyles as styles } from "./slider.styles";
 
 @customElement({
diff --git a/packages/web-components/fast-components-msft/src/slider/slider.styles.ts b/packages/web-components/fast-components-msft/src/slider/slider.styles.ts
index dd1b8601504..9c97ca7145d 100644
--- a/packages/web-components/fast-components-msft/src/slider/slider.styles.ts
+++ b/packages/web-components/fast-components-msft/src/slider/slider.styles.ts
@@ -3,16 +3,15 @@ import {
     disabledCursor,
     display,
     focusVisible,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
     neutralForegroundActiveBehavior,
     neutralForegroundHoverBehavior,
     neutralForegroundRestBehavior,
     neutralOutlineHoverBehavior,
     neutralOutlineRestBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const SliderStyles = css`
     :host([hidden]) {
diff --git a/packages/web-components/fast-components-msft/src/styles/patterns/button.ts b/packages/web-components/fast-components-msft/src/styles/patterns/button.ts
index fc556bc713c..f47cd0ebebe 100644
--- a/packages/web-components/fast-components-msft/src/styles/patterns/button.ts
+++ b/packages/web-components/fast-components-msft/src/styles/patterns/button.ts
@@ -1,7 +1,5 @@
 import { css } from "@microsoft/fast-element";
-import { display, focusVisible } from "@microsoft/fast-components";
-// update the below once #3091 is merged
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
+import { display, focusVisible, heightNumber } from "@microsoft/fast-components";
 
 export const BaseButtonStyles = css`
     ${display("inline-block")} :host {
diff --git a/packages/web-components/fast-components-msft/src/switch/switch.styles.ts b/packages/web-components/fast-components-msft/src/switch/switch.styles.ts
index 3e154f4c926..c6947d4af86 100644
--- a/packages/web-components/fast-components-msft/src/switch/switch.styles.ts
+++ b/packages/web-components/fast-components-msft/src/switch/switch.styles.ts
@@ -5,6 +5,8 @@ import {
     disabledCursor,
     display,
     focusVisible,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
     neutralFillInputActiveBehavior,
     neutralFillInputHoverBehavior,
     neutralFillInputRestBehavior,
@@ -12,11 +14,8 @@ import {
     neutralOutlineActiveBehavior,
     neutralOutlineHoverBehavior,
     neutralOutlineRestBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const SwitchStyles = css`
     :host([hidden]) {
diff --git a/packages/web-components/fast-components-msft/src/tabs/tab/tab.styles.ts b/packages/web-components/fast-components-msft/src/tabs/tab/tab.styles.ts
index 3b80a437e2c..e9d5025f93e 100644
--- a/packages/web-components/fast-components-msft/src/tabs/tab/tab.styles.ts
+++ b/packages/web-components/fast-components-msft/src/tabs/tab/tab.styles.ts
@@ -2,15 +2,14 @@ import { css } from "@microsoft/fast-element";
 import {
     display,
     focusVisible,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
     neutralFocusBehavior,
     neutralForegroundActiveBehavior,
     neutralForegroundHoverBehavior,
     neutralForegroundRestBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const TabStyles = css`
     ${display("inline-flex")} :host {
diff --git a/packages/web-components/fast-components-msft/src/tabs/tabs.styles.ts b/packages/web-components/fast-components-msft/src/tabs/tabs.styles.ts
index 94e8526c00c..eb2a6720340 100644
--- a/packages/web-components/fast-components-msft/src/tabs/tabs.styles.ts
+++ b/packages/web-components/fast-components-msft/src/tabs/tabs.styles.ts
@@ -2,11 +2,10 @@ import { css } from "@microsoft/fast-element";
 import {
     accentFillRestBehavior,
     display,
+    forcedColorsStylesheetBehavior,
     neutralForegroundRestBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const TabsStyles = css`
     ${display("grid")} :host {
diff --git a/packages/web-components/fast-components-msft/src/text-area/text-area.styles.ts b/packages/web-components/fast-components-msft/src/text-area/text-area.styles.ts
index 79580e50b92..a269c50231a 100644
--- a/packages/web-components/fast-components-msft/src/text-area/text-area.styles.ts
+++ b/packages/web-components/fast-components-msft/src/text-area/text-area.styles.ts
@@ -3,6 +3,8 @@ import {
     disabledCursor,
     display,
     focusVisible,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
     neutralFillHoverBehavior,
     neutralFillInputHoverBehavior,
     neutralFillInputRestBehavior,
@@ -12,9 +14,6 @@ import {
     neutralOutlineHoverBehavior,
     neutralOutlineRestBehavior,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const TextAreaStyles = css`
     ${display("inline-block")} :host {
diff --git a/packages/web-components/fast-components-msft/src/text-field/text-field.styles.ts b/packages/web-components/fast-components-msft/src/text-field/text-field.styles.ts
index fef5fe8e3fe..5ff2b5d79d4 100644
--- a/packages/web-components/fast-components-msft/src/text-field/text-field.styles.ts
+++ b/packages/web-components/fast-components-msft/src/text-field/text-field.styles.ts
@@ -3,6 +3,8 @@ import {
     disabledCursor,
     display,
     focusVisible,
+    forcedColorsStylesheetBehavior,
+    heightNumber,
     neutralFillHoverBehavior,
     neutralFillInputHoverBehavior,
     neutralFillInputRestBehavior,
@@ -11,11 +13,8 @@ import {
     neutralForegroundRestBehavior,
     neutralOutlineHoverBehavior,
     neutralOutlineRestBehavior,
+    SystemColors,
 } from "@microsoft/fast-components";
-// update the below imports once #3091 is merged
-import { SystemColors } from "@microsoft/fast-components/dist/styles/system-colors";
-import { heightNumber } from "@microsoft/fast-components/dist/styles/size";
-import { forcedColorsStylesheetBehavior } from "@microsoft/fast-components/dist/styles/match-media-stylesheet-behavior";
 
 export const TextFieldStyles = css`
     ${display("inline-block")} :host {