From fe92e8867ddba2ee26d7e79916a39e52bb48a744 Mon Sep 17 00:00:00 2001
From: RonnyWinkler <ronny.winkler@web.de>
Date: Mon, 22 Jul 2024 21:11:08 +0200
Subject: [PATCH] 1.6.3

Added decimals parameter for manually  added entities.
---
 .homeychangelog.json                          |  4 ++
 .homeycompose/app.json                        |  2 +-
 .../drivers/repair/add_entity/index.html      | 51 +++++++++++++++++--
 app.json                                      |  2 +-
 .../repair/add_entity.html                    | 51 +++++++++++++++++--
 drivers/basedriver.js                         |  8 +++
 drivers/button/repair/add_entity.html         | 51 +++++++++++++++++--
 drivers/camera/repair/add_entity.html         | 51 +++++++++++++++++--
 drivers/climate/repair/add_entity.html        | 51 +++++++++++++++++--
 drivers/climate_fan/repair/add_entity.html    | 51 +++++++++++++++++--
 drivers/compound/repair/add_entity.html       | 51 +++++++++++++++++--
 drivers/cover/repair/add_entity.html          | 51 +++++++++++++++++--
 drivers/custom/repair/add_entity.html         | 51 +++++++++++++++++--
 drivers/fan/repair/add_entity.html            | 51 +++++++++++++++++--
 drivers/light/repair/add_entity.html          | 51 +++++++++++++++++--
 drivers/lock/repair/add_entity.html           | 51 +++++++++++++++++--
 drivers/media/repair/add_entity.html          | 51 +++++++++++++++++--
 drivers/presence/repair/add_entity.html       | 51 +++++++++++++++++--
 drivers/scene/repair/add_entity.html          | 51 +++++++++++++++++--
 drivers/schedule/repair/add_entity.html       | 51 +++++++++++++++++--
 drivers/script/repair/add_entity.html         | 51 +++++++++++++++++--
 drivers/sensor/repair/add_entity.html         | 51 +++++++++++++++++--
 drivers/switch/repair/add_entity.html         | 51 +++++++++++++++++--
 drivers/timer/repair/add_entity.html          | 51 +++++++++++++++++--
 drivers/vacuum/repair/add_entity.html         | 51 +++++++++++++++++--
 drivers/water_heater/repair/add_entity.html   | 51 +++++++++++++++++--
 locales/de.json                               |  4 +-
 locales/en.json                               |  4 +-
 locales/nl.json                               |  4 +-
 29 files changed, 1079 insertions(+), 71 deletions(-)

diff --git a/.homeychangelog.json b/.homeychangelog.json
index fa18f90..0bedda4 100644
--- a/.homeychangelog.json
+++ b/.homeychangelog.json
@@ -594,6 +594,10 @@
   "1.6.2": {
     "en": "Small technical fixes.",
     "de": "Kleine technische Korrekturen."
+  },
+  "1.6.3": {
+    "en": "Added decimals parameter for manually  added entities.",
+    "de": "Dezimalstellen-Parameter für manuell hinzugefügte Entitäten ergänzt."
   }
 
 }
