diff --git a/.changeset/neat-penguins-collect.md b/.changeset/neat-penguins-collect.md
new file mode 100644
index 000000000..72067dafc
--- /dev/null
+++ b/.changeset/neat-penguins-collect.md
@@ -0,0 +1,45 @@
+---
+'babel-plugin-extend-docs': patch
+'providence-analytics': patch
+'remark-extend': patch
+'@lion/accordion': patch
+'@lion/ajax': patch
+'@lion/button': patch
+'@lion/calendar': patch
+'@lion/checkbox-group': patch
+'@lion/collapsible': patch
+'@lion/combobox': patch
+'@lion/core': patch
+'@lion/dialog': patch
+'@lion/fieldset': patch
+'@lion/form': patch
+'@lion/form-core': patch
+'@lion/form-integrations': patch
+'@lion/helpers': patch
+'@lion/icon': patch
+'@lion/input': patch
+'@lion/input-amount': patch
+'@lion/input-date': patch
+'@lion/input-datepicker': patch
+'@lion/input-email': patch
+'@lion/input-iban': patch
+'@lion/input-range': patch
+'@lion/input-stepper': patch
+'@lion/listbox': patch
+'@lion/localize': patch
+'@lion/overlays': patch
+'@lion/pagination': patch
+'@lion/progress-indicator': patch
+'@lion/radio-group': patch
+'@lion/select': patch
+'@lion/select-rich': patch
+'singleton-manager': patch
+'@lion/steps': patch
+'@lion/switch': patch
+'@lion/tabs': patch
+'@lion/textarea': patch
+'@lion/tooltip': patch
+'@lion/validate-messages': patch
+---
+
+Ensure all lit imports are imported from @lion/core. Remove devDependencies in all subpackages and move to root package.json. Add demo dependencies as real dependencies for users that extend our docs/demos.
diff --git a/demo/README.md b/demo/README.md
index 3f3663a7d..fb6f52b71 100644
--- a/demo/README.md
+++ b/demo/README.md
@@ -149,7 +149,7 @@ npm i lit-element @lion/tabs
 Create a `lea-tabs` component by reusing the functionality of Lion. This gives Lea all the functionality and accessible core that she needs for his custom tabs component.
 
 ```js
-import { css } from 'lit-element';
+import { css } from '@lion/core';
 import { LionTabs } from '@lion/tabs';
 
 export class LeaTabs extends LionTabs {
@@ -178,7 +178,7 @@ customElements.define('lea-tabs', LeaTabs);
 Lea also wants to be able to style the tab and tab-panel according to Betatechs visual identity. In order to do so, she creates a `lea-tab-panel` component and a `lea-tab` component, which she can then fully style however she desires, and eventually place inside the `lea-tabs` component. You can see how Lea achieved this in the example down below.
 
 ```js
