diff --git a/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonDialogClose.jsx b/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonDialogClose.tsx
similarity index 80%
rename from packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonDialogClose.jsx
rename to packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonDialogClose.tsx
index 3bd0c5bbd..7fb62ef5d 100644
--- a/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonDialogClose.jsx
+++ b/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonDialogClose.tsx
@@ -13,6 +13,7 @@
  * (Free for non-commercial use).
  */
 
+import type { CSSProperties } from 'react';
 import React from 'react';
 import PropTypes from 'prop-types';
 
@@ -25,15 +26,28 @@ import {
     I18n, Icon,
 } from '@iobroker/adapter-react-v5';
 
+import type { VisBaseWidgetProps, WidgetStyleState } from '@/Vis/visBaseWidget';
 import VisBaseWidget from '@/Vis/visBaseWidget';
 // eslint-disable-next-line import/no-cycle
+import type {
+    AnyWidgetId, GetRxDataFromWidget, RxRenderWidgetProps, RxWidgetInfoAttributesField, RxWidgetInfoCustomComponentProperties, ViewCommand, WidgetData,
+} from '@iobroker/types-vis-2';
+import type { VisRxWidgetState } from '../../visRxWidget';
 import VisRxWidget from '../../visRxWidget';
 
-class JQuiButtonDialogClose extends VisRxWidget {
-    constructor(props) {
+// eslint-disable-next-line no-use-before-define
+type RxData = GetRxDataFromWidget<typeof JQuiButtonDialogClose>;
+
+interface JQuiButtonDialogCloseState extends VisRxWidgetState {
+    width: number;
+    height: number;
+}
+
+class JQuiButtonDialogClose extends VisRxWidget<RxData, JQuiButtonDialogCloseState> {
+    constructor(props: VisBaseWidgetProps) {
         super(props);
-        this.state.width = 0;
-        this.state.height = 0;
+        (this.state as JQuiButtonDialogCloseState).width = 0;
+        (this.state as JQuiButtonDialogCloseState).height = 0;
     }
 
     static getWidgetInfo() {
@@ -54,16 +68,16 @@ class JQuiButtonDialogClose extends VisRxWidget {
                             tooltip: 'jqui_dialog_name_tooltip',
                             type: 'custom',
                             component: (
-                                field,
-                                data,
-                                onDataChange,
-                                options, // {context: {adapterName, instance, projectName, socket, views}, selectedView, selectedWidget, selectedWidgets}
-                            ) => {
+                                field: RxWidgetInfoAttributesField,
+                                data: WidgetData,
+                                onDataChange: (newData: WidgetData) => void,
+                                options: RxWidgetInfoCustomComponentProperties,
+                            ): React.JSX.Element | React.JSX.Element[] => {
                                 // find all possible dialogs
-                                const names = [];
+                                const names: {label: string; value: string}[] = [];
                                 Object.keys(options.context.views).forEach(id => {
                                     const widgets = options.context.views[id].widgets;
-                                    widgets && Object.keys(widgets).forEach(widget => {
+                                    widgets && Object.keys(widgets).forEach((widget: AnyWidgetId) => {
                                         if (widgets[widget].data?.html_dialog || widgets[widget].data?.contains_view || widgets[widget].data?.externalDialog) {
                                             if (widgets[widget].data.dialogName) {
                                                 names.push({ label: `${widgets[widget].data.dialogName} (${widget})`, value: widgets[widget].data.dialogName });
@@ -73,15 +87,15 @@ class JQuiButtonDialogClose extends VisRxWidget {
                                         }
                                     });
                                 });
-                                return <Autocomplete
+                                return <Autocomplete<{label: string; value: string}, false, false, true>
                                     freeSolo
                                     options={names}
-                                    variant="standard"
+                                    // variant="standard"
                                     value={data[field.name] || ''}
                                     sx={{ width: '100%' }}
                                     onInputChange={(e, inputValue) => {
                                         if (typeof inputValue === 'object' && inputValue !== null) {
-                                            inputValue = inputValue.value;
+                                            inputValue = (inputValue as {label: string; value: string}).value;
                                         }
                                         onDataChange({ [field.name]: inputValue });
                                     }}
@@ -105,27 +119,27 @@ class JQuiButtonDialogClose extends VisRxWidget {
                             name: 'buttontext',
                             type: 'text',
                             default: I18n.t('jqui_Close').replace('jqui_', ''),
-                            hidden: data => !!data.html,
+                            hidden: (data: any) => !!data.html,
                         },
                         {
                             name: 'html',
                             type: 'html',
                             default: '',
                             tooltip: 'jqui_html_tooltip',
-                            disabled: data => !!data.buttontext || !!data.icon || !!data.src,
+                            disabled: (data: any) => !!data.buttontext || !!data.icon || !!data.src,
                         },
                     ],
                 },
                 {
                     name: 'style',
-                    hidden: data => !!data.externalDialog,
+                    hidden: (data: any) => !!data.externalDialog,
                     fields: [
-                        { name: 'no_style', type: 'checkbox', hidden: data => data.jquery_style },
+                        { name: 'no_style', type: 'checkbox', hidden: (data: any) => data.jquery_style },
                         {
                             name: 'jquery_style',
                             label: 'jqui_jquery_style',
                             type: 'checkbox',
-                            hidden: data => data.no_style,
+                            hidden: (data: any) => data.no_style,
                         },
                         {
                             name: 'padding',
@@ -133,7 +147,7 @@ class JQuiButtonDialogClose extends VisRxWidget {
                             min: 0,
                             max: 100,
                             default: 5,
-                            // hidden: data => !data.no_style && !data.jquery_style,
+                            // hidden: (data: any) => !data.no_style && !data.jquery_style,
                         },
                         {
                             name: 'variant',
@@ -142,7 +156,7 @@ class JQuiButtonDialogClose extends VisRxWidget {
                             noTranslation: true,
                             options: ['contained', 'outlined', 'standard'],
                             default: 'contained',
-                            hidden: data => data.jquery_style || data.no_style,
+                            hidden: (data: any) => data.jquery_style || data.no_style,
                         },
                         {
                             name: 'color',
@@ -151,7 +165,7 @@ class JQuiButtonDialogClose extends VisRxWidget {
                             noTranslation: true,
                             options: ['', 'primary', 'secondary'],
                             default: '',
-                            hidden: data => data.jquery_style || data.no_style,
+                            hidden: (data: any) => data.jquery_style || data.no_style,
                         },
                         { name: 'html_prepend', type: 'html' },
                         { name: 'html_append', type: 'html' },
@@ -166,25 +180,25 @@ class JQuiButtonDialogClose extends VisRxWidget {
                 },
                 {
                     name: 'icon',
-                    hidden: data => !!data.html,
+                    hidden: (data: any) => !!data.html,
                     fields: [
                         {
                             name: 'src',
                             label: 'jqui_image',
                             type: 'image',
-                            hidden: data => data.icon || data.jquery_style,
+                            hidden: (data: any) => data.icon || data.jquery_style,
                         },
                         {
                             name: 'icon',
                             label: 'jqui_icon',
                             type: 'icon64',
                             default: 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0Ij48cGF0aCBmaWxsPSJjdXJyZW50Q29sb3IiIGQ9Ik0xOSA2LjQxTDE3LjU5IDVMMTIgMTAuNTlMNi40MSA1TDUgNi40MUwxMC41OSAxMkw1IDE3LjU5TDYuNDEgMTlMMTIgMTMuNDFMMTcuNTkgMTlMMTkgMTcuNTlMMTMuNDEgMTJ6Ii8+PC9zdmc+',
-                            hidden: data => data.src || data.jquery_style,
+                            hidden: (data: any) => data.src || data.jquery_style,
                         },
                         {
                             name: 'invert_icon',
                             type: 'checkbox',
-                            hidden: data => (!data.icon || !data.image) && data.jquery_style,
+                            hidden: (data: any) => (!data.icon || !data.image) && data.jquery_style,
                         },
                         {
                             name: 'imageHeight',
@@ -192,12 +206,12 @@ class JQuiButtonDialogClose extends VisRxWidget {
                             min: 0,
                             max: 200,
                             default: 100,
-                            hidden: data => !data.src || data.jquery_style,
+                            hidden: (data: any) => !data.src || data.jquery_style,
                         },
                     ],
                 },
             ],
-        };
+        } as const;
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -206,14 +220,14 @@ class JQuiButtonDialogClose extends VisRxWidget {
     }
 
     onClick() {
-        let dlgName = this.state.rxData.dlgName;
+        let dlgName: AnyWidgetId = this.state.rxData.dlgName as AnyWidgetId;
         if (!dlgName) {
             // go through all widgets and find the one with dialog content as this view
             const views = Object.keys(this.props.context.views);
             for (let i = 0; i < views.length; i++) {
                 const widgets = this.props.context.views[views[i]].widgets;
                 if (widgets) {
-                    const wids = Object.keys(widgets);
+                    const wids: AnyWidgetId[] = Object.keys(widgets) as AnyWidgetId[];
                     for (let j = 0; j < wids.length; j++) {
                         if (widgets[wids[j]].data?.contains_view === this.props.view) {
                             dlgName = wids[j];
@@ -230,23 +244,23 @@ class JQuiButtonDialogClose extends VisRxWidget {
             const el = window.document.getElementById(dlgName) || window.document.querySelector(`[data-dialog-name="${dlgName}"]`);
 
             const viewName = Object.keys(this.props.context.views).find(view => this.props.context.views[view].widgets[dlgName]);
-            this.props.context.onCommand('closeDialog', viewName, dlgName);
+            this.props.context.onCommand('closeDialog', viewName as ViewCommand, dlgName as unknown as Record<string, string>);
 
-            if (el?._showDialog) {
-                el._showDialog(false);
+            if ((el as any)?._showDialog) {
+                (el as any)._showDialog(false);
             } else {
                 // noinspection JSJQueryEfficiency
-                window.jQuery(`#${dlgName}_dialog`).dialog('close');
+                (window.jQuery as any)(`#${dlgName}_dialog`).dialog('close');
             }
         } else {
             window.alert('Dialog not found');
         }
     }
 
-    renderWidgetBody(props) {
+    renderWidgetBody(props: RxRenderWidgetProps) {
         super.renderWidgetBody(props);
 
-        const iconStyle = {
+        const iconStyle: CSSProperties = {
             filter: this.state.rxData.invert_icon ? 'invert(1)' : undefined,
         };
 
@@ -270,19 +284,19 @@ class JQuiButtonDialogClose extends VisRxWidget {
             style={iconStyle}
         /> : null;
 
-        const buttonStyle = {};
+        const buttonStyle: CSSProperties = {};
         // apply style from the element
-        Object.keys(this.state.rxStyle).forEach(attr => {
+        Object.keys(this.state.rxStyle).forEach((attr: keyof WidgetStyleState) => {
             const value = this.state.rxStyle[attr];
             if (value !== null &&
                 value !== undefined &&
                 VisRxWidget.POSSIBLE_MUI_STYLES.includes(attr)
             ) {
-                attr = attr.replace(
+                (attr as string) = attr.replace(
                     /(-\w)/g,
                     text => text[1].toUpperCase(),
                 );
-                buttonStyle[attr] = value;
+                (buttonStyle as any)[attr] = value;
             }
         });
         buttonStyle.minWidth = 'unset';
@@ -338,7 +352,7 @@ class JQuiButtonDialogClose extends VisRxWidget {
                                 zIndex: this.props.editMode ? 0 : undefined,
                             }}
                             key="content"
-                            color={this.state.rxData.color || 'grey'}
+                            color={this.state.rxData.color || 'grey' as any}
                             onClick={() => this.onClick()}
                             size="small"
                         >
@@ -347,8 +361,8 @@ class JQuiButtonDialogClose extends VisRxWidget {
                         <Button
                             key="content"
                             style={buttonStyle}
-                            color={this.state.rxData.color || 'grey'}
-                            variant={this.state.rxData.variant === undefined ? 'contained' : this.state.rxData.variant}
+                            color={this.state.rxData.color || 'grey' as any}
+                            variant={this.state.rxData.variant === undefined ? 'contained' : this.state.rxData.variant as any}
                             onClick={() => this.onClick()}
                             startIcon={icon}
                         >
@@ -370,12 +384,4 @@ class JQuiButtonDialogClose extends VisRxWidget {
     }
 }
 
-JQuiButtonDialogClose.propTypes = {
-    id: PropTypes.string.isRequired,
-    context: PropTypes.object.isRequired,
-    view: PropTypes.string.isRequired,
-    editMode: PropTypes.bool.isRequired,
-    tpl: PropTypes.string.isRequired,
-};
-
 export default JQuiButtonDialogClose;
diff --git a/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonNavigation.jsx b/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonNavigation.tsx
similarity index 66%
rename from packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonNavigation.jsx
rename to packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonNavigation.tsx
index d37c9ec26..2486fb2a1 100644
--- a/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonNavigation.jsx
+++ b/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonNavigation.tsx
@@ -15,11 +15,15 @@
 import PropTypes from 'prop-types';
 
 // eslint-disable-next-line import/no-cycle
+import type {
+    RxWidgetInfo, RxWidgetInfoAttributesFieldCheckbox, RxWidgetInfoAttributesFieldDefault, RxWidgetInfoAttributesFieldText, RxWidgetInfoWriteable,
+} from '@iobroker/types-vis-2';
+import type { RxWidgetInfoAttributesFieldAll } from '@/Vis/visWidgetsCatalog';
 import JQuiButton from './JQuiButton';
 
 class JQuiButtonNavigation extends JQuiButton {
     static getWidgetInfo() {
-        const widgetInfo = JQuiButton.getWidgetInfo();
+        const widgetInfo = JQuiButton.getWidgetInfo() as unknown as RxWidgetInfoWriteable;
 
         const newWidgetInfo = {
             id: 'tplJquiButtonNav',
@@ -38,20 +42,20 @@ class JQuiButtonNavigation extends JQuiButton {
             text: 'jqui_button_nav_blank_note',
         });
 
-        const modal = JQuiButton.findField(newWidgetInfo, 'modal');
+        const modal = JQuiButton.findField<RxWidgetInfoAttributesFieldCheckbox>(newWidgetInfo, 'modal');
         delete modal.default;
 
-        const navView = JQuiButton.findField(newWidgetInfo, 'nav_view');
+        const navView = JQuiButton.findField<RxWidgetInfoAttributesFieldDefault>(newWidgetInfo, 'nav_view');
         navView.default = '';
 
-        const text = JQuiButton.findField(newWidgetInfo, 'buttontext');
+        const text = JQuiButton.findField<RxWidgetInfoAttributesFieldText>(newWidgetInfo, 'buttontext');
         text.default = 'View';
 
         // set resizable to true
-        const visResizable = JQuiButton.findField(newWidgetInfo, 'visResizable');
+        const visResizable = JQuiButton.findField<RxWidgetInfoAttributesFieldCheckbox>(newWidgetInfo, 'visResizable');
         visResizable.default = true;
 
-        return newWidgetInfo;
+        return newWidgetInfo as RxWidgetInfo;
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -60,12 +64,4 @@ class JQuiButtonNavigation extends JQuiButton {
     }
 }
 
-JQuiButtonNavigation.propTypes = {
-    id: PropTypes.string.isRequired,
-    context: PropTypes.object.isRequired,
-    view: PropTypes.string.isRequired,
-    editMode: PropTypes.bool.isRequired,
-    tpl: PropTypes.string.isRequired,
-};
-
 export default JQuiButtonNavigation;
diff --git a/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonPasswordNavigation.jsx b/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonPasswordNavigation.tsx
similarity index 66%
rename from packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonPasswordNavigation.jsx
rename to packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonPasswordNavigation.tsx
index 929ffd3bc..5f5e1a875 100644
--- a/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonPasswordNavigation.jsx
+++ b/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiButtonPasswordNavigation.tsx
@@ -15,11 +15,12 @@
 import PropTypes from 'prop-types';
 
 // eslint-disable-next-line import/no-cycle
+import { RxWidgetInfo, RxWidgetInfoAttributesFieldCheckbox, RxWidgetInfoAttributesFieldDefault, RxWidgetInfoAttributesFieldText, type RxWidgetInfoWriteable } from '@iobroker/types-vis-2';
 import JQuiButton from './JQuiButton';
 
 class JQuiButtonPasswordNavigation extends JQuiButton {
     static getWidgetInfo() {
-        const widgetInfo = JQuiButton.getWidgetInfo();
+        const widgetInfo = JQuiButton.getWidgetInfo() as unknown as RxWidgetInfoWriteable;
 
         const newWidgetInfo = {
             id: 'tplJquiNavPw',
@@ -38,23 +39,23 @@ class JQuiButtonPasswordNavigation extends JQuiButton {
             text: 'jqui_button_nav_blank_note',
         });
 
-        const modal = JQuiButton.findField(newWidgetInfo, 'modal');
+        const modal = JQuiButton.findField<RxWidgetInfoAttributesFieldCheckbox>(newWidgetInfo, 'modal');
         delete modal.default;
 
-        const text = JQuiButton.findField(newWidgetInfo, 'buttontext');
+        const text = JQuiButton.findField<RxWidgetInfoAttributesFieldText>(newWidgetInfo, 'buttontext');
         text.default = 'Password';
 
-        const navView = JQuiButton.findField(newWidgetInfo, 'nav_view');
+        const navView = JQuiButton.findField<RxWidgetInfoAttributesFieldDefault>(newWidgetInfo, 'nav_view');
         navView.default = '';
 
-        const password = JQuiButton.findField(newWidgetInfo, 'Password');
+        const password = JQuiButton.findField<RxWidgetInfoAttributesFieldText>(newWidgetInfo, 'Password');
         password.default = '';
 
         // set resizable to true
-        const visResizable = JQuiButton.findField(newWidgetInfo, 'visResizable');
+        const visResizable = JQuiButton.findField<RxWidgetInfoAttributesFieldCheckbox>(newWidgetInfo, 'visResizable');
         visResizable.default = true;
 
-        return newWidgetInfo;
+        return newWidgetInfo as RxWidgetInfo;
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -63,12 +64,4 @@ class JQuiButtonPasswordNavigation extends JQuiButton {
     }
 }
 
-JQuiButtonPasswordNavigation.propTypes = {
-    id: PropTypes.string.isRequired,
-    context: PropTypes.object.isRequired,
-    view: PropTypes.string.isRequired,
-    editMode: PropTypes.bool.isRequired,
-    tpl: PropTypes.string.isRequired,
-};
-
 export default JQuiButtonPasswordNavigation;
diff --git a/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiContainerButtonDialog.jsx b/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiContainerButtonDialog.tsx
similarity index 76%
rename from packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiContainerButtonDialog.jsx
rename to packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiContainerButtonDialog.tsx
index e51335792..1b3e475c6 100644
--- a/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiContainerButtonDialog.jsx
+++ b/packages/iobroker.vis-2/src/src/Vis/Widgets/JQui/JQuiContainerButtonDialog.tsx
@@ -16,10 +16,11 @@ import PropTypes from 'prop-types';
 
 // eslint-disable-next-line import/no-cycle
 import JQuiButton from './JQuiButton';
+import { RxWidgetInfo, RxWidgetInfoAttributesFieldDefault, RxWidgetInfoAttributesFieldText, RxWidgetInfoWriteable } from '@iobroker/types-vis-2';
 
 class JQuiContainerButtonDialog extends JQuiButton {
     static getWidgetInfo() {
-        const widgetInfo = JQuiButton.getWidgetInfo();
+        const widgetInfo = JQuiButton.getWidgetInfo() as unknown as RxWidgetInfoWriteable;
 
         const newWidgetInfo = {
             id: 'tplContainerButtonDialog',
@@ -38,13 +39,13 @@ class JQuiContainerButtonDialog extends JQuiButton {
             text: 'jqui_button_link_blank_note',
         });
 
-        const buttonText = JQuiButton.findField(newWidgetInfo, 'buttontext');
+        const buttonText = JQuiButton.findField<RxWidgetInfoAttributesFieldText>(newWidgetInfo, 'buttontext');
         buttonText.default = 'Container Dialog';
 
-        const containsView = JQuiButton.findField(newWidgetInfo, 'contains_view');
+        const containsView = JQuiButton.findField<RxWidgetInfoAttributesFieldDefault>(newWidgetInfo, 'contains_view');
         containsView.default = '';
 
-        return newWidgetInfo;
+        return newWidgetInfo as RxWidgetInfo;
     }
 
     // eslint-disable-next-line class-methods-use-this
@@ -53,11 +54,4 @@ class JQuiContainerButtonDialog extends JQuiButton {
     }
 }
 
-JQuiContainerButtonDialog.propTypes = {
-    id: PropTypes.string.isRequired,
-    context: PropTypes.object.isRequired,
-    view: PropTypes.string.isRequired,
-    editMode: PropTypes.bool.isRequired,
-};
-
 export default JQuiContainerButtonDialog;