diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml
index 8d6101b05..2523b325a 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/bridgeConfig.xml
@@ -14,54 +14,46 @@
@text/dss_param_group_general_desc
-
+
@text/dss_param_app_token_desc
- false
-
+
network-address
@text/dss_param_ip_address_desc
- true
-
+
@text/dss_param_username_desc
- false
-
+
@text/dss_param_password_desc
- false
password
-
+
120
@text/dss_param_sensor_inter_desc
- false
-
+
30
@text/dss_param_total_power_inter_desc
- false
-
+
7
@text/dss_param_trash_delete_desc
- false
-
+
true
@text/dss_param_sensor_wait_label
60
- false
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml
index da12533fb..77194eabc 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/config/deviceConfig.xml
@@ -15,7 +15,7 @@
@text/device_param_group_sensor_desc
-
+
@text/device_param_active_power_desc
@@ -25,9 +25,8 @@
never
- false
-
+
@text/device_param_electric_meter_desc
@@ -37,9 +36,8 @@
never
- false
-
+
@text/device_param_output_current_desc
@@ -49,21 +47,18 @@
never
- false
-
+
@text/device_param_dsid_desc
- true
-
+
@text/device_param_dsid_desc
- true
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/AppartmentScene.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/AppartmentScene.xml
index 9712bf3b5..dad19d473 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/AppartmentScene.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/AppartmentScene.xml
@@ -16,10 +16,9 @@
-
+
@text/param_scene_id_desc
- true
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/GroupScene.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/GroupScene.xml
index b597c6400..4ef0adf92 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/GroupScene.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/GroupScene.xml
@@ -17,22 +17,19 @@
-
+
@text/param_scene_zone_id_desc
- false
-
+
@text/param_scene_group_id_desc
- false
-
+
@text/param_scene_id_desc
- false
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/NamedScene.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/NamedScene.xml
index 8edcfeac4..521b57cdb 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/NamedScene.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/NamedScene.xml
@@ -17,22 +17,19 @@
-
+
@text/param_scene_zone_id_desc
- false
-
+
@text/param_scene_group_id_desc
- false
-
+
@text/param_scene_id_desc
- false
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneScene.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneScene.xml
index e2dc0471b..7dc9ff805 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneScene.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneScene.xml
@@ -17,16 +17,14 @@
-
+
@text/param_scene_zone_id_desc
- false
-
+
@text/param_scene_id_desc
- false
diff --git a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneTemperatureControl.xml b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneTemperatureControl.xml
index 32346f11e..3b053d010 100644
--- a/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneTemperatureControl.xml
+++ b/bundles/org.openhab.binding.digitalstrom/src/main/resources/OH-INF/thing/ZoneTemperatureControl.xml
@@ -13,10 +13,9 @@
-
+
@text/zoneTemperatureControl_parm_zoneID_desc
- true