-import { LitElement, html, css } from 'lit-element';
+import { LitElement, html, css } from '@lion/core';
 
 export class LeaTab extends LitElement {
   static get styles() {
diff --git a/demo/docs/20-lea-tabs.md b/demo/docs/20-lea-tabs.md
index f909bf81e..5c3154b10 100644
--- a/demo/docs/20-lea-tabs.md
+++ b/demo/docs/20-lea-tabs.md
@@ -7,7 +7,7 @@
 `lea-tabs` implements tabs view to allow users to quickly move between a small number of equally important views.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { LitElement } from '@lion/core';
 
 import '../lea-tabs.js';
diff --git a/demo/src/LeaTab.js b/demo/src/LeaTab.js
index 1cd7e5ece..b43d5944f 100644
--- a/demo/src/LeaTab.js
+++ b/demo/src/LeaTab.js
@@ -1,4 +1,4 @@
-import { css, html, LitElement } from 'lit-element';
+import { css, html, LitElement } from '@lion/core';
 
 export class LeaTab extends LitElement {
   static get styles() {
diff --git a/demo/src/LeaTabPanel.js b/demo/src/LeaTabPanel.js
index 282899436..993461a19 100644
--- a/demo/src/LeaTabPanel.js
+++ b/demo/src/LeaTabPanel.js
@@ -1,4 +1,4 @@
-import { LitElement, html, css } from 'lit-element';
+import { LitElement, html, css } from '@lion/core';
 
 export class LeaTabPanel extends LitElement {
   static get styles() {
diff --git a/demo/src/LeaTabs.js b/demo/src/LeaTabs.js
index c1a2caa11..aa81386a7 100644
--- a/demo/src/LeaTabs.js
+++ b/demo/src/LeaTabs.js
@@ -1,4 +1,4 @@
-import { css } from 'lit-element';
+import { css } from '@lion/core';
 import { LionTabs } from '@lion/tabs';
 
 export class LeaTabs extends LionTabs {
diff --git a/package.json b/package.json
index 0e0bd142f..dafa0ebc7 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,8 @@
     "test:screenshots:update": "cross-env UPDATE_SCREENSHOTS=true npm run test:screenshots"
   },
   "devDependencies": {
+    "@babel/core": "^7.10.1",
+    "@bundled-es-modules/fetch-mock": "^6.5.2",
     "@changesets/cli": "^2.9.2",
     "@commitlint/cli": "^7.0.0",
     "@commitlint/config-conventional": "^7.0.0",
@@ -68,16 +70,21 @@
     "lint-staged": "^10.0.0",
     "looks-same": "^7.2.3",
     "markdownlint-cli": "^0.17.0",
+    "mermaid": "^8.2.6",
     "minimist": "^1.2.5",
     "mkdirp-promise": "^5.0.1",
     "mocha": "^7.1.1",
+    "mock-fs": "^4.10.1",
     "npm-run-all": "^4.1.5",
+    "nyc": "^15.0.0",
     "playwright": "^1.7.1",
     "prettier": "^2.0.5",
     "prettier-package-json": "^2.1.3",
+    "remark-html": "^11.0.1",
     "rimraf": "^2.6.3",
     "rollup": "^2.0.0",
     "sinon": "^7.2.2",
+    "ssl-root-cas": "^1.3.1",
     "typescript": "3.9.7",
     "web-component-analyzer": "^1.0.3",
     "webpack-merge": "^4.1.5",
diff --git a/packages-node/babel-plugin-extend-docs/README.md b/packages-node/babel-plugin-extend-docs/README.md
index e53a3bafb..b2059746b 100644
--- a/packages-node/babel-plugin-extend-docs/README.md
+++ b/packages-node/babel-plugin-extend-docs/README.md
@@ -80,7 +80,7 @@ paths: [
 We have an existing demo code which we want to reuse.
 
 ```js
-import { LitElement, html } from 'lit-element';
+import { LitElement, html } from '@lion/core';
 import './my-counter.js';
 class MyApp extends LitElement {
   render() {
@@ -109,7 +109,7 @@ tag: {
 ### Result of Replacement of tags
 
 ```js
-import { LitElement, html } from 'lit-element';
+import { LitElement, html } from '@lion/core';
 import './my-extension/my-extension.js';
 class MyApp extends LitElement {
   render() {
@@ -127,7 +127,7 @@ customElements.define('my-app', MyApp);
 We have an existing demo code which we want to reuse.
 
 ```js
-import { LitElement, html } from 'lit-element';
+import { LitElement, html } from '@lion/core';
 import { MyCounter } from './src/MyCounter.js';
 class TenCounter extends MyCounter {
   inc() {
@@ -163,7 +163,7 @@ variable: {
 ### Result of Replacement of classes
 
 ```js
-import { LitElement, html } from 'lit-element';
+import { LitElement, html } from '@lion/core';
 import { MyExtension } from './my-extension/index.js';
 class TenCounter extends MyExtension {
   inc() {
diff --git a/packages-node/babel-plugin-extend-docs/demo/my-app.demo.js b/packages-node/babel-plugin-extend-docs/demo/my-app.demo.js
index 64fc4c084..5adcc70a4 100644
--- a/packages-node/babel-plugin-extend-docs/demo/my-app.demo.js
+++ b/packages-node/babel-plugin-extend-docs/demo/my-app.demo.js
@@ -1,4 +1,4 @@
-import { LitElement, html } from 'lit-element';
+import { LitElement, html } from '@lion/core';
 
 import { MyCounter } from './src/MyCounter.js';
 import './my-counter.js';
diff --git a/packages-node/babel-plugin-extend-docs/demo/my-extension/MyExtension.js b/packages-node/babel-plugin-extend-docs/demo/my-extension/MyExtension.js
index 16b8983ee..ce75716c2 100644
--- a/packages-node/babel-plugin-extend-docs/demo/my-extension/MyExtension.js
+++ b/packages-node/babel-plugin-extend-docs/demo/my-extension/MyExtension.js
@@ -1,4 +1,4 @@
-import { html, css } from 'lit-element';
+import { html, css } from '@lion/core';
 import { MyCounter } from '../src/MyCounter.js';
 
 export class MyExtension extends MyCounter {
diff --git a/packages-node/babel-plugin-extend-docs/demo/src/MyCounter.js b/packages-node/babel-plugin-extend-docs/demo/src/MyCounter.js
index b31fe8278..672bf7d3e 100644
--- a/packages-node/babel-plugin-extend-docs/demo/src/MyCounter.js
+++ b/packages-node/babel-plugin-extend-docs/demo/src/MyCounter.js
@@ -1,4 +1,4 @@
-import { LitElement, html, css } from 'lit-element';
+import { LitElement, html, css } from '@lion/core';
 
 export class MyCounter extends LitElement {
   static get properties() {
diff --git a/packages-node/babel-plugin-extend-docs/package.json b/packages-node/babel-plugin-extend-docs/package.json
index 60d3866b5..45ff03bb9 100644
--- a/packages-node/babel-plugin-extend-docs/package.json
+++ b/packages-node/babel-plugin-extend-docs/package.json
@@ -24,13 +24,6 @@
     "test:node": "mocha test-node",
     "test:watch": "mocha test-node --watch"
   },
-  "devDependencies": {
-    "@babel/core": "^7.10.1",
-    "mermaid": "^8.2.6",
-    "mock-fs": "^4.10.1",
-    "nyc": "^15.0.0",
-    "ssl-root-cas": "^1.3.1"
-  },
   "keywords": [
     "babel",
     "extend"
diff --git a/packages-node/babel-plugin-extend-docs/test-node/integration.test.js b/packages-node/babel-plugin-extend-docs/test-node/integration.test.js
index 2121899df..010dacb75 100644
--- a/packages-node/babel-plugin-extend-docs/test-node/integration.test.js
+++ b/packages-node/babel-plugin-extend-docs/test-node/integration.test.js
@@ -27,7 +27,7 @@ const extendDocsConfig = {
 
 describe('babel-plugin-extend-docs: integration tests', () => {
   it('works for the demo', () => {
-    const code = `import { LitElement, html } from 'lit-element';
+    const code = `import { LitElement, html } from '@lion/core';
 import { MyCounter } from './src/MyCounter.js';
 import './my-counter.js';
 
@@ -52,7 +52,7 @@ class MyApp extends LitElement {
 
 customElements.define('my-app', MyApp);
 `;
-    const output = `import { LitElement, html } from "lit-element";
+    const output = `import { LitElement, html } from "@lion/core";
 import { MyExtension } from "./my-extension/index.js";
 import "./my-extension/my-extension.js";
 
diff --git a/packages-node/providence-analytics/README.md b/packages-node/providence-analytics/README.md
index 78f67fd95..94c75d05a 100644
--- a/packages-node/providence-analytics/README.md
+++ b/packages-node/providence-analytics/README.md
@@ -3,7 +3,7 @@
 # Providence
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { providenceFlowSvg, providenceInternalFlowSvg } from './docs/_mermaid.svg.js';
 
 export default {
diff --git a/packages-node/providence-analytics/package.json b/packages-node/providence-analytics/package.json
index a94449faf..391e6e574 100644
--- a/packages-node/providence-analytics/package.json
+++ b/packages-node/providence-analytics/package.json
@@ -52,12 +52,6 @@
     "semver": "^7.1.3",
     "typescript": "3.9.7"
   },
-  "devDependencies": {
-    "mermaid": "^8.2.6",
-    "mock-fs": "^4.10.1",
-    "nyc": "^15.0.0",
-    "ssl-root-cas": "^1.3.1"
-  },
   "keywords": [
     "analysis",
     "impact",
diff --git a/packages-node/remark-extend/package.json b/packages-node/remark-extend/package.json
index 7227f7010..88308e14d 100644
--- a/packages-node/remark-extend/package.json
+++ b/packages-node/remark-extend/package.json
@@ -30,9 +30,6 @@
     "unist-util-select": "^3.0.1",
     "unist-util-visit": "^2.0.2"
   },
-  "devDependencies": {
-    "remark-html": "^11.0.1"
-  },
   "keywords": [
     "remark"
   ],
diff --git a/packages/accordion/README.md b/packages/accordion/README.md
index f5b169580..2dbee6ae6 100644
--- a/packages/accordion/README.md
+++ b/packages/accordion/README.md
@@ -6,8 +6,8 @@
 Its purpose is to reduce the need to scroll when presenting multiple sections of content on a single page. Accordions often allow users to get the big picture before focusing on details.
 
 ```js script
-import { LitElement } from 'lit-element';
-import { html } from 'lit-html';
+import { LitElement } from '@lion/core';
+import { html } from '@lion/core';
 import './lion-accordion.js';
 
 export default {
diff --git a/packages/accordion/src/LionAccordion.js b/packages/accordion/src/LionAccordion.js
index f0d70ecbf..a2a74c190 100644
--- a/packages/accordion/src/LionAccordion.js
+++ b/packages/accordion/src/LionAccordion.js
@@ -194,7 +194,7 @@ export class LionAccordion extends LitElement {
     this.__expanded = [];
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   firstUpdated(changedProperties) {
     super.firstUpdated(changedProperties);
     this.__setupSlots();
diff --git a/packages/ajax/README.md b/packages/ajax/README.md
index 20d73b7e4..4ce89d821 100644
--- a/packages/ajax/README.md
+++ b/packages/ajax/README.md
@@ -4,7 +4,7 @@
 It is a promise based system for fetching data, based on [axios](https://github.com/axios/axios)
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { ajax } from './src/ajax.js';
 import { AjaxClass } from './src/AjaxClass.js';
 
diff --git a/packages/button/README.md b/packages/button/README.md
index 63a7cd476..8b4be746b 100644
--- a/packages/button/README.md
+++ b/packages/button/README.md
@@ -5,7 +5,7 @@
 `lion-button` provides a button component that is easily styleable and is accessible.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 
 import './lion-button.js';
 import iconSvg from './docs/assets/icon.svg.js';
diff --git a/packages/button/src/LionButton.js b/packages/button/src/LionButton.js
index ab5526669..63804b1cd 100644
--- a/packages/button/src/LionButton.js
+++ b/packages/button/src/LionButton.js
@@ -196,7 +196,7 @@ export class LionButton extends DisabledWithTabIndexMixin(SlotMixin(LitElement))
   }
 
   /**
-   * @param {import('lit-element').PropertyValues } changedProperties
+   * @param {import('@lion/core').PropertyValues } changedProperties
    */
   updated(changedProperties) {
     super.updated(changedProperties);
diff --git a/packages/calendar/src/LionCalendar.js b/packages/calendar/src/LionCalendar.js
index 7d707036f..37dce69d1 100644
--- a/packages/calendar/src/LionCalendar.js
+++ b/packages/calendar/src/LionCalendar.js
@@ -281,7 +281,7 @@ export class LionCalendar extends LocalizeMixin(LitElement) {
     }
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
     if (changedProperties.has('__focusedDate') && this.__focusedDate) {
diff --git a/packages/checkbox-group/README.md b/packages/checkbox-group/README.md
index d69e439fb..ed611ed5a 100644
--- a/packages/checkbox-group/README.md
+++ b/packages/checkbox-group/README.md
@@ -8,7 +8,7 @@ Its purpose is to provide a way for users to check **multiple** options amongst
 > You should use `<lion-checkbox>` elements as the children of the `<lion-checkbox-group>`.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { Required, Validator } from '@lion/form-core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 import './lion-checkbox-group.js';
diff --git a/packages/checkbox-group/package.json b/packages/checkbox-group/package.json
index 73b438e9c..6ac66487e 100644
--- a/packages/checkbox-group/package.json
+++ b/packages/checkbox-group/package.json
@@ -37,7 +37,8 @@
     "@lion/core": "0.13.6",
     "@lion/fieldset": "0.15.12",
     "@lion/form-core": "0.6.14",
-    "@lion/input": "0.10.12"
+    "@lion/input": "0.10.12",
+    "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
     "checkbox-group",
diff --git a/packages/checkbox-group/src/LionCheckboxGroup.js b/packages/checkbox-group/src/LionCheckboxGroup.js
index c41919f96..6e09239c8 100644
--- a/packages/checkbox-group/src/LionCheckboxGroup.js
+++ b/packages/checkbox-group/src/LionCheckboxGroup.js
@@ -11,7 +11,7 @@ export class LionCheckboxGroup extends ChoiceGroupMixin(FormGroupMixin(LitElemen
     this.multipleChoice = true;
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
     if (changedProperties.has('name') && !String(this.name).match(/\[\]$/)) {
diff --git a/packages/collapsible/README.md b/packages/collapsible/README.md
index 4e9c683b6..e7b8782a8 100644
--- a/packages/collapsible/README.md
+++ b/packages/collapsible/README.md
@@ -3,7 +3,7 @@
 `lion-collapsible` is a combination of a button (the invoker), a chunk of 'extra content', and an animation that is used to disclose the extra content. There are two slots available respectively; `invoker` to specify collapsible invoker and `content` for the extra content of the collapsible.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 
 import './lion-collapsible.js';
 import './demo/custom-collapsible.js';
diff --git a/packages/collapsible/src/LionCollapsible.js b/packages/collapsible/src/LionCollapsible.js
index 7d209ae16..55985a765 100644
--- a/packages/collapsible/src/LionCollapsible.js
+++ b/packages/collapsible/src/LionCollapsible.js
@@ -67,7 +67,7 @@ export class LionCollapsible extends LitElement {
 
   /**
    * Update aria labels on state change.
-   * @param {import('lit-element').PropertyValues } changedProperties
+   * @param {import('@lion/core').PropertyValues } changedProperties
    */
   updated(changedProperties) {
     if (changedProperties.has('opened')) {
diff --git a/packages/combobox/README.md b/packages/combobox/README.md
index 1d41e8446..20bc39cee 100644
--- a/packages/combobox/README.md
+++ b/packages/combobox/README.md
@@ -13,7 +13,7 @@ availability of the popup.
 > Fore more information, consult [Combobox wai-aria design pattern](https://www.w3.org/TR/wai-aria-practices/#combobox)
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { Required } from '@lion/form-core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 import { listboxData } from '@lion/listbox/docs/listboxData.js';
diff --git a/packages/combobox/docs/LinkMixin.js b/packages/combobox/docs/LinkMixin.js
index 01cc58614..2f87c7321 100644
--- a/packages/combobox/docs/LinkMixin.js
+++ b/packages/combobox/docs/LinkMixin.js
@@ -1,7 +1,7 @@
 import { dedupeMixin } from '@lion/core';
 
 /**
- * @typedef {import('lit-element').PropertyValues } changedProperties
+ * @typedef {import('@lion/core').PropertyValues } changedProperties
  */
 
 /**
diff --git a/packages/combobox/docs/Subclassers.md b/packages/combobox/docs/Subclassers.md
index 823ef2206..1dc9fcfd2 100644
--- a/packages/combobox/docs/Subclassers.md
+++ b/packages/combobox/docs/Subclassers.md
@@ -1,7 +1,7 @@
 # Combobox Extensions
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import './md-combobox/md-combobox.js';
 import './gh-combobox/gh-combobox.js';
 import './wa-combobox/wa-combobox.js';
diff --git a/packages/combobox/docs/demo-selection-display.js b/packages/combobox/docs/demo-selection-display.js
index 1ab2c09e8..b7e60b153 100644
--- a/packages/combobox/docs/demo-selection-display.js
+++ b/packages/combobox/docs/demo-selection-display.js
@@ -94,7 +94,7 @@ export class DemoSelectionDisplay extends LitElement {
   }
 
   /**
-   * @param {import('lit-element').PropertyValues } changedProperties
+   * @param {import('@lion/core').PropertyValues } changedProperties
    */
   firstUpdated(changedProperties) {
     super.firstUpdated(changedProperties);
@@ -106,7 +106,7 @@ export class DemoSelectionDisplay extends LitElement {
   }
 
   /**
-   * @param {import('lit-element').PropertyValues } changedProperties
+   * @param {import('@lion/core').PropertyValues } changedProperties
    */
   onComboboxElementUpdated(changedProperties) {
     if (changedProperties.has('modelValue')) {
diff --git a/packages/combobox/package.json b/packages/combobox/package.json
index 365b2d56e..93c2239bd 100644
--- a/packages/combobox/package.json
+++ b/packages/combobox/package.json
@@ -45,9 +45,7 @@
     "@lion/core": "0.13.6",
     "@lion/form-core": "0.6.14",
     "@lion/listbox": "0.3.12",
-    "@lion/overlays": "0.22.8"
-  },
-  "devDependencies": {
+    "@lion/overlays": "0.22.8",
     "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
diff --git a/packages/combobox/src/LionCombobox.js b/packages/combobox/src/LionCombobox.js
index d73528d81..b57ffa288 100644
--- a/packages/combobox/src/LionCombobox.js
+++ b/packages/combobox/src/LionCombobox.js
@@ -300,7 +300,7 @@ export class LionCombobox extends OverlayMixin(LionListbox) {
   }
 
   /**
-   * @param {import('lit-element').PropertyValues } changedProperties
+   * @param {import('@lion/core').PropertyValues } changedProperties
    */
   updated(changedProperties) {
     super.updated(changedProperties);
diff --git a/packages/combobox/test/lion-combobox.test.js b/packages/combobox/test/lion-combobox.test.js
index 00de36613..a28951bf3 100644
--- a/packages/combobox/test/lion-combobox.test.js
+++ b/packages/combobox/test/lion-combobox.test.js
@@ -533,7 +533,7 @@ describe('lion-combobox', () => {
   describe('Selection display', () => {
     class MySelectionDisplay extends LitElement {
       /**
-       * @param {import('lit-element').PropertyValues } changedProperties
+       * @param {import('@lion/core').PropertyValues } changedProperties
        */
       onComboboxElementUpdated(changedProperties) {
         if (
diff --git a/packages/core/index.d.ts b/packages/core/index.d.ts
index a76e1d221..5e6584e42 100644
--- a/packages/core/index.d.ts
+++ b/packages/core/index.d.ts
@@ -21,12 +21,14 @@ export { EventTargetShim } from './src/EventTargetShim.js';
 export {
   css,
   CSSResult,
+  CSSResultArray,
   customElement,
   defaultConverter,
   eventOptions,
   LitElement,
   notEqual,
   property,
+  PropertyValues,
   query,
   queryAll,
   supportsAdoptingStyleSheets,
diff --git a/packages/core/types/DisabledMixinTypes.d.ts b/packages/core/types/DisabledMixinTypes.d.ts
index a88aeeddb..663b8b9ab 100644
--- a/packages/core/types/DisabledMixinTypes.d.ts
+++ b/packages/core/types/DisabledMixinTypes.d.ts
@@ -1,5 +1,5 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { LitElement } from 'lit-element';
+import { LitElement } from '../index.js';
 
 export declare class DisabledHost {
   disabled: boolean;
diff --git a/packages/core/types/DisabledWithTabIndexMixinTypes.d.ts b/packages/core/types/DisabledWithTabIndexMixinTypes.d.ts
index d7a40eb84..b5eee2c33 100644
--- a/packages/core/types/DisabledWithTabIndexMixinTypes.d.ts
+++ b/packages/core/types/DisabledWithTabIndexMixinTypes.d.ts
@@ -1,6 +1,6 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
 import { DisabledHost } from './DisabledMixinTypes';
-import { LitElement } from 'lit-element';
+import { LitElement } from '../index.js';
 export declare class DisabledWithTabIndexHost {
   tabIndex: number;
   /**
diff --git a/packages/dialog/README.md b/packages/dialog/README.md
index b5f19b3e9..1a43f183e 100644
--- a/packages/dialog/README.md
+++ b/packages/dialog/README.md
@@ -6,7 +6,7 @@
 Its purpose is to make it easy to use our Overlay System declaratively.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import demoStyle from './docs/demo-dialog-style.js';
 import './docs/styled-dialog-content.js';
 import './docs/slots-dialog-content.js';
diff --git a/packages/fieldset/README.md b/packages/fieldset/README.md
index f9fe9b654..88d671fdc 100644
--- a/packages/fieldset/README.md
+++ b/packages/fieldset/README.md
@@ -3,7 +3,7 @@
 `lion-fieldset` groups multiple input fields or other fieldsets together.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import '@lion/input/lion-input.js';
 import { localize } from '@lion/localize';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
diff --git a/packages/fieldset/package.json b/packages/fieldset/package.json
index 4fab5ea5a..efc37858b 100644
--- a/packages/fieldset/package.json
+++ b/packages/fieldset/package.json
@@ -35,7 +35,8 @@
   ],
   "dependencies": {
     "@lion/core": "0.13.6",
-    "@lion/form-core": "0.6.14"
+    "@lion/form-core": "0.6.14",
+    "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
     "fieldset",
diff --git a/packages/form-core/package.json b/packages/form-core/package.json
index 357b90e2e..7608a6cfb 100644
--- a/packages/form-core/package.json
+++ b/packages/form-core/package.json
@@ -35,6 +35,7 @@
   ],
   "dependencies": {
     "@lion/core": "0.13.6",
+    "@lion/input": "0.10.12",
     "@lion/localize": "0.15.3"
   },
   "keywords": [
diff --git a/packages/form-core/src/FormControlMixin.js b/packages/form-core/src/FormControlMixin.js
index f0e393a10..3a2609caa 100644
--- a/packages/form-core/src/FormControlMixin.js
+++ b/packages/form-core/src/FormControlMixin.js
@@ -231,7 +231,7 @@ const FormControlMixinImplementation = superclass =>
       }
     }
 
-    /** @param {import('lit-element').PropertyValues } changedProperties */
+    /** @param {import('@lion/core').PropertyValues } changedProperties */
     updated(changedProperties) {
       super.updated(changedProperties);
 
diff --git a/packages/form-core/src/LionField.js b/packages/form-core/src/LionField.js
index 208c2dea3..e6b36105d 100644
--- a/packages/form-core/src/LionField.js
+++ b/packages/form-core/src/LionField.js
@@ -46,7 +46,7 @@ export class LionField extends FormControlMixin(
   }
 
   /**
-   * @param {import('lit-element').PropertyValues } changedProperties
+   * @param {import('@lion/core').PropertyValues } changedProperties
    */
   firstUpdated(changedProperties) {
     super.firstUpdated(changedProperties);
diff --git a/packages/form-core/src/choice-group/ChoiceGroupMixin.js b/packages/form-core/src/choice-group/ChoiceGroupMixin.js
index a584a1cb7..b8c02ad02 100644
--- a/packages/form-core/src/choice-group/ChoiceGroupMixin.js
+++ b/packages/form-core/src/choice-group/ChoiceGroupMixin.js
@@ -161,7 +161,7 @@ const ChoiceGroupMixinImplementation = superclass =>
       });
     }
 
-    /** @param {import('lit-element').PropertyValues} changedProperties */
+    /** @param {import('@lion/core').PropertyValues} changedProperties */
     updated(changedProperties) {
       super.updated(changedProperties);
       if (changedProperties.has('name') && this.name !== changedProperties.get('name')) {
diff --git a/packages/form-core/src/choice-group/ChoiceInputMixin.js b/packages/form-core/src/choice-group/ChoiceInputMixin.js
index 7194da506..58cba4e73 100644
--- a/packages/form-core/src/choice-group/ChoiceInputMixin.js
+++ b/packages/form-core/src/choice-group/ChoiceInputMixin.js
@@ -92,7 +92,7 @@ const ChoiceInputMixinImplementation = superclass =>
     }
 
     /**
-     * @param {import('lit-element').PropertyValues } changedProperties
+     * @param {import('@lion/core').PropertyValues } changedProperties
      */
     firstUpdated(changedProperties) {
       super.firstUpdated(changedProperties);
@@ -104,7 +104,7 @@ const ChoiceInputMixinImplementation = superclass =>
     }
 
     /**
-     * @param {import('lit-element').PropertyValues } changedProperties
+     * @param {import('@lion/core').PropertyValues } changedProperties
      */
     updated(changedProperties) {
       super.updated(changedProperties);
diff --git a/packages/form-core/src/form-group/FormGroupMixin.js b/packages/form-core/src/form-group/FormGroupMixin.js
index 8c0bebd8f..4ceb1dbce 100644
--- a/packages/form-core/src/form-group/FormGroupMixin.js
+++ b/packages/form-core/src/form-group/FormGroupMixin.js
@@ -207,7 +207,7 @@ const FormGroupMixinImplementation = superclass =>
     }
 
     /**
-     * @param {import('lit-element').PropertyValues } changedProperties
+     * @param {import('@lion/core').PropertyValues } changedProperties
      */
     updated(changedProperties) {
       super.updated(changedProperties);
diff --git a/packages/form-core/src/utils/SyncUpdatableMixin.js b/packages/form-core/src/utils/SyncUpdatableMixin.js
index 93c7e495d..55b7daae4 100644
--- a/packages/form-core/src/utils/SyncUpdatableMixin.js
+++ b/packages/form-core/src/utils/SyncUpdatableMixin.js
@@ -34,7 +34,7 @@ const SyncUpdatableMixinImplementation = superclass =>
       this.__SyncUpdatableNamespace = {};
     }
 
-    /** @param {import('lit-element').PropertyValues } changedProperties */
+    /** @param {import('@lion/core').PropertyValues } changedProperties */
     firstUpdated(changedProperties) {
       super.firstUpdated(changedProperties);
       this.__SyncUpdatableNamespace.connected = true;
diff --git a/packages/form-core/src/validate/LionValidationFeedback.js b/packages/form-core/src/validate/LionValidationFeedback.js
index dd1e034f0..6ebe4fa53 100644
--- a/packages/form-core/src/validate/LionValidationFeedback.js
+++ b/packages/form-core/src/validate/LionValidationFeedback.js
@@ -33,7 +33,7 @@ export class LionValidationFeedback extends LitElement {
   }
 
   /**
-   * @param {import('lit-element').PropertyValues } changedProperties
+   * @param {import('@lion/core').PropertyValues } changedProperties
    */
   updated(changedProperties) {
     super.updated(changedProperties);
diff --git a/packages/form-core/src/validate/ValidateMixin.js b/packages/form-core/src/validate/ValidateMixin.js
index 88fe89a1b..6086323fa 100644
--- a/packages/form-core/src/validate/ValidateMixin.js
+++ b/packages/form-core/src/validate/ValidateMixin.js
@@ -171,7 +171,7 @@ export const ValidateMixinImplementation = superclass =>
     }
 
     /**
-     * @param {import('lit-element').PropertyValues} changedProperties
+     * @param {import('@lion/core').PropertyValues} changedProperties
      */
     firstUpdated(changedProperties) {
       super.firstUpdated(changedProperties);
@@ -607,7 +607,7 @@ export const ValidateMixinImplementation = superclass =>
       );
     }
 
-    /** @param {import('lit-element').PropertyValues} changedProperties */
+    /** @param {import('@lion/core').PropertyValues} changedProperties */
     updated(changedProperties) {
       super.updated(changedProperties);
 
diff --git a/packages/form-core/test/utils/SyncUpdatableMixin.test.js b/packages/form-core/test/utils/SyncUpdatableMixin.test.js
index d38867836..680039de7 100644
--- a/packages/form-core/test/utils/SyncUpdatableMixin.test.js
+++ b/packages/form-core/test/utils/SyncUpdatableMixin.test.js
@@ -26,7 +26,7 @@ describe('SyncUpdatableMixin', () => {
           this.propB = 'init-b';
         }
 
-        /** @param {import('lit-element').PropertyValues } changedProperties */
+        /** @param {import('@lion/core').PropertyValues } changedProperties */
         firstUpdated(changedProperties) {
           super.firstUpdated(changedProperties);
           hasCalledFirstUpdated = true;
diff --git a/packages/form-core/types/FormControlMixinTypes.d.ts b/packages/form-core/types/FormControlMixinTypes.d.ts
index a0659509f..4a22aa04f 100644
--- a/packages/form-core/types/FormControlMixinTypes.d.ts
+++ b/packages/form-core/types/FormControlMixinTypes.d.ts
@@ -1,5 +1,4 @@
-import { CSSResultArray } from 'lit-element';
-import { LitElement, nothing, TemplateResult } from '@lion/core';
+import { LitElement, nothing, TemplateResult, CSSResultArray } from '@lion/core';
 import { SlotsMap, SlotHost } from '@lion/core/types/SlotMixinTypes';
 import { Constructor } from '@open-wc/dedupe-mixin';
 import { DisabledHost } from '@lion/core/types/DisabledMixinTypes';
@@ -102,7 +101,7 @@ export declare class FormControlHost {
   _isRepropagationEndpoint: boolean;
 
   connectedCallback(): void;
-  updated(changedProperties: import('lit-element').PropertyValues): void;
+  updated(changedProperties: import('@lion/core').PropertyValues): void;
 
   render(): TemplateResult;
   _groupOneTemplate(): TemplateResult;
diff --git a/packages/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts b/packages/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts
index 5106f5a72..622a58e3a 100644
--- a/packages/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts
+++ b/packages/form-core/types/choice-group/ChoiceInputMixinTypes.d.ts
@@ -1,6 +1,6 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
 import { LitElement, TemplateResult } from '@lion/core';
-import { CSSResultArray } from 'lit-element';
+import { CSSResultArray } from '@lion/core';
 import { FormatHost } from '../FormatMixinTypes';
 
 export interface ChoiceInputModelValue {
diff --git a/packages/form-core/types/utils/SyncUpdatableMixinTypes.d.ts b/packages/form-core/types/utils/SyncUpdatableMixinTypes.d.ts
index 64ec03618..911fda41b 100644
--- a/packages/form-core/types/utils/SyncUpdatableMixinTypes.d.ts
+++ b/packages/form-core/types/utils/SyncUpdatableMixinTypes.d.ts
@@ -1,6 +1,6 @@
 import { LitElement } from '@lion/core';
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { PropertyValues } from 'lit-element';
+import { PropertyValues } from '@lion/core';
 
 export declare interface SyncUpdatableNamespace {
   connected?: boolean;
diff --git a/packages/form-core/types/validate/ValidateMixinTypes.d.ts b/packages/form-core/types/validate/ValidateMixinTypes.d.ts
index c9bd86808..bb2885018 100644
--- a/packages/form-core/types/validate/ValidateMixinTypes.d.ts
+++ b/packages/form-core/types/validate/ValidateMixinTypes.d.ts
@@ -41,9 +41,9 @@ export declare class ValidateHost {
 
   connectedCallback(): void;
   disconnectedCallback(): void;
-  firstUpdated(changedProperties: import('lit-element').PropertyValues): void;
+  firstUpdated(changedProperties: import('@lion/core').PropertyValues): void;
   updateSync(name: string, oldValue: unknown): void;
-  updated(changedProperties: import('lit-element').PropertyValues): void;
+  updated(changedProperties: import('@lion/core').PropertyValues): void;
 
   validate(opts?: { clearCurrentResult?: boolean }): void;
   __storePrevResult(): void;
diff --git a/packages/form-integrations/docs/15-features-overview.md b/packages/form-integrations/docs/15-features-overview.md
index 209bbd830..ce7358d1f 100644
--- a/packages/form-integrations/docs/15-features-overview.md
+++ b/packages/form-integrations/docs/15-features-overview.md
@@ -6,7 +6,7 @@ This is a meta package to show interaction between various form elements.
 For usage and installation please see the appropriate packages.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import '@lion/checkbox-group/lion-checkbox-group.js';
 import '@lion/checkbox-group/lion-checkbox.js';
 import '@lion/combobox/lion-combobox.js';
diff --git a/packages/form-integrations/docs/17-validation-examples.md b/packages/form-integrations/docs/17-validation-examples.md
index fe71ecb81..92b22ace3 100644
--- a/packages/form-integrations/docs/17-validation-examples.md
+++ b/packages/form-integrations/docs/17-validation-examples.md
@@ -10,7 +10,7 @@ For an input that may mean that it is not an empty string,
 while for a checkbox group it means at least one checkbox needs to be checked.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 /* eslint-disable import/no-extraneous-dependencies */
 import { LionInput } from '@lion/input';
 import '@lion/input-amount/lion-input-amount.js';
diff --git a/packages/form-integrations/docs/30-system-formatting.md b/packages/form-integrations/docs/30-system-formatting.md
index 88a8aaad3..cc4108f97 100644
--- a/packages/form-integrations/docs/30-system-formatting.md
+++ b/packages/form-integrations/docs/30-system-formatting.md
@@ -3,7 +3,7 @@
 # Formatting and Parsing
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import '@lion/input/lion-input.js';
 import { Unparseable } from '@lion/form-core';
 import '../docs/helper-wc/h-output.js';
diff --git a/packages/form-integrations/docs/35-system-interaction-states.md b/packages/form-integrations/docs/35-system-interaction-states.md
index f7f54de3d..4846f1df0 100644
--- a/packages/form-integrations/docs/35-system-interaction-states.md
+++ b/packages/form-integrations/docs/35-system-interaction-states.md
@@ -3,7 +3,7 @@
 # Interaction States
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { render } from '@lion/core';
 import { renderLitAsNode } from '@lion/helpers';
 import '@lion/input/lion-input.js';
diff --git a/packages/form-integrations/docs/40-system-creating-a-custom-field.md b/packages/form-integrations/docs/40-system-creating-a-custom-field.md
index 1829a92f1..73b3ae225 100644
--- a/packages/form-integrations/docs/40-system-creating-a-custom-field.md
+++ b/packages/form-integrations/docs/40-system-creating-a-custom-field.md
@@ -3,7 +3,7 @@
 # Creating a custom field
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { render } from '@lion/core';
 import '@lion/input/lion-input.js';
 import { Validator } from '@lion/form-core';
diff --git a/packages/form-integrations/docs/50-content-inside-fields.md b/packages/form-integrations/docs/50-content-inside-fields.md
index 050147e2b..8737e7ea0 100644
--- a/packages/form-integrations/docs/50-content-inside-fields.md
+++ b/packages/form-integrations/docs/50-content-inside-fields.md
@@ -3,7 +3,7 @@
 # Content inside fields
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import '@lion/input/lion-input.js';
 import '@lion/button/lion-button.js';
 
diff --git a/packages/form-integrations/docs/60-dialog-integration.md b/packages/form-integrations/docs/60-dialog-integration.md
index cbbf058b7..8f3150d86 100644
--- a/packages/form-integrations/docs/60-dialog-integration.md
+++ b/packages/form-integrations/docs/60-dialog-integration.md
@@ -3,7 +3,7 @@
 # Forms in a dialog
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import '@lion/dialog/lion-dialog.js';
 import '@lion/select-rich/lion-select-rich.js';
 import '@lion/listbox/lion-options.js';
diff --git a/packages/form-integrations/docs/fieldset-examples.md b/packages/form-integrations/docs/fieldset-examples.md
index d132a9235..ddcc69774 100644
--- a/packages/form-integrations/docs/fieldset-examples.md
+++ b/packages/form-integrations/docs/fieldset-examples.md
@@ -3,7 +3,7 @@
 # Fieldset Examples
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import '@lion/input/lion-input.js';
 import { localize } from '@lion/localize';
 import { MinLength, Validator, Required } from '@lion/form-core';
diff --git a/packages/form/README.md b/packages/form/README.md
index 6931729d2..addc1e48b 100644
--- a/packages/form/README.md
+++ b/packages/form/README.md
@@ -4,7 +4,7 @@
 It is designed to interact with (instances of) the [form controls](?path=/docs/forms-system-overview--page).
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import '@lion/input/lion-input.js';
 import './lion-form.js';
 
diff --git a/packages/form/package.json b/packages/form/package.json
index d6c61159a..29aff3189 100644
--- a/packages/form/package.json
+++ b/packages/form/package.json
@@ -34,7 +34,8 @@
   ],
   "dependencies": {
     "@lion/core": "0.13.6",
-    "@lion/fieldset": "0.15.12"
+    "@lion/fieldset": "0.15.12",
+    "@lion/input": "0.10.12"
   },
   "keywords": [
     "form",
diff --git a/packages/helpers/sb-action-logger/README.md b/packages/helpers/sb-action-logger/README.md
index 28bd879a0..2485cbb53 100644
--- a/packages/helpers/sb-action-logger/README.md
+++ b/packages/helpers/sb-action-logger/README.md
@@ -5,7 +5,7 @@
 A visual element to show action logs in Storybook demos `sb-action-logger`
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 
 import '../sb-action-logger.js';
 
diff --git a/packages/icon/README.md b/packages/icon/README.md
index bb41c5078..e7203acec 100644
--- a/packages/icon/README.md
+++ b/packages/icon/README.md
@@ -3,7 +3,7 @@
 A web component for displaying icons.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { icons } from './index.js';
 import './docs/icons/iconset-bugs.js';
 import './docs/icons/iconset-misc.js';
diff --git a/packages/icon/docs/system.md b/packages/icon/docs/system.md
index d02766c93..4abdd3b71 100644
--- a/packages/icon/docs/system.md
+++ b/packages/icon/docs/system.md
@@ -15,7 +15,7 @@ application, and you don't need to worry about carefully coordinating the dynami
 For security reasons, icons are defined using lit-html templates to guarantee XSS safety:
 
 ```js
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 
 export default html` <svg focusable="false" ...>...</svg> `;
 ```
diff --git a/packages/icon/src/LionIcon.js b/packages/icon/src/LionIcon.js
index 33d423921..3a1f689f7 100644
--- a/packages/icon/src/LionIcon.js
+++ b/packages/icon/src/LionIcon.js
@@ -101,7 +101,7 @@ export class LionIcon extends LitElement {
     this.__svg = nothing;
   }
 
-  /** @param {import('lit-element').PropertyValues} changedProperties */
+  /** @param {import('@lion/core').PropertyValues} changedProperties */
   update(changedProperties) {
     super.update(changedProperties);
     if (changedProperties.has('ariaLabel')) {
diff --git a/packages/input-amount/README.md b/packages/input-amount/README.md
index 3807f2f70..8e4b0816d 100644
--- a/packages/input-amount/README.md
+++ b/packages/input-amount/README.md
@@ -10,7 +10,7 @@ Valid characters are digits and separators. Formatting happens on-blur.
 If there are no valid characters in the input whatsoever, it will provide an error feedback.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 
 import './lion-input-amount.js';
diff --git a/packages/input-amount/package.json b/packages/input-amount/package.json
index b6c4f9b38..5a1539410 100644
--- a/packages/input-amount/package.json
+++ b/packages/input-amount/package.json
@@ -36,9 +36,7 @@
     "@lion/core": "0.13.6",
     "@lion/form-core": "0.6.14",
     "@lion/input": "0.10.12",
-    "@lion/localize": "0.15.3"
-  },
-  "devDependencies": {
+    "@lion/localize": "0.15.3",
     "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
diff --git a/packages/input-amount/src/LionInputAmount.js b/packages/input-amount/src/LionInputAmount.js
index 9a7585702..1068d9718 100644
--- a/packages/input-amount/src/LionInputAmount.js
+++ b/packages/input-amount/src/LionInputAmount.js
@@ -89,7 +89,7 @@ export class LionInputAmount extends LocalizeMixin(LionInput) {
     }
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
     if (changedProperties.has('currency') && this.currency) {
diff --git a/packages/input-date/README.md b/packages/input-date/README.md
index 06616e99f..12bbe84e7 100644
--- a/packages/input-date/README.md
+++ b/packages/input-date/README.md
@@ -3,7 +3,7 @@
 `lion-input-date` component is based on the generic text input field. Its purpose is to provide a way for users to fill in a date.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { MinDate, MinMaxDate, MaxDate } from '@lion/form-core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 
diff --git a/packages/input-date/package.json b/packages/input-date/package.json
index 3103e3a4e..d3fb8705d 100644
--- a/packages/input-date/package.json
+++ b/packages/input-date/package.json
@@ -36,9 +36,7 @@
     "@lion/core": "0.13.6",
     "@lion/form-core": "0.6.14",
     "@lion/input": "0.10.12",
-    "@lion/localize": "0.15.3"
-  },
-  "devDependencies": {
+    "@lion/localize": "0.15.3",
     "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
diff --git a/packages/input-date/src/LionInputDate.js b/packages/input-date/src/LionInputDate.js
index 82b627a15..6579055f0 100644
--- a/packages/input-date/src/LionInputDate.js
+++ b/packages/input-date/src/LionInputDate.js
@@ -36,7 +36,7 @@ export class LionInputDate extends LocalizeMixin(LionInput) {
     this.defaultValidators.push(new IsDate());
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
     if (changedProperties.has('locale')) {
diff --git a/packages/input-datepicker/README.md b/packages/input-datepicker/README.md
index 0ff75d6a9..e0055fc39 100644
--- a/packages/input-datepicker/README.md
+++ b/packages/input-datepicker/README.md
@@ -7,7 +7,7 @@ For an input field with a big range, such as `birthday-input`, a datepicker is n
 We encourage using the standard [lion-input-date](?path=/docs/form-component-input-date) for this.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { MinMaxDate, IsDateDisabled } from '@lion/form-core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 import { formatDate } from '@lion/localize';
diff --git a/packages/input-datepicker/package.json b/packages/input-datepicker/package.json
index b1dc93f03..ce35c5c0e 100644
--- a/packages/input-datepicker/package.json
+++ b/packages/input-datepicker/package.json
@@ -38,9 +38,7 @@
     "@lion/form-core": "0.6.14",
     "@lion/input-date": "0.8.12",
     "@lion/localize": "0.15.3",
-    "@lion/overlays": "0.22.8"
-  },
-  "devDependencies": {
+    "@lion/overlays": "0.22.8",
     "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
diff --git a/packages/input-datepicker/src/LionInputDatepicker.js b/packages/input-datepicker/src/LionInputDatepicker.js
index c57608511..3601ae3d5 100644
--- a/packages/input-datepicker/src/LionInputDatepicker.js
+++ b/packages/input-datepicker/src/LionInputDatepicker.js
@@ -205,13 +205,13 @@ export class LionInputDatepicker extends ScopedElementsMixin(
     }
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   firstUpdated(changedProperties) {
     super.firstUpdated(changedProperties);
     this.__toggleInvokerDisabled();
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
     if (changedProperties.has('validators')) {
diff --git a/packages/input-email/README.md b/packages/input-email/README.md
index f246314ee..bb57f5eb1 100644
--- a/packages/input-email/README.md
+++ b/packages/input-email/README.md
@@ -3,7 +3,7 @@
 `lion-input-email` component is based on the generic text input field. Its purpose is to provide a way for users to fill in an email.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { Validator } from '@lion/form-core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 
diff --git a/packages/input-email/package.json b/packages/input-email/package.json
index dd047bb5e..ad67f66ab 100644
--- a/packages/input-email/package.json
+++ b/packages/input-email/package.json
@@ -36,9 +36,7 @@
     "@lion/core": "0.13.6",
     "@lion/form-core": "0.6.14",
     "@lion/input": "0.10.12",
-    "@lion/localize": "0.15.3"
-  },
-  "devDependencies": {
+    "@lion/localize": "0.15.3",
     "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
diff --git a/packages/input-iban/README.md b/packages/input-iban/README.md
index d4a5db9be..b961f0427 100644
--- a/packages/input-iban/README.md
+++ b/packages/input-iban/README.md
@@ -6,7 +6,7 @@
 Its purpose is to provide a way for users to fill in an IBAN (International Bank Account Number).
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 import { IsCountryIBAN, IsNotCountryIBAN } from './src/validators.js';
 
diff --git a/packages/input-iban/package.json b/packages/input-iban/package.json
index 1cb3d61c8..5ce2aa683 100644
--- a/packages/input-iban/package.json
+++ b/packages/input-iban/package.json
@@ -37,11 +37,9 @@
     "@lion/form-core": "0.6.14",
     "@lion/input": "0.10.12",
     "@lion/localize": "0.15.3",
+    "@lion/validate-messages": "0.3.12",
     "ibantools": "^2.2.0"
   },
-  "devDependencies": {
-    "@lion/validate-messages": "0.3.12"
-  },
   "keywords": [
     "input-iban",
     "lion",
diff --git a/packages/input-range/README.md b/packages/input-range/README.md
index 06ef07ce7..061eacbad 100644
--- a/packages/input-range/README.md
+++ b/packages/input-range/README.md
@@ -4,7 +4,7 @@
 Its purpose is to provide a way for users to select one value from a range of values.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 
 import './lion-input-range.js';
 
diff --git a/packages/input-range/package.json b/packages/input-range/package.json
index b4a0f1f05..ad1e85eca 100644
--- a/packages/input-range/package.json
+++ b/packages/input-range/package.json
@@ -34,7 +34,6 @@
   ],
   "dependencies": {
     "@lion/core": "0.13.6",
-    "@lion/form-core": "0.6.14",
     "@lion/input": "0.10.12",
     "@lion/localize": "0.15.3"
   },
diff --git a/packages/input-range/src/LionInputRange.js b/packages/input-range/src/LionInputRange.js
index 159651b15..a33471025 100644
--- a/packages/input-range/src/LionInputRange.js
+++ b/packages/input-range/src/LionInputRange.js
@@ -86,7 +86,7 @@ export class LionInputRange extends LocalizeMixin(LionInput) {
     this.__teardownStyleTag();
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
 
@@ -103,7 +103,7 @@ export class LionInputRange extends LocalizeMixin(LionInput) {
     }
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   firstUpdated(changedProperties) {
     super.firstUpdated(changedProperties);
     if (changedProperties.has('modelValue')) {
diff --git a/packages/input-stepper/README.md b/packages/input-stepper/README.md
index 2244e6e94..28c1cc318 100644
--- a/packages/input-stepper/README.md
+++ b/packages/input-stepper/README.md
@@ -3,7 +3,7 @@
 `lion-input-stepper` enables the user to increase and decrease a numeric value by predefined range. It is a combination of two buttons and a number input field with an optional slot `after` to suffix the extra information.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import '@lion/form/lion-form.js';
 import './lion-input-stepper.js';
 
diff --git a/packages/input-stepper/package.json b/packages/input-stepper/package.json
index 93fe8f83c..f59ad25e8 100644
--- a/packages/input-stepper/package.json
+++ b/packages/input-stepper/package.json
@@ -34,6 +34,7 @@
   ],
   "dependencies": {
     "@lion/core": "0.13.6",
+    "@lion/form": "0.7.12",
     "@lion/form-core": "0.6.14",
     "@lion/input": "0.10.12"
   },
diff --git a/packages/input-stepper/src/LionInputStepper.js b/packages/input-stepper/src/LionInputStepper.js
index dff05ccb1..face6c110 100644
--- a/packages/input-stepper/src/LionInputStepper.js
+++ b/packages/input-stepper/src/LionInputStepper.js
@@ -84,7 +84,7 @@ export class LionInputStepper extends LionInput {
     this.removeEventListener('keydown', this.__keyDownHandler);
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
 
diff --git a/packages/input/README.md b/packages/input/README.md
index f96333081..2aa379d43 100644
--- a/packages/input/README.md
+++ b/packages/input/README.md
@@ -3,7 +3,7 @@
 `lion-input` component is a webcomponent that enhances the functionality of the native `<input>` element.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { MaxLength } from '@lion/form-core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 
diff --git a/packages/input/package.json b/packages/input/package.json
index 36cdae99e..efa33e888 100644
--- a/packages/input/package.json
+++ b/packages/input/package.json
@@ -33,8 +33,9 @@
     "lion-input.js"
   ],
   "dependencies": {
-    "@lion/core": "0.13.6",
-    "@lion/form-core": "0.6.14"
+    "@lion/form-core": "0.6.14",
+    "@lion/localize": "0.15.3",
+    "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
     "input",
diff --git a/packages/input/src/LionInput.js b/packages/input/src/LionInput.js
index cfc971278..65b2724d5 100644
--- a/packages/input/src/LionInput.js
+++ b/packages/input/src/LionInput.js
@@ -71,13 +71,13 @@ export class LionInput extends NativeTextFieldMixin(LionField) {
     }
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   firstUpdated(changedProperties) {
     super.firstUpdated(changedProperties);
     this.__delegateReadOnly();
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
     if (changedProperties.has('type')) {
diff --git a/packages/listbox/package.json b/packages/listbox/package.json
index cad11095b..a61781e4a 100644
--- a/packages/listbox/package.json
+++ b/packages/listbox/package.json
@@ -36,7 +36,8 @@
   ],
   "dependencies": {
     "@lion/core": "0.13.6",
-    "@lion/form-core": "0.6.14"
+    "@lion/form-core": "0.6.14",
+    "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
     "form",
diff --git a/packages/listbox/src/LionOption.js b/packages/listbox/src/LionOption.js
index 27e676d81..4ffa1adb1 100644
--- a/packages/listbox/src/LionOption.js
+++ b/packages/listbox/src/LionOption.js
@@ -84,7 +84,7 @@ export class LionOption extends DisabledMixin(ChoiceInputMixin(FormRegisteringMi
   }
 
   /**
-   * @param {import('lit-element').PropertyValues } changedProperties
+   * @param {import('@lion/core').PropertyValues } changedProperties
    */
   updated(changedProperties) {
     super.updated(changedProperties);
diff --git a/packages/listbox/src/ListboxMixin.js b/packages/listbox/src/ListboxMixin.js
index 33fe22b76..3d9860662 100644
--- a/packages/listbox/src/ListboxMixin.js
+++ b/packages/listbox/src/ListboxMixin.js
@@ -303,7 +303,7 @@ const ListboxMixinImplementation = superclass =>
     }
 
     /**
-     * @param {import('lit-element').PropertyValues } changedProperties
+     * @param {import('@lion/core').PropertyValues } changedProperties
      */
     firstUpdated(changedProperties) {
       super.firstUpdated(changedProperties);
@@ -315,7 +315,7 @@ const ListboxMixinImplementation = superclass =>
     }
 
     /**
-     * @param {import('lit-element').PropertyValues } changedProperties
+     * @param {import('@lion/core').PropertyValues } changedProperties
      */
     updated(changedProperties) {
       super.updated(changedProperties);
diff --git a/packages/localize/docs/10-features-overview.md b/packages/localize/docs/10-features-overview.md
index 48418e278..dd01a1640 100644
--- a/packages/localize/docs/10-features-overview.md
+++ b/packages/localize/docs/10-features-overview.md
@@ -5,7 +5,7 @@
 ### As a function
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { render, LitElement } from '@lion/core';
 import { localize, formatNumber, formatDate, LocalizeMixin } from '../index.js';
 
diff --git a/packages/localize/package.json b/packages/localize/package.json
index d00c6b3b8..a44d3a32f 100644
--- a/packages/localize/package.json
+++ b/packages/localize/package.json
@@ -35,9 +35,6 @@
     "@lion/core": "0.13.6",
     "singleton-manager": "1.2.0"
   },
-  "devDependencies": {
-    "@bundled-es-modules/fetch-mock": "^6.5.2"
-  },
   "keywords": [
     "lion",
     "localize",
diff --git a/packages/overlays/docs/20-index.md b/packages/overlays/docs/20-index.md
index 84b55ef7a..2064b5c60 100644
--- a/packages/overlays/docs/20-index.md
+++ b/packages/overlays/docs/20-index.md
@@ -3,7 +3,7 @@
 # Overlay System
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { render, LitElement } from '@lion/core';
 import { renderLitAsNode } from '@lion/helpers';
 import {
diff --git a/packages/overlays/docs/40-system-configuration.md b/packages/overlays/docs/40-system-configuration.md
index cfb272c2a..9b80e61ac 100644
--- a/packages/overlays/docs/40-system-configuration.md
+++ b/packages/overlays/docs/40-system-configuration.md
@@ -3,7 +3,7 @@
 # Overlay System - Configuration
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import '../docs/demo-overlay-system.js';
 import '../docs/applyDemoOverlayStyles.js';
 
diff --git a/packages/overlays/docs/directives/ref.js b/packages/overlays/docs/directives/ref.js
index 14b13cfbb..734b69610 100644
--- a/packages/overlays/docs/directives/ref.js
+++ b/packages/overlays/docs/directives/ref.js
@@ -1,7 +1,7 @@
 import { directive } from '@lion/core';
 
 /**
- * @typedef {import('lit-html').PropertyPart} PropertyPart
+ * @typedef {import('@lion/core').PropertyPart} PropertyPart
  */
 
 /** @type {WeakSet<Element>} */
diff --git a/packages/overlays/src/OverlayMixin.js b/packages/overlays/src/OverlayMixin.js
index 6ea8c1b68..de9ba05ce 100644
--- a/packages/overlays/src/OverlayMixin.js
+++ b/packages/overlays/src/OverlayMixin.js
@@ -111,7 +111,7 @@ export const OverlayMixinImplementation = superclass =>
     }
 
     /**
-     * @param {import('lit-element').PropertyValues } changedProperties
+     * @param {import('@lion/core').PropertyValues } changedProperties
      */
     updated(changedProperties) {
       super.updated(changedProperties);
diff --git a/packages/overlays/types/ArrowMixinTypes.d.ts b/packages/overlays/types/ArrowMixinTypes.d.ts
index 1f7fae2d9..c0159b7d2 100644
--- a/packages/overlays/types/ArrowMixinTypes.d.ts
+++ b/packages/overlays/types/ArrowMixinTypes.d.ts
@@ -1,6 +1,6 @@
 import { Constructor } from '@open-wc/dedupe-mixin';
 import { LitElement, TemplateResult } from '@lion/core';
-import { CSSResultArray } from 'lit-element';
+import { CSSResultArray } from '@lion/core';
 import Data from 'popper.js';
 import { Options as PopperOptions } from '@popperjs/core/lib/popper';
 import { OverlayConfig } from '../types/OverlayConfig';
diff --git a/packages/pagination/README.md b/packages/pagination/README.md
index 23cf6f106..92be9302c 100644
--- a/packages/pagination/README.md
+++ b/packages/pagination/README.md
@@ -3,7 +3,7 @@
 `lion-pagination` component that handles pagination.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 
 import './lion-pagination.js';
 
diff --git a/packages/progress-indicator/README.md b/packages/progress-indicator/README.md
index ae1e8e5ad..15189e8f5 100644
--- a/packages/progress-indicator/README.md
+++ b/packages/progress-indicator/README.md
@@ -5,7 +5,7 @@
 `lion-progress-indicator` implements accessibility requirements for progress indicators.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import './demo/custom-progress-indicator.js';
 
 export default {
diff --git a/packages/radio-group/README.md b/packages/radio-group/README.md
index 2d1791cc4..39d5f2749 100644
--- a/packages/radio-group/README.md
+++ b/packages/radio-group/README.md
@@ -5,7 +5,7 @@
 You should use `<lion-radio>`s inside this element.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { Required, Validator } from '@lion/form-core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 
diff --git a/packages/radio-group/package.json b/packages/radio-group/package.json
index dfd418194..c76300b5a 100644
--- a/packages/radio-group/package.json
+++ b/packages/radio-group/package.json
@@ -35,9 +35,9 @@
   ],
   "dependencies": {
     "@lion/core": "0.13.6",
-    "@lion/fieldset": "0.15.12",
     "@lion/form-core": "0.6.14",
-    "@lion/input": "0.10.12"
+    "@lion/input": "0.10.12",
+    "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
     "lion",
diff --git a/packages/select-rich/package.json b/packages/select-rich/package.json
index 2de5e64d4..1d6de93e7 100644
--- a/packages/select-rich/package.json
+++ b/packages/select-rich/package.json
@@ -38,7 +38,8 @@
     "@lion/core": "0.13.6",
     "@lion/form-core": "0.6.14",
     "@lion/listbox": "0.3.12",
-    "@lion/overlays": "0.22.8"
+    "@lion/overlays": "0.22.8",
+    "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
     "field",
diff --git a/packages/select-rich/src/LionSelectRich.js b/packages/select-rich/src/LionSelectRich.js
index 83e0b1624..c6fe48ace 100644
--- a/packages/select-rich/src/LionSelectRich.js
+++ b/packages/select-rich/src/LionSelectRich.js
@@ -160,7 +160,7 @@ export class LionSelectRich extends SlotMixin(ScopedElementsMixin(OverlayMixin(L
   }
 
   /**
-   * @param {import('lit-element').PropertyValues } changedProperties
+   * @param {import('@lion/core').PropertyValues } changedProperties
    */
   updated(changedProperties) {
     super.updated(changedProperties);
diff --git a/packages/select-rich/test/lion-select-rich-dialog-integration.test.js b/packages/select-rich/test/lion-select-rich-dialog-integration.test.js
index 9dd64b6a1..179b5ade4 100644
--- a/packages/select-rich/test/lion-select-rich-dialog-integration.test.js
+++ b/packages/select-rich/test/lion-select-rich-dialog-integration.test.js
@@ -1,5 +1,5 @@
 import { OverlayMixin } from '@lion/overlays';
-import { LitElement } from 'lit-element';
+import { LitElement } from '@lion/core';
 import { defineCE, fixture, html, expect, unsafeStatic } from '@open-wc/testing';
 import '@lion/listbox/lion-option.js';
 import '@lion/listbox/lion-options.js';
diff --git a/packages/select/README.md b/packages/select/README.md
index 3d03cf120..937befbaf 100644
--- a/packages/select/README.md
+++ b/packages/select/README.md
@@ -8,7 +8,7 @@ where each option name starts with the same word or phrase can also significantl
 usability for keyboard and screen reader users.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { Required } from '@lion/form-core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 
diff --git a/packages/select/package.json b/packages/select/package.json
index 232a8b7e0..beddb0f44 100644
--- a/packages/select/package.json
+++ b/packages/select/package.json
@@ -34,7 +34,8 @@
   ],
   "dependencies": {
     "@lion/core": "0.13.6",
-    "@lion/form-core": "0.6.14"
+    "@lion/form-core": "0.6.14",
+    "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
     "lion",
diff --git a/packages/select/src/LionSelect.js b/packages/select/src/LionSelect.js
index 9ae6bd108..83fc1e02b 100644
--- a/packages/select/src/LionSelect.js
+++ b/packages/select/src/LionSelect.js
@@ -62,7 +62,7 @@ export class LionSelect extends LionFieldWithSelect {
     }
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
     if (changedProperties.has('disabled')) {
diff --git a/packages/singleton-manager/demo/fail/demo-app.js b/packages/singleton-manager/demo/fail/demo-app.js
index f2caa2baf..faf135488 100644
--- a/packages/singleton-manager/demo/fail/demo-app.js
+++ b/packages/singleton-manager/demo/fail/demo-app.js
@@ -1,4 +1,4 @@
-import { LitElement, css, html } from 'lit-element';
+import { LitElement, css, html } from '@lion/core';
 
 import 'page-a/page-a.js';
 import 'page-b/page-b.js';
diff --git a/packages/singleton-manager/demo/fail/package.json b/packages/singleton-manager/demo/fail/package.json
index a973830e0..5bf693476 100644
--- a/packages/singleton-manager/demo/fail/package.json
+++ b/packages/singleton-manager/demo/fail/package.json
@@ -2,6 +2,7 @@
   "name": "fail-demo-app",
   "version": "1.0.0",
   "dependencies": {
+    "@lion/core": "0.13.6",
     "page-a": "^1.0.0",
     "page-b": "^1.0.0"
   }
diff --git a/packages/singleton-manager/demo/singleton-complex/demo-app.js b/packages/singleton-manager/demo/singleton-complex/demo-app.js
index abe524fb3..ded8f27a3 100644
--- a/packages/singleton-manager/demo/singleton-complex/demo-app.js
+++ b/packages/singleton-manager/demo/singleton-complex/demo-app.js
@@ -1,4 +1,4 @@
-import { LitElement, css, html } from 'lit-element';
+import { LitElement, css, html } from '@lion/core';
 
 import './overlayCompatibility.js';
 
diff --git a/packages/singleton-manager/demo/singleton-complex/package.json b/packages/singleton-manager/demo/singleton-complex/package.json
index a973830e0..5bf693476 100644
--- a/packages/singleton-manager/demo/singleton-complex/package.json
+++ b/packages/singleton-manager/demo/singleton-complex/package.json
@@ -2,6 +2,7 @@
   "name": "fail-demo-app",
   "version": "1.0.0",
   "dependencies": {
+    "@lion/core": "0.13.6",
     "page-a": "^1.0.0",
     "page-b": "^1.0.0"
   }
diff --git a/packages/singleton-manager/demo/singleton/demo-app.js b/packages/singleton-manager/demo/singleton/demo-app.js
index abe524fb3..ded8f27a3 100644
--- a/packages/singleton-manager/demo/singleton/demo-app.js
+++ b/packages/singleton-manager/demo/singleton/demo-app.js
@@ -1,4 +1,4 @@
-import { LitElement, css, html } from 'lit-element';
+import { LitElement, css, html } from '@lion/core';
 
 import './overlayCompatibility.js';
 
diff --git a/packages/singleton-manager/demo/singleton/package.json b/packages/singleton-manager/demo/singleton/package.json
index a973830e0..5bf693476 100644
--- a/packages/singleton-manager/demo/singleton/package.json
+++ b/packages/singleton-manager/demo/singleton/package.json
@@ -2,6 +2,7 @@
   "name": "fail-demo-app",
   "version": "1.0.0",
   "dependencies": {
+    "@lion/core": "0.13.6",
     "page-a": "^1.0.0",
     "page-b": "^1.0.0"
   }
diff --git a/packages/steps/README.md b/packages/steps/README.md
index 53f197db5..5faa8fda6 100644
--- a/packages/steps/README.md
+++ b/packages/steps/README.md
@@ -3,7 +3,7 @@
 `lion-steps` breaks a single goal down into dependable sub-tasks.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import './lion-step.js';
 import './lion-steps.js';
 
diff --git a/packages/steps/src/LionStep.js b/packages/steps/src/LionStep.js
index 85fa96c15..78f3fdf70 100644
--- a/packages/steps/src/LionStep.js
+++ b/packages/steps/src/LionStep.js
@@ -89,7 +89,7 @@ export class LionStep extends LitElement {
     return html`<slot></slot>`;
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   firstUpdated(changedProperties) {
     super.firstUpdated(changedProperties);
     this.controller = /** @type {LionSteps} */ (this.parentNode);
diff --git a/packages/steps/src/LionSteps.js b/packages/steps/src/LionSteps.js
index a56988e4e..43eed40be 100644
--- a/packages/steps/src/LionSteps.js
+++ b/packages/steps/src/LionSteps.js
@@ -59,7 +59,7 @@ export class LionSteps extends LitElement {
     this._max = 0;
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   firstUpdated(changedProperties) {
     super.firstUpdated(changedProperties);
     this._max = this.steps.length - 1;
@@ -76,7 +76,7 @@ export class LionSteps extends LitElement {
     }
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
     if (changedProperties.has('current')) {
diff --git a/packages/switch/README.md b/packages/switch/README.md
index 8fcf76d57..66e13b9dd 100644
--- a/packages/switch/README.md
+++ b/packages/switch/README.md
@@ -3,7 +3,7 @@
 `lion-switch` is a component that is used to toggle a property or feature on or off. Toggling the component on or off should have immediate action and should not require pressing any additional buttons (submit) to confirm what just happened. The Switch is not a Checkbox in disguise and should not be used as part of a form.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { Validator } from '@lion/form-core';
 import { LionSwitch } from './index.js';
 import './lion-switch.js';
diff --git a/packages/switch/package.json b/packages/switch/package.json
index fb745bd85..12df467a3 100644
--- a/packages/switch/package.json
+++ b/packages/switch/package.json
@@ -35,7 +35,8 @@
   ],
   "dependencies": {
     "@lion/core": "0.13.6",
-    "@lion/form-core": "0.6.14"
+    "@lion/form-core": "0.6.14",
+    "@lion/helpers": "0.5.17"
   },
   "keywords": [
     "lion",
diff --git a/packages/switch/src/LionSwitch.js b/packages/switch/src/LionSwitch.js
index 177572e9d..ccbbb305a 100644
--- a/packages/switch/src/LionSwitch.js
+++ b/packages/switch/src/LionSwitch.js
@@ -99,7 +99,7 @@ export class LionSwitch extends ScopedElementsMixin(ChoiceInputMixin(LionField))
     }
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
     this._syncButtonSwitch();
diff --git a/packages/switch/src/LionSwitchButton.js b/packages/switch/src/LionSwitchButton.js
index faad4cdbb..ab74c1d65 100644
--- a/packages/switch/src/LionSwitchButton.js
+++ b/packages/switch/src/LionSwitchButton.js
@@ -136,7 +136,7 @@ export class LionSwitchButton extends DisabledWithTabIndexMixin(LitElement) {
     }
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     if (changedProperties.has('disabled')) {
       this.setAttribute('aria-disabled', `${this.disabled}`); // create mixin if we need it in more places
diff --git a/packages/tabs/README.md b/packages/tabs/README.md
index 97ad114f0..82950d294 100644
--- a/packages/tabs/README.md
+++ b/packages/tabs/README.md
@@ -5,8 +5,7 @@
 `lion-tabs` implements tabs view to allow users to quickly move between a small number of equally important views.
 
 ```js script
-import { LitElement } from 'lit-element';
-import { html } from 'lit-html';
+import { html, LitElement } from '@lion/core';
 import './lion-tabs.js';
 
 export default {
diff --git a/packages/tabs/src/LionTabs.js b/packages/tabs/src/LionTabs.js
index f6e0e5bd6..33cf7c600 100644
--- a/packages/tabs/src/LionTabs.js
+++ b/packages/tabs/src/LionTabs.js
@@ -160,7 +160,7 @@ export class LionTabs extends LitElement {
     this.selectedIndex = 0;
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   firstUpdated(changedProperties) {
     super.firstUpdated(changedProperties);
     this.__setupSlots();
diff --git a/packages/textarea/README.md b/packages/textarea/README.md
index 7e4a750c3..ca50750a4 100644
--- a/packages/textarea/README.md
+++ b/packages/textarea/README.md
@@ -4,7 +4,7 @@
 Its purpose is to provide a way for users to write text that is multiple lines long.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { MaxLength, MinLength, Required } from '@lion/form-core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 
diff --git a/packages/textarea/package.json b/packages/textarea/package.json
index 75fe6b9cf..169e69916 100644
--- a/packages/textarea/package.json
+++ b/packages/textarea/package.json
@@ -35,6 +35,7 @@
   "dependencies": {
     "@lion/core": "0.13.6",
     "@lion/form-core": "0.6.14",
+    "@lion/validate-messages": "0.3.12",
     "@types/autosize": "^3.0.7",
     "autosize": "4.0.2"
   },
diff --git a/packages/textarea/src/LionTextarea.js b/packages/textarea/src/LionTextarea.js
index e9f9e4417..6228fbabc 100644
--- a/packages/textarea/src/LionTextarea.js
+++ b/packages/textarea/src/LionTextarea.js
@@ -77,7 +77,7 @@ export class LionTextarea extends NativeTextFieldMixin(LionFieldWithTextArea) {
     this.__intersectionObserver.observe(this);
   }
 
-  /** @param {import('lit-element').PropertyValues } changedProperties */
+  /** @param {import('@lion/core').PropertyValues } changedProperties */
   updated(changedProperties) {
     super.updated(changedProperties);
 
diff --git a/packages/tooltip/src/LionTooltip.js b/packages/tooltip/src/LionTooltip.js
index 4d7b95696..7d53fbb7a 100644
--- a/packages/tooltip/src/LionTooltip.js
+++ b/packages/tooltip/src/LionTooltip.js
@@ -4,7 +4,7 @@ import { ArrowMixin, OverlayMixin } from '@lion/overlays';
 /**
  * @typedef {import('@lion/overlays/types/OverlayConfig').OverlayConfig} OverlayConfig
  * @typedef {import('@lion/core').CSSResult} CSSResult
- * @typedef {import('lit-element').CSSResultArray} CSSResultArray
+ * @typedef {import('@lion/core').CSSResultArray} CSSResultArray
  */
 
 /**
diff --git a/packages/validate-messages/README.md b/packages/validate-messages/README.md
index f85931c25..43d80832e 100644
--- a/packages/validate-messages/README.md
+++ b/packages/validate-messages/README.md
@@ -7,7 +7,7 @@ It uses the `@lion/localize` system to provide these translations and has suppor
 15 locales.
 
 ```js script
-import { html } from 'lit-html';
+import { html } from '@lion/core';
 import { loadDefaultFeedbackMessages } from '@lion/validate-messages';
 import { Required } from '@lion/form-core';
 import '@lion/form-core/lion-field.js';
diff --git a/packages/validate-messages/package.json b/packages/validate-messages/package.json
index e329b648d..57862ca3c 100644
--- a/packages/validate-messages/package.json
+++ b/packages/validate-messages/package.json
@@ -32,7 +32,8 @@
   "dependencies": {
     "@lion/core": "0.13.6",
     "@lion/form-core": "0.6.14",
-    "@lion/localize": "0.15.3"
+    "@lion/localize": "0.15.3",
+    "@lion/validate-messages": "0.3.12"
   },
   "keywords": [
     "feedback",