diff --git a/docs/blog/lion-without-polyfills.md b/docs/blog/lion-without-polyfills.md
index 7a6176873..e0341c068 100644
--- a/docs/blog/lion-without-polyfills.md
+++ b/docs/blog/lion-without-polyfills.md
@@ -23,7 +23,7 @@ To clarify: within Lion class files we never import files that run `customElemen
```js
import { LitElement, html } from 'lit';
-import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements/lit-element.js';
import { MyCardHeader } from './MyCardHeader.js';
export class MyCard extends ScopedElementsMixin(LitElement) {
@@ -78,7 +78,7 @@ Be sure to always define **ALL** the sub elements you are using in your template
```js
import { LitElement, html } from 'lit';
-import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements/lit-element.js';
import { MyCardHeader } from './MyCardHeader.js';
export class MyCard extends ScopedElementsMixin(LitElement) {
diff --git a/docs/components/accordion/overview.md b/docs/components/accordion/overview.md
index 349645d43..372a81f9f 100644
--- a/docs/components/accordion/overview.md
+++ b/docs/components/accordion/overview.md
@@ -8,7 +8,7 @@ import { html as previewHtml } from '@mdjs/mdjs-preview';
```js preview-story
import { html, LitElement } from 'lit';
-import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements/lit-element.js';
import { LionAccordion } from '@lion/ui/accordion.js';
class MyComponent extends ScopedElementsMixin(LitElement) {
@@ -83,7 +83,7 @@ npm i --save @lion/ui
```js
import { html, LitElement } from 'lit';
-import { ScopedElementsMixin } from '@open-wc/scoped-elements';
+import { ScopedElementsMixin } from '@open-wc/scoped-elements/lit-element.js';
import { LionAccordion } from '@lion/ui/accordion.js';
class MyComponent extends ScopedElementsMixin(LitElement) {
diff --git a/docs/components/fieldset/use-cases.md b/docs/components/fieldset/use-cases.md
index ca8428153..2aa181fe0 100644
--- a/docs/components/fieldset/use-cases.md
+++ b/docs/components/fieldset/use-cases.md
@@ -4,7 +4,6 @@
import { html } from '@mdjs/mdjs-preview';
import { localize } from '@lion/ui/localize.js';
import { MinLength, Validator, Required } from '@lion/ui/form-core.js';
-import { loadDefaultFeedbackMessages } from '@lion/ui/validate-messages.js';
import '@lion/ui/define/lion-input.js';
import '@lion/ui/define/lion-fieldset.js';
diff --git a/docs/components/form/overview.md b/docs/components/form/overview.md
index 02225f2ae..6d08d6860 100644
--- a/docs/components/form/overview.md
+++ b/docs/components/form/overview.md
@@ -11,14 +11,25 @@ A web component that enhances the functionality of the native `form` component.
It is designed to interact with (instances of) the [form controls](../../fundamentals/systems/form/overview.md).
```js preview-story
-export const main = () => html`
-