diff --git a/api/js/etemplate/et2_widget_dialog.js b/api/js/etemplate/et2_widget_dialog.js
index 4626540c8c..d058b012f9 100644
--- a/api/js/etemplate/et2_widget_dialog.js
+++ b/api/js/etemplate/et2_widget_dialog.js
@@ -142,29 +142,11 @@ var et2_dialog = /** @class */ (function (_super) {
                 { "button_id": 0, "text": 'cancel', id: 'dialog[cancel]', image: 'cancel' }
             ]
         ];
-        /**
-         * Types
-         * @constant
-         */
-        _this.PLAIN_MESSAGE = 0;
-        _this.INFORMATION_MESSAGE = 1;
-        _this.QUESTION_MESSAGE = 2;
-        _this.WARNING_MESSAGE = 3;
-        _this.ERROR_MESSAGE = 4;
-        /* Pre-defined Button combos */
-        _this.BUTTONS_OK = 0;
-        _this.BUTTONS_OK_CANCEL = 1;
-        _this.BUTTONS_YES_NO = 2;
-        _this.BUTTONS_YES_NO_CANCEL = 3;
-        /* Button constants */
-        _this.CANCEL_BUTTON = 0;
-        _this.OK_BUTTON = 1;
-        _this.YES_BUTTON = 2;
-        _this.NO_BUTTON = 3;
         _this.div = null;
         _this.template = null;
         // Define this as null to avoid breaking any hierarchies (eg: destroy())