diff --git a/.homeycompose/app.json b/.homeycompose/app.json
index b998049..3424de7 100644
--- a/.homeycompose/app.json
+++ b/.homeycompose/app.json
@@ -1,6 +1,6 @@
 {
   "id": "io.home-assistant.community",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "compatibility": ">=8.1.0",
   "sdk": 3,
   "brandColor": "#0DA6EA",
diff --git a/.homeycompose/drivers/repair/add_entity/index.html b/.homeycompose/drivers/repair/add_entity/index.html
index 1f0d03b..893be27 100644
--- a/.homeycompose/drivers/repair/add_entity/index.html
+++ b/.homeycompose/drivers/repair/add_entity/index.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/app.json b/app.json
index 69ecae2..1cb813b 100644
--- a/app.json
+++ b/app.json
@@ -1,7 +1,7 @@
 {
   "_comment": "This file is generated. Please edit .homeycompose/app.json instead.",
   "id": "io.home-assistant.community",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "compatibility": ">=8.1.0",
   "sdk": 3,
   "brandColor": "#0DA6EA",
diff --git a/drivers/alarm_control_panel/repair/add_entity.html b/drivers/alarm_control_panel/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/alarm_control_panel/repair/add_entity.html
+++ b/drivers/alarm_control_panel/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/basedriver.js b/drivers/basedriver.js
index c39631c..2b8e970 100644
--- a/drivers/basedriver.js
+++ b/drivers/basedriver.js
@@ -805,6 +805,14 @@ class BaseDriver extends Homey.Driver {
                     capability = 'onoff';
                 }
             }
+
+            // Add decimals for number capability
+            if (data.decimals != undefined){
+                if ( parseInt(data.decimals).par != NaN){
+                    capabilitiesOptions["decimals"] = parseInt(data.decimals);
+                }
+            }
+
             if (!device.hasCapability(capability)){
                 this.log("Adding capability: "+capability);
                 try{
diff --git a/drivers/button/repair/add_entity.html b/drivers/button/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/button/repair/add_entity.html
+++ b/drivers/button/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/camera/repair/add_entity.html b/drivers/camera/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/camera/repair/add_entity.html
+++ b/drivers/camera/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/climate/repair/add_entity.html b/drivers/climate/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/climate/repair/add_entity.html
+++ b/drivers/climate/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/climate_fan/repair/add_entity.html b/drivers/climate_fan/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/climate_fan/repair/add_entity.html
+++ b/drivers/climate_fan/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/compound/repair/add_entity.html b/drivers/compound/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/compound/repair/add_entity.html
+++ b/drivers/compound/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/cover/repair/add_entity.html b/drivers/cover/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/cover/repair/add_entity.html
+++ b/drivers/cover/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/custom/repair/add_entity.html b/drivers/custom/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/custom/repair/add_entity.html
+++ b/drivers/custom/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/fan/repair/add_entity.html b/drivers/fan/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/fan/repair/add_entity.html
+++ b/drivers/fan/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/light/repair/add_entity.html b/drivers/light/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/light/repair/add_entity.html
+++ b/drivers/light/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/lock/repair/add_entity.html b/drivers/lock/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/lock/repair/add_entity.html
+++ b/drivers/lock/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/media/repair/add_entity.html b/drivers/media/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/media/repair/add_entity.html
+++ b/drivers/media/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/presence/repair/add_entity.html b/drivers/presence/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/presence/repair/add_entity.html
+++ b/drivers/presence/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/scene/repair/add_entity.html b/drivers/scene/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/scene/repair/add_entity.html
+++ b/drivers/scene/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/schedule/repair/add_entity.html b/drivers/schedule/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/schedule/repair/add_entity.html
+++ b/drivers/schedule/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/script/repair/add_entity.html b/drivers/script/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/script/repair/add_entity.html
+++ b/drivers/script/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/sensor/repair/add_entity.html b/drivers/sensor/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/sensor/repair/add_entity.html
+++ b/drivers/sensor/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/switch/repair/add_entity.html b/drivers/switch/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/switch/repair/add_entity.html
+++ b/drivers/switch/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/timer/repair/add_entity.html b/drivers/timer/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/timer/repair/add_entity.html
+++ b/drivers/timer/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/vacuum/repair/add_entity.html b/drivers/vacuum/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/vacuum/repair/add_entity.html
+++ b/drivers/vacuum/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/drivers/water_heater/repair/add_entity.html b/drivers/water_heater/repair/add_entity.html
index 1f0d03b..893be27 100644
--- a/drivers/water_heater/repair/add_entity.html
+++ b/drivers/water_heater/repair/add_entity.html
@@ -44,6 +44,7 @@
       capability: document.getElementById('capabilityAdd').value,
       name: document.getElementById('nameAdd').value,
       unit: document.getElementById('unitAdd').value,
+      decimals: document.getElementById('decimalsAdd').value,
       converter_ha2homey: document.getElementById('converter_ha2homeyAdd').value,
       converter_homey2ha: document.getElementById('converter_homey2haAdd').value,
       add_as_main_capability: document.getElementById('addAsMainCapabilityAdd').checked,
@@ -137,7 +138,18 @@
         }
       );
   }
-
+  function onInfoDecimals(){
+    let message = new InfoMessage();
+    message.info( 
+        Homey.__("repair.custom_device.info_decimals"),
+        {
+          duration: 0,
+          closable: true,
+          dangerUseHtml: true
+        }
+      );
+  }
+  
   function onAddEntityAttributeClick(){
     if (document.getElementById("addEntityAttributeAdd").checked){
       document.getElementById("labelEntityAttributeAdd").style.display = 'unset';
@@ -174,6 +186,27 @@
     }
   }
 
