diff --git a/package.json b/package.json
index 45652ea..cf6270a 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web && tsbundle npm)"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.28",
diff --git a/ts/dees-element.plugins.ts b/ts/dees-element.plugins.ts
index 025e463..3cfb0b6 100644
--- a/ts/dees-element.plugins.ts
+++ b/ts/dees-element.plugins.ts
@@ -9,7 +9,7 @@ export {
 
 // third party scope
 import { css, unsafeCSS, LitElement } from 'lit';
-import { property } from 'lit/decorators';
+import { property } from 'lit/decorators/property.js';
 const lit = {
   css,
   unsafeCSS,
diff --git a/ts/index.ts b/ts/index.ts
index ad5b36d..dc41995 100644
--- a/ts/index.ts
+++ b/ts/index.ts
@@ -1,24 +1,17 @@
 import { CssManager } from './dees-element.classes.cssmanager';
 
 // lit exports
-export {
-  html,
-  TemplateResult,
-  css,
-  unsafeCSS,
-} from 'lit';
+export { html, TemplateResult, css, unsafeCSS } from 'lit';
 
-export {
-  customElement,
-  property,
-  state
-} from 'lit/decorators'
+export { customElement } from 'lit/decorators/custom-element.js';
+
+export { property } from 'lit/decorators/property.js';
+
+export { state } from 'lit/decorators/state.js';
 
 // domtools exports
 import * as domtools from '@designestate/dees-domtools';
-export {
-  domtools
-}
+export { domtools };
 
 // DeesElements exports
 export { DeesElement } from './dees-element.classes.dees-element';