diff --git a/src/App.svelte b/src/App.svelte
index 7280300..1d15557 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -120,21 +120,21 @@
           <Card title="Corridor">
             {#each wigets as widget, i}
               {#if widget.widget === "input"}
-                <Myinput bind:value={widget.status} descr={widget.descr} topic={widget.topic} ws={1} type={widget.type} />
+                <Myinput bind:value={widget.status} widget={widget} />
               {/if}
             {/each}
           </Card>
           <Card title="Living room">
             {#each wigets as widget, i}
               {#if widget.widget === "input"}
-                <Myinput bind:value={widget.status} descr={widget.descr} topic={widget.topic} ws={1} type={widget.type} />
+                <Myinput bind:value={widget.status} widget={widget} />
               {/if}
             {/each}
           </Card>
           <Card title="Bedroom">
             {#each wigets as widget, i}
               {#if widget.widget === "input"}
-                <Myinput bind:value={widget.status} descr={widget.descr} topic={widget.topic} ws={1} type={widget.type} />
+                <Myinput bind:value={widget.status} widget={widget} />
               {/if}
             {/each}
           </Card>
diff --git a/src/Myinput.svelte b/src/Myinput.svelte
index 4498fa5..55ac2f6 100644
--- a/src/Myinput.svelte
+++ b/src/Myinput.svelte
@@ -4,31 +4,28 @@
 
 <script>
   export let value;
-  export let descr;
-  export let topic;
-  export let ws;
-  export let type;
+  export let widget;
   //style="min-width:50%; max-width:100%; width:{value.length * 10}px" on:change={(WSpush(ws, topic, value), console.log(value.length))}
 </script>
 
 <div class="card-items">
   <div class="md:w-2/3 lg:w-2/3 2xl:w-2/3">
     <!-- svelte-ignore a11y-label-has-associated-control -->
-    <label class="widget-descr-gray-left">{!descr ? "" : descr}</label>
+    <label class="widget-descr-gray-left">{!widget.descr ? "" : widget.descr}</label>
   </div>
   <div class="md:w-1/3 lg:w-1/3 2xl:w-1/3">
     <!-- on:change={WSpush(ws, topic, value)} -->
-    {#if type == "number"}
-      <input class="widget-input-indigo text-right" step="0.1" on:change={WSpush(ws, topic, value)} bind:value type="number" />
+    {#if widget.type == "number"}
+      <input class="widget-input-indigo text-right" step="0.1" on:change={WSpush(widget.ws, widget.topic, widget.value)} bind:value type="number" />
     {/if}
-    {#if type == "text"}
-      <input class="widget-input-indigo text-right" on:change={WSpush(ws, topic, value)} bind:value type="text" />
+    {#if widget.type == "text"}
+      <input class="widget-input-indigo text-right" on:change={WSpush(widget.ws, widget.topic, widget.value)} bind:value type="text" />
     {/if}
-    {#if type == "date"}
-      <input class="widget-input-indigo text-right" on:change={WSpush(ws, topic, value)} bind:value type="date" />
+    {#if widget.type == "date"}
+      <input class="widget-input-indigo text-right" on:change={WSpush(widget.ws, widget.topic, widget.value)} bind:value type="date" />
     {/if}
-    {#if type == "time"}
-      <input class="widget-input-indigo text-right" on:change={WSpush(ws, topic, value)} bind:value type="time" />
+    {#if widget.type == "time"}
+      <input class="widget-input-indigo text-right" on:change={WSpush(widget.ws, widget.topic, widget.value)} bind:value type="time" />
     {/if}
   </div>
 </div>