+  function onCapabilityChanged(){
+    decimalsVisibility();
+  }
+
+  function decimalsVisibility(){  
+    document.getElementById('decimalsAdd').value = '';
+    let capability = document.getElementById('capabilityAdd').value;
+    if (
+        (capability.startsWith('measure') || capability.startsWith('meter'))
+      &&
+        !capability.startsWith('measure_generic')){
+      document.getElementById("divNumberDecimal").style.display = 'unset';
+    }
+    else{
+      document.getElementById("divNumberDecimal").style.display = 'none';
+    }
+  } 
+
+  // update decimal value field
+  decimalsVisibility();
+
   // update visible/invisible fields
   onAddEntityAttributeClick();
 </script>
@@ -216,7 +249,7 @@
       <div class="info_icon" onClick="onInfoCapability()"> 
         <span class="fa fa-icon fa-info-circle"></span>
       </div>
-      <input id="capabilityAdd"  class="homey-form-input" type="text" value=""/>
+      <input id="capabilityAdd"  class="homey-form-input" type="text" value="" onchange="onCapabilityChanged()" oninput="onCapabilityChanged()"/>
     <!-- </div>
     <div class="homey-form-group"> -->
       <fieldset class="homey-form-checkbox-set">
@@ -233,6 +266,17 @@
       </div>
     </div>
 
+    <!-- Number Decimal options -->
+    <div class="homey-form-group" id="divNumberDecimal" style="display:none"> 
+      <fieldset class="homey-form-checkbox-set">
+        <label for="decimalsAdd" class="homey-form-label" style="display: inline;"><span data-i18n="repair.custom_device.decimals"></span></label>
+        <div class="info_icon" onClick="onInfoDecimals()"> 
+          <span class="fa fa-icon fa-info-circle"></span>
+        </div>
+        <input id="decimalsAdd"  class="homey-form-input" type="number" value=""/>
+      </fieldset>
+    </div>
+    
     <!-- Number Input options -->
     <div class="homey-form-group" id="divNumberInput" style="display:none">
       <fieldset class="homey-form-checkbox-set">
@@ -258,7 +302,7 @@
             <input id="entityNumberRangeMaxAdd"  class="homey-form-input" type="text" value=""/>
           </td>
           <td>
-            <label for="entityNumberRangeStepnAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
+            <label for="entityNumberRangeStepAdd" class="homey-form-label"><span data-i18n="repair.custom_device.number_range_step"></span></label>
             <input id="entityNumberRangeStepAdd"  class="homey-form-input" type="text" value=""/>
           </td>
         </tr>
@@ -364,6 +408,7 @@
                       document.getElementById('nameAdd').value = event.detail.selection.value.name;
                       document.getElementById('unitAdd').value = event.detail.selection.value.unit;
                       document.getElementById('capabilityAdd').value = await Homey.emit("getCustomTemplateCapability", event.detail.selection.value.entity_id)