-        _this._parent = null;
+        if (_this.getParent() != null)
+            _this.getParent().removeChild(_this);
         // Button callbacks need a reference to this
         var self = _this;
         for (var i = 0; i < _this._buttons.length; i++) {
@@ -360,7 +342,6 @@ var et2_dialog = /** @class */ (function (_super) {
             this.set_dialog_type(this.options.dialog_type);
         }
         this.set_buttons(typeof this.options.buttons == "number" ? this._buttons[this.options.buttons] : this.options.buttons);
-        var self = this;
         var options = {
             // Pass the internal object, not the option
             buttons: this.options.buttons,
@@ -391,7 +372,7 @@ var et2_dialog = /** @class */ (function (_super) {
         };
         // Leaving width unset lets it size itself according to contents
         if (this.options.width) {
-            options.width = this.options.width;
+            options['width'] = this.options.width;
         }
         this.div.dialog(options);
         // Make sure dialog is wide enough for the title
@@ -405,22 +386,23 @@ var et2_dialog = /** @class */ (function (_super) {
     /**
      * Create a parent to inject application specific egw object with loaded translations into et2_dialog
      *
-     * @param {string|egw} _egw_or_appname egw object with already laoded translations or application name to load translations for
+     * @param {string|egw} _egw_or_appname egw object with already loaded translations or application name to load translations for
      */
     et2_dialog._create_parent = function (_egw_or_appname) {
         if (typeof _egw_or_appname == 'undefined') {
+            // @ts-ignore
             _egw_or_appname = egw_appName;
         }
         // create a dummy parent with a correct reference to an application specific egw object
         var parent = new et2_core_widget_1.et2_widget();
         // if egw object is passed in because called from et2, just use it
         if (typeof _egw_or_appname != 'string') {
-            parent._egw = _egw_or_appname;
+            parent.setApiInstance(_egw_or_appname);
         }
         // otherwise use given appname to create app-specific egw instance and load default translations
         else {
-            parent._egw = egw(_egw_or_appname);
-            parent._egw.langRequireApp(parent._egw.window, _egw_or_appname);
+            parent.setApiInstance(egw(_egw_or_appname));
+            parent.egw().langRequireApp(parent.egw().window, _egw_or_appname);
         }
         return parent;
     };
@@ -443,7 +425,7 @@ var et2_dialog = /** @class */ (function (_super) {
             callback: _callback || function () {
             },
             message: _message,
-            title: _title || parent._egw.lang('Confirmation required'),
+            title: _title || parent.egw().lang('Confirmation required'),
             buttons: typeof _buttons != 'undefined' ? _buttons : et2_dialog.BUTTONS_YES_NO,
             dialog_type: typeof _type != 'undefined' ? _type : et2_dialog.QUESTION_MESSAGE,
             icon: _icon,
@@ -460,7 +442,7 @@ var et2_dialog = /** @class */ (function (_super) {
      * @param {integer} _type One of the message constants.  This defines the style of the message.
      */
     et2_dialog.alert = function (_message, _title, _type) {
-        var parent = et2_dialog._create_parent(et2_dialog._create_parent()._egw);
+        var parent = et2_dialog._create_parent(et2_dialog._create_parent().egw());
         et2_createWidget("dialog", {
             callback: function () {
             },
@@ -517,7 +499,7 @@ var et2_dialog = /** @class */ (function (_super) {
         var buttonId = _senders.id;
         var dialogMsg = (typeof _dialogMsg != "undefined") ? _dialogMsg : '';
         var titleMsg = (typeof _titleMsg != "undefined") ? _titleMsg : '';
-        var egw = _senders instanceof et2_core_widget_1.et2_widget ? _senders.egw() : et2_dialog._create_parent()._egw;
+        var egw = _senders instanceof et2_core_widget_1.et2_widget ? _senders.egw() : et2_dialog._create_parent().egw();
         var callbackDialog = function (button_id) {
             if (button_id == et2_dialog.YES_BUTTON) {
                 if (_postSubmit) {
@@ -528,7 +510,7 @@ var et2_dialog = /** @class */ (function (_super) {
                 }
             }
         };
-        et2_dialog.show_dialog(callbackDialog, egw.lang(dialogMsg), egw.lang(titleMsg), {}, et2_dialog.BUTTON_YES_NO, et2_dialog.WARNING_MESSAGE, undefined, egw);
+        et2_dialog.show_dialog(callbackDialog, egw.lang(dialogMsg), egw.lang(titleMsg), {}, et2_dialog.BUTTONS_YES_NO, et2_dialog.WARNING_MESSAGE, undefined, egw);
     };
     ;
     /**
@@ -560,7 +542,7 @@ var et2_dialog = /** @class */ (function (_super) {
      */
     et2_dialog.long_task = function (_callback, _message, _title, _menuaction, _list, _egw_or_appname) {
         var parent = et2_dialog._create_parent(_egw_or_appname);
-        var egw = parent._egw;
+        var egw = parent.egw();
         // Special action for cancel
         var buttons = [
             { "button_id": et2_dialog.OK_BUTTON, "text": egw.lang('ok'), "default": true, "disabled": true },
@@ -790,5 +772,25 @@ var et2_dialog = /** @class */ (function (_super) {
             default: "center"
         }
     };
+    /**
+     * Types
+     * @constant
+     */
+    et2_dialog.PLAIN_MESSAGE = 0;
+    et2_dialog.INFORMATION_MESSAGE = 1;
+    et2_dialog.QUESTION_MESSAGE = 2;
+    et2_dialog.WARNING_MESSAGE = 3;
+    et2_dialog.ERROR_MESSAGE = 4;
+    /* Pre-defined Button combos */
+    et2_dialog.BUTTONS_OK = 0;
+    et2_dialog.BUTTONS_OK_CANCEL = 1;
+    et2_dialog.BUTTONS_YES_NO = 2;
+    et2_dialog.BUTTONS_YES_NO_CANCEL = 3;
+    /* Button constants */
+    et2_dialog.CANCEL_BUTTON = 0;
+    et2_dialog.OK_BUTTON = 1;
+    et2_dialog.YES_BUTTON = 2;
+    et2_dialog.NO_BUTTON = 3;
     return et2_dialog;
 }(et2_core_widget_1.et2_widget));
+//# sourceMappingURL=et2_widget_dialog.js.map
\ No newline at end of file
diff --git a/api/js/etemplate/et2_widget_dialog.js.map b/api/js/etemplate/et2_widget_dialog.js.map
index 317e81e1e1..400fa195ab 100644
--- a/api/js/etemplate/et2_widget_dialog.js.map
+++ b/api/js/etemplate/et2_widget_dialog.js.map
@@ -1 +1 @@
-{"version":3,"file":"et2_widget_dialog.js","sourceRoot":"","sources":["et2_widget_dialog.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"et2_widget_dialog.js","sourceRoot":"","sources":["et2_widget_dialog.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/api/js/etemplate/et2_widget_dialog.ts b/api/js/etemplate/et2_widget_dialog.ts
index a4693c092f..4fab5dece9 100644
--- a/api/js/etemplate/et2_widget_dialog.ts
+++ b/api/js/etemplate/et2_widget_dialog.ts
@@ -240,32 +240,32 @@ class et2_dialog extends et2_widget {
      * Types
      * @constant
      */
-    readonly PLAIN_MESSAGE: number = 0;
-    readonly INFORMATION_MESSAGE: number = 1;
-    readonly QUESTION_MESSAGE: number = 2;
-    readonly WARNING_MESSAGE: number = 3;
-    readonly ERROR_MESSAGE: number = 4;
+    public static PLAIN_MESSAGE: number = 0;
+    public static INFORMATION_MESSAGE: number = 1;
+    public static QUESTION_MESSAGE: number = 2;
+    public static WARNING_MESSAGE: number = 3;
+    public static ERROR_MESSAGE: number = 4;
 
     /* Pre-defined Button combos */
-    readonly BUTTONS_OK: number = 0;
-    readonly BUTTONS_OK_CANCEL: number = 1;
-    readonly BUTTONS_YES_NO: number = 2;
-    readonly BUTTONS_YES_NO_CANCEL: number = 3;
+    public static BUTTONS_OK: number = 0;
+    public static BUTTONS_OK_CANCEL: number = 1;
+    public static BUTTONS_YES_NO: number = 2;
+    public static BUTTONS_YES_NO_CANCEL: number = 3;
 
     /* Button constants */
-    readonly CANCEL_BUTTON: number = 0;
-    readonly OK_BUTTON: number = 1;
-    readonly YES_BUTTON: number = 2;
-    readonly NO_BUTTON: number = 3;
+    public static CANCEL_BUTTON: number = 0;
+    public static OK_BUTTON: number = 1;
+    public static YES_BUTTON: number = 2;
+    public static NO_BUTTON: number = 3;
 
     div: JQuery = null;
     template: any = null;
 
-    constructor(_parent?, _attrs?: WidgetConfig, _child?: object) {
+    constructor(_parent?, _attrs? : WidgetConfig, _child? : object) {
         super();
 
         // Define this as null to avoid breaking any hierarchies (eg: destroy())
-        this._parent = null;
+        if (this.getParent() != null) this.getParent().removeChild(this);
 
         // Button callbacks need a reference to this
         let self = this;
@@ -477,9 +477,8 @@ class et2_dialog extends et2_widget {
             this.set_dialog_type(this.options.dialog_type);
         }
         this.set_buttons(typeof this.options.buttons == "number" ? this._buttons[this.options.buttons] : this.options.buttons);
-        var self = this;
 
-        var options = {
+        let options = {
             // Pass the internal object, not the option
             buttons: this.options.buttons,
             modal: this.options.modal,
@@ -509,7 +508,7 @@ class et2_dialog extends et2_widget {
         };
         // Leaving width unset lets it size itself according to contents
         if (this.options.width) {
-            options.width = this.options.width;
+            options['width'] = this.options.width;
         }
 
         this.div.dialog(options);
@@ -526,22 +525,23 @@ class et2_dialog extends et2_widget {
     /**
      * Create a parent to inject application specific egw object with loaded translations into et2_dialog
      *
-     * @param {string|egw} _egw_or_appname egw object with already laoded translations or application name to load translations for
+     * @param {string|egw} _egw_or_appname egw object with already loaded translations or application name to load translations for
      */
-    static _create_parent(_egw_or_appname) {
+    static _create_parent(_egw_or_appname? : string) {
         if (typeof _egw_or_appname == 'undefined') {
+            // @ts-ignore
             _egw_or_appname = egw_appName;
         }
         // create a dummy parent with a correct reference to an application specific egw object
-        var parent = new et2_widget();
+        let parent = new et2_widget();
         // if egw object is passed in because called from et2, just use it
         if (typeof _egw_or_appname != 'string') {
-            parent._egw = _egw_or_appname;
+            parent.setApiInstance(_egw_or_appname);
         }
         // otherwise use given appname to create app-specific egw instance and load default translations
         else {
-            parent._egw = egw(_egw_or_appname);
-            parent._egw.langRequireApp(parent._egw.window, _egw_or_appname);
+            parent.setApiInstance(egw(_egw_or_appname));
+            parent.egw().langRequireApp(parent.egw().window, _egw_or_appname);
         }
         return parent;
     }
@@ -566,7 +566,7 @@ class et2_dialog extends et2_widget {
             callback: _callback || function () {
             },
             message: _message,
-            title: _title || parent._egw.lang('Confirmation required'),
+            title: _title || parent.egw().lang('Confirmation required'),
             buttons: typeof _buttons != 'undefined' ? _buttons : et2_dialog.BUTTONS_YES_NO,
             dialog_type: typeof _type != 'undefined' ? _type : et2_dialog.QUESTION_MESSAGE,
             icon: _icon,
@@ -582,8 +582,8 @@ class et2_dialog extends et2_widget {
      * @param {string} _title Text in the top bar of the dialog.
      * @param {integer} _type One of the message constants.  This defines the style of the message.
      */
-    static alert(_message, _title, _type) {
-        var parent = et2_dialog._create_parent(et2_dialog._create_parent()._egw);
+    static alert(_message? : string, _title? : string, _type?) {
+        let parent = et2_dialog._create_parent(et2_dialog._create_parent().egw());
         et2_createWidget("dialog", {
             callback: function () {
             },
@@ -642,7 +642,7 @@ class et2_dialog extends et2_widget {
         var buttonId = _senders.id;
         var dialogMsg = (typeof _dialogMsg != "undefined") ? _dialogMsg : '';
         var titleMsg = (typeof _titleMsg != "undefined") ? _titleMsg : '';
-        var egw = _senders instanceof et2_widget ? _senders.egw() : et2_dialog._create_parent()._egw;
+        var egw = _senders instanceof et2_widget ? _senders.egw() : et2_dialog._create_parent().egw();
         var callbackDialog = function (button_id) {
             if (button_id == et2_dialog.YES_BUTTON) {
                 if (_postSubmit) {
@@ -653,7 +653,7 @@ class et2_dialog extends et2_widget {
             }
         };
         et2_dialog.show_dialog(callbackDialog, egw.lang(dialogMsg), egw.lang(titleMsg), {},
-            et2_dialog.BUTTON_YES_NO, et2_dialog.WARNING_MESSAGE, undefined, egw);
+            et2_dialog.BUTTONS_YES_NO, et2_dialog.WARNING_MESSAGE, undefined, egw);
     };
 
 
@@ -684,12 +684,13 @@ class et2_dialog extends et2_widget {
      *
      * @return {et2_dialog}
      */
-    static long_task(_callback, _message, _title, _menuaction, _list, _egw_or_appname) {
-        var parent = et2_dialog._create_parent(_egw_or_appname);
-        var egw = parent._egw;
+    static long_task(_callback, _message, _title, _menuaction, _list, _egw_or_appname)
+    {
+        let parent = et2_dialog._create_parent(_egw_or_appname);
+        let egw = parent.egw();
 
         // Special action for cancel
-        var buttons = [
+        let buttons = [
             {"button_id": et2_dialog.OK_BUTTON, "text": egw.lang('ok'), "default": true, "disabled": true},
             {
                 "button_id": et2_dialog.CANCEL_BUTTON, "text": egw.lang('cancel'), click: function () {
@@ -700,7 +701,7 @@ class et2_dialog extends et2_widget {
                 }
             }
         ];
-        var dialog = et2_createWidget("dialog", {
+        let dialog = et2_createWidget("dialog", {
             template: egw.webserverUrl + '/api/templates/default/long_task.xet',
             value: {
                 content: {
@@ -722,10 +723,10 @@ class et2_dialog extends et2_widget {
         // OK starts disabled
         jQuery("button[button_id=" + et2_dialog.OK_BUTTON + "]", dialog.div.parent()).button("disable");
 
-        var log = null;
-        var progressbar = null;
-        var cancel = false;
-        var totals = {
+        let log = null;
+        let progressbar = null;
+        let cancel = false;
+        let totals = {
             success: 0,
             skipped: 0,
             failed: 0,
@@ -733,9 +734,9 @@ class et2_dialog extends et2_widget {
         };
 
         // Updates progressbar & log, calls next step
-        var update = function (response) {
+        let update = function (response) {
             // context is index
-            var index = this || 0;
+            let index = this || 0;
 
             progressbar.set_value(100 * (index / _list.length));
             progressbar.set_label(index + ' / ' + _list.length);
@@ -787,7 +788,7 @@ class et2_dialog extends et2_widget {
                     }
             }
             // Scroll to bottom
-            var height = log[0].scrollHeight;
+            let height = log[0].scrollHeight;
             log.scrollTop(height);
 
             // Update totals