diff --git a/api/js/etemplate/Et2Box/Et2Box.ts b/api/js/etemplate/Et2Box/Et2Box.ts
index 043059b399..cf7b4e765a 100644
--- a/api/js/etemplate/Et2Box/Et2Box.ts
+++ b/api/js/etemplate/Et2Box/Et2Box.ts
@@ -9,7 +9,7 @@
  */
 
 
-import {css, html, LitElement} from "../../../../node_modules/@lion/core/index.js";
+import {css, html, LitElement} from "@lion/core";
 import {Et2Widget} from "../Et2Widget/Et2Widget";
 
 export class Et2Box extends Et2Widget(LitElement)
diff --git a/api/js/etemplate/Et2Button/Et2Button.ts b/api/js/etemplate/Et2Button/Et2Button.ts
index e14e282dc4..d072322658 100644
--- a/api/js/etemplate/Et2Button/Et2Button.ts
+++ b/api/js/etemplate/Et2Button/Et2Button.ts
@@ -10,8 +10,8 @@
 
 
 import {css, html} from "@lion/core";
-import {LionButton} from "../../../../node_modules/@lion/button/index.js";
-import {SlotMixin} from "../../../../node_modules/@lion/core/src/SlotMixin.js";
+import {LionButton} from "@lion/button";
+import {SlotMixin} from "@lion/core";
 import {Et2InputWidget} from "../Et2InputWidget/Et2InputWidget";
 import {Et2Widget} from "../Et2Widget/Et2Widget";
 
diff --git a/api/js/etemplate/Et2Date/Et2Date.ts b/api/js/etemplate/Et2Date/Et2Date.ts
index ef8d900880..b57f60fe84 100644
--- a/api/js/etemplate/Et2Date/Et2Date.ts
+++ b/api/js/etemplate/Et2Date/Et2Date.ts
@@ -9,11 +9,10 @@
  */
 
 
-import {css, html} from "../../../../node_modules/@lion/core/index.js";
-import {LionInputDatepicker} from "../../../../node_modules/@lion/input-datepicker/index.js";
-import {Unparseable} from "../../../../node_modules/@lion/form-core/src/validate/Unparseable.js";
+import {css, html} from "@lion/core";
+import {LionInputDatepicker} from "@lion/input-datepicker";
+import {Unparseable} from "@lion/form-core";
 import {Et2InputWidget} from "../Et2InputWidget/Et2InputWidget";
-import {Et2Widget} from "../Et2Widget/Et2Widget";
 
 
 /**
diff --git a/api/js/etemplate/Et2InputWidget/Et2InputWidget.ts b/api/js/etemplate/Et2InputWidget/Et2InputWidget.ts
index 754c78a722..5f25b4d839 100644
--- a/api/js/etemplate/Et2InputWidget/Et2InputWidget.ts
+++ b/api/js/etemplate/Et2InputWidget/Et2InputWidget.ts
@@ -1,6 +1,6 @@
 import {et2_IInput, et2_IInputNode} from "../et2_core_interfaces";
 import {Et2Widget} from "../Et2Widget/Et2Widget";
-import {dedupeMixin} from "../../../../node_modules/@lion/core/index.js";
+import {dedupeMixin} from "@lion/core";
 
 /**
  * This mixin will allow any LitElement to become an Et2InputWidget
diff --git a/api/js/etemplate/Et2Textarea/Et2Textarea.ts b/api/js/etemplate/Et2Textarea/Et2Textarea.ts
index 5e9281fd79..e401a2d548 100644
--- a/api/js/etemplate/Et2Textarea/Et2Textarea.ts
+++ b/api/js/etemplate/Et2Textarea/Et2Textarea.ts
@@ -9,8 +9,8 @@
  */
 
 
-import {css, html} from "../../../../node_modules/@lion/core/index.js"
-import {LionTextarea} from "../../../../node_modules/@lion/textarea/index.js"
+import {css, html} from "@lion/core";
+import {LionTextarea} from "@lion/textarea";
 import {Et2InputWidget} from "../Et2InputWidget/Et2InputWidget";
 import {Et2Widget} from "../Et2Widget/Et2Widget";
 
diff --git a/api/js/etemplate/Et2Textbox/Et2Textbox.ts b/api/js/etemplate/Et2Textbox/Et2Textbox.ts
index c8a11ca736..66b734c26d 100644
--- a/api/js/etemplate/Et2Textbox/Et2Textbox.ts
+++ b/api/js/etemplate/Et2Textbox/Et2Textbox.ts
@@ -9,8 +9,8 @@
  */
 
 
-import {css, html} from "../../../../node_modules/@lion/core/index.js"
-import {LionInput} from "../../../../node_modules/@lion/input/index.js"
+import {css, html} from "@lion/core";
+import {LionInput} from "@lion/input";
 import {Et2InputWidget} from "../Et2InputWidget/Et2InputWidget";
 
 export class Et2Textbox extends Et2InputWidget(LionInput)
diff --git a/api/js/etemplate/Et2Widget/Et2Widget.ts b/api/js/etemplate/Et2Widget/Et2Widget.ts
index e17d8b97b6..e8e1ec97df 100644
--- a/api/js/etemplate/Et2Widget/Et2Widget.ts
+++ b/api/js/etemplate/Et2Widget/Et2Widget.ts
@@ -7,7 +7,7 @@ import {et2_cloneObject, et2_csvSplit} from "../et2_core_common";
 // @ts-ignore
 import type {IegwAppLocal} from "../../jsapi/egw_global";
 import {ClassWithAttributes, ClassWithInterfaces} from "../et2_core_inheritance";
-import {LitElement} from "../../../../node_modules/@lion/core/index.js";
+import {LitElement} from "@lion/core";
 import type {et2_container} from "../et2_core_baseWidget";
 
 /**