+                      decimalsVisibility();
                       if (event.detail.selection.value.number_range != undefined){
                         document.getElementById('addEntityNumberInput').checked = false;
                         if (event.detail.selection.value.number_range.min != undefined){
diff --git a/locales/de.json b/locales/de.json
index 5fb30cd..e753279 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -112,7 +112,9 @@
             "info_converter": "Es kann eine <strong>JavaScript-Function</strong> angegeben werden, um den Parameter <strong>value</strong> zu konvertieren und einen berechneten/konvertierten Wert zurückzugeben, der im Gerät als Capability-Wert übernommen werden soll.\n Verwenden einen passenden Datentyp.\n\n.<strong>Beispiel für eine einfache Berechnung:</strong>\n\n(value) => { return value * 100; }\n\nEs wird der 100-fache Wert als Capability-Wert übernommen.\n\n<strong>Beispiel für eine Datumskonvertierung</strong> vom ISO ins lokale Datums-Format:\n\n(value) => { return new Date(value).toLocaleString('de-DE', {hour12s: false, hour: '2-digit', minute: '2-digit', day: '2-digit', month: '2-digit', year: 'numeric' }); }\n\nErsetze 'de-DE' durch dein Gebietsschema.",
             "info_capability": "Die Geräte-Capability wird vorbelegt bei Auswahl einer Entität.\n\nWenn die Capability nicht korrekt bestimmmt werden kann, dann kann eine individuelle Capability angegeben werden. Alternativ kann die Vorbelegung angepasst werden.\n\nEs können Capability-Namen wie <strong>measure_*, meter_*, alarm_*, onoff, onoff_button or button</strong> verwendet werden. Oder es kann ein Wert der Auswahlliste gewählt werden.\n\nWenn eine Capability mehrfach im Gerät verwendet wird, dann muss ab der zweiten Variante eine Sub-Capability verwendet werden wie z.B. <strong>onoff.livingroom</strong>.",
             "info_entity": "Die gewünschte Entität kann in der Liste gewählt werden, um den Entitäts-Status als Capability hinzuzufügen.\n\nSoll stattdessen ein <strong>Entitäts-Attribut</strong> hinzugefügt werden, dann kann diese Checkbox aktiviert und ein Attribut gewählt werden.\n\nDas Attribut kann auch manuell angegeben werden.\n\nBeispiele für Entitär weather.home:\n\nEinfaches Attribut:\ntemperature\n\nArray:\nforecast[0].temperature\n\nGib eine passende Capability an (ggf. incl. Sub-Capability), wenn eine numerische oder anphanumerische Capability nicht korrekt ist und das Attribut z.B. eine Temperatur oder eine Binärsensor/Alarm repräsentiert.",
-            "info_number_input": "Eine numerische Eingabe-Entität (number oder input_number) wird normalerweise als Sensor importiert.\n\nSoll der Wert dieser Entität in Homey geändert werden, so kann die Entität als Schieberegler dargestellt werden.\nDie Eigenschaften der Entität (Min, Max, Schrittweite) wird übernommen.\n\nVerwende den Schieberegler, um den Wert zu ändern - auch in der HA-Entität."
+            "info_number_input": "Eine numerische Eingabe-Entität (number oder input_number) wird normalerweise als Sensor importiert.\n\nSoll der Wert dieser Entität in Homey geändert werden, so kann die Entität als Schieberegler dargestellt werden.\nDie Eigenschaften der Entität (Min, Max, Schrittweite) wird übernommen.\n\nVerwende den Schieberegler, um den Wert zu ändern - auch in der HA-Entität.",
+            "decimals": "Dezimalstellen",
+            "info_decimals": "Definiere die Anzahl an Dezimalstellen für numerische Capabilities. Dies überschreibt den Standardwert der Capability."
         }
     },
     "device_unavailable_reason": {
diff --git a/locales/en.json b/locales/en.json
index afd8a63..4106418 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -111,7 +111,9 @@
             "info_converter": "You can add a <strong>JavaScript function</strong> to convert the parameter <strong>value</strong> and return a converted/calculated value that should be set as capability value of the Homey device.\nUse the correct data type.\n\n<strong>Example for simple calculation</strong>\n\n(value) => { return value * 100; }\n\nThis uses the 100x of the HA value as capability value.\n\n<strong>Example for date conversion</strong> from ISO to local date:\n\n(value) => { return new Date(value).toLocaleString('de-DE', {hour12s: false, hour: '2-digit', minute: '2-digit', day: '2-digit', month: '2-digit', year: 'numeric' }); }\n\nReplace 'de-DE' with your locale.",
             "info_capability": "The device capability is preassigned after entity selection.\n\nIf the capability can not be determined correctly, you can set a custom target capability. Alternatively you can adjust the preassigned capability name.\n\nYou can use capability names  like <strong>measure_*, meter_*, alarm_*, onoff, onoff_button or button</strong>. Or select one capability from the autocomplete list.\n\nWhen using a capability name more than once in a device, use subcapabilities instead like <strong>onoff.livingroom</strong>.",
             "info_entity": "Select an entity from the list to add the entity state as device capability.\n\nIf you want to add an <strong>entity attribute</strong> instead, you can activate this checkbox and select the attribute of the selected entity.\n\nYou can insert an attribute manually, too.\n\nExamples for entity weather.home:\n\nSimple attribute:\ntemperature\n\nArray:\nforecast[0].temperature\n\nSelect a corresponding capability (possibly including a sub capability) if a numeric or alphanumeric capability is not the right one and the attribute is representing e.g. a temperature or a binary sensor/alarm.",
-            "info_number_input": "A numeric input entity (number or input_number) is usually imported as a sensor.\n\nIf the value of this entity is to be changed in Homey, the entity can be represented as a slider.\nThe properties of the entity (min, max, increment) are taken over.\n\nUse the slider to change the value - also in the HA entity."
+            "info_number_input": "A numeric input entity (number or input_number) is usually imported as a sensor.\n\nIf the value of this entity is to be changed in Homey, the entity can be represented as a slider.\nThe properties of the entity (min, max, increment) are taken over.\n\nUse the slider to change the value - also in the HA entity.",
+            "decimals": "Decimals for numeric values",
+            "info_decimals": "Set the number of decimal places for numeric capabilities. This overrides the default value of the entity."
         }
     },
     "device_unavailable_reason": {
diff --git a/locales/nl.json b/locales/nl.json
index d9eddba..2fe2066 100644
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -112,7 +112,9 @@
             "info_converter": "U kunt een <strong>JavaScript functie</strong> toevoegen om de parameterwaarde <strong>value</strong> te converteren, en een geconverteerde/berekende waarde terug te geven, die als capaciteitswaarde van het Homey apparaat moet worden ingesteld. Gebruik wel het juiste gegevenstype alstublieft. \n\n<strong>Voorbeeld van eenvoudige berekening</strong>\n\n(value) => { return value * 100; }\n\nDit vermenigvuldigt de HA-waarde met een factor 100 als Homey capaciteitswaarde. \n\n<strong>Voorbeeld van datumconversie</strong> van ISO naar lokale datum:\n\n(value) => { return new Date(value).toLocaleString('de-DE', {hour12s: false, hour: '2-digit', minute: '2-digit', day: '2-digit', month: '2-digit', year: 'numeric' }); }\n\nVervang 'de-DE' door uw tijdzone, bijv nl-NL.",
             "info_capability": "De apparaatfunctionaliteit (capability) wordt toegewezen na selectie van de entiteit.\n\nAls de mogelijkheid niet correct kan worden bepaald, kunt u een aangepaste doelfunctionaliteit instellen. U kunt ook de naam van de vooraf toegewezen mogelijkheid aanpassen.\n\nU kunt mogelijkheidsnamen gebruiken zoals <strong>measure_*, meter_*, alarm_*, onoff, onoff_button of button (* = alles wat u wilt, maar in kleine letters en zonder spaties)</strong>. Of selecteer een mogelijkheid uit de apparatenlijst.\n\nGebruik je een functionaliteit meer dan één keer in een apparaat, gebruik dan submogelijkheden zoals <strong>onoff.livingroom of measure_power.fridge</strong>.",
             "info_entity": "Selecteer een entiteit uit de lijst om de entiteitsstatus toe te voegen als capability.\n\nAls u in plaats daarvan een <strong>entiteits-attribuut</strong> wilt toevoegen, kunt u dit selectievakje activeren en het kenmerk van de geselecteerde entiteit selecteren.\n\nU kunt ook handmatig een attribuut invoegen.\n\nVoorbeelden voor entiteit weather.home:\n\nEenvoudig attribuut:\ntemperature\n\nArray:\nforecast[0].temperature\n\nSelecteer een overeenkomstige mogelijkheid (eventueel inclusief een submogelijkheid) als een numerieke of alfanumerieke mogelijkheid niet de juiste is en het attribuut staat voor b.v. een temperatuur of een binaire sensor/alarm.",
-            "info_number_input": "Een numerieke invoerentiteit (number of input_number) wordt meestal geïmporteerd als een sensor.\n\nAls de waarde van deze entiteit moet worden gewijzigd in Homey, kan de entiteit worden weergegeven als een schuifregelaar.\nDe eigenschappen van de entiteit (min, max, increment) worden overgenomen.\n\nGebruik de schuifregelaar om de waarde te wijzigen - ook in de HA-entiteit."
+            "info_number_input": "Een numerieke invoerentiteit (number of input_number) wordt meestal geïmporteerd als een sensor.\n\nAls de waarde van deze entiteit moet worden gewijzigd in Homey, kan de entiteit worden weergegeven als een schuifregelaar.\nDe eigenschappen van de entiteit (min, max, increment) worden overgenomen.\n\nGebruik de schuifregelaar om de waarde te wijzigen - ook in de HA-entiteit.",
+            "decimals": "Decimalen",
+            "info_decimals": "Definieer het aantal decimalen voor numerieke mogelijkheden. Dit overschrijft de standaardwaarde van de mogelijkheid."
         }
     },
     "device_unavailable_reason": {