diff --git a/HMserver/etc/config_templates/log4j.xml b/HMserver/etc/config_templates/log4j.xml
index df776ffe..4cb59917 100644
--- a/HMserver/etc/config_templates/log4j.xml
+++ b/HMserver/etc/config_templates/log4j.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-	<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
-		<param name="File" value="/var/log/hmserver.log"/>		
-		<param name="MaxFileSize" value="2048KB" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{MMM d HH:mm:ss} %c %-5p [%t] %m %n"/> 
-		</layout>
-	</appender>
-
-	<appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
-		<param name="SyslogHost" value="127.0.0.1"/>
-		<param name="Facility" value="LOCAL0"/>
-		<param name="FacilityPrinting" value="true"/>
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%c %-5p [%t] %m %n"/> 
-		</layout>
-	</appender>
-   
-	<category name="de.eq3">
-		<priority value="INFO" />
-	</category>
-	<category name="org">
-		<priority value="INFO" />
-	</category>
-	<category name="com">
-		<priority value="INFO" />
-	</category>
-
-	<root>
-		<priority value="ERROR" />
-		<appender-ref ref="FILE" />
-		<appender-ref ref="SYSLOG" />
-	</root>
-
-</log4j:configuration>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+	<appender name="FILE" class="org.apache.log4j.RollingFileAppender">
+		<param name="File" value="/var/log/hmserver.log"/>		
+		<param name="MaxFileSize" value="2048KB" />
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%d{MMM d HH:mm:ss} %c %-5p [%t] %m %n"/> 
+		</layout>
+	</appender>
+
+	<appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+		<param name="SyslogHost" value="127.0.0.1"/>
+		<param name="Facility" value="LOCAL0"/>
+		<param name="FacilityPrinting" value="true"/>
+		<layout class="org.apache.log4j.PatternLayout">
+			<param name="ConversionPattern" value="%c %-5p [%t] %m %n"/> 
+		</layout>
+	</appender>
+   
+	<category name="de.eq3">
+		<priority value="INFO" />
+	</category>
+	<category name="org">
+		<priority value="INFO" />
+	</category>
+	<category name="com">
+		<priority value="INFO" />
+	</category>
+
+	<root>
+		<priority value="ERROR" />
+		<appender-ref ref="FILE" />
+		<appender-ref ref="SYSLOG" />
+	</root>
+
+</log4j:configuration>
+
diff --git a/HMserver/etc/init.d b/HMserver/etc/init.d
index f6c93315..39ec1388 100644
--- a/HMserver/etc/init.d
+++ b/HMserver/etc/init.d
@@ -5,6 +5,8 @@
 
 LOGLEVEL_HMServer=5
 CFG_TEMPLATE_DIR=/etc/config_templates
+PIDFILE=/var/run/HMIPServer.pid
+STARTWAITFILE=/var/status/HMServerStarted
 
 init() {
 	export TZ=`cat /etc/config/TZ | cut -d'-' -f1 | cut -d'+' -f1`
@@ -18,13 +20,16 @@ init() {
 start() {
 	echo -n "Starting HMServer: "
 	init
-	start-stop-daemon -S -q -p /var/run/HMServer.pid --exec java -- -Xmx32m -Dlog4j.configuration=file:///etc/config/log4j.xml -Dfile.encoding=ISO-8859-1 -jar /opt/HMServer/HMServer.jar &
-	sleep 135
+	start-stop-daemon -S -q -m -p $PIDFILE --exec java -- -Xmx64m -Dlog4j.configuration=file:///etc/config/log4j.xml -Dfile.encoding=ISO-8859-1 -jar /opt/HMServer/HMIPServer.jar /etc/crRFD.conf &
+	echo "Waiting for HMServer to get ready"
+	eq3configcmd wait-for-file -f $STARTWAITFILE -p 5 -t 135
 	echo "OK"
 }
 stop() {
 	echo -n "Stopping HMServer: "
-	start-stop-daemon -K -q -p /var/run/HMServer.pid
+	rm -f $STARTWAITFILE
+	start-stop-daemon -K -q -p $PIDFILE
+	rm -f $PIDFILE
 	echo "OK"
 }
 restart() {
diff --git a/HMserver/opt/HMServer/HMIPServer.jar b/HMserver/opt/HMServer/HMIPServer.jar
new file mode 100644
index 00000000..205b8c40
Binary files /dev/null and b/HMserver/opt/HMServer/HMIPServer.jar differ
diff --git a/HMserver/opt/HMServer/HMServer.jar b/HMserver/opt/HMServer/HMServer.jar
index 6759de5f..8145527d 100644
Binary files a/HMserver/opt/HMServer/HMServer.jar and b/HMserver/opt/HMServer/HMServer.jar differ
diff --git a/HMserver/opt/HMServer/groups/groupdefinitions.xml b/HMserver/opt/HMServer/groups/groupdefinitions.xml
index fa29eedd..65f8d663 100644
--- a/HMserver/opt/HMServer/groups/groupdefinitions.xml
+++ b/HMserver/opt/HMServer/groups/groupdefinitions.xml
@@ -36,6 +36,9 @@
       <allowed_member_type>
         <member_type type="HM-PB-2-FM"/>
       </allowed_member_type>
+      <allowed_member_type>
+        <member_type type="HM-RC-2-PBU-FM"/>
+      </allowed_member_type>
     </allowed_member_types>
     <group_type>
       <id>HomeMatic.heating</id>
diff --git a/HMserver/opt/HMServer/measurement/templates.dit b/HMserver/opt/HMServer/measurement/templates.dit
index 72ac5457..96f7a8fb 100644
--- a/HMserver/opt/HMServer/measurement/templates.dit
+++ b/HMserver/opt/HMServer/measurement/templates.dit
@@ -1,566 +1,566 @@
-[
-	{
-		"id" : "1",
-		"name" : "${diagramTemplate1}",
-		"description" : "${diagramTemplateDescription1}",
-		"seriesTemplate" : 
-		{
-			grid: {
-				drawGridlines: true,
-				gridLineColor: "#cccccc",
-				gridLineWidth: 1,
-				backgroundColor: "#e6edff",
-				borderColor: "#999999",
-				borderWidth: 2,
-				shadow: true
-			},
-			animate : false,
-			animateReplot: false,
-			axes :
-			{
-				xaxis :
-				{
-					tickOptions :
-					{
-						formatString : '%d.%m.%y %H:%M',
-						angle : 37
-					}
-				}
-			},
-			cursor:
-			{
-				show: true,
-				zoom: true, 
-				showTooltip: true
-			},
-			legend:
-			{
-				show: true,
-				location: 'ne',
-				placement: 'insideGrid',
-				xoffset: 12,
-				yoffset: 12,
-				rendererOptions:
-				{
-					seriesToggle: 'normal',
-					seriesToggleReplot:
-					{
-						resetAxes: false
-					}
-				}
-			},
-			seriesDefaults :
-			{
-				markerOptions :
-				{
-					style: 'filledCircle'
-				}
-			},
-			series :
-			[
-				{
-					lineWidth: 1,
-					showMarker: false,
-					rendererOptions:
-					{
-						smooth: true
-					}
-				}
-			]
-		}
-	},
-	{
-		"id" : "2",
-		"name" : "${diagramTemplate2}",
-		"description" : "${diagramTemplateDescription2}",
-		"seriesTemplate" : 
-		{
-			grid: {
-				drawGridlines: true,
-				gridLineColor: "#cccccc",
-				gridLineWidth: 1,
-				backgroundColor: "#fff6ed",
-				borderColor: "#999999",
-				borderWidth: 2,
-				shadow: true
-			},
-			animate : false,
-			animateReplot: false,
-			axes :
-			{
-				xaxis :
-				{
-					tickOptions :
-					{
-						formatString : '%d.%m.%y %H:%M',
-						angle : 37
-					}
-				}
-			},
-			cursor:
-			{
-				show: true,
-				zoom: true, 
-				showTooltip: true
-			},
-			legend:
-			{
-				show: true,
-				location: 'ne',
-				placement: 'insideGrid',
-				xoffset: 12,
-				yoffset: 12,
-				rendererOptions:
-				{
-					seriesToggle: 'normal',
-					seriesToggleReplot:
-					{
-						resetAxes: false
-					}
-				}
-			},
-			seriesDefaults :
-			{
-				markerOptions :
-				{
-					style: 'filledCircle'
-				}
-			},
-			series :
-			[
-				{
-					lineWidth: 1,
-					showMarker: false,
-					rendererOptions:
-					{
-						smooth: true
-					}
-				}
-			]
-		}
-	},
-	{
-		"id" : "3",
-		"name" : "${diagramTemplate3}",
-		"description" : "${diagramTemplateDescription3}",
-		"seriesTemplate" : 
-		{
-			grid: {
-				drawGridlines: true,
-				gridLineColor: "#cccccc",
-				gridLineWidth: 1,
-				backgroundColor: "#e6edff",
-				borderColor: "#999999",
-				borderWidth: 2,
-				shadow: true
-			},
-			animate : false,
-			animateReplot: false,
-			axes :
-			{
-				xaxis :
-				{
-					tickOptions :
-					{
-						formatString : '%d.%m.%y %H:%M',
-						angle : 37
-					}
-				}
-			},
-			cursor:
-			{
-				show: true,
-				zoom: true, 
-				showTooltip: true
-			},
-			legend:
-			{
-				show: true,
-				location: 'ne',
-				placement: 'insideGrid',
-				xoffset: 12,
-				yoffset: 12,
-				rendererOptions:
-				{
-					seriesToggle: 'normal',
-					seriesToggleReplot:
-					{
-						resetAxes: false
-					}
-				}
-			},
-			seriesDefaults :
-			{
-				markerOptions :
-				{
-					style: 'filledCircle'
-				}
-			},
-			series :
-			[
-				{
-					lineWidth: 2,
-					showMarker: false,
-					rendererOptions:
-					{
-						smooth: true
-					}
-				}
-			]
-		}
-	},
-	{
-		"id" : "4",
-		"name" : "${diagramTemplate4}",
-		"description" : "${diagramTemplateDescription4}",
-		"seriesTemplate" : 
-		{
-			grid: {
-				drawGridlines: true,
-				gridLineColor: "#cccccc",
-				gridLineWidth: 1,
-				backgroundColor: "#fff6ed",
-				borderColor: "#999999",
-				borderWidth: 2,
-				shadow: true
-			},
-			animate : false,
-			animateReplot: false,
-			axes :
-			{
-				xaxis :
-				{
-					tickOptions :
-					{
-						formatString : '%d.%m.%y %H:%M',
-						angle : 37
-					}
-				}
-			},
-			cursor:
-			{
-				show: true,
-				zoom: true, 
-				showTooltip: true
-			},
-			legend:
-			{
-				show: true,
-				location: 'ne',
-				placement: 'insideGrid',
-				xoffset: 12,
-				yoffset: 12,
-				rendererOptions:
-				{
-					seriesToggle: 'normal',
-					seriesToggleReplot:
-					{
-						resetAxes: false
-					}
-				}
-			},
-			seriesDefaults :
-			{
-				markerOptions :
-				{
-					style: 'filledCircle'
-				}
-			},
-			series :
-			[
-				{
-					lineWidth: 2,
-					showMarker: false,
-					rendererOptions:
-					{
-						smooth: true
-					}
-				}
-			]
-		}
-	},
-	{
-		"id" : "5",
-		"name" : "${diagramTemplate5}",
-		"description" : "${diagramTemplateDescription5}",
-		"seriesTemplate" : 
-		{
-			grid: {
-				drawGridlines: true,
-				gridLineColor: "#cccccc",
-				gridLineWidth: 1,
-				backgroundColor: "#e6edff",
-				borderColor: "#999999",
-				borderWidth: 2,
-				shadow: true
-			},
-			animate : false,
-			animateReplot: false,
-			axes :
-			{
-				xaxis :
-				{
-					tickOptions :
-					{
-						formatString : '%d.%m.%y %H:%M',
-						angle : 37
-					}
-				}
-			},
-			cursor:
-			{
-				show: true,
-				zoom: true, 
-				showTooltip: true
-			},
-			legend:
-			{
-				show: true,
-				location: 's',
-				placement: 'outside',
-				xoffset: 12,
-				yoffset: 85,
-				rendererOptions:
-				{
-					seriesToggle: 'normal',
-					numberColumns: 4,
-					seriesToggleReplot:
-					{
-						resetAxes: false
-					}
-				}
-			},
-			seriesDefaults :
-			{
-				markerOptions :
-				{
-					style: 'filledCircle'
-				}
-			},
-			series :
-			[
-				{
-					lineWidth: 1,
-					showMarker: false,
-					rendererOptions:
-					{
-						smooth: true
-					}
-				}
-			]
-		}
-	},
-	{
-		"id" : "6",
-		"name" : "${diagramTemplate6}",
-		"description" : "${diagramTemplateDescription6}",
-		"seriesTemplate" : 
-		{
-			grid: {
-				drawGridlines: true,
-				gridLineColor: "#cccccc",
-				gridLineWidth: 1,
-				backgroundColor: "#fff6ed",
-				borderColor: "#999999",
-				borderWidth: 2,
-				shadow: true
-			},
-			animate : false,
-			animateReplot: false,
-			axes :
-			{
-				xaxis :
-				{
-					tickOptions :
-					{
-						formatString : '%d.%m.%y %H:%M',
-						angle : 37
-					}
-				}
-			},
-			cursor:
-			{
-				show: true,
-				zoom: true, 
-				showTooltip: true
-			},
-			legend:
-			{
-				show: true,
-				location: 's',
-				placement: 'outside',
-				xoffset: 12,
-				yoffset: 85,
-				rendererOptions:
-				{
-					seriesToggle: 'normal',
-					numberColumns: 4,
-					seriesToggleReplot:
-					{
-						resetAxes: false
-					}
-				}
-			},
-			seriesDefaults :
-			{
-				markerOptions :
-				{
-					style: 'filledCircle'
-				}
-			},
-			series :
-			[
-				{
-					lineWidth: 1,
-					showMarker: false,
-					rendererOptions:
-					{
-						smooth: true
-					}
-				}
-			]
-		}
-	},
-	{
-		"id" : "7",
-		"name" : "${diagramTemplate7}",
-		"description" : "${diagramTemplateDescription7}",
-		"seriesTemplate" : 
-		{
-			grid: {
-				drawGridlines: true,
-				gridLineColor: "#cccccc",
-				gridLineWidth: 1,
-				backgroundColor: "#e6edff",
-				borderColor: "#999999",
-				borderWidth: 2,
-				shadow: true
-			},
-			animate : false,
-			animateReplot: false,
-			axes :
-			{
-				xaxis :
-				{
-					tickOptions :
-					{
-						formatString : '%d.%m.%y %H:%M',
-						angle : 37
-					}
-				}
-			},
-			cursor:
-			{
-				show: true,
-				zoom: true, 
-				showTooltip: true
-			},
-			legend:
-			{
-				show: true,
-				location: 's',
-				placement: 'outside',
-				xoffset: 12,
-				yoffset: 85,
-				rendererOptions:
-				{
-					seriesToggle: 'normal',
-					numberColumns: 4,
-					seriesToggleReplot:
-					{
-						resetAxes: false
-					}
-				}
-			},
-			seriesDefaults :
-			{
-				markerOptions :
-				{
-					style: 'filledCircle'
-				}
-			},
-			series :
-			[
-				{
-					lineWidth: 2,
-					showMarker: false,
-					rendererOptions:
-					{
-						smooth: true
-					}
-				}
-			]
-		}
-	},
-	{
-		"id" : "8",
-		"name" : "${diagramTemplate8}",
-		"description" : "${diagramTemplateDescription8}",
-		"seriesTemplate" : 
-		{
-			grid: {
-				drawGridlines: true,
-				gridLineColor: "#cccccc",
-				gridLineWidth: 1,
-				backgroundColor: "#fff6ed",
-				borderColor: "#999999",
-				borderWidth: 2,
-				shadow: true
-			},
-			animate : false,
-			animateReplot: false,
-			axes :
-			{
-				xaxis :
-				{
-					tickOptions :
-					{
-						formatString : '%d.%m.%y %H:%M',
-						angle : 37
-					}
-				}
-			},
-			cursor:
-			{
-				show: true,
-				zoom: true, 
-				showTooltip: true
-			},
-			legend:
-			{
-				show: true,
-				location: 's',
-				placement: 'outside',
-				xoffset: 12,
-				yoffset: 85,
-				rendererOptions:
-				{
-					seriesToggle: 'normal',
-					numberColumns: 4,
-					seriesToggleReplot:
-					{
-						resetAxes: false
-					}
-				}
-			},
-			seriesDefaults :
-			{
-				markerOptions :
-				{
-					style: 'filledCircle'
-				}
-			},
-			series :
-			[
-				{
-					lineWidth: 2,
-					showMarker: false,
-					rendererOptions:
-					{
-						smooth: true
-					}
-				}
-			]
-		}
-	}
+[
+	{
+		"id" : "1",
+		"name" : "${diagramTemplate1}",
+		"description" : "${diagramTemplateDescription1}",
+		"seriesTemplate" : 
+		{
+			grid: {
+				drawGridlines: true,
+				gridLineColor: "#cccccc",
+				gridLineWidth: 1,
+				backgroundColor: "#e6edff",
+				borderColor: "#999999",
+				borderWidth: 2,
+				shadow: true
+			},
+			animate : false,
+			animateReplot: false,
+			axes :
+			{
+				xaxis :
+				{
+					tickOptions :
+					{
+						formatString : '%d.%m.%y %H:%M',
+						angle : 37
+					}
+				}
+			},
+			cursor:
+			{
+				show: true,
+				zoom: true, 
+				showTooltip: true
+			},
+			legend:
+			{
+				show: true,
+				location: 'ne',
+				placement: 'insideGrid',
+				xoffset: 12,
+				yoffset: 12,
+				rendererOptions:
+				{
+					seriesToggle: 'normal',
+					seriesToggleReplot:
+					{
+						resetAxes: false
+					}
+				}
+			},
+			seriesDefaults :
+			{
+				markerOptions :
+				{
+					style: 'filledCircle'
+				}
+			},
+			series :
+			[
+				{
+					lineWidth: 1,
+					showMarker: false,
+					rendererOptions:
+					{
+						smooth: true
+					}
+				}
+			]
+		}
+	},
+	{
+		"id" : "2",
+		"name" : "${diagramTemplate2}",
+		"description" : "${diagramTemplateDescription2}",
+		"seriesTemplate" : 
+		{
+			grid: {
+				drawGridlines: true,
+				gridLineColor: "#cccccc",
+				gridLineWidth: 1,
+				backgroundColor: "#fff6ed",
+				borderColor: "#999999",
+				borderWidth: 2,
+				shadow: true
+			},
+			animate : false,
+			animateReplot: false,
+			axes :
+			{
+				xaxis :
+				{
+					tickOptions :
+					{
+						formatString : '%d.%m.%y %H:%M',
+						angle : 37
+					}
+				}
+			},
+			cursor:
+			{
+				show: true,
+				zoom: true, 
+				showTooltip: true
+			},
+			legend:
+			{
+				show: true,
+				location: 'ne',
+				placement: 'insideGrid',
+				xoffset: 12,
+				yoffset: 12,
+				rendererOptions:
+				{
+					seriesToggle: 'normal',
+					seriesToggleReplot:
+					{
+						resetAxes: false
+					}
+				}
+			},
+			seriesDefaults :
+			{
+				markerOptions :
+				{
+					style: 'filledCircle'
+				}
+			},
+			series :
+			[
+				{
+					lineWidth: 1,
+					showMarker: false,
+					rendererOptions:
+					{
+						smooth: true
+					}
+				}
+			]
+		}
+	},
+	{
+		"id" : "3",
+		"name" : "${diagramTemplate3}",
+		"description" : "${diagramTemplateDescription3}",
+		"seriesTemplate" : 
+		{
+			grid: {
+				drawGridlines: true,
+				gridLineColor: "#cccccc",
+				gridLineWidth: 1,
+				backgroundColor: "#e6edff",
+				borderColor: "#999999",
+				borderWidth: 2,
+				shadow: true
+			},
+			animate : false,
+			animateReplot: false,
+			axes :
+			{
+				xaxis :
+				{
+					tickOptions :
+					{
+						formatString : '%d.%m.%y %H:%M',
+						angle : 37
+					}
+				}
+			},
+			cursor:
+			{
+				show: true,
+				zoom: true, 
+				showTooltip: true
+			},
+			legend:
+			{
+				show: true,
+				location: 'ne',
+				placement: 'insideGrid',
+				xoffset: 12,
+				yoffset: 12,
+				rendererOptions:
+				{
+					seriesToggle: 'normal',
+					seriesToggleReplot:
+					{
+						resetAxes: false
+					}
+				}
+			},
+			seriesDefaults :
+			{
+				markerOptions :
+				{
+					style: 'filledCircle'
+				}
+			},
+			series :
+			[
+				{
+					lineWidth: 2,
+					showMarker: false,
+					rendererOptions:
+					{
+						smooth: true
+					}
+				}
+			]
+		}
+	},
+	{
+		"id" : "4",
+		"name" : "${diagramTemplate4}",
+		"description" : "${diagramTemplateDescription4}",
+		"seriesTemplate" : 
+		{
+			grid: {
+				drawGridlines: true,
+				gridLineColor: "#cccccc",
+				gridLineWidth: 1,
+				backgroundColor: "#fff6ed",
+				borderColor: "#999999",
+				borderWidth: 2,
+				shadow: true
+			},
+			animate : false,
+			animateReplot: false,
+			axes :
+			{
+				xaxis :
+				{
+					tickOptions :
+					{
+						formatString : '%d.%m.%y %H:%M',
+						angle : 37
+					}
+				}
+			},
+			cursor:
+			{
+				show: true,
+				zoom: true, 
+				showTooltip: true
+			},
+			legend:
+			{
+				show: true,
+				location: 'ne',
+				placement: 'insideGrid',
+				xoffset: 12,
+				yoffset: 12,
+				rendererOptions:
+				{
+					seriesToggle: 'normal',
+					seriesToggleReplot:
+					{
+						resetAxes: false
+					}
+				}
+			},
+			seriesDefaults :
+			{
+				markerOptions :
+				{
+					style: 'filledCircle'
+				}
+			},
+			series :
+			[
+				{
+					lineWidth: 2,
+					showMarker: false,
+					rendererOptions:
+					{
+						smooth: true
+					}
+				}
+			]
+		}
+	},
+	{
+		"id" : "5",
+		"name" : "${diagramTemplate5}",
+		"description" : "${diagramTemplateDescription5}",
+		"seriesTemplate" : 
+		{
+			grid: {
+				drawGridlines: true,
+				gridLineColor: "#cccccc",
+				gridLineWidth: 1,
+				backgroundColor: "#e6edff",
+				borderColor: "#999999",
+				borderWidth: 2,
+				shadow: true
+			},
+			animate : false,
+			animateReplot: false,
+			axes :
+			{
+				xaxis :
+				{
+					tickOptions :
+					{
+						formatString : '%d.%m.%y %H:%M',
+						angle : 37
+					}
+				}
+			},
+			cursor:
+			{
+				show: true,
+				zoom: true, 
+				showTooltip: true
+			},
+			legend:
+			{
+				show: true,
+				location: 's',
+				placement: 'outside',
+				xoffset: 12,
+				yoffset: 85,
+				rendererOptions:
+				{
+					seriesToggle: 'normal',
+					numberColumns: 4,
+					seriesToggleReplot:
+					{
+						resetAxes: false
+					}
+				}
+			},
+			seriesDefaults :
+			{
+				markerOptions :
+				{
+					style: 'filledCircle'
+				}
+			},
+			series :
+			[
+				{
+					lineWidth: 1,
+					showMarker: false,
+					rendererOptions:
+					{
+						smooth: true
+					}
+				}
+			]
+		}
+	},
+	{
+		"id" : "6",
+		"name" : "${diagramTemplate6}",
+		"description" : "${diagramTemplateDescription6}",
+		"seriesTemplate" : 
+		{
+			grid: {
+				drawGridlines: true,
+				gridLineColor: "#cccccc",
+				gridLineWidth: 1,
+				backgroundColor: "#fff6ed",
+				borderColor: "#999999",
+				borderWidth: 2,
+				shadow: true
+			},
+			animate : false,
+			animateReplot: false,
+			axes :
+			{
+				xaxis :
+				{
+					tickOptions :
+					{
+						formatString : '%d.%m.%y %H:%M',
+						angle : 37
+					}
+				}
+			},
+			cursor:
+			{
+				show: true,
+				zoom: true, 
+				showTooltip: true
+			},
+			legend:
+			{
+				show: true,
+				location: 's',
+				placement: 'outside',
+				xoffset: 12,
+				yoffset: 85,
+				rendererOptions:
+				{
+					seriesToggle: 'normal',
+					numberColumns: 4,
+					seriesToggleReplot:
+					{
+						resetAxes: false
+					}
+				}
+			},
+			seriesDefaults :
+			{
+				markerOptions :
+				{
+					style: 'filledCircle'
+				}
+			},
+			series :
+			[
+				{
+					lineWidth: 1,
+					showMarker: false,
+					rendererOptions:
+					{
+						smooth: true
+					}
+				}
+			]
+		}
+	},
+	{
+		"id" : "7",
+		"name" : "${diagramTemplate7}",
+		"description" : "${diagramTemplateDescription7}",
+		"seriesTemplate" : 
+		{
+			grid: {
+				drawGridlines: true,
+				gridLineColor: "#cccccc",
+				gridLineWidth: 1,
+				backgroundColor: "#e6edff",
+				borderColor: "#999999",
+				borderWidth: 2,
+				shadow: true
+			},
+			animate : false,
+			animateReplot: false,
+			axes :
+			{
+				xaxis :
+				{
+					tickOptions :
+					{
+						formatString : '%d.%m.%y %H:%M',
+						angle : 37
+					}
+				}
+			},
+			cursor:
+			{
+				show: true,
+				zoom: true, 
+				showTooltip: true
+			},
+			legend:
+			{
+				show: true,
+				location: 's',
+				placement: 'outside',
+				xoffset: 12,
+				yoffset: 85,
+				rendererOptions:
+				{
+					seriesToggle: 'normal',
+					numberColumns: 4,
+					seriesToggleReplot:
+					{
+						resetAxes: false
+					}
+				}
+			},
+			seriesDefaults :
+			{
+				markerOptions :
+				{
+					style: 'filledCircle'
+				}
+			},
+			series :
+			[
+				{
+					lineWidth: 2,
+					showMarker: false,
+					rendererOptions:
+					{
+						smooth: true
+					}
+				}
+			]
+		}
+	},
+	{
+		"id" : "8",
+		"name" : "${diagramTemplate8}",
+		"description" : "${diagramTemplateDescription8}",
+		"seriesTemplate" : 
+		{
+			grid: {
+				drawGridlines: true,
+				gridLineColor: "#cccccc",
+				gridLineWidth: 1,
+				backgroundColor: "#fff6ed",
+				borderColor: "#999999",
+				borderWidth: 2,
+				shadow: true
+			},
+			animate : false,
+			animateReplot: false,
+			axes :
+			{
+				xaxis :
+				{
+					tickOptions :
+					{
+						formatString : '%d.%m.%y %H:%M',
+						angle : 37
+					}
+				}
+			},
+			cursor:
+			{
+				show: true,
+				zoom: true, 
+				showTooltip: true
+			},
+			legend:
+			{
+				show: true,
+				location: 's',
+				placement: 'outside',
+				xoffset: 12,
+				yoffset: 85,
+				rendererOptions:
+				{
+					seriesToggle: 'normal',
+					numberColumns: 4,
+					seriesToggleReplot:
+					{
+						resetAxes: false
+					}
+				}
+			},
+			seriesDefaults :
+			{
+				markerOptions :
+				{
+					style: 'filledCircle'
+				}
+			},
+			series :
+			[
+				{
+					lineWidth: 2,
+					showMarker: false,
+					rendererOptions:
+					{
+						smooth: true
+					}
+				}
+			]
+		}
+	}
 ]
\ No newline at end of file
diff --git a/HMserver/opt/HMServer/pages/AvailableFirmware.ftl b/HMserver/opt/HMServer/pages/AvailableFirmware.ftl
index 89151e36..6fb0dd6a 100644
--- a/HMserver/opt/HMServer/pages/AvailableFirmware.ftl
+++ b/HMserver/opt/HMServer/pages/AvailableFirmware.ftl
@@ -1,198 +1,201 @@
-<!DOCTYPE html>
-<html>
-  <head>
-
-  </head>
-  <body>
-   <table id="DeviceListTable" cellpadding="0" cellspacing="0">
-    <colgroup>
-      <col width="5%">
-      <col width="30%">
-      <col width="25%">
-      <col width="25%">
-      <col width="15%">
-    </colgroup>
-    <thead>
-      <tr>
-        <th class="DeviceListHead" name="thPic">${"$"}{thPicture}</th>
-        <th class="DeviceListHead" name="thName">${"$"}{thName}</th>
-        <th class="DeviceListHead" name="thVersion">${"$"}{thVersion}</th>
-        <th class="DeviceListHead" name="thMinCCU">${"$"}{thMinCCU}</th>
-        <th class="DeviceListHead" name="thAction">${"$"}{thAction}</th>
-      </tr>
-    </thead>
-    <tbody>
-
-      <!-- Creates the table rows with all available firmware versions -->
-      ${deviceRow}
-
-    </tbody>
-   </table>
-
-   <script type="text/javascript">
-   	  var s = "";
-   	  s += "<table cellspacing='8'>";
-   	  s += "<tr>";
-   	  s += "<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.goBack();'>"+ translateKey('footerBtnPageBack') +"</div></td>";
- 			s += "<td align='center' valign='middle'><div class='FooterButton' onclick='addNewFirware();'>"+ translateKey('footerBtnNew') +"</div></td>";
-      setFooter(s);
-
-      deleteFirmware = function(fwID, devName) {
-        //new YesNoDialog("title - Bestaetigung","body - Wollen Sie die Firmware wirklich vom System entfernen?",function(result) {
-        new YesNoDialog(translateKey("delDevFirmwareMsgTitle"),translateKey("delDevFirmwareMsgBody"),function(result) {
-          if (result == YesNoDialog.RESULT_YES) {
-            var url = '/pages/jpages/system/DeviceFirmware/deleteFirmware?sid=' + SessionId;
-            var pb ='{';
-            pb += '"firmwareID": ' + '"' + fwID + '",';
-            pb += '"deviceName": ' + '"' + devName + '"';
-            pb += '}'
-            var opt= {
-              postBody: pb,
-              onComplete: function(t) {
-                var response = JSON.parse(t.responseText);
-                //jQuery("#content").html(response.content);
-                if(!response.isSuccessful)
-                {
-                  if(response.errorCode == "42")
-                  {
-                    jQuery("#content").html(translateString(response.content));
-                  } else {
-                    alert("deleteFirmware: Something very strange happend here :-(");
-                  }
-                } else {
-                    // all right
-                    MessageBox.show("Delete firmware", translateString(response.content));
-                    WebUI.reload();
-                    var ok = homematic("Interface.refreshDeployedDeviceFirmwareList", {"interface": "BidCos-RF"});
-                    conInfo("Delete firmware - refreshing device firmware list: " + ok);
-                }
-              }
-            }
-            new Ajax.Request(url, opt);
-          }
-        });
-      };
-
-      addNewFirware = function() {
-        try {
-          var tmp = new FormData();
-        } catch(e) {
-          addFirmwareOldFashioned(); // IE8 u. IE9
-          return;
-        }
-        var file;
-        //var msgContent = "<b>Waehle die gewuenschte Firmware:</b><br/><br/>";
-        var msgContent = "<b>"+translateKey("addFirmwareMsgBody")+"</b><br/><br/>";
-
-        msgContent += "<form id='fileupload' name='fileupload' enctype='multipart/form-data' method='post'>"
-        msgContent += "  <fieldset>"
-        msgContent += "    <input type='file' name='fileselect' id='fileselect'></input>"
-        msgContent += "  </fieldset>"
-        msgContent += "</form>"
-
-        new YesNoDialog(translateKey("addFirmwareMsgTitle"),msgContent, function(result) {
-          if (result == YesNoDialog.RESULT_YES) {
-
-          var formData = new FormData();
-          formData.append('file', file);
-          var url = '/pages/jpages/system/DeviceFirmware/addFirmware?sid=' + SessionId;
-
-            jQuery.ajax({
-              url: url,
-              type: "post",
-              data: formData,
-              processData:false,
-              contentType: false,
-              success: function(result) {
-                MessageBox.show(translateKey("dialogInfo"),translateString(result), null,"320", "80");
-                WebUI.reload();
-                var ok = homematic("Interface.refreshDeployedDeviceFirmwareList", {"interface": "BidCos-RF"});
-                conInfo("Add firmware - refreshing device firmware list: " + ok);
-              },
-              error: function(error) {
-              conInfo(error.statusText);
-              }
-            });
-          }
-        }, "html");
-
-        // Set an event listener on the Choose File field.
-        jQuery("#fileselect").bind("change", function(e) {
-          jQuery(".YesNoDialog_yesButton").show();
-          var files = e.target.files || e.dataTransfer.files;
-          // Our file var now holds the selected file
-          file = files[0];
-        });
-
-        jQuery(".YesNoDialog_yesButton").hide().text(translateKey("dialogSettingsCMBtnPerformSoftwareUpdateUpload"));
-        jQuery(".YesNoDialog_noButton").text(translateKey("btnCancel"));
-      };
-
-      // This is for IE8 and IE9 neccessary
-      addFirmwareOldFashioned = function() {
-
-        var msgContent = "<b>"+translateKey("addFirmwareMsgBody")+"</b><br/><br/>";
-        msgContent += "<form id='uploadForm' action='/pages/jpages/system/DeviceFirmware/addFirmware?sid="+SessionId+"' method='post' enctype='multipart/form-data'>";
-          msgContent += "Firmware: <input type='file' name='file' />";
-          msgContent += "<br/><br/><div style='text-align:right;'><input id='btnSubmit' type='submit' value='"+translateKey('dialogSettingsCMBtnPerformSoftwareUpdateUpload')+"' /></div>";
-        msgContent += "</form>";
-
-        ynDlg = new YesNoDialog(translateKey("addFirmwareMsgTitle"),msgContent, function(result){
-
-        },"html");
-
-        var options = {
-          success: function(response) {
-            ynDlg.close();
-            MessageBox.show(translateKey("dialogInfo"),translateString(response), null,"320", "80");
-            WebUI.reload();
-            var ok = homematic("Interface.refreshDeployedDeviceFirmwareList", {"interface": "BidCos-RF"});
-            conInfo("Add firmware - refreshing device firmware list: " + ok);
-          }
-        };
-
-        jQuery('#uploadForm').submit(function() {
-          jQuery(this).ajaxSubmit(options);
-            return false;
-        });
-
-        jQuery('#btnSubmit').live("submit",function(event) {
-          event.prefentDefault();
-        });
-
-        jQuery(".YesNoDialog_yesButton").hide().text(translateKey("btnUpload"));
-        jQuery(".YesNoDialog_noButton").text(translateKey("btnCancel"));
-
-      };
-
-      showChangelog = function(fwID) {
-          var url = '/pages/jpages/system/DeviceFirmware/showChangelog?sid=' + SessionId;
-          var pb ='{';
-          pb += '"firmwareID": ' + '"' + fwID + '"';
-          pb += '}'
-          var opt= {
-            postBody: pb,
-            onComplete: function(t) {
-              var response = JSON.parse(t.responseText);
-              if(!response.isSuccessful)
-              {
-                if(response.errorCode == "42")
-                {
-                  jQuery("#content").html(translateString(response.content));
-                } else {
-                  alert("Show changelog: Something very strange happend here :-(");
-                }
-              } else {
-                  // all right
-                  MessageBox.show(translateKey("dialogChangeLogTitle"), translateString(response.content),"", "600", "400");
-              }
-            }
-          }
-          new Ajax.Request(url, opt);
-      };
-
-      translatePage();
-
-   </script>
-  </body>
-</html>
+<!DOCTYPE html>
+<html>
+  <head>
+
+  </head>
+  <body>
+   <table id="DeviceListTable" cellpadding="0" cellspacing="0">
+    <colgroup>
+      <col width="5%">
+      <col width="30%">
+      <col width="25%">
+      <col width="25%">
+      <col width="15%">
+    </colgroup>
+    <thead>
+      <tr>
+        <th class="DeviceListHead" name="thPic">${"$"}{thPicture}</th>
+        <th class="DeviceListHead" name="thName">${"$"}{thName}</th>
+        <th class="DeviceListHead" name="thVersion">${"$"}{thVersion}</th>
+        <th class="DeviceListHead" name="thMinCCU">${"$"}{thMinCCU}</th>
+        <th class="DeviceListHead" name="thAction">${"$"}{thAction}</th>
+      </tr>
+    </thead>
+    <tbody>
+
+      <!-- Creates the table rows with all available firmware versions -->
+      ${deviceRow}
+
+    </tbody>
+   </table>
+
+   <script type="text/javascript">
+   	  var s = "";
+   	  s += "<table cellspacing='8'>";
+   	  s += "<tr>";
+   	  s += "<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.goBack();'>"+ translateKey('footerBtnPageBack') +"</div></td>";
+ 			s += "<td align='center' valign='middle'><div class='FooterButton' onclick='addNewFirware();'>"+ translateKey('footerBtnNew') +"</div></td>";
+      setFooter(s);
+
+      deleteFirmware = function(fwID, devName) {
+        //new YesNoDialog("title - Bestaetigung","body - Wollen Sie die Firmware wirklich vom System entfernen?",function(result) {
+        new YesNoDialog(translateKey("delDevFirmwareMsgTitle"),translateKey("delDevFirmwareMsgBody"),function(result) {
+          if (result == YesNoDialog.RESULT_YES) {
+            var url = '/pages/jpages/system/DeviceFirmware/deleteFirmware?sid=' + SessionId;
+            var pb ='{';
+            pb += '"firmwareID": ' + '"' + fwID + '",';
+            pb += '"deviceName": ' + '"' + devName + '"';
+            pb += '}'
+            var opt= {
+              postBody: pb,
+              onComplete: function(t) {
+                var response = JSON.parse(t.responseText);
+                //jQuery("#content").html(response.content);
+                if(!response.isSuccessful)
+                {
+                  if(response.errorCode == "42")
+                  {
+                    jQuery("#content").html(translateString(response.content));
+                  } else {
+                    alert("deleteFirmware: Something very strange happend here :-(");
+                  }
+                } else {
+                    // all right
+                    MessageBox.show("Delete firmware", translateString(response.content));
+                    WebUI.reload();
+                    var ok = homematic("Interface.refreshDeployedDeviceFirmwareList", {"interface": "BidCos-RF"});
+                    homematic("Interface.refreshDeployedDeviceFirmwareList", {"interface": "HmIP-RF"});
+                    conInfo("Delete firmware - refreshing device firmware list: " + ok);
+                }
+              }
+            }
+            new Ajax.Request(url, opt);
+          }
+        });
+      };
+
+      addNewFirware = function() {
+        try {
+          var tmp = new FormData();
+        } catch(e) {
+          addFirmwareOldFashioned(); // IE8 u. IE9
+          return;
+        }
+        var file;
+        //var msgContent = "<b>Waehle die gewuenschte Firmware:</b><br/><br/>";
+        var msgContent = "<b>"+translateKey("addFirmwareMsgBody")+"</b><br/><br/>";
+
+        msgContent += "<form id='fileupload' name='fileupload' enctype='multipart/form-data' method='post'>"
+        msgContent += "  <fieldset>"
+        msgContent += "    <input type='file' name='fileselect' id='fileselect'></input>"
+        msgContent += "  </fieldset>"
+        msgContent += "</form>"
+
+        new YesNoDialog(translateKey("addFirmwareMsgTitle"),msgContent, function(result) {
+          if (result == YesNoDialog.RESULT_YES) {
+
+          var formData = new FormData();
+          formData.append('file', file);
+          var url = '/pages/jpages/system/DeviceFirmware/addFirmware?sid=' + SessionId;
+
+            jQuery.ajax({
+              url: url,
+              type: "post",
+              data: formData,
+              processData:false,
+              contentType: false,
+              success: function(result) {
+                MessageBox.show(translateKey("dialogInfo"),translateString(result), null,"320", "80");
+                WebUI.reload();
+                var ok = homematic("Interface.refreshDeployedDeviceFirmwareList", {"interface": "BidCos-RF"});
+                homematic("Interface.refreshDeployedDeviceFirmwareList", {"interface": "HmIP-RF"});
+                conInfo("Add firmware - refreshing device firmware list: " + ok);
+              },
+              error: function(error) {
+              conInfo(error.statusText);
+              }
+            });
+          }
+        }, "html");
+
+        // Set an event listener on the Choose File field.
+        jQuery("#fileselect").bind("change", function(e) {
+          jQuery(".YesNoDialog_yesButton").show();
+          var files = e.target.files || e.dataTransfer.files;
+          // Our file var now holds the selected file
+          file = files[0];
+        });
+
+        jQuery(".YesNoDialog_yesButton").hide().text(translateKey("dialogSettingsCMBtnPerformSoftwareUpdateUpload"));
+        jQuery(".YesNoDialog_noButton").text(translateKey("btnCancel"));
+      };
+
+      // This is for IE8 and IE9 neccessary
+      addFirmwareOldFashioned = function() {
+
+        var msgContent = "<b>"+translateKey("addFirmwareMsgBody")+"</b><br/><br/>";
+        msgContent += "<form id='uploadForm' action='/pages/jpages/system/DeviceFirmware/addFirmware?sid="+SessionId+"' method='post' enctype='multipart/form-data'>";
+          msgContent += "Firmware: <input type='file' name='file' />";
+          msgContent += "<br/><br/><div style='text-align:right;'><input id='btnSubmit' type='submit' value='"+translateKey('dialogSettingsCMBtnPerformSoftwareUpdateUpload')+"' /></div>";
+        msgContent += "</form>";
+
+        ynDlg = new YesNoDialog(translateKey("addFirmwareMsgTitle"),msgContent, function(result){
+
+        },"html");
+
+        var options = {
+          success: function(response) {
+            ynDlg.close();
+            MessageBox.show(translateKey("dialogInfo"),translateString(response), null,"320", "80");
+            WebUI.reload();
+            var ok = homematic("Interface.refreshDeployedDeviceFirmwareList", {"interface": "BidCos-RF"});
+            homematic("Interface.refreshDeployedDeviceFirmwareList", {"interface": "HmIP-RF"});
+            conInfo("Add firmware - refreshing device firmware list: " + ok);
+          }
+        };
+
+        jQuery('#uploadForm').submit(function() {
+          jQuery(this).ajaxSubmit(options);
+            return false;
+        });
+
+        jQuery('#btnSubmit').live("submit",function(event) {
+          event.prefentDefault();
+        });
+
+        jQuery(".YesNoDialog_yesButton").hide().text(translateKey("btnUpload"));
+        jQuery(".YesNoDialog_noButton").text(translateKey("btnCancel"));
+
+      };
+
+      showChangelog = function(fwID) {
+          var url = '/pages/jpages/system/DeviceFirmware/showChangelog?sid=' + SessionId;
+          var pb ='{';
+          pb += '"firmwareID": ' + '"' + fwID + '"';
+          pb += '}'
+          var opt= {
+            postBody: pb,
+            onComplete: function(t) {
+              var response = JSON.parse(t.responseText);
+              if(!response.isSuccessful)
+              {
+                if(response.errorCode == "42")
+                {
+                  jQuery("#content").html(translateString(response.content));
+                } else {
+                  alert("Show changelog: Something very strange happend here :-(");
+                }
+              } else {
+                  // all right
+                  MessageBox.show(translateKey("dialogChangeLogTitle"), translateString(response.content),"", "600", "400");
+              }
+            }
+          }
+          new Ajax.Request(url, opt);
+      };
+
+      translatePage();
+
+   </script>
+  </body>
+</html>
diff --git a/HMserver/opt/HMServer/pages/DiagramControlListPage.ftl b/HMserver/opt/HMServer/pages/DiagramControlListPage.ftl
index 0880f8c9..9be391fb 100644
--- a/HMserver/opt/HMServer/pages/DiagramControlListPage.ftl
+++ b/HMserver/opt/HMServer/pages/DiagramControlListPage.ftl
@@ -1,1406 +1,1427 @@
-<html>
-<head>
-<style>
-.StdButtonBig {
-	padding-right: 12px;
-	padding-left: 12px;
-}
-.hideAtStart {
-	visibility:hidden;
-}
-#legendTooltip {
-	color:#192C6E;
-	position:absolute;
-	top:-14px;
-	right:-5px;
-	font-weight:bold;
-}
-#
-</style>
-
-<script language="text/javascript">
-	var selectedDiagramId;
-  var noDiagramData = true;
-	var refreshDiagramOnRefreshTimeout;
-	var lastDiagramSettingsAsJson;
-	var showComparisonPeriod = false;
-	var comparisonLegendExtension = "";
-	var timePeriod = "unknown";
-	var defaultPeriod = undefined;
-	var origXAxis = {};
-	var diagramRenderer = undefined;
-	var barRenderer = false;
-	var selectedPeriod = -1; // -1 = unknown, 0 = hour, 1 = day, 2 = week, 3 = month, 4 = year
-	var arPeriod = ["hour", "24h", "week", "month", "year"];
-	var arTicks = ["10 minutes", "60 minutes", "1440 minutes", "2880 minutes", "52560 minutes"]; 	// 0 = hour, 1 = day, 2 = week, 3 = month, 4 = year
-	var numberOfDataSets = 1;
-	var diagramElem = jQuery('#currentDiagram');
-	var btnPeriodDay = jQuery('#selectPeriodLastDay');
-	var btnPeriodWeek = jQuery('#selectPeriodLastWeek');
-	var btnPeriodMonth = jQuery('#selectPeriodLastMonth');
-	var btnPeriodYear = jQuery('#selectPeriodLastYear');
-	var btnComparisonPeriod = jQuery('#showComparisonPeriod');
-	var selBoxComparisonDevice = jQuery('#selectDeviceForComparisonPeriod');
-	var lblNoDataAvailable = jQuery("#hintNoDataAvailable");
-	var consolidationElem = jQuery('#selectConsolidationFunction');
-	var debug = jQuery.url().param('debug');
-	var createDummy = jQuery.url().param('createDummy');
-  var curDate = new Date();
-  var comparisonSelectedDevice = 0;
-  var numberOfDevices = 1;
-  var consolidationMode = 0;
-
-	function initSite() {
-		jQuery('#contentRight').css('visibility','hidden');
-		setPath("<span onclick='WebUI.enter(ControlPage);'>"+translateKey('menuControlPage')+"</span> &gt; "+ translateKey('submenuDiagramListPage'));
-		var s = "";
-		s += "<table cellspacing='8'>";
-		s += "<tr>";
-		s += "<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.goBack();'>"+ translateKey('footerBtnPageBack') +"</div></td>";	  
-		s += "</tr>";
-		s += "</table>";
-		setFooter(s);
-		translateButtons("diagramPeriodLastHour, diagramPeriodLastDay, diagramPeriodLastWeek, diagramPeriodLastMonth, diagramPeriodLastYear, btnDiagramRepaint, btnDiagramExport, btnDiagramResetDiagramZoom, btnDiagramShowComparisonPeriod");
-		translatePage("#${TableId}");
-		jQuery("#${TableId}").show();
-	};
-
-  function storeOrigXAxisTimePeriod(min, max) {
-    origXAxis.min = min;
-    origXAxis.max = max;
-  };
-
-  function getComparisonOptions() {
-    return {
-      label: translateKey("diagramComparisonPeriod") + ": " + translateKey(comparisonLegendExtension),
-      lineWidth: 1,
-      rendererOptions: {smooth: true},
-      showMarker: false
-    };
-  }
-
-  function getComparisonColor(deviceColor) {
-    /* Currently not in use
-    var compColor = {
-      "#FF0000" : "#1E1E1E", // Rot
-      "#00FF00" : "#2D2D2D", // Grün
-      "#0000FF" : "#3D3D3D", // Blau
-      "#FFFF00" : "#4C4D4C", // Gelb
-      "#FF00FF" : "#5B5B5B", // Magenta
-      "#00FFFF" : "#6B6B6B", // Zyan
-      "#FF9900" : "#7A7A7A", // Orange
-      "#9999FF" : "#898989", // Schieferblau
-      "#339966" : "#999999", // Meeresgrün
-      "#993366" : "#A3A3A3", // Violet
-      "#33CCD2" : "#ADADAD", // Türkis
-      "#FFCC99" : "#B7B7B7", // Weizen
-      "#666699" : "#C1C1C1", // Dunkles Schieferblau
-      "#FF8080" : "#CCCCCC", // Lachsrosa
-    }
-    return compColor[deviceColor];
-    */
-    return "#7A7A7A";
-  }
-
-  function getSelectedDeviceForComparison() {
-    return comparisonSelectedDevice;
-  }
-
-  function getBarGraphXAxis(period) {
-    // period > 0 = hour, 1 = today, 2 = this week, 3 = this month, 4 = this year
-    var d = curDate;
-    var result = {}
-    switch (arPeriod[period]) {
-       case 0:
-        // Todo default
-        // hour not used
-        break;
-      case "24h":
-        var date = parseInt(d.getMonth() + 1) + "-" +d.getDate() + "-" + d.getFullYear()+" ";
-        result.min = date + "00:00";
-        result.max = date + "24:00";
-        result.tickInterval = "1 hours";
-        result.timeFormatString = "%H:%M";
-        comparisonLegendExtension = "diagramComparisonYesterday";
-        break;
-      case "week":
-        result.min = parseInt(d.getMonth() + 1) + "-" +((d.getDate()-(d.getDay()-1)))+"-"+d.getFullYear()+ " 0:00";
-        result.max = parseInt(d.getMonth() + 1) + "-" +((d.getDate()-(d.getDay()-1))+6)+"-"+d.getFullYear()+ " 24:00";
-        result.tickInterval = "1 day";
-        result.timeFormatString = "%d.%m.%y";
-        comparisonLegendExtension = "diagramComparisonLastWeek";
-        break;
-      case "month":
-         result.min = parseInt(d.getMonth() + 1) + "-1-" + d.getFullYear()+" 00:00";
-        result.max = parseInt(d.getMonth() + 1) + "-30-" + d.getFullYear()+" 24:00";
-        result.tickInterval = "1 day";
-        result.timeFormatString = "%d.%m.%y";
-        comparisonLegendExtension = "diagramComparisonLastMonth";
-        break;
-      case "year":
-        result.min = "1-1-" + d.getFullYear()+" 00:00";
-        result.max = "12-31-" + d.getFullYear()+" 24:00";
-        result.tickInterval = "1 month";
-        result.timeFormatString = "%m.%y";
-        comparisonLegendExtension = "diagramComparisonLastYear";
-        break;
-    }
-    return result;
-  };
-
-  // Mode = int 1 - 3
-  function setButtonText(mode) {
-    var strippedPeriod = [
-      translateKey("diagramPeriodToday"),
-      translateKey("diagramPeriodThisWeek"),
-      translateKey("diagramPeriodThisMonth"),
-      translateKey("diagramPeriodThisYear")
-    ],
-    fullPeriod = [
-      translateKey("diagramPeriodLastDay"),
-      translateKey("diagramPeriodLastWeek"),
-      translateKey("diagramPeriodLastMonth"),
-      translateKey("diagramPeriodLastYear")
-    ];
-    var result;
-    if (mode == 3) {
-      // User defined
-      result = jQuery.merge([], fullPeriod);
-    } else {
-      // Temperature and Power
-      result = jQuery.merge([], strippedPeriod);
-    }
-    btnPeriodDay.val(result[0]);
-    btnPeriodWeek.val(result[1]);
-    btnPeriodMonth.val(result[2]);
-    btnPeriodYear.val(result[3]);
-  };
-
-  function getConsolitation() {
-   return consolidationMode;
-  };
-
-	function setRenderer(id) {
-    if (id == 3) {
-      diagramRenderer = jQuery.jqplot.BarRenderer;
-      barRenderer = true;
-    } else {
-      diagramRenderer = undefined;
-      barRenderer = false;
-    }
-	};
-
-  function getBarWidth() {
-    return null; // The with of the bars will be calculated automatically
-
-    var viewPortWidth = jQuery(window).width();
-    var factor = (showComparisonPeriod == false) ? 80 : 160;
-    var singleBarWidth = parseInt(viewPortWidth / factor);
-    return parseInt(singleBarWidth / (numberOfDataSets + 2));
-  };
-
-  function getNumberOfData(valToCheck, sizeOfData) {
-    var numberOfData = 0;
-    if (sizeOfData >= valToCheck) {
-      numberOfData = valToCheck;
-    } else {numberOfData = sizeOfData;}
-    return numberOfData;
-  };
-
-  function getMinMaxValue(data, sMode) {
-    var value = 0;
-    var result = 0;
-    var numberOfData = 0;
-    var sizeOfData; // = data.size() - 1;
-    var date = curDate;
-    var periodSelector;
-    var arValues = [];
-    switch (arPeriod[selectedPeriod]) {
-      case "24h" :
-        periodSelector = date.getHours();
-        break;
-      case "week" :
-        var weekDay = date.getDay();
-        //periodSelector = (weekDay==0) ? 6 : weekDay; // Su = 6, Mo = 1, Di = 2 .....
-        periodSelector = 6;
-        break;
-      case "month" :
-        periodSelector = date.getDate();
-        break;
-      case "year" :
-       periodSelector = date.getMonth() + 1;
-        break;
-      default:
-        periodSelector = 0;
-        value = 1000;
-        break;
-    }
-
-    jQuery.each(data, function(index, valueSet) {
-      arValues = valueSet;
-      sizeOfData = arValues.size() - 1;
-      numberOfData = getNumberOfData(periodSelector, sizeOfData);
-      for (var x = (sizeOfData - numberOfData); x <= sizeOfData; x++) {
-          //conInfo(x + " - " + data[x]);
-          result = arValues[x];
-          if (sMode == "max") {
-            if (result > value) {
-              value = result;
-            }
-          } else if(sMode == "min") {
-            if (result < value) {
-              value = result;
-            }
-          }
-        }
-      });
-      if (sMode == "max") {value = value + (value * 0.1) ;}
-      if (sMode == "min") {value = value - (value * 0.1) ;}
-
-      return value;
-  };
-
-  function y2k(number) { return (number < 1000) ? number + 1900 : number; };
-
-  function getWeekNumber(year,month,day) {
-      var when = new Date(year,month,day);
-      var newYear = new Date(y2k(year),0,1);
-      var modDay = newYear.getDay();
-      if (modDay == 0) modDay=6; else modDay--;
-      var daynum = ((Date.UTC(y2k(year),when.getMonth(),when.getDate(),0,0,0) -
-                   Date.UTC(y2k(year),0,1,0,0,0)) /1000/60/60/24) + 1;
-
-      if (modDay < 4 ) {
-          var weeknum = Math.floor((daynum+modDay-1)/7)+1;
-      }
-      else {
-          var weeknum = Math.floor((daynum+modDay-1)/7);
-          if (weeknum == 0) {
-              year--;
-              var prevNewYear = new Date(year,0,1);
-              var prevmodDay = prevNewYear.getDay();
-              if (prevmodDay == 0) prevmodDay = 6; else prevmodDay--;
-              if (prevmodDay < 4) weeknum = 53; else weeknum = 52;
-          }
-      }
-      return + weeknum;
-  };
-
-  // Returns the hour of the diagram data timestamp
-  function getHour(timeStamp) {
-    var tmp = timeStamp.split(" ");
-    var PM = timeStamp.indexOf("PM");
-    var result =  tmp[1].split(":")[0]; // hour of the timestamp
-
-    // This is necessary for the IE (at least version 8)
-    // This amazing browser interprets a 'parseInt("01")' as 0 instead of 1;
-    result = parseInt(result, 10);
-
-    if (PM != -1 && result != 12) {
-      result+=12;
-    }
-    // 12:00AM = 0:00AM
-    if (PM == -1 && result == 12) {
-      result-=12;
-    }
-    return result;
-  };
-
-  // Returns the day of the diagram data timestamp
-  function getDayOfTheWeek(timeStamp) {
-    var oStampDate = getStampDateObject(timeStamp);
-    var date = new Date(oStampDate.year, oStampDate.month - 1, oStampDate.day);
-    if (date.getDay() == 0) {return 6;} // Sunday
-    return (date.getDay() - 1);
-  };
-
-  function getDayOfTheMonth(timeStamp) {
-    var oStampDate = getStampDateObject(timeStamp);
-    return oStampDate.day - 1;
-  };
-
-  function getMonthOfTheYear(timeStamp) {
-    var oStampDate = getStampDateObject(timeStamp);
-    return oStampDate.month - 1;
-  };
-
-  function getStampDateObject(timeStamp) {
-    var result = {};
-    var stampDate = timeStamp.split(" ");
-    var arStampDate = stampDate[0].split("-");
-
-    // IMPORTANT use parseInt with radix 10. Otherwise some browser (e.g. IE8) will not work properly.
-    // Without the radix the IE8 will return 0 instead of 8 with 'parseInt("08")'
-    result.day = parseInt(arStampDate[2], 10);
-    result.month = parseInt(arStampDate[1], 10);
-    result.year = parseInt(arStampDate[0], 10);
-    return result;
-  };
-
-  // Checks if it is todays timestamp
-  function isValidDay(timeStamp, bComparisonPeriod) {
-    var oStampDate = getStampDateObject(timeStamp);
-    var date = curDate;
-    var dateYesterday = new Date();
-    if (!bComparisonPeriod) {
-      if ((date.getDate() == oStampDate.day) && (parseInt(date.getMonth() + 1) == oStampDate.month) && (date.getFullYear() == oStampDate.year)) return true;
-    } else {
-        dateYesterday.setDate(date.getDate() - 1); // yesterday
-        if (((parseInt(dateYesterday.getDate())) == parseInt(oStampDate.day)) && (parseInt(dateYesterday.getMonth() + 1) == oStampDate.month) && (dateYesterday.getFullYear() == oStampDate.year)) return true;
-    }
-    return false;
-  };
-
-  function isValidWeek(timeStamp, bComparisonPeriod) {
-    var oStampDate = getStampDateObject(timeStamp);
-    var date = curDate;
-    var dateLastWeek = new Date();
-    var curWeek = getWeekNumber(date.getYear(), date.getMonth(), date.getDate()); // the current week number
-    var weekOfTimeStamp = getWeekNumber(oStampDate.year, oStampDate.month - 1, oStampDate.day); // the week number of the timestamp
-
-    if (!bComparisonPeriod) {
-      if (curWeek == weekOfTimeStamp) return true;
-    } else {
-      dateLastWeek.setDate(date.getDate() - 7); // last week
-      var lastWeek = getWeekNumber(dateLastWeek.getYear(), dateLastWeek.getMonth(), dateLastWeek.getDate()); // the week number of last week
-      if (parseInt(lastWeek) == parseInt(weekOfTimeStamp)){return true;}
-    }
-    return false;
-  };
-
-  function isValidMonth(timeStamp, bComparisonPeriod) {
-    var oStampDate = getStampDateObject(timeStamp);
-    var date = curDate;
-    var dateLastMonth = new Date();
-    if (!bComparisonPeriod) {
-      if (oStampDate.month == (parseInt(date.getMonth()) + 1)) return true;
-    } else {
-      dateLastMonth.setMonth(date.getMonth() - 1);
-      if ((parseInt(oStampDate.month) - 1) == parseInt(dateLastMonth.getMonth())) return true;
-    }
-    return false;
-  };
-
-  function isValidYear(timeStamp, bComparisonPeriod) {
-    var oStampDate = getStampDateObject(timeStamp);
-    var date = curDate;
-    if (!bComparisonPeriod) {
-      if (oStampDate.year == date.getFullYear()) return true;
-    } else {
-      if (parseInt(oStampDate.year) == (date.getFullYear() - 1)) return true;
-    }
-    return false;
-  };
-
-  function isValidDataSet(timeStamp, bComparison) {
-    var result = false;
-    switch (arPeriod[selectedPeriod]) {
-      case "24h":
-        result = isValidDay(timeStamp, bComparison);
-        break;
-      case "week":
-        result = isValidWeek(timeStamp, bComparison);
-        break;
-      case "month":
-        result = isValidMonth(timeStamp, bComparison);
-        break;
-     case "year":
-        result = isValidYear(timeStamp, bComparison);
-        break;
-    }
-    return result;
-  };
-
-  function getIndexOfDataSet(timeStamp) {
-    var result;
-    switch (arPeriod[selectedPeriod]) {
-      case "24h":
-        result = getHour(timeStamp);
-        break;
-      case "week":
-        result = getDayOfTheWeek(timeStamp);
-        break;
-      case "month":
-        result = getDayOfTheMonth(timeStamp);
-        break;
-      case "year":
-        result = getMonthOfTheYear(timeStamp);
-        break;
-    }
-    return result;
-  };
-
-  // Converts the data for the use of the CategoryAxisRenderer instead of the DateAxisRenderer
-  function stripDiagramData(data) {
-    var result = [];
-    var tmp,timeStamp, value;
-    jQuery.each(data,function(index, valueSet) {
-      tmp = [];
-      // Begin at the end of the values and leave the for-loop when there are no more appropriate valuesets.
-      for (var x = valueSet.size() - 1; x >= 0; x--) {
-        timeStamp = valueSet[x][0];
-        if(isValidDataSet(timeStamp, false)) {
-          value = valueSet[x][1];
-          tmp[getIndexOfDataSet(timeStamp)] = value;
-        } else {
-          break;
-        }
-      }
-      result.push(tmp);
-    });
-    return result;
-  };
-
-  function getCompareData(data) {
-    var tmpData = [];
-    jQuery.extend(true, tmpData, data);
-    var result = [];
-    var tmp,timeStamp, value;
-
-    // Delete all entries of the current period - e. g. today or this week
-    jQuery.each(data,function(index, valueSet) {
-      if (valueSet) {
-        // Checks if this is the current period, e. g. today or this week
-        // If it´s true then delete this entry
-        timeStamp = valueSet[0];
-        if(isValidDataSet(timeStamp, false)) {
-          // remove the value from the end of the dataset
-          tmpData.splice(-1,1);
-        }
-      }
-    });
-    // Now the dataset contains all values without the current period
-
-    // Take all data of the previous period
-    jQuery.each(tmpData, function(index, valueSet) {
-      tmp = [];
-      timeStamp = valueSet[0];
-      // Check if the dataset contains the data of the previous period - e. g. yesterday or last week
-      if (isValidDataSet(timeStamp, true)) {
-       value = valueSet[1];
-       tmp[getIndexOfDataSet(timeStamp)] = value
-       result[getIndexOfDataSet(timeStamp)] = value;
-      }
-    });
-    // Now the dataset contains all values of the previous period
-    return result;
-  }
-
-  function getNumberOfDaysInMonth(month, fullYear) {
-    return 32 - new Date(fullYear, month, 32).getDate();
-  };
-
-  function getTickInterval() {
-    return arTicks[selectedPeriod];
-  };
-
-  function getBarGraphRenderOptions() {
-    return {
-      "barWidth" : getBarWidth(),
-      "highlightMouseOver" : false,
-      "waterfall" : false,
-      "fillToZero" : true,
-      "shadow" : false,
-    };
-  };
-
-  function getBarGraphTicks() {
-    var arTicks = [];
-    switch (arPeriod[selectedPeriod]) {
-      case "24h":
-        for(x = 0; x < 24; x++) {
-          arTicks.push(x.toString());
-        }
-        break;
-      case "week":
-        var arWeekDays = [
-          translateKey("Mon"),
-          translateKey("Tue"),
-          translateKey("Wed"),
-          translateKey("Thu"),
-          translateKey("Fri"),
-          translateKey("Sat"),
-          translateKey("Sun")
-          ];
-        for(x = 0; x < 7; x++) {
-          arTicks.push(arWeekDays[x]);
-        }
-        break;
-      case "month":
-        for (x = 1; x <= getNumberOfDaysInMonth(curDate.getMonth(), curDate.getFullYear()); x++) {
-          arTicks.push(x.toString());
-        }
-        break;
-      case "year":
-        var arMonth = [
-        translateKey("Jan"),
-        translateKey("Feb"),
-        translateKey("Mar"),
-        translateKey("Apr"),
-        translateKey("May"),
-        translateKey("Jun"),
-        translateKey("Jul"),
-        translateKey("Aug"),
-        translateKey("Sep"),
-        translateKey("Oct"),
-        translateKey("Nov"),
-        translateKey("Dec")
-        ];
-        for (x = 0; x <= 11; x++) {
-          arTicks.push(arMonth[x]);
-        }
-        break;
-    }
-    return arTicks;
-  }
-
-  function resetAllBtn() {
-    jQuery(".jPeriodButton").css("color","#000000");
-  }
-
-	function setSelectedBtn(mode) {
-    var arMode = ["Hour","Day","Week","Month","Year"];
-	  resetAllBtn();
-	  jQuery("#selectPeriodLast"+arMode[mode]).css("color","green");
-	};
-
-  function setTimeSelectors() {
-    jElemsDate = jQuery("#selectPeriodStartDate, #selectPeriodEndDate");
-    jElemsTime = jQuery("#selectPeriodStartTime, #selectPeriodEndTime");
-
-    if (consolidationMode == 3) {
-      jElemsDate.attr("readonly", true);
-      jElemsTime.attr("readonly", true);
-      jQuery(".datepicker").datepicker("disable");
-      jQuery(".timepicker").timepicker("disable");
-    } else {
-      jElemsDate.attr("readonly", false);
-      jElemsTime.attr("readonly", false);
-      jQuery(".datepicker").datepicker("enable");
-      jQuery(".timepicker").timepicker("enable");
-    }
-  };
-
-	function initGui() {
-		jQuery(window).unbind('resize');
-		jQuery(window).resize(function() {
-			clearTimeout(refreshDiagramOnRefreshTimeout);
-			refreshDiagramOnRefreshTimeout = setTimeout(doneResizing, 250);
-		});
-
-		setTimeSelectors();
-
-		jQuery("#selectConsolidationFunction").change(function() {
-		  consolidationMode = this.value;
-      setTimeSelectors();
-      setRenderer(this.value);
-      refreshDiagram();
-		});
-
-    jQuery("#selectPeriodLastHour").click(function() {
-      defaultPeriod = 0;
-      timePeriod = arPeriod[defaultPeriod];
-      showPeriod(defaultPeriod);
-      refreshDiagram();
-    });
-
-		btnPeriodDay.click(function() {
-      defaultPeriod = 1;
-      timePeriod = arPeriod[defaultPeriod];
-      showPeriod(defaultPeriod);
-			refreshDiagram();
-		});
-			
-		btnPeriodWeek.click(function() {
-      defaultPeriod = 2;
-      timePeriod = arPeriod[defaultPeriod];
-      showPeriod(defaultPeriod);
-			refreshDiagram();
-		});
-		
-		btnPeriodMonth.click(function() {
-      defaultPeriod = 3;
-      timePeriod = arPeriod[defaultPeriod];
-      showPeriod(defaultPeriod);
-			refreshDiagram();
-		});
-		
-		btnPeriodYear.click(function() {
-      defaultPeriod = 4;
-      timePeriod = arPeriod[defaultPeriod];
-      showPeriod(defaultPeriod);
-			refreshDiagram();
-		});
-		
-		jQuery("#selectPeriodDo").click(function() {
-			refreshDiagram();
-		});
-		
-		jQuery("#exportPeriodDo").click(function() {
-			exportDiagram();
-		});
-		
-		jQuery("#resetDiagramZoom").click(function() {
-			resetDiagramZoom();
-		});
-
-		btnComparisonPeriod.click(function() {
-
-		  if (!noDiagramData) {
-		    comparisonSelectedDevice = 0;
-		    showComparisonPeriod = (showComparisonPeriod == true) ? false : true;
-        (showComparisonPeriod == true && (numberOfDevices > 1)) ? selBoxComparisonDevice.show() : selBoxComparisonDevice.hide();
-		    ShowDiagram(lastDiagramSettingsAsJson);
-		  }
-		});
-
-		selBoxComparisonDevice.change(function() {
-		   comparisonSelectedDevice = this.value;
-		   showComparisonPeriod = true;
-		   ShowDiagram(lastDiagramSettingsAsJson);
-		});
-
-    // Only for testing
-    jQuery("#toggleRenderer").click(function() {
-      if (diagramRenderer == undefined) {
-        diagramRenderer = jQuery.jqplot.BarRenderer;
-      } else {
-        diagramRenderer = undefined;
-      }
-      refreshDiagram();
-    });
-		var legendTooltipText = jQuery('#legendTooltipText').text();
-		jQuery('#legendTooltip').attr('title', legendTooltipText);
-		initPicker();
-	};
-	
-	function doneResizing(){
-		if (lastDiagramSettingsAsJson != undefined) {
-			 ShowDiagram(lastDiagramSettingsAsJson);
-		}
-	}
-	
-	function initPicker() {
-		var langDatePicker = {
-			monthNames: [
-				translateKey('timeModuleSelectSerialPatternJan'),
-				translateKey('timeModuleSelectSerialPatternFeb'),
-				translateKey('timeModuleSelectSerialPatternMar'),
-				translateKey('timeModuleSelectSerialPatternApr'),
-				translateKey('timeModuleSelectSerialPatternMay'),
-				translateKey('timeModuleSelectSerialPatternJun'),
-				translateKey('timeModuleSelectSerialPatternJul'),
-				translateKey('timeModuleSelectSerialPatternAug'),
-				translateKey('timeModuleSelectSerialPatternSep'),
-				translateKey('timeModuleSelectSerialPatternOct'),
-				translateKey('timeModuleSelectSerialPatternNov'),
-				translateKey('timeModuleSelectSerialPatternDec')
-				],
-			dayNames: [
-				translateKey('timeModuleLblSelSerialPatternSunday'),
-				translateKey('timeModuleLblSelSerialPatternMonday'),,
-				translateKey('timeModuleLblSelSerialPatternTuesday'),
-				translateKey('timeModuleLblSelSerialPatternWednesday'),
-				translateKey('timeModuleLblSelSerialPatternThursday'),
-				translateKey('timeModuleLblSelSerialPatternFriday'),
-				translateKey('timeModuleLblSelSerialPatternSaturday')
-				],
-			dayNamesMin: [
-				translateKey('Sun'),
-				translateKey('Mon'),
-				translateKey('Tue'),
-				translateKey('Wed'),
-				translateKey('Thu'),
-				translateKey('Fre'),
-				translateKey('Sat')
-				],
-			firstDay: 1,
-			isRTL: false
-		};
-		jQuery.datepicker.setDefaults(langDatePicker);
-		
-		jQuery(".datepicker").datepicker({
-			dateFormat: 'dd.mm.yy',
-			showButtonPanel: true,
-			closeText: translateKey("btnOk")
-		});
-		
-		jQuery(".timepicker").timepicker({
-			showAnim: 'blind',
-			hourText: translateKey('Hou'),
-			minuteText: translateKey('Min'),
-			amPmText: ['AM', 'PM'],
-			showCloseButton: true,
-			closeButtonText: translateKey("btnOk")
-		});
-	}
-	
-	showPeriod = function(periodChoice) {
-		var offset1 = (barRenderer) ? 2 : 1;
-		var offset2 = (barRenderer) ? 14 : 7;
-		selectedPeriod = parseInt(periodChoice);
-
-		var start;
-		switch (selectedPeriod) {
-		// last hour
-		//case 0:
-			//start = new Date(new Date().setHours(new Date().getHours() - offset1));
-			//break;
-		// last day
-		case 0:
-		case 1:
-			//start = new Date(new Date().setDate(new Date().getDate() - 1));
-			start = new Date(new Date().setDate(new Date().getDate() - offset1));
-			break;
-		// last week
-		case 2:
-			//start = new Date(new Date().setDate(new Date().getDate() - 7));
-			start = new Date(new Date().setDate(new Date().getDate() - offset2));
-			break;
-			
-		// last month
-		case 3:
-			//start = new Date(new Date().setMonth(new Date().getMonth() - 1));
-			start = new Date(new Date().setMonth(new Date().getMonth() - offset1));
-			break;
-			
-		// last year
-		case 4:
-			//start = new Date(new Date().setFullYear(new Date().getFullYear() - 1));
-			start = new Date(new Date().setFullYear(new Date().getFullYear() - offset1));
-			break;
-		}
-
-		if (barRenderer) {
-		  jQuery(".j_barGraphMode").show();
-		  setSelectedBtn(selectedPeriod);
-		} else {
-		  jQuery(".j_barGraphMode").hide();
-		  resetAllBtn();
-		}
-		var end = curDate;
-		showPeriodInGui(start, end);
-	};
-	
-	showPeriodInGui = function(start, end) {
-		jQuery('#selectPeriodStartDate').val(getFormattedDate(start));
-		jQuery('#selectPeriodEndDate').val(getFormattedDate(end));
-		jQuery('#selectPeriodStartTime').val(getFormattedTime(start));
-		jQuery('#selectPeriodEndTime').val(getFormattedTime(end));
-	};
-	
-	function getFormattedDate(date) {
-		return manageLeadingZero(date.getDate(), 2) + '.' + manageLeadingZero((date.getMonth() + 1), 2) + '.' + manageLeadingZero(date.getFullYear(), 4);
-	};
-	
-	function getFormattedTime(date) {
-		return manageLeadingZero(date.getHours(), 2) + ':' + manageLeadingZero(date.getMinutes(), 2);
-	};
-	
-	function manageLeadingZero(number, size) {	
-		var result = number + "";
-		while (result.length < size) {
-			result = "0" + result;
-		}
-		
-		return result;
-	};
-	
-	triggerDiagram = function(diagramID) {
-		if (!${initialized?string('true', 'false')}) {
-			return;
-		}
-		showComparisonPeriod = false;
-		selBoxComparisonDevice.hide();
-		highlightSelectedDiagram(diagramID);
-	
-		selectedDiagramId = diagramID;
-		triggerDiagramRefresh(selectedDiagramId, false);
-	};
-
-	triggerDiagramRefresh = function(diagramID, useCustomPeriod) {
-		if (!${initialized?string('true', 'false')}) {
-			return;
-		}
-		var url = '/pages/jpages/diagram/control/show?sid=' + SessionId + '&diagramid=' + diagramID + '&consolidationFunction=' + getConsolitation() + '&timePeriod=' + arPeriod[defaultPeriod];
-
-		if (useCustomPeriod) {
-			var customPeriodStart = jQuery('#selectPeriodStartDate').val() + '_' + jQuery('#selectPeriodStartTime').val();
-			var customPeriodEnd = jQuery('#selectPeriodEndDate').val() + '_' + jQuery('#selectPeriodEndTime').val();
-			url += '&start=' + customPeriodStart + '&end=' + customPeriodEnd;
-		} else {
-			appendDiagramSettings(diagramID);
-		}
-
-		if (!barRenderer) {
-		  showComparisonPeriod = false;
-		}
-		blockUI();
-		var opt =
-		{
-			onComplete: function(t) {
-				var response = JSON.parse(t.responseText);
-				if(!response.isSuccessful)
-				{
-					if(response.errorCode == "42")
-					{
-						jQuery("#content").html(response.content);
-					} else {
-						alert(response.content);
-					}
-				} else {
-				  lblNoDataAvailable.hide();
-				  noDiagramData = false;
-					ShowDiagram([response.content]);
-				}
-				
-				jQuery.unblockUI();
-			},
-			onException: function(t) {
-			  conInfo("Exception triggerDiagramRefresh!");
-			  lblNoDataAvailable.show();
-        //Draw an empty chart
-        diagramElem.empty();
-        var options = {
-          seriesDefaults: {
-            renderer: jQuery.jqplot.BarRenderer
-          },
-          axesDefaults: {
-            tickRenderer: jQuery.jqplot.CanvasAxisTickRenderer,
-            tickOptions: {angle: 37}
-          },
-          axes: {
-            xaxis: {
-              renderer:jQuery.jqplot.CategoryAxisRenderer,
-              ticks: getBarGraphTicks(),
-            }
-          }
-        }
-        noDiagramData = true;
-        var lastPlotter = jQuery.jqplot('currentDiagram', [[null]], options );
-        jQuery.unblockUI();
-			}
-		}
-		setTimeout(function() {jQuery.unblockUI();}, 10000); // Fallback after 10000ms.....
-		new Ajax.Request(url, opt);
-	};
-
-	refreshDiagram = function() {
-		triggerDiagramRefresh(selectedDiagramId, true);
-	};
-
-	exportDiagram = function() {
-		var url = '/pages/jpages/diagram/control/export?sid=' + SessionId + '&language=' + getLang() + '&diagramid=' + selectedDiagramId + '&consolidationFunction=' + getConsolitation();
-		var customPeriodStart = jQuery('#selectPeriodStartDate').val() + '_' + jQuery('#selectPeriodStartTime').val();
-		var customPeriodEnd = jQuery('#selectPeriodEndDate').val() + '_' + jQuery('#selectPeriodEndTime').val();		
-		url += '&start=' + customPeriodStart + '&end=' + customPeriodEnd;
-        window.open(url,'_blank')
-	};
-
-
-	function resetDiagramZoom() {
-    if (window.lastPlotter != undefined) {
-      window.lastPlotter.resetZoom();
-    }
-	};
-
-  function hideCustomModeElements() {
-    jQuery("[name='customMode']").hide();
-  };
-
-  function showCustomModeElements() {
-    jQuery("[name='customMode']").show();
-  };
-
-	function ShowDiagram(diagramSettingsAsJson) {
-		setTimeSelectors();
-		// only show diagram and its options if data is available
-		if (diagramSettingsAsJson) {
-			jQuery('#contentRight').css('visibility','visible');
-		} else {
-			jQuery('#contentRight').css('visibility','hidden');
-		}
-		
-		var diagramSettings = JSON.parse(diagramSettingsAsJson);
-    storeOrigXAxisTimePeriod(diagramSettings.options.axes.xaxis.min, diagramSettings.options.axes.xaxis.max);
-
-    var numberOfNecessaryDatapoints = (barRenderer == false) ? 2 : 1;
-    // Show hint when no diagram data available
-    // With the line diagram we need at least 2 datapoints, the bargraph diagram needs 1 datapoint
-    jQuery.each(diagramSettings.diagram, function(index,diagram) {
-      if (diagram.length < numberOfNecessaryDatapoints ) {
-        lblNoDataAvailable.show();
-        noDiagramData = true;
-      }
-    });
-
-		// release memory and empty the chart if necessary
-		if (window.lastPlotter != undefined) {
-		  window.lastPlotter.destroy();
-		}
-
-		// clear diagramm and initialize renderers
-		diagramElem.empty();
-		diagramSettings.options.axes.xaxis.renderer = jQuery.jqplot.DateAxisRenderer;
-		diagramSettings.options.axesDefaults = { tickRenderer: jQuery.jqplot.CanvasAxisTickRenderer};
-		diagramSettings.options.legend.renderer = jQuery.jqplot.EnhancedLegendRenderer;
-		
-		// do not allow zoom if no series has a value
-		if (!hasOneSeriesAtLeastOneValue(diagramSettings.diagram)) {
-			diagramSettings.options.cursor.zoom = false;
-		}
-		
-		// disable reset diagram zoom button if zoom is not enabled
-		if(diagramSettings.options.cursor.zoom == true) {
-			jQuery("#resetDiagramZoom").show(); 
-		} else {
-			jQuery("#resetDiagramZoom").hide();
-		}
-		
-		// set device name as series value
-		for (var i = 0; i < diagramSettings.options.series.length; i++)
-		{
-			var oldLabel = diagramSettings.options.series[i].label;
-			var label = GetChannelName(oldLabel.substring(0,12)) + " ";
-			label += translateKey('diagramValueType' + oldLabel.split(" ")[1]);
-			diagramSettings.options.series[i].label = label;
-		}		
-		
-		// show chart even if no data is available for selected period (jqplot needs at least one value for plotting)
-		if (diagramSettings.diagram.length == 0) {
-			diagramSettings.diagram = [[null]];
-		} else {
-			for (var i = 0; i < diagramSettings.diagram.length; i++)
-			{
-				if(diagramSettings.diagram[i].length == 0) {
-					diagramSettings.diagram[i] = [null];
-				}
-			}
-		}
-		
-		// adjust diagramm width and height
-		var isLegendOutsideOfDiagram = diagramSettings.options.legend.placement == "outside";
-		adjustDiagramSize(diagramSettings.diagram.length, isLegendOutsideOfDiagram);
-		
-		// show single data point instead of empty chart if only one value for a series is available
-		for (var i = 0; i < diagramSettings.diagram.length; i++) {
-			diagramSettings.options.series[i].showMarker = diagramSettings.diagram.indexOf(i).length == 1;
-		}
-
-    // Only for debugging! Don´t forget to uncomment this. Otherwise you will experience massive problems with some MS browsers :-(
-    // console.dir(diagramSettings);
-
-    setButtonText(diagramSettings.type);
-		// plot the diagram
-		diagramSettings.options.seriesDefaults.renderer = diagramRenderer;
-		if (barRenderer) {
-    selBoxComparisonDevice.html("");
-
-    if (createDummy) {
-      // ************ DUMMY DEVICE ************
-      // Creates a dummy device with nearly identical data
-      var dummyDiagramData = [];
-      jQuery.extend(true, dummyDiagramData, diagramSettings.diagram);
-      jQuery.each(dummyDiagramData[0], function(index,value) {
-        if (value[1]) {
-          // Dummy data = original * 0.95 so it is somewhat different
-          dummyDiagramData[0][index][1] = value[1] * 0.95 ;
-        }
-      });
-      diagramSettings.diagram.push(dummyDiagramData[0]);
-      jQuery.extend(true, dummyDiagramData, diagramSettings.options.series);
-      diagramSettings.options.series.push(dummyDiagramData[0]);
-      diagramSettings.options.series[1].label = "DummY Nr. 1";
-      diagramSettings.options.seriesColors.push("#FFFF00");
-
-      // ************ END DUMMY DEVICE ************
-
-      /*
-      // ************ DUMMY DEVICE ************
-      // Creates a dummy device with nearly identical data
-      var dummyDiagramData = [];
-      jQuery.extend(true, dummyDiagramData, diagramSettings.diagram);
-      jQuery.each(dummyDiagramData[0], function(index,value) {
-        if (value[1]) {
-          // Dummy data = original * 1.25 so it is somewhat different
-          dummyDiagramData[0][index][1] = value[1] * 1.25 ;
-        }
-      });
-      diagramSettings.diagram.push(dummyDiagramData[0]);
-      jQuery.extend(true, dummyDiagramData, diagramSettings.options.series);
-      diagramSettings.options.series.push(dummyDiagramData[0]);
-      diagramSettings.options.series[2].label = "DummY Nr. 2";
-      diagramSettings.options.seriesColors.push("#666699");
-      // ************ END DUMMY DEVICE ************
-      */
-    }
-
-    numberOfDevices = diagramSettings.diagram.length;
-
-  	jQuery.each(diagramSettings.options.series, function (index, item) {
-        selBoxComparisonDevice.append(jQuery('<option>', {
-            value: index,
-            text : item.label
-        }));
-    });
-
-    selBoxComparisonDevice.val(getSelectedDeviceForComparison());
-
-      var origDiagramData = [];
-      var comparisonOptions = [];
-      var comparisonDiagram = [];
-
-      jQuery.extend(true, origDiagramData, diagramSettings.diagram);
-
-		  numberOfDataSets = diagramSettings.diagram.size();
- 		  hideCustomModeElements();
-      diagramSettings.options.seriesDefaults.rendererOptions = getBarGraphRenderOptions();
-      diagramSettings.options.axes.xaxis.tickInterval = getTickInterval();
-      diagramSettings.options.axes.yaxis.tickOptions = {formatString: "%.2f"}; // %d is another option (without zoom)
-
-      // The next 3 lines are changing the x-axis renderer
-      diagramSettings.diagram = stripDiagramData(diagramSettings.diagram);
-      diagramSettings.options.axes.xaxis.renderer = jQuery.jqplot.CategoryAxisRenderer;
-      diagramSettings.options.axes.xaxis.ticks = getBarGraphTicks();
-
-      // 1 = Temperature, 2 = Power, 3 = Consumption, 4 = User
-      if (diagramSettings.type == 1 || diagramSettings.type == 2) {
-        var xAxis = getBarGraphXAxis(defaultPeriod);
-        diagramSettings.options.axes.xaxis.min = xAxis.min;
-        diagramSettings.options.axes.xaxis.max = xAxis.max;
-        diagramSettings.options.axes.xaxis.tickInterval = xAxis.tickInterval;
-        diagramSettings.options.axes.xaxis.tickOptions.formatString = xAxis.timeFormatString;
-        //diagramSettings.options.axes.xaxis.tickOptions.angle = 0;
-      } else {
-        diagramSettings.options.axes.xaxis.min = origXAxis.min;
-        diagramSettings.options.axes.xaxis.max = origXAxis.max;
-      }
-
-      if (showComparisonPeriod)  {
-        jQuery.extend(true, comparisonOptions, diagramSettings.options);
-
-        // This will display only one device with its comparison data
-        var selectedDevice = getSelectedDeviceForComparison();
-        comparisonDiagram.push(diagramSettings.diagram[selectedDevice]);
-        comparisonDiagram.push(getCompareData(origDiagramData[selectedDevice]));
-        comparisonOptions.seriesColors[0] = diagramSettings.options.seriesColors[selectedDevice];
-        comparisonOptions.seriesColors[1] = getComparisonColor(diagramSettings.options.seriesColors[selectedDevice]);
-
-        comparisonOptions.series[0].label = diagramSettings.options.series[selectedDevice].label;
-        comparisonOptions.series[1] = getComparisonOptions();
-        comparisonOptions.series[1].label =  translateKey("diagramComparisonPeriod") + ": " + translateKey(comparisonLegendExtension);
-
-
-        /*
-        With this we can display all devices including the comparision data
-        This will lead to a mayhem of bar graphs when more devices are involved.
-
-        jQuery.each(origDiagramData, function(index, diagram) {
-          comparisonDiagram.push(diagramSettings.diagram[index]);
-          comparisonDiagram.push(getCompareData(origDiagramData[index]));
-          comparisonOptions.seriesColors.splice((index * 2) + 1, 0, getComparisonColor(diagramSettings.options.seriesColors[index]));
-          comparisonOptions.series.splice(index * 2 + 1, 0, (getComparisonOptions()));
-        });
-        */
-
-        diagramSettings.options = comparisonOptions;
-        diagramSettings.options.axes.yaxis.max = getMinMaxValue(comparisonDiagram, "max");
-
-        // Min value of the y-Axis set to 'auto'
-        if (!diagramSettings.options.axes.yaxis.customMin) {
-          diagramSettings.options.axes.yaxis.min = getMinMaxValue(comparisonDiagram, "min");
-        }
-        // Max value of the y-Axis set to 'auto'
-        if (!diagramSettings.options.axes.yaxis.customMax) {
-          diagramSettings.options.axes.yaxis.max = getMinMaxValue(comparisonDiagram, "max");
-        }
-      } else {
-        // Min value of the y-Axis set to 'auto'
-        if (!diagramSettings.options.axes.yaxis.customMin) {
-          diagramSettings.options.axes.yaxis.min = getMinMaxValue(diagramSettings.diagram, "min");
-        }
-
-        // Max value of the y-Axis set to 'auto'
-        if (!diagramSettings.options.axes.yaxis.customMax) {
-          diagramSettings.options.axes.yaxis.max = getMinMaxValue(diagramSettings.diagram, "max");
-        }
-      }
-    } else {
-      showCustomModeElements();
-    }
-    // ATTENTION only for debugging - IE might crash when not in debugging mode (console available)
-    if (debug == "true" && !jQuery.browser.msie) {
-      console.dir(diagramSettings);
-		}
-
-		if (showComparisonPeriod)  {
-		  lastPlotter = jQuery.jqplot('currentDiagram', comparisonDiagram, diagramSettings.options );
-    } else {
-		  lastPlotter = jQuery.jqplot('currentDiagram', diagramSettings.diagram, diagramSettings.options );
-		}
-		lastDiagramSettingsAsJson = diagramSettingsAsJson;
-
-    // the tooltip doesn´t work with lte IE8
-    if(!jQuery.browser.msie || (jQuery.browser.msie && parseInt(jQuery.browser.version) > 8)) {
-      // add tooltip
-      addLegendTooltip();
-      jQuery.jqplot.postDrawHooks.push(addLegendTooltip);
-    } else {
-      jQuery("#legendTooltipText, #legendTooltip, #diagramPleaseWaitForLoadingNextDiagram").hide();
-    }
-	};
-
-	function hasOneSeriesAtLeastOneValue(series) {
-		for (var i = 0; i < series.length; i++) {			
-			if (series[i].length > 0) {
-				return true;
-			}
-		}
-	
-		return false;
-	}
-	
-	function adjustDiagramSize(amountOfSeries, isLegendOutsideOfDiagram) {
-		var minWidth = 400;
-		var minHeight = 200;
-	
-		var offsetRight = 50; // correct displaying of all x axis labels
-		var offsetTopDown = 370; // space for header, control elements and footer
-		
-		if (isLegendOutsideOfDiagram) {
-			offsetTopDown += calculatePossibleLegendHeight(amountOfSeries);
-		}
-		
-		var calculatedWidth = jQuery(window).width() - jQuery('#contentLeft').width() - offsetRight;
-		var calculatedHeight = jQuery(window).height() - offsetTopDown;
-		
-		if (calculatedWidth < minWidth) {
-			calculatedWidth = minWidth;
-		}
-		
-		if (calculatedHeight < minHeight) {
-			calculatedHeight = minHeight;
-		}
-		
-		jQuery('#currentDiagram').width(calculatedWidth);
-		jQuery('#currentDiagram').height(calculatedHeight);
-	}
-	
-	function calculatePossibleLegendHeight(amountOfSeries) {
-		var legendColumns = 4;
-		var heightForEachRow = 42;
-		
-		var amountOfRowsInLegend = Math.ceil(amountOfSeries / legendColumns);
-		return amountOfRowsInLegend * heightForEachRow;
-	}
-	
-	function addLegendTooltip() {
-		jQuery('#legendTooltip').css('visibility', 'visible');
-		
-		var tooltipDiv = jQuery('#legendTooltip').clone();		
-		jQuery('.jqplot-table-legend:last').append(tooltipDiv);
-	}
-
-	function appendDiagramSettings(diagramID) {		
-		var url = '/pages/jpages/diagram/control/settings?sid=' + SessionId + '&diagramid=' + diagramID;
-		var opt =
-		{
-			onComplete: function(t) {
-				var response = JSON.parse(t.responseText);
-				if(!response.isSuccessful)
-				{
-					if(response.errorCode == "42")
-					{
-						jQuery("#content").html(response.content);
-					} else {
-						alert(response.content);
-					}
-				} else {
-					var diagramSettings = JSON.parse(response.content);					
-					parseDiagramSettings(diagramSettings);
-				}
-			}
-		}
-		
-		new Ajax.Request(url, opt);
-	};
-	
-	function parseDiagramSettings(diagramSettings) {
-    var tmpDefaultPeriod = defaultPeriod,
-    tmpConsolidationFunction = getConsolitation();
-		setConsolidationFunction(diagramSettings.consolidationFunction);
-    defaultPeriod = diagramSettings.defaultPeriod;
-		setVisibilitySelectPeriod(diagramSettings.isOperable);
-		showPeriod(defaultPeriod);
-		if ((tmpDefaultPeriod != diagramSettings.defaultPeriod) || (tmpConsolidationFunction != diagramSettings.consolidationFunction)) {
-		  triggerDiagram(selectedDiagramId);
-		}
-	};
-	
-	function setVisibilitySelectPeriod(isVisible) {
-		if (isVisible) {
-			jQuery('#selectPeriod').show();
-		} else {
-			jQuery('#selectPeriod').hide();
-		}
-	};
-
-	function setConsolidationFunction(consolidationFunction) {
-    setRenderer(consolidationFunction);
-		consolidationMode = consolidationFunction;
-	};
-	
-	function highlightSelectedDiagram(diagramID) {
-		jQuery('#diagrams td').removeClass('ButtonStatusRoomsSelected');
-		jQuery('#diagram' + diagramID).addClass('ButtonStatusRoomsSelected');
-		jQuery('#diagram' + diagramID).css('text-align', 'left');
-	};
-	
-	function blockUI() {
-		jQuery.blockUI({
-			message: jQuery('#diagramPleaseWaitForLoadingNextDiagram').text()
-		});
-	}
-  
-	GetChannelName = function(address) {
-		var ch = DeviceList.getChannelByAddress(address);
-		if (ch != undefined) {
-			return ch.getName();
-		} else {
-			return address;
-		}
-	};
-
-	(function () {
-		initSite();
-		
-		if (!${initialized?string('true', 'false')}) {
-		
-			var s = "<table id=\"dataloggingError\" class=\"tTable\" cellpadding=\"3\" cellspacing=\"3\"><tr><td class=\"CLASS21906\">";
-			s += translateKey('diagramDataloggingNotInitialised');
-			s += "</td></tr></table>";
-			jQuery('#contentRight').html(s);
-			jQuery('#contentRight').css('visibility','visible');
-			return;
-		}
-		
-		initGui();
-		
-		var firstDiagram = ${firstDiagram};
-		if (firstDiagram != -1) {
-			triggerDiagram(firstDiagram);
-		}
-	})();
-</script>
-</head>
-<body>
-<table id="${TableId}" width="100%" class="CLASS03900" cellpadding="0" cellspacing="0">
-  <tr>
-    <td id="contentLeft">
-		<div class="CLASS04002" style="height: 719px;">
-			<table id="tblFunctionNames" class="CLASS03903" border="1" cellpadding="4" cellspacing="0" style="width:200px">
-				<#list objectList as diagram>
-					<tr id="diagrams">
-						<td id='diagram${diagram.id}' class="ButtonStatusRooms CLASS03905" onclick="triggerDiagram(${diagram.id});">
-							<table>
-								<tr class='CLASS03904'>
-									<td style="font-weight:bold;">${diagram.name}</td></td>
-								</tr>
-								<tr>
-									<td>${diagram.description}</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</#list>
-			</table>
-		</div>
-   </td>
-   
-   <td id="contentRight" class="j_translate">
-		<div id="selectPeriod">
-			<table>
-				<tr>
-          <!--
-          <td>
-            <input type="button" value="diagramPeriodLastHour" name="diagramPeriodLastHour" id="selectPeriodLastHour" class="StdButtonBig jPeriodButton"/>
-          </td>
-          -->
-					<td>
-						<input type="button" value="diagramPeriodLastDay" name="diagramPeriodLastDay" id="selectPeriodLastDay" class="StdButtonBig jPeriodButton"/>
-					</td>
-					<td>
-						<input type="button" value="diagramPeriodLastWeek" name="diagramPeriodLastWeek" id="selectPeriodLastWeek" class="StdButtonBig jPeriodButton"/>
-					</td>
-					<td>
-						<input type="button" value="diagramPeriodLastMonth" name="diagramPeriodLastMonth" id="selectPeriodLastMonth" class="StdButtonBig jPeriodButton"/>
-					</td>
-					<td>
-						<input type="button" value="diagramPeriodLastYear" name="diagramPeriodLastYear" id="selectPeriodLastYear" class="StdButtonBig jPeriodButton"/>
-					</td>
-				</tr>
-			</table>
-			<table name="customMode">
-				<tr>
-					<td>${"$"}{diagramPeriodCustomStart}</td>
-					<td><input type="text" id="selectPeriodStartDate" class="datepicker"/></td>
-					<td><input type="text" id="selectPeriodStartTime" class="timepicker"/></td>
-					<td width="15px"></td>
-					<td>${"$"}{diagramPeriodCustomEnd}</td>
-					<td><input type="text" id="selectPeriodEndDate" class="datepicker"/></td>
-					<td><input type="text" id="selectPeriodEndTime" class="timepicker"/></td>
-				</tr>
-			</table>
-			<table>
-				<tr>
-					<td name="customMode">${"$"}{thDiagramSelectTempConsolidationFunction}</td>
-					<td name="customMode">
-						<select id="selectConsolidationFunction" size="1">
-							<option value="0">${"$"}{diagramConsolidationFunctionAverage}</option>
-							<option value="1">${"$"}{diagramConsolidationFunctionMinimum}</option>
-							<option value="2">${"$"}{diagramConsolidationFunctionMaximum}</option>
-						</select>
-					</td>
-					<td>
-						<input type="button" value="btnDiagramRepaint" name="btnDiagramRepaint" class="StdButtonBig" id="selectPeriodDo"/>
-					</td>
-
-          <td>
-            <input type="button" value="btnDiagramShowComparisonPeriod" name="btnDiagramShowComparisonPeriod" class="j_barGraphMode StdButtonBig hidden" id="showComparisonPeriod"/>
-          </td>
-
-          <td>
-            <select class="hidden" id="selectDeviceForComparisonPeriod" />
-          </td>
-
-          <!-- for testing only -->
-          <!--
-          <td>
-            <input type="button" value="ToggleRenderer" name="" class="StdButtonBig" id="toggleRenderer"/>
-          </td>
-          -->
-
-				</tr>
-			</table>
-		</div>
-		<table>
-			<tr>
-				<td>
-					<input type="button" value="btnDiagramResetZoom" name="btnDiagramResetDiagramZoom" class="StdButtonBig" id="resetDiagramZoom"/>
-				</td>
-        <td>
-          <input type="button" value="btnDiagramExport" name="btnDiagramExport" class="StdButtonBig" id="exportPeriodDo"/>
-        </td>
-			</tr>
-		</table>
-		<div id='hintNoDataAvailable' class='hidden' style='text-align:center'><b>${'$'}{diagramNoDataAvailable}</b></div>
-		<div id="currentDiagram" style="margin-left: 25px;"></div>
-		
-		<div id="legendTooltipText" class="hideAtStart">${"$"}{diagramLegendExplanationTooltip}</div>
-		<div id="legendTooltip" class="hideAtStart">${"$"}{diagramLegendExplanationTeaser}</div>
-		<div id="diagramPleaseWaitForLoadingNextDiagram" class="hideAtStart">${"$"}{diagramPleaseWaitForLoadingNextDiagram}</div>
-
-   </td>
-</table>
-</body>
+<html>
+<head>
+<style>
+.StdButtonBig {
+	padding-right: 12px;
+	padding-left: 12px;
+}
+.hideAtStart {
+	visibility:hidden;
+}
+#legendTooltip {
+	color:#192C6E;
+	position:absolute;
+	top:-14px;
+	right:-5px;
+	font-weight:bold;
+}
+#
+</style>
+
+<script language="text/javascript">
+	var selectedDiagramId;
+  var noDiagramData = true;
+	var refreshDiagramOnRefreshTimeout;
+	var lastDiagramSettingsAsJson;
+	var showComparisonPeriod = false;
+	var comparisonLegendExtension = "";
+	var timePeriod = "unknown";
+	var defaultPeriod = undefined;
+	var origXAxis = {};
+	var diagramRenderer = undefined;
+	var barRenderer = false;
+	var selectedPeriod = -1; // -1 = unknown, 0 = hour, 1 = day, 2 = week, 3 = month, 4 = year
+	var arPeriod = ["hour", "24h", "week", "month", "year"];
+	var arTicks = ["10 minutes", "60 minutes", "1440 minutes", "2880 minutes", "52560 minutes"]; 	// 0 = hour, 1 = day, 2 = week, 3 = month, 4 = year
+	var numberOfDataSets = 1;
+	var diagramElem = jQuery('#currentDiagram');
+	var btnPeriodDay = jQuery('#selectPeriodLastDay');
+	var btnPeriodWeek = jQuery('#selectPeriodLastWeek');
+	var btnPeriodMonth = jQuery('#selectPeriodLastMonth');
+	var btnPeriodYear = jQuery('#selectPeriodLastYear');
+	var btnComparisonPeriod = jQuery('#showComparisonPeriod');
+	var selBoxComparisonDevice = jQuery('#selectDeviceForComparisonPeriod');
+	var lblNoDataAvailable = jQuery("#hintNoDataAvailable");
+	var consolidationElem = jQuery('#selectConsolidationFunction');
+	var debug = jQuery.url().param('debug');
+	var createDummy = jQuery.url().param('createDummy');
+  var curDate = new Date();
+  var comparisonSelectedDevice = 0;
+  var numberOfDevices = 1;
+  var consolidationMode = 0;
+
+	function initSite() {
+		jQuery('#contentRight').css('visibility','hidden');
+		setPath("<span onclick='WebUI.enter(ControlPage);'>"+translateKey('menuControlPage')+"</span> &gt; "+ translateKey('submenuDiagramListPage'));
+		var s = "";
+		s += "<table cellspacing='8'>";
+		s += "<tr>";
+		s += "<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.goBack();'>"+ translateKey('footerBtnPageBack') +"</div></td>";	  
+		s += "</tr>";
+		s += "</table>";
+		setFooter(s);
+		translateButtons("diagramPeriodLastHour, diagramPeriodLastDay, diagramPeriodLastWeek, diagramPeriodLastMonth, diagramPeriodLastYear, btnDiagramRepaint, btnDiagramExport, btnDiagramResetDiagramZoom, btnDiagramShowComparisonPeriod");
+		translatePage("#${TableId}");
+		jQuery("#${TableId}").show();
+	};
+
+  function storeOrigXAxisTimePeriod(min, max) {
+    origXAxis.min = min;
+    origXAxis.max = max;
+  };
+
+  function getComparisonOptions() {
+    return {
+      label: translateKey("diagramComparisonPeriod") + ": " + translateKey(comparisonLegendExtension),
+      lineWidth: 1,
+      rendererOptions: {smooth: true},
+      showMarker: false
+    };
+  }
+
+  function getComparisonColor(deviceColor) {
+    /* Currently not in use
+    var compColor = {
+      "#FF0000" : "#1E1E1E", // Rot
+      "#00FF00" : "#2D2D2D", // Grün
+      "#0000FF" : "#3D3D3D", // Blau
+      "#FFFF00" : "#4C4D4C", // Gelb
+      "#FF00FF" : "#5B5B5B", // Magenta
+      "#00FFFF" : "#6B6B6B", // Zyan
+      "#FF9900" : "#7A7A7A", // Orange
+      "#9999FF" : "#898989", // Schieferblau
+      "#339966" : "#999999", // Meeresgrün
+      "#993366" : "#A3A3A3", // Violet
+      "#33CCD2" : "#ADADAD", // Türkis
+      "#FFCC99" : "#B7B7B7", // Weizen
+      "#666699" : "#C1C1C1", // Dunkles Schieferblau
+      "#FF8080" : "#CCCCCC", // Lachsrosa
+    }
+    return compColor[deviceColor];
+    */
+    return "#7A7A7A";
+  }
+
+  function getSelectedDeviceForComparison() {
+    return comparisonSelectedDevice;
+  }
+
+  function getBarGraphXAxis(period) {
+    // period > 0 = hour, 1 = today, 2 = this week, 3 = this month, 4 = this year
+    var d = curDate;
+    var result = {}
+    switch (arPeriod[period]) {
+       case 0:
+        // Todo default
+        // hour not used
+        break;
+      case "24h":
+        var date = parseInt(d.getMonth() + 1) + "-" +d.getDate() + "-" + d.getFullYear()+" ";
+        result.min = date + "00:00";
+        result.max = date + "24:00";
+        result.tickInterval = "1 hours";
+        result.timeFormatString = "%H:%M";
+        comparisonLegendExtension = "diagramComparisonYesterday";
+        break;
+      case "week":
+        result.min = parseInt(d.getMonth() + 1) + "-" +((d.getDate()-(d.getDay()-1)))+"-"+d.getFullYear()+ " 0:00";
+        result.max = parseInt(d.getMonth() + 1) + "-" +((d.getDate()-(d.getDay()-1))+6)+"-"+d.getFullYear()+ " 24:00";
+        result.tickInterval = "1 day";
+        result.timeFormatString = "%d.%m.%y";
+        comparisonLegendExtension = "diagramComparisonLastWeek";
+        break;
+      case "month":
+         result.min = parseInt(d.getMonth() + 1) + "-1-" + d.getFullYear()+" 00:00";
+        result.max = parseInt(d.getMonth() + 1) + "-30-" + d.getFullYear()+" 24:00";
+        result.tickInterval = "1 day";
+        result.timeFormatString = "%d.%m.%y";
+        comparisonLegendExtension = "diagramComparisonLastMonth";
+        break;
+      case "year":
+        result.min = "1-1-" + d.getFullYear()+" 00:00";
+        result.max = "12-31-" + d.getFullYear()+" 24:00";
+        result.tickInterval = "1 month";
+        result.timeFormatString = "%m.%y";
+        comparisonLegendExtension = "diagramComparisonLastYear";
+        break;
+    }
+    return result;
+  };
+
+  // Mode = int 1 - 3
+  function setButtonText(mode) {
+    var strippedPeriod = [
+      translateKey("diagramPeriodToday"),
+      translateKey("diagramPeriodThisWeek"),
+      translateKey("diagramPeriodThisMonth"),
+      translateKey("diagramPeriodThisYear")
+    ],
+    fullPeriod = [
+      translateKey("diagramPeriodLastDay"),
+      translateKey("diagramPeriodLastWeek"),
+      translateKey("diagramPeriodLastMonth"),
+      translateKey("diagramPeriodLastYear")
+    ];
+    var result;
+    if (mode == 3) {
+      // User defined
+      result = jQuery.merge([], fullPeriod);
+    } else {
+      // Temperature and Power
+      result = jQuery.merge([], strippedPeriod);
+    }
+    btnPeriodDay.val(result[0]);
+    btnPeriodWeek.val(result[1]);
+    btnPeriodMonth.val(result[2]);
+    btnPeriodYear.val(result[3]);
+  };
+
+  function getConsolitation() {
+   return consolidationMode;
+  };
+
+	function setRenderer(id) {
+    if (id == 3) {
+      diagramRenderer = jQuery.jqplot.BarRenderer;
+      barRenderer = true;
+    } else {
+      diagramRenderer = undefined;
+      barRenderer = false;
+    }
+	};
+
+  function getBarWidth() {
+    return null; // The with of the bars will be calculated automatically
+
+    var viewPortWidth = jQuery(window).width();
+    var factor = (showComparisonPeriod == false) ? 80 : 160;
+    var singleBarWidth = parseInt(viewPortWidth / factor);
+    return parseInt(singleBarWidth / (numberOfDataSets + 2));
+  };
+
+  function getNumberOfData(valToCheck, sizeOfData) {
+    var numberOfData = 0;
+    if (sizeOfData >= valToCheck) {
+      numberOfData = valToCheck;
+    } else {numberOfData = sizeOfData;}
+    return numberOfData;
+  };
+
+  function getMinMaxValue(data, sMode) {
+    var value = 0;
+    var result = 0;
+    var numberOfData = 0;
+    var sizeOfData; // = data.size() - 1;
+    var date = curDate;
+    var periodSelector;
+    var arValues = [];
+    switch (arPeriod[selectedPeriod]) {
+      case "24h" :
+        periodSelector = date.getHours();
+        break;
+      case "week" :
+        var weekDay = date.getDay();
+        //periodSelector = (weekDay==0) ? 6 : weekDay; // Su = 6, Mo = 1, Di = 2 .....
+        periodSelector = 6;
+        break;
+      case "month" :
+        periodSelector = date.getDate();
+        break;
+      case "year" :
+       periodSelector = date.getMonth() + 1;
+        break;
+      default:
+        periodSelector = 0;
+        value = 1000;
+        break;
+    }
+
+    jQuery.each(data, function(index, valueSet) {
+      arValues = valueSet;
+      sizeOfData = arValues.size() - 1;
+      numberOfData = getNumberOfData(periodSelector, sizeOfData);
+      for (var x = (sizeOfData - numberOfData); x <= sizeOfData; x++) {
+          //conInfo(x + " - " + data[x]);
+          result = arValues[x];
+          if (sMode == "max") {
+            if (result > value) {
+              value = result;
+            }
+          } else if(sMode == "min") {
+            if (result < value) {
+              value = result;
+            }
+          }
+        }
+      });
+      if (sMode == "max") {value = value + (value * 0.1) ;}
+      if (sMode == "min") {value = value - (value * 0.1) ;}
+
+      return value;
+  };
+
+  function y2k(number) { return (number < 1000) ? number + 1900 : number; };
+
+  function getWeekNumber(year,month,day) {
+      var when = new Date(year,month,day);
+      var newYear = new Date(y2k(year),0,1);
+      var modDay = newYear.getDay();
+      if (modDay == 0) modDay=6; else modDay--;
+      var daynum = ((Date.UTC(y2k(year),when.getMonth(),when.getDate(),0,0,0) -
+                   Date.UTC(y2k(year),0,1,0,0,0)) /1000/60/60/24) + 1;
+
+      if (modDay < 4 ) {
+          var weeknum = Math.floor((daynum+modDay-1)/7)+1;
+      }
+      else {
+          var weeknum = Math.floor((daynum+modDay-1)/7);
+          if (weeknum == 0) {
+              year--;
+              var prevNewYear = new Date(year,0,1);
+              var prevmodDay = prevNewYear.getDay();
+              if (prevmodDay == 0) prevmodDay = 6; else prevmodDay--;
+              if (prevmodDay < 4) weeknum = 53; else weeknum = 52;
+          }
+      }
+      return + weeknum;
+  };
+
+  // Returns the hour of the diagram data timestamp
+  function getHour(timeStamp) {
+    var tmp = timeStamp.split(" ");
+    var PM = timeStamp.indexOf("PM");
+    var result =  tmp[1].split(":")[0]; // hour of the timestamp
+
+    // This is necessary for the IE (at least version 8)
+    // This amazing browser interprets a 'parseInt("01")' as 0 instead of 1;
+    result = parseInt(result, 10);
+
+    if (PM != -1 && result != 12) {
+      result+=12;
+    }
+    // 12:00AM = 0:00AM
+    if (PM == -1 && result == 12) {
+      result-=12;
+    }
+    return result;
+  };
+
+  // Returns the day of the diagram data timestamp
+  function getDayOfTheWeek(timeStamp) {
+    var oStampDate = getStampDateObject(timeStamp);
+    var date = new Date(oStampDate.year, oStampDate.month - 1, oStampDate.day);
+    if (date.getDay() == 0) {return 6;} // Sunday
+    return (date.getDay() - 1);
+  };
+
+  function getDayOfTheMonth(timeStamp) {
+    var oStampDate = getStampDateObject(timeStamp);
+    return oStampDate.day - 1;
+  };
+
+  function getMonthOfTheYear(timeStamp) {
+    var oStampDate = getStampDateObject(timeStamp);
+    return oStampDate.month - 1;
+  };
+
+  function getStampDateObject(timeStamp) {
+    var result = {};
+    var stampDate = timeStamp.split(" ");
+    var arStampDate = stampDate[0].split("-");
+
+    // IMPORTANT use parseInt with radix 10. Otherwise some browser (e.g. IE8) will not work properly.
+    // Without the radix the IE8 will return 0 instead of 8 with 'parseInt("08")'
+    result.day = parseInt(arStampDate[2], 10);
+    result.month = parseInt(arStampDate[1], 10);
+    result.year = parseInt(arStampDate[0], 10);
+    return result;
+  };
+
+  // Checks if it is todays timestamp
+  function isValidDay(timeStamp, bComparisonPeriod) {
+    var oStampDate = getStampDateObject(timeStamp);
+    var date = curDate;
+    var dateYesterday = new Date();
+    if (!bComparisonPeriod) {
+      if ((date.getDate() == oStampDate.day) && (parseInt(date.getMonth() + 1) == oStampDate.month) && (date.getFullYear() == oStampDate.year)) return true;
+    } else {
+        dateYesterday.setDate(date.getDate() - 1); // yesterday
+        if (((parseInt(dateYesterday.getDate())) == parseInt(oStampDate.day)) && (parseInt(dateYesterday.getMonth() + 1) == oStampDate.month) && (dateYesterday.getFullYear() == oStampDate.year)) return true;
+    }
+    return false;
+  };
+
+  function isValidWeek(timeStamp, bComparisonPeriod) {
+    var oStampDate = getStampDateObject(timeStamp);
+    var date = curDate;
+    var dateLastWeek = new Date();
+    var curWeek = getWeekNumber(date.getYear(), date.getMonth(), date.getDate()); // the current week number
+    var weekOfTimeStamp = getWeekNumber(oStampDate.year, oStampDate.month - 1, oStampDate.day); // the week number of the timestamp
+
+    if (!bComparisonPeriod) {
+      if (curWeek == weekOfTimeStamp) return true;
+    } else {
+      dateLastWeek.setDate(date.getDate() - 7); // last week
+      var lastWeek = getWeekNumber(dateLastWeek.getYear(), dateLastWeek.getMonth(), dateLastWeek.getDate()); // the week number of last week
+      if (parseInt(lastWeek) == parseInt(weekOfTimeStamp)){return true;}
+    }
+    return false;
+  };
+
+  function isValidMonth(timeStamp, bComparisonPeriod) {
+    var oStampDate = getStampDateObject(timeStamp);
+    var date = curDate;
+    var dateLastMonth = new Date();
+    if (!bComparisonPeriod) {
+      if (oStampDate.month == (parseInt(date.getMonth()) + 1)) return true;
+    } else {
+      dateLastMonth.setMonth(date.getMonth() - 1);
+      if ((parseInt(oStampDate.month) - 1) == parseInt(dateLastMonth.getMonth())) return true;
+    }
+    return false;
+  };
+
+  function isValidYear(timeStamp, bComparisonPeriod) {
+    var oStampDate = getStampDateObject(timeStamp);
+    var date = curDate;
+    if (!bComparisonPeriod) {
+      if (oStampDate.year == date.getFullYear()) return true;
+    } else {
+      if (parseInt(oStampDate.year) == (date.getFullYear() - 1)) return true;
+    }
+    return false;
+  };
+
+  function isValidDataSet(timeStamp, bComparison) {
+    var result = false;
+    switch (arPeriod[selectedPeriod]) {
+      case "24h":
+        result = isValidDay(timeStamp, bComparison);
+        break;
+      case "week":
+        result = isValidWeek(timeStamp, bComparison);
+        break;
+      case "month":
+        result = isValidMonth(timeStamp, bComparison);
+        break;
+     case "year":
+        result = isValidYear(timeStamp, bComparison);
+        break;
+    }
+    return result;
+  };
+
+  function getIndexOfDataSet(timeStamp) {
+    var result;
+    switch (arPeriod[selectedPeriod]) {
+      case "24h":
+        result = getHour(timeStamp);
+        break;
+      case "week":
+        result = getDayOfTheWeek(timeStamp);
+        break;
+      case "month":
+        result = getDayOfTheMonth(timeStamp);
+        break;
+      case "year":
+        result = getMonthOfTheYear(timeStamp);
+        break;
+    }
+    return result;
+  };
+
+  // Converts the data for the use of the CategoryAxisRenderer instead of the DateAxisRenderer
+  function stripDiagramData(data) {
+    var result = [];
+    var tmp,timeStamp, value;
+    jQuery.each(data,function(index, valueSet) {
+      tmp = [];
+      // Begin at the end of the values and leave the for-loop when there are no more appropriate valuesets.
+      for (var x = valueSet.size() - 1; x >= 0; x--) {
+        timeStamp = valueSet[x][0];
+        if(isValidDataSet(timeStamp, false)) {
+          value = valueSet[x][1];
+          tmp[getIndexOfDataSet(timeStamp)] = value;
+        } else {
+          break;
+        }
+      }
+      result.push(tmp);
+    });
+    return result;
+  };
+
+  function getCompareData(data) {
+    var tmpData = [];
+    jQuery.extend(true, tmpData, data);
+    var result = [];
+    var tmp,timeStamp, value;
+
+    // Delete all entries of the current period - e. g. today or this week
+    jQuery.each(data,function(index, valueSet) {
+      if (valueSet) {
+        // Checks if this is the current period, e. g. today or this week
+        // If it´s true then delete this entry
+        timeStamp = valueSet[0];
+        if(isValidDataSet(timeStamp, false)) {
+          // remove the value from the end of the dataset
+          tmpData.splice(-1,1);
+        }
+      }
+    });
+    // Now the dataset contains all values without the current period
+
+    // Take all data of the previous period
+    jQuery.each(tmpData, function(index, valueSet) {
+      tmp = [];
+      timeStamp = valueSet[0];
+      // Check if the dataset contains the data of the previous period - e. g. yesterday or last week
+      if (isValidDataSet(timeStamp, true)) {
+       value = valueSet[1];
+       tmp[getIndexOfDataSet(timeStamp)] = value
+       result[getIndexOfDataSet(timeStamp)] = value;
+      }
+    });
+    // Now the dataset contains all values of the previous period
+    return result;
+  }
+
+  function getNumberOfDaysInMonth(month, fullYear) {
+    return 32 - new Date(fullYear, month, 32).getDate();
+  };
+
+  function getTickInterval() {
+    return arTicks[selectedPeriod];
+  };
+
+  function getBarGraphRenderOptions() {
+    return {
+      "barWidth" : getBarWidth(),
+      "highlightMouseOver" : false,
+      "waterfall" : false,
+      "fillToZero" : true,
+      "shadow" : false,
+    };
+  };
+
+  function getBarGraphTicks() {
+    var arTicks = [];
+    switch (arPeriod[selectedPeriod]) {
+      case "24h":
+        for(x = 0; x < 24; x++) {
+          arTicks.push(x.toString());
+        }
+        break;
+      case "week":
+        var arWeekDays = [
+          translateKey("Mon"),
+          translateKey("Tue"),
+          translateKey("Wed"),
+          translateKey("Thu"),
+          translateKey("Fri"),
+          translateKey("Sat"),
+          translateKey("Sun")
+          ];
+        for(x = 0; x < 7; x++) {
+          arTicks.push(arWeekDays[x]);
+        }
+        break;
+      case "month":
+        for (x = 1; x <= getNumberOfDaysInMonth(curDate.getMonth(), curDate.getFullYear()); x++) {
+          arTicks.push(x.toString());
+        }
+        break;
+      case "year":
+        var arMonth = [
+        translateKey("Jan"),
+        translateKey("Feb"),
+        translateKey("Mar"),
+        translateKey("Apr"),
+        translateKey("May"),
+        translateKey("Jun"),
+        translateKey("Jul"),
+        translateKey("Aug"),
+        translateKey("Sep"),
+        translateKey("Oct"),
+        translateKey("Nov"),
+        translateKey("Dec")
+        ];
+        for (x = 0; x <= 11; x++) {
+          arTicks.push(arMonth[x]);
+        }
+        break;
+    }
+    return arTicks;
+  }
+
+  function resetAllBtn() {
+    jQuery(".jPeriodButton").css("color","#000000");
+  }
+
+	function setSelectedBtn(mode) {
+    var arMode = ["Hour","Day","Week","Month","Year"];
+	  resetAllBtn();
+	  jQuery("#selectPeriodLast"+arMode[mode]).css("color","green");
+	};
+
+  function setTimeSelectors() {
+    jElemsDate = jQuery("#selectPeriodStartDate, #selectPeriodEndDate");
+    jElemsTime = jQuery("#selectPeriodStartTime, #selectPeriodEndTime");
+
+    if (consolidationMode == 3) {
+      jElemsDate.attr("readonly", true);
+      jElemsTime.attr("readonly", true);
+      jQuery(".datepicker").datepicker("disable");
+      jQuery(".timepicker").timepicker("disable");
+    } else {
+      jElemsDate.attr("readonly", false);
+      jElemsTime.attr("readonly", false);
+      jQuery(".datepicker").datepicker("enable");
+      jQuery(".timepicker").timepicker("enable");
+    }
+  };
+
+	function initGui() {
+		jQuery(window).unbind('resize');
+		jQuery(window).resize(function() {
+			clearTimeout(refreshDiagramOnRefreshTimeout);
+			refreshDiagramOnRefreshTimeout = setTimeout(doneResizing, 250);
+		});
+
+		setTimeSelectors();
+
+		jQuery("#selectConsolidationFunction").change(function() {
+		  consolidationMode = this.value;
+      setTimeSelectors();
+      setRenderer(this.value);
+      refreshDiagram();
+		});
+
+    jQuery("#selectPeriodLastHour").click(function() {
+      defaultPeriod = 0;
+      timePeriod = arPeriod[defaultPeriod];
+      showPeriod(defaultPeriod);
+      refreshDiagram();
+    });
+
+    jQuery("#showCustomModeHelp").click(function() {
+      showCustomModeHelp();
+    });
+
+		btnPeriodDay.click(function() {
+      defaultPeriod = 1;
+      timePeriod = arPeriod[defaultPeriod];
+      showPeriod(defaultPeriod);
+			refreshDiagram();
+		});
+			
+		btnPeriodWeek.click(function() {
+      defaultPeriod = 2;
+      timePeriod = arPeriod[defaultPeriod];
+      showPeriod(defaultPeriod);
+			refreshDiagram();
+		});
+		
+		btnPeriodMonth.click(function() {
+      defaultPeriod = 3;
+      timePeriod = arPeriod[defaultPeriod];
+      showPeriod(defaultPeriod);
+			refreshDiagram();
+		});
+		
+		btnPeriodYear.click(function() {
+      defaultPeriod = 4;
+      timePeriod = arPeriod[defaultPeriod];
+      showPeriod(defaultPeriod);
+			refreshDiagram();
+		});
+		
+		jQuery("#selectPeriodDo").click(function() {
+			refreshDiagram();
+		});
+		
+		jQuery("#exportPeriodDo").click(function() {
+			exportDiagram();
+		});
+		
+		jQuery("#resetDiagramZoom").click(function() {
+			resetDiagramZoom();
+		});
+
+		btnComparisonPeriod.click(function() {
+
+		  if (!noDiagramData) {
+		    comparisonSelectedDevice = 0;
+		    showComparisonPeriod = (showComparisonPeriod == true) ? false : true;
+        (showComparisonPeriod == true && (numberOfDevices > 1)) ? selBoxComparisonDevice.show() : selBoxComparisonDevice.hide();
+		    ShowDiagram(lastDiagramSettingsAsJson);
+		  }
+		});
+
+		selBoxComparisonDevice.change(function() {
+		   comparisonSelectedDevice = this.value;
+		   showComparisonPeriod = true;
+		   ShowDiagram(lastDiagramSettingsAsJson);
+		});
+
+    // Only for testing
+    jQuery("#toggleRenderer").click(function() {
+      if (diagramRenderer == undefined) {
+        diagramRenderer = jQuery.jqplot.BarRenderer;
+      } else {
+        diagramRenderer = undefined;
+      }
+      refreshDiagram();
+    });
+		var legendTooltipText = jQuery('#legendTooltipText').text();
+		jQuery('#legendTooltip').attr('title', legendTooltipText);
+		initPicker();
+	};
+	
+	function doneResizing(){
+		if (lastDiagramSettingsAsJson != undefined) {
+			 ShowDiagram(lastDiagramSettingsAsJson);
+		}
+	}
+	
+	function initPicker() {
+		var langDatePicker = {
+			monthNames: [
+				translateKey('timeModuleSelectSerialPatternJan'),
+				translateKey('timeModuleSelectSerialPatternFeb'),
+				translateKey('timeModuleSelectSerialPatternMar'),
+				translateKey('timeModuleSelectSerialPatternApr'),
+				translateKey('timeModuleSelectSerialPatternMay'),
+				translateKey('timeModuleSelectSerialPatternJun'),
+				translateKey('timeModuleSelectSerialPatternJul'),
+				translateKey('timeModuleSelectSerialPatternAug'),
+				translateKey('timeModuleSelectSerialPatternSep'),
+				translateKey('timeModuleSelectSerialPatternOct'),
+				translateKey('timeModuleSelectSerialPatternNov'),
+				translateKey('timeModuleSelectSerialPatternDec')
+				],
+			dayNames: [
+				translateKey('timeModuleLblSelSerialPatternSunday'),
+				translateKey('timeModuleLblSelSerialPatternMonday'),,
+				translateKey('timeModuleLblSelSerialPatternTuesday'),
+				translateKey('timeModuleLblSelSerialPatternWednesday'),
+				translateKey('timeModuleLblSelSerialPatternThursday'),
+				translateKey('timeModuleLblSelSerialPatternFriday'),
+				translateKey('timeModuleLblSelSerialPatternSaturday')
+				],
+			dayNamesMin: [
+				translateKey('Sun'),
+				translateKey('Mon'),
+				translateKey('Tue'),
+				translateKey('Wed'),
+				translateKey('Thu'),
+				translateKey('Fre'),
+				translateKey('Sat')
+				],
+			firstDay: 1,
+			isRTL: false
+		};
+		jQuery.datepicker.setDefaults(langDatePicker);
+		
+		jQuery(".datepicker").datepicker({
+			dateFormat: 'dd.mm.yy',
+			showButtonPanel: true,
+			closeText: translateKey("btnOk")
+		});
+		
+		jQuery(".timepicker").timepicker({
+			showAnim: 'blind',
+			hourText: translateKey('Hou'),
+			minuteText: translateKey('Min'),
+			amPmText: ['AM', 'PM'],
+			showCloseButton: true,
+			closeButtonText: translateKey("btnOk")
+		});
+	}
+	
+	showPeriod = function(periodChoice) {
+		var offset1 = (barRenderer) ? 2 : 1;
+		var offset2 = (barRenderer) ? 14 : 7;
+		selectedPeriod = parseInt(periodChoice);
+
+		var start;
+		switch (selectedPeriod) {
+		// last hour
+		//case 0:
+			//start = new Date(new Date().setHours(new Date().getHours() - offset1));
+			//break;
+		// last day
+		case 0:
+		case 1:
+			//start = new Date(new Date().setDate(new Date().getDate() - 1));
+			start = new Date(new Date().setDate(new Date().getDate() - offset1));
+			break;
+		// last week
+		case 2:
+			//start = new Date(new Date().setDate(new Date().getDate() - 7));
+			start = new Date(new Date().setDate(new Date().getDate() - offset2));
+			break;
+			
+		// last month
+		case 3:
+			//start = new Date(new Date().setMonth(new Date().getMonth() - 1));
+			start = new Date(new Date().setMonth(new Date().getMonth() - offset1));
+			break;
+			
+		// last year
+		case 4:
+			//start = new Date(new Date().setFullYear(new Date().getFullYear() - 1));
+			start = new Date(new Date().setFullYear(new Date().getFullYear() - offset1));
+			break;
+		}
+
+		if (barRenderer) {
+		  jQuery("#tdCustomModeHelp").hide();
+		  jQuery(".j_barGraphMode").show();
+		  setSelectedBtn(selectedPeriod);
+		} else {
+		  jQuery("#tdCustomModeHelp").show();
+		  jQuery(".j_barGraphMode").hide();
+		  resetAllBtn();
+		}
+		var end = curDate;
+		showPeriodInGui(start, end);
+	};
+	
+	showPeriodInGui = function(start, end) {
+		jQuery('#selectPeriodStartDate').val(getFormattedDate(start));
+		jQuery('#selectPeriodEndDate').val(getFormattedDate(end));
+		jQuery('#selectPeriodStartTime').val(getFormattedTime(start));
+		jQuery('#selectPeriodEndTime').val(getFormattedTime(end));
+	};
+	
+	function getFormattedDate(date) {
+		return manageLeadingZero(date.getDate(), 2) + '.' + manageLeadingZero((date.getMonth() + 1), 2) + '.' + manageLeadingZero(date.getFullYear(), 4);
+	};
+	
+	function getFormattedTime(date) {
+		return manageLeadingZero(date.getHours(), 2) + ':' + manageLeadingZero(date.getMinutes(), 2);
+	};
+	
+	function manageLeadingZero(number, size) {	
+		var result = number + "";
+		while (result.length < size) {
+			result = "0" + result;
+		}
+		
+		return result;
+	};
+	
+	triggerDiagram = function(diagramID) {
+		if (!${initialized?string('true', 'false')}) {
+			return;
+		}
+		showComparisonPeriod = false;
+		selBoxComparisonDevice.hide();
+		highlightSelectedDiagram(diagramID);
+	
+		selectedDiagramId = diagramID;
+		triggerDiagramRefresh(selectedDiagramId, false);
+	};
+
+	triggerDiagramRefresh = function(diagramID, useCustomPeriod) {
+		if (!${initialized?string('true', 'false')}) {
+			return;
+		}
+		var url = '/pages/jpages/diagram/control/show?sid=' + SessionId + '&diagramid=' + diagramID + '&consolidationFunction=' + getConsolitation() + '&timePeriod=' + arPeriod[defaultPeriod];
+
+		if (useCustomPeriod) {
+			var customPeriodStart = jQuery('#selectPeriodStartDate').val() + '_' + jQuery('#selectPeriodStartTime').val();
+			var customPeriodEnd = jQuery('#selectPeriodEndDate').val() + '_' + jQuery('#selectPeriodEndTime').val();
+			url += '&start=' + customPeriodStart + '&end=' + customPeriodEnd;
+		} else {
+			appendDiagramSettings(diagramID);
+		}
+
+		if (!barRenderer) {
+		  showComparisonPeriod = false;
+		}
+		blockUI();
+		var opt =
+		{
+			onComplete: function(t) {
+				var response = JSON.parse(t.responseText);
+				if(!response.isSuccessful)
+				{
+					if(response.errorCode == "42")
+					{
+						jQuery("#content").html(response.content);
+					} else {
+						alert(response.content);
+					}
+				} else {
+				  lblNoDataAvailable.hide();
+				  noDiagramData = false;
+					ShowDiagram([response.content]);
+				}
+				
+				jQuery.unblockUI();
+			},
+			onException: function(t) {
+			  conInfo("Exception triggerDiagramRefresh!");
+			  lblNoDataAvailable.show();
+        //Draw an empty chart
+        diagramElem.empty();
+        var options = {
+          seriesDefaults: {
+            renderer: jQuery.jqplot.BarRenderer
+          },
+          axesDefaults: {
+            tickRenderer: jQuery.jqplot.CanvasAxisTickRenderer,
+            tickOptions: {angle: 37}
+          },
+          axes: {
+            xaxis: {
+              renderer:jQuery.jqplot.CategoryAxisRenderer,
+              ticks: getBarGraphTicks(),
+            }
+          }
+        }
+        noDiagramData = true;
+        var lastPlotter = jQuery.jqplot('currentDiagram', [[null]], options );
+        jQuery.unblockUI();
+			}
+		}
+		setTimeout(function() {jQuery.unblockUI();}, 10000); // Fallback after 10000ms.....
+		new Ajax.Request(url, opt);
+	};
+
+	refreshDiagram = function() {
+		triggerDiagramRefresh(selectedDiagramId, true);
+	};
+
+	exportDiagram = function() {
+		var url = '/pages/jpages/diagram/control/export?sid=' + SessionId + '&language=' + getLang() + '&diagramid=' + selectedDiagramId + '&consolidationFunction=' + getConsolitation();
+		var customPeriodStart = jQuery('#selectPeriodStartDate').val() + '_' + jQuery('#selectPeriodStartTime').val();
+		var customPeriodEnd = jQuery('#selectPeriodEndDate').val() + '_' + jQuery('#selectPeriodEndTime').val();		
+		url += '&start=' + customPeriodStart + '&end=' + customPeriodEnd;
+        window.open(url,'_blank')
+	};
+
+
+	function resetDiagramZoom() {
+    if (window.lastPlotter != undefined) {
+      window.lastPlotter.resetZoom();
+    }
+	};
+
+  function hideCustomModeElements() {
+    jQuery("[name='customMode']").hide();
+  };
+
+  function showCustomModeElements() {
+    jQuery("[name='customMode']").show();
+  };
+
+	function ShowDiagram(diagramSettingsAsJson) {
+		setTimeSelectors();
+		// only show diagram and its options if data is available
+		if (diagramSettingsAsJson) {
+			jQuery('#contentRight').css('visibility','visible');
+		} else {
+			jQuery('#contentRight').css('visibility','hidden');
+		}
+		
+		var diagramSettings = JSON.parse(diagramSettingsAsJson);
+    storeOrigXAxisTimePeriod(diagramSettings.options.axes.xaxis.min, diagramSettings.options.axes.xaxis.max);
+
+    var numberOfNecessaryDatapoints = (barRenderer == false) ? 2 : 1;
+    // Show hint when no diagram data available
+    // With the line diagram we need at least 2 datapoints, the bargraph diagram needs 1 datapoint
+    jQuery.each(diagramSettings.diagram, function(index,diagram) {
+      if (diagram.length < numberOfNecessaryDatapoints ) {
+        lblNoDataAvailable.show();
+        noDiagramData = true;
+      }
+    });
+
+		// release memory and empty the chart if necessary
+		if (window.lastPlotter != undefined) {
+		  window.lastPlotter.destroy();
+		}
+
+		// clear diagramm and initialize renderers
+		diagramElem.empty();
+		diagramSettings.options.axes.xaxis.renderer = jQuery.jqplot.DateAxisRenderer;
+		diagramSettings.options.axesDefaults = { tickRenderer: jQuery.jqplot.CanvasAxisTickRenderer};
+		diagramSettings.options.legend.renderer = jQuery.jqplot.EnhancedLegendRenderer;
+		
+		// do not allow zoom if no series has a value
+		if (!hasOneSeriesAtLeastOneValue(diagramSettings.diagram)) {
+			diagramSettings.options.cursor.zoom = false;
+		}
+		
+		// disable reset diagram zoom button if zoom is not enabled
+		if(diagramSettings.options.cursor.zoom == true) {
+			jQuery("#resetDiagramZoom").show(); 
+		} else {
+			jQuery("#resetDiagramZoom").hide();
+		}
+		
+		// set device name as series value
+		for (var i = 0; i < diagramSettings.options.series.length; i++)
+		{
+			var oldLabel = diagramSettings.options.series[i].label;
+			var label = GetChannelName(oldLabel.substring(0,12)) + " ";
+			label += translateKey('diagramValueType' + oldLabel.split(" ")[1]);
+			diagramSettings.options.series[i].label = label;
+		}		
+		
+		// show chart even if no data is available for selected period (jqplot needs at least one value for plotting)
+		if (diagramSettings.diagram.length == 0) {
+			diagramSettings.diagram = [[null]];
+		} else {
+			for (var i = 0; i < diagramSettings.diagram.length; i++)
+			{
+				if(diagramSettings.diagram[i].length == 0) {
+					diagramSettings.diagram[i] = [null];
+				}
+			}
+		}
+		
+		// adjust diagramm width and height
+		var isLegendOutsideOfDiagram = diagramSettings.options.legend.placement == "outside";
+		adjustDiagramSize(diagramSettings.diagram.length, isLegendOutsideOfDiagram);
+		
+		// show single data point instead of empty chart if only one value for a series is available
+		for (var i = 0; i < diagramSettings.diagram.length; i++) {
+			diagramSettings.options.series[i].showMarker = diagramSettings.diagram.indexOf(i).length == 1;
+		}
+
+    // Only for debugging! Don´t forget to uncomment this. Otherwise you will experience massive problems with some MS browsers :-(
+    // console.dir(diagramSettings);
+
+    setButtonText(diagramSettings.type);
+		// plot the diagram
+		diagramSettings.options.seriesDefaults.renderer = diagramRenderer;
+		if (barRenderer) {
+    selBoxComparisonDevice.html("");
+
+    if (createDummy) {
+      // ************ DUMMY DEVICE ************
+      // Creates a dummy device with nearly identical data
+      var dummyDiagramData = [];
+      jQuery.extend(true, dummyDiagramData, diagramSettings.diagram);
+      jQuery.each(dummyDiagramData[0], function(index,value) {
+        if (value[1]) {
+          // Dummy data = original * 0.95 so it is somewhat different
+          dummyDiagramData[0][index][1] = value[1] * 0.95 ;
+        }
+      });
+      diagramSettings.diagram.push(dummyDiagramData[0]);
+      jQuery.extend(true, dummyDiagramData, diagramSettings.options.series);
+      diagramSettings.options.series.push(dummyDiagramData[0]);
+      diagramSettings.options.series[1].label = "DummY Nr. 1";
+      diagramSettings.options.seriesColors.push("#FFFF00");
+
+      // ************ END DUMMY DEVICE ************
+
+      /*
+      // ************ DUMMY DEVICE ************
+      // Creates a dummy device with nearly identical data
+      var dummyDiagramData = [];
+      jQuery.extend(true, dummyDiagramData, diagramSettings.diagram);
+      jQuery.each(dummyDiagramData[0], function(index,value) {
+        if (value[1]) {
+          // Dummy data = original * 1.25 so it is somewhat different
+          dummyDiagramData[0][index][1] = value[1] * 1.25 ;
+        }
+      });
+      diagramSettings.diagram.push(dummyDiagramData[0]);
+      jQuery.extend(true, dummyDiagramData, diagramSettings.options.series);
+      diagramSettings.options.series.push(dummyDiagramData[0]);
+      diagramSettings.options.series[2].label = "DummY Nr. 2";
+      diagramSettings.options.seriesColors.push("#666699");
+      // ************ END DUMMY DEVICE ************
+      */
+    }
+
+    numberOfDevices = diagramSettings.diagram.length;
+
+  	jQuery.each(diagramSettings.options.series, function (index, item) {
+        selBoxComparisonDevice.append(jQuery('<option>', {
+            value: index,
+            text : item.label
+        }));
+    });
+
+    selBoxComparisonDevice.val(getSelectedDeviceForComparison());
+
+      var origDiagramData = [];
+      var comparisonOptions = [];
+      var comparisonDiagram = [];
+
+      jQuery.extend(true, origDiagramData, diagramSettings.diagram);
+
+		  numberOfDataSets = diagramSettings.diagram.size();
+ 		  hideCustomModeElements();
+      diagramSettings.options.seriesDefaults.rendererOptions = getBarGraphRenderOptions();
+      diagramSettings.options.axes.xaxis.tickInterval = getTickInterval();
+      diagramSettings.options.axes.yaxis.tickOptions = {formatString: "%.2f"}; // %d is another option (without zoom)
+
+      // The next 3 lines are changing the x-axis renderer
+      diagramSettings.diagram = stripDiagramData(diagramSettings.diagram);
+      diagramSettings.options.axes.xaxis.renderer = jQuery.jqplot.CategoryAxisRenderer;
+      diagramSettings.options.axes.xaxis.ticks = getBarGraphTicks();
+
+      // 1 = Temperature, 2 = Power, 3 = Consumption, 4 = User
+      if (diagramSettings.type == 1 || diagramSettings.type == 2) {
+        var xAxis = getBarGraphXAxis(defaultPeriod);
+        diagramSettings.options.axes.xaxis.min = xAxis.min;
+        diagramSettings.options.axes.xaxis.max = xAxis.max;
+        diagramSettings.options.axes.xaxis.tickInterval = xAxis.tickInterval;
+        diagramSettings.options.axes.xaxis.tickOptions.formatString = xAxis.timeFormatString;
+        //diagramSettings.options.axes.xaxis.tickOptions.angle = 0;
+      } else {
+        diagramSettings.options.axes.xaxis.min = origXAxis.min;
+        diagramSettings.options.axes.xaxis.max = origXAxis.max;
+      }
+
+      if (showComparisonPeriod)  {
+        jQuery.extend(true, comparisonOptions, diagramSettings.options);
+
+        // This will display only one device with its comparison data
+        var selectedDevice = getSelectedDeviceForComparison();
+        comparisonDiagram.push(diagramSettings.diagram[selectedDevice]);
+        comparisonDiagram.push(getCompareData(origDiagramData[selectedDevice]));
+        comparisonOptions.seriesColors[0] = diagramSettings.options.seriesColors[selectedDevice];
+        comparisonOptions.seriesColors[1] = getComparisonColor(diagramSettings.options.seriesColors[selectedDevice]);
+
+        comparisonOptions.series[0].label = diagramSettings.options.series[selectedDevice].label;
+        comparisonOptions.series[1] = getComparisonOptions();
+        comparisonOptions.series[1].label =  translateKey("diagramComparisonPeriod") + ": " + translateKey(comparisonLegendExtension);
+
+
+        /*
+        With this we can display all devices including the comparision data
+        This will lead to a mayhem of bar graphs when more devices are involved.
+
+        jQuery.each(origDiagramData, function(index, diagram) {
+          comparisonDiagram.push(diagramSettings.diagram[index]);
+          comparisonDiagram.push(getCompareData(origDiagramData[index]));
+          comparisonOptions.seriesColors.splice((index * 2) + 1, 0, getComparisonColor(diagramSettings.options.seriesColors[index]));
+          comparisonOptions.series.splice(index * 2 + 1, 0, (getComparisonOptions()));
+        });
+        */
+
+        diagramSettings.options = comparisonOptions;
+        diagramSettings.options.axes.yaxis.max = getMinMaxValue(comparisonDiagram, "max");
+
+        // Min value of the y-Axis set to 'auto'
+        if (!diagramSettings.options.axes.yaxis.customMin) {
+          diagramSettings.options.axes.yaxis.min = getMinMaxValue(comparisonDiagram, "min");
+        }
+        // Max value of the y-Axis set to 'auto'
+        if (!diagramSettings.options.axes.yaxis.customMax) {
+          diagramSettings.options.axes.yaxis.max = getMinMaxValue(comparisonDiagram, "max");
+        }
+      } else {
+        // Min value of the y-Axis set to 'auto'
+        if (!diagramSettings.options.axes.yaxis.customMin) {
+          diagramSettings.options.axes.yaxis.min = getMinMaxValue(diagramSettings.diagram, "min");
+        }
+
+        // Max value of the y-Axis set to 'auto'
+        if (!diagramSettings.options.axes.yaxis.customMax) {
+          diagramSettings.options.axes.yaxis.max = getMinMaxValue(diagramSettings.diagram, "max");
+        }
+      }
+    } else {
+      showCustomModeElements();
+    }
+    // ATTENTION only for debugging - IE might crash when not in debugging mode (console available)
+    if (debug == "true" && !jQuery.browser.msie) {
+      console.dir(diagramSettings);
+		}
+
+		if (showComparisonPeriod)  {
+		  lastPlotter = jQuery.jqplot('currentDiagram', comparisonDiagram, diagramSettings.options );
+    } else {
+		  lastPlotter = jQuery.jqplot('currentDiagram', diagramSettings.diagram, diagramSettings.options );
+		}
+		lastDiagramSettingsAsJson = diagramSettingsAsJson;
+
+    // the tooltip doesn´t work with lte IE8
+    if(!jQuery.browser.msie || (jQuery.browser.msie && parseInt(jQuery.browser.version) > 8)) {
+      // add tooltip
+      addLegendTooltip();
+      jQuery.jqplot.postDrawHooks.push(addLegendTooltip);
+    } else {
+      jQuery("#legendTooltipText, #legendTooltip, #diagramPleaseWaitForLoadingNextDiagram").hide();
+    }
+	};
+
+	function hasOneSeriesAtLeastOneValue(series) {
+		for (var i = 0; i < series.length; i++) {			
+			if (series[i].length > 0) {
+				return true;
+			}
+		}
+	
+		return false;
+	}
+	
+	function adjustDiagramSize(amountOfSeries, isLegendOutsideOfDiagram) {
+		var minWidth = 400;
+		var minHeight = 200;
+	
+		var offsetRight = 50; // correct displaying of all x axis labels
+		var offsetTopDown = 370; // space for header, control elements and footer
+		
+		if (isLegendOutsideOfDiagram) {
+			offsetTopDown += calculatePossibleLegendHeight(amountOfSeries);
+		}
+		
+		var calculatedWidth = jQuery(window).width() - jQuery('#contentLeft').width() - offsetRight;
+		var calculatedHeight = jQuery(window).height() - offsetTopDown;
+		
+		if (calculatedWidth < minWidth) {
+			calculatedWidth = minWidth;
+		}
+		
+		if (calculatedHeight < minHeight) {
+			calculatedHeight = minHeight;
+		}
+		
+		jQuery('#currentDiagram').width(calculatedWidth);
+		jQuery('#currentDiagram').height(calculatedHeight);
+	}
+	
+	function calculatePossibleLegendHeight(amountOfSeries) {
+		var legendColumns = 4;
+		var heightForEachRow = 42;
+		
+		var amountOfRowsInLegend = Math.ceil(amountOfSeries / legendColumns);
+		return amountOfRowsInLegend * heightForEachRow;
+	}
+	
+	function addLegendTooltip() {
+		jQuery('#legendTooltip').css('visibility', 'visible');
+		
+		var tooltipDiv = jQuery('#legendTooltip').clone();		
+		jQuery('.jqplot-table-legend:last').append(tooltipDiv);
+	}
+
+	function appendDiagramSettings(diagramID) {		
+		var url = '/pages/jpages/diagram/control/settings?sid=' + SessionId + '&diagramid=' + diagramID;
+		var opt =
+		{
+			onComplete: function(t) {
+				var response = JSON.parse(t.responseText);
+				if(!response.isSuccessful)
+				{
+					if(response.errorCode == "42")
+					{
+						jQuery("#content").html(response.content);
+					} else {
+						alert(response.content);
+					}
+				} else {
+					var diagramSettings = JSON.parse(response.content);					
+					parseDiagramSettings(diagramSettings);
+				}
+			}
+		}
+		
+		new Ajax.Request(url, opt);
+	};
+	
+	function parseDiagramSettings(diagramSettings) {
+    var tmpDefaultPeriod = defaultPeriod,
+    tmpConsolidationFunction = getConsolitation();
+		setConsolidationFunction(diagramSettings.consolidationFunction);
+    defaultPeriod = diagramSettings.defaultPeriod;
+		setVisibilitySelectPeriod(diagramSettings.isOperable);
+		showPeriod(defaultPeriod);
+		if ((tmpDefaultPeriod != diagramSettings.defaultPeriod) || (tmpConsolidationFunction != diagramSettings.consolidationFunction)) {
+		  triggerDiagram(selectedDiagramId);
+		}
+	};
+	
+	function setVisibilitySelectPeriod(isVisible) {
+		if (isVisible) {
+			jQuery('#selectPeriod').show();
+		} else {
+			jQuery('#selectPeriod').hide();
+		}
+	};
+
+	function setConsolidationFunction(consolidationFunction) {
+    setRenderer(consolidationFunction);
+		consolidationMode = consolidationFunction;
+	};
+	
+	function highlightSelectedDiagram(diagramID) {
+		jQuery('#diagrams td').removeClass('ButtonStatusRoomsSelected');
+		jQuery('#diagram' + diagramID).addClass('ButtonStatusRoomsSelected');
+		jQuery('#diagram' + diagramID).css('text-align', 'left');
+	};
+	
+	function blockUI() {
+		jQuery.blockUI({
+			message: jQuery('#diagramPleaseWaitForLoadingNextDiagram').text()
+		});
+	}
+
+  function showCustomModeHelp() {
+    MessageBox.show(translateKey("diagramHelpCustomModeTitle"),
+     translateKey("diagramHelpCustomModeContent")
+    ,
+    "",
+    600,
+    250
+    );
+  }
+
+	GetChannelName = function(address) {
+		var ch = DeviceList.getChannelByAddress(address);
+		if (ch != undefined) {
+			return ch.getName();
+		} else {
+			return address;
+		}
+	};
+
+	(function () {
+		initSite();
+		
+		if (!${initialized?string('true', 'false')}) {
+		
+			var s = "<table id=\"dataloggingError\" class=\"tTable\" cellpadding=\"3\" cellspacing=\"3\"><tr><td class=\"CLASS21906\">";
+			s += translateKey('diagramDataloggingNotInitialised');
+			s += "</td></tr></table>";
+			jQuery('#contentRight').html(s);
+			jQuery('#contentRight').css('visibility','visible');
+			return;
+		}
+		
+		initGui();
+		
+		var firstDiagram = ${firstDiagram};
+		if (firstDiagram != -1) {
+			triggerDiagram(firstDiagram);
+		}
+	})();
+</script>
+</head>
+<body>
+<table id="${TableId}" width="100%" class="CLASS03900" cellpadding="0" cellspacing="0">
+  <tr>
+    <td id="contentLeft">
+		<div class="CLASS04002" style="height: 719px;">
+			<table id="tblFunctionNames" class="CLASS03903" border="1" cellpadding="4" cellspacing="0" style="width:200px">
+				<#list objectList as diagram>
+					<tr id="diagrams">
+						<td id='diagram${diagram.id}' class="ButtonStatusRooms CLASS03905" onclick="triggerDiagram(${diagram.id});">
+							<table>
+								<tr class='CLASS03904'>
+									<td style="font-weight:bold;">${diagram.name}</td></td>
+								</tr>
+								<tr>
+									<td>${diagram.description}</td>
+								</tr>
+							</table>
+						</td>
+					</tr>
+				</#list>
+			</table>
+		</div>
+   </td>
+   
+   <td id="contentRight" class="j_translate">
+		<div id="selectPeriod">
+			<table>
+				<tr>
+          <!--
+          <td>
+            <input type="button" value="diagramPeriodLastHour" name="diagramPeriodLastHour" id="selectPeriodLastHour" class="StdButtonBig jPeriodButton"/>
+          </td>
+          -->
+					<td>
+						<input type="button" value="diagramPeriodLastDay" name="diagramPeriodLastDay" id="selectPeriodLastDay" class="StdButtonBig jPeriodButton"/>
+					</td>
+					<td>
+						<input type="button" value="diagramPeriodLastWeek" name="diagramPeriodLastWeek" id="selectPeriodLastWeek" class="StdButtonBig jPeriodButton"/>
+					</td>
+					<td>
+						<input type="button" value="diagramPeriodLastMonth" name="diagramPeriodLastMonth" id="selectPeriodLastMonth" class="StdButtonBig jPeriodButton"/>
+					</td>
+					<td>
+						<input type="button" value="diagramPeriodLastYear" name="diagramPeriodLastYear" id="selectPeriodLastYear" class="StdButtonBig jPeriodButton"/>
+					</td>
+				</tr>
+			</table>
+			<table name="customMode">
+				<tr>
+					<td>${"$"}{diagramPeriodCustomStart}</td>
+					<td><input type="text" id="selectPeriodStartDate" class="datepicker"/></td>
+					<td><input type="text" id="selectPeriodStartTime" class="timepicker"/></td>
+					<td width="15px"></td>
+					<td>${"$"}{diagramPeriodCustomEnd}</td>
+					<td><input type="text" id="selectPeriodEndDate" class="datepicker"/></td>
+					<td><input type="text" id="selectPeriodEndTime" class="timepicker"/></td>
+				</tr>
+			</table>
+			<table>
+				<tr>
+					<td name="customMode">${"$"}{thDiagramSelectTempConsolidationFunction}</td>
+					<td name="customMode">
+						<select id="selectConsolidationFunction" size="1">
+							<option value="0">${"$"}{diagramConsolidationFunctionAverage}</option>
+							<option value="1">${"$"}{diagramConsolidationFunctionMinimum}</option>
+							<option value="2">${"$"}{diagramConsolidationFunctionMaximum}</option>
+						</select>
+					</td>
+
+          <td id="tdCustomModeHelp" class="CLASS01408 hidden">
+            &nbsp;
+            <img id="showCustomModeHelp" height="25" width="25" src="/ise/img/help.png">
+          </td>
+
+          <td>
+            <input type="button" value="btnDiagramShowComparisonPeriod" name="btnDiagramShowComparisonPeriod" class="j_barGraphMode StdButtonBig hidden" id="showComparisonPeriod"/>
+          </td>
+
+          <td>
+            <select class="hidden" id="selectDeviceForComparisonPeriod" />
+          </td>
+
+          <!-- for testing only -->
+          <!--
+          <td>
+            <input type="button" value="ToggleRenderer" name="" class="StdButtonBig" id="toggleRenderer"/>
+          </td>
+          -->
+
+				</tr>
+			</table>
+		</div>
+		<table>
+			<tr>
+        <td>
+          <input type="button" value="btnDiagramRepaint" name="btnDiagramRepaint" class="StdButtonBig" id="selectPeriodDo"/>
+        </td>
+				<td>
+					<input type="button" value="btnDiagramResetZoom" name="btnDiagramResetDiagramZoom" class="StdButtonBig" id="resetDiagramZoom"/>
+				</td>
+        <td>
+          <input type="button" value="btnDiagramExport" name="btnDiagramExport" class="StdButtonBig" id="exportPeriodDo"/>
+        </td>
+			</tr>
+		</table>
+		<div id='hintNoDataAvailable' class='hidden' style='text-align:center'><b>${'$'}{diagramNoDataAvailable}</b></div>
+		<div id="currentDiagram" style="margin-left: 25px;"></div>
+		
+		<div id="legendTooltipText" class="hideAtStart">${"$"}{diagramLegendExplanationTooltip}</div>
+		<div id="legendTooltip" class="hideAtStart">${"$"}{diagramLegendExplanationTeaser}</div>
+		<div id="diagramPleaseWaitForLoadingNextDiagram" class="hideAtStart">${"$"}{diagramPleaseWaitForLoadingNextDiagram}</div>
+
+   </td>
+</table>
+</body>
 </html>
\ No newline at end of file
diff --git a/HMserver/opt/HMServer/pages/DiagramSettingsDetailPage.ftl b/HMserver/opt/HMServer/pages/DiagramSettingsDetailPage.ftl
index ff815251..ddfcd859 100644
--- a/HMserver/opt/HMServer/pages/DiagramSettingsDetailPage.ftl
+++ b/HMserver/opt/HMServer/pages/DiagramSettingsDetailPage.ftl
@@ -1,576 +1,576 @@
-<html>
-<head>
-
-
-<script type="text/javascript">
-	var notAssignedVisible;
-	var diagramType;
-
-	var jUnitElm = jQuery("#diagram_displayedUnit"),
-	jConsolidationElm = jQuery("#diagram_defaultConsolidationFunction");
-
-  GetDeviceName = function(address) {
-	var dev = DeviceList.getDeviceByAddress(address);
-	if (dev != undefined) {
-		return dev.getName();
-	} else {
-		return address;
-	}
-  };
-  
-  GetChannelName = function(address) {
-	var ch = DeviceList.getChannelByAddress(address);
-	if (ch != undefined) {
-		return ch.getName();
-	} else {
-		return address;
-	}
-  };
-  
-  ShowNotAssigned = function() {
-	jQuery('#notAssignedDataSources').show(); 
-	jQuery('#notAssignedDataSourcesMINUS').show();
-	jQuery('#notAssignedDataSourcesPLUS').hide();
-	notAssignedVisible = 1;
-  };
-  
-  HideNotAssigned = function() {
-	jQuery('#notAssignedDataSources').hide(); 
-	jQuery('#notAssignedDataSourcesMINUS').hide();
-	jQuery('#notAssignedDataSourcesPLUS').show();
-	notAssignedVisible = 0;
-  };
-
-  adaptDefaultPeriodOptions = function() {
-    var arOptions = [
-      translateKey("diagramPeriodToday"),
-      translateKey("diagramPeriodThisWeek"),
-      translateKey("diagramPeriodThisMonth"),
-      translateKey("diagramPeriodThisYear")
-    ];
-
-    jQuery("#diagram_defaultPeriod option").each(function(index) {
-      jQuery(this).text(arOptions[index]);
-    });
-  };
-
-  initDiagramType = function(type) {
-    // type 1 = temperature, 2 = energy, 3 = user
-    // TODO translate the unit values
-    var arUnit = ["","\u00B0C", "Wh", ""];
-    if (jUnitElm.val() == "") {
-      jUnitElm.val(arUnit[type]);
-    }
-    if (type == 1 || type == 2) {
-      // With bargraph diagrams the visible time period changes, e. g. there is no 'Last 24h' but a option 'Today'
-      adaptDefaultPeriodOptions();
-
-      // Select only the value 'Total' and hide the other options.
-      jConsolidationElm.val(3).prop("selected", true).prop("disabled",true);
-      jQuery("[name='nonTotal']").hide();
-      jQuery("[name='total']").show();
-    } else {
-      // Hide the option 'Total'
-      jQuery("[name='nonTotal']").show();
-      jQuery("[name='total']").hide();
-    }
-
-  };
-
-(function () {
-	setPath("<span onclick='WebUI.enter(DiagramDetailPage);'>"+translateKey('menuSettingsPage')+"</span> &gt; "+ translateKey('submenuCreateDiagram'));
-
-	<#if object.id = 0 && object.name == "">
-		jQuery('#diagram_name').val(translateKey('diagramDefaultName'));
-	</#if>
-	
-	var s = "";
-	s += "<table cellspacing='8'>";
-	s += "<tr>";
-	s += "<td align='center' valign='middle'><div class='FooterButton' onclick='ReturnToListWithoutSave();'>"+ translateKey('footerBtnCancel') +"</div></td>";
-	s += "<td align='center' valign='middle'><div class='FooterButton' onclick='SaveDiagram();'>"+ translateKey('footerBtnOk') +"</div></td>";
-	s += "</tr>";
-	s += "</table>";
-	setFooter(s);
-	translateButtons("btnRemove");
-	translateButtons("btnAddDataSource");
-	translatePage("#parameterTable");
-	translatePage("#dataSourcesTable");
-	jQuery("#DiagramDetailPage").show();
-	
-	<#assign i = 0>
-	<#list object.dataSources as dataSource>
-		jQuery('#assignedGroupName${i}').text(GetDeviceName('${dataSource.getGroupId()}'));
-		jQuery('#assignedName${i}').text(GetChannelName('${dataSource.getId()?substring(0,12)}'));	
-	<#assign i = i + 1>		
-	</#list> 
-		
-	<#assign i = 0>
-	<#list notAssignedDataSources as dataSource>
-		jQuery('#notAssignedGroupName${i}').text(GetDeviceName('${dataSource.getGroupId()}'));
-		jQuery('#notAssignedName${i}').text(GetChannelName('${dataSource.getId()?substring(0,12)}'));
-		
-	<#assign i = i + 1>
-	</#list>
-
-
-
-	<#if notAssignedVisible = "1">
-		ShowNotAssigned();
-	<#else>
-		HideNotAssigned();
-	</#if>
-	  initDiagramType(${object.type});
-		initSelectColorDropDowns();
-	})();
-
-	function initSelectColorDropDowns() {
-		jQuery('.dropdown').msDropDown();
-	}
-</script>
-
-<style>
-<#list [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] as x>
-option.Colors${x}{
-<#if 2= x>
-color:#ffffff;
-</#if>
-<#if 2 != x>
-color:#000000;
-</#if>
-background-color:#${colors[x]};
-}
-</#list>
-</style>
-</head>
-<body>
-<form>
-<table id="parameterTable" class="tTable"  border="0" cellpadding="0" cellspacing="0">
-  <thead>
-  <tr>
-      <td class="thCell CLASS04900" >${"$"}{thParameter}</td>
-      <td class="thCell CLASS04900" >${"$"}{thValues}</td>
-    </tr>
-  </thead>
-  <tbody>
-  	<input type="hidden" id="diagram_id" value="${object.id}" />
-  	<tr>
-  		<td class="tBodyCell">${"$"}{thDiagramName}</td>
-        <td class="tBodyCell">
-        	<input type="text" id="diagram_name" value="${object.name}" size="100" maxlength="200"/>
-        </td>
-    </tr>
-  	<tr>
-  		<td class="tBodyCell">${"$"}{thDiagramDescription}</td>
-        <td class="tBodyCell">
-        	<input type="text" id="diagram_description" value="${object.description}" size="100" maxlength="200"/>
-        </td>
-    </tr>
-    <tr class="hidden">
-  		<td class="tBodyCell">${"$"}{thDiagramType}</td>
-        <td class="tBodyCell">
-        	<input type="text" id="diagram_type" value="${object.type}" size="100" maxlength="200"/>
-        </td>
-    </tr>    
-  	<tr>
-  		<td class="tBodyCell">${"$"}{thDiagramTemplate}</td>
-        <td class="tBodyCell">
-        	<select id="diagram_templateId" size="1">	        
-		        <#list templates as template>
-	        		<!--<option value="${template.id}" <#if object.templateId = template.getId()>selected</#if> >${template.getName()} - ${template.getDescription()}</option>-->
-	        		<option value="${template.id}" <#if object.templateId = template.getId()>selected</#if> >${template.getDescription()}</option>
-	        	</#list>
-	        </select>
-        </td>
-    </tr>
-  	<tr>
-  		<td class="tBodyCell">${"$"}{thDiagramDefaultPeriod}</td>
-        <td class="tBodyCell">
-	        <select id="diagram_defaultPeriod" size="1">
-	          <!--<option value="0" <#if object.defaultPeriod = 0>selected</#if> > ${"$"}{diagramPeriodLastHour}</option>-->
-	        	<option value="1" <#if object.defaultPeriod = 1>selected</#if> > ${"$"}{diagramPeriodLastDay}</option>
-	        	<option value="2" <#if object.defaultPeriod = 2>selected</#if> > ${"$"}{diagramPeriodLastWeek}</option>
-	        	<option value="3" <#if object.defaultPeriod = 3>selected</#if> > ${"$"}{diagramPeriodLastMonth}</option>
-	        	<option value="4" <#if object.defaultPeriod = 4>selected</#if> > ${"$"}{diagramPeriodLastYear}</option>
-	        </select>
-        </td>
-    </tr>
-  	<tr>
-  		<td class="tBodyCell">${"$"}{thDiagramDefaultConsolidationFunction}</td>
-        <td class="tBodyCell">
-	        <select id="diagram_defaultConsolidationFunction" size="1">
-	        	<option name="nonTotal" value="0" <#if object.defaultConsolidationFunction = 0>selected</#if> > ${"$"}{diagramConsolidationFunctionAverage}</option>
-	        	<option name="nonTotal" value="1" <#if object.defaultConsolidationFunction = 1>selected</#if> > ${"$"}{diagramConsolidationFunctionMinimum}</option>
-	        	<option name="nonTotal" value="2" <#if object.defaultConsolidationFunction = 2>selected</#if> > ${"$"}{diagramConsolidationFunctionMaximum}</option>
-	        	<option name="total" value="3" <#if object.defaultConsolidationFunction = 3>selected</#if> > ${"$"}{diagramConsolidationFunctionTotal}</option>
-	        </select>
-        </td>
-    </tr>
-	<tr>
-  		<td class="tBodyCell">${"$"}{thDiagramDisplayedUnit}</td>
-        <td class="tBodyCell">
-        	<input type="text" id="diagram_displayedUnit" value="${object.displayedUnit}" size="50" maxlength="50"/>
-        </td>
-    </tr>
-	<tr>
-  		<td class="tBodyCell">${"$"}{thDiagramYAxisScalingModeMin}</td>
-        <td class="tBodyCell">
-			<table>
-				<tr>
-					<td><input type="radio" name="selectYAxisScalingModeMin" ${object.usingCustomYAxisMin?string('', 'checked')} id="diagram_selectYAxisScalingModeMinAutomatic" value="false">${"$"}{diagramScalingModeAutomatic}</input></td>
-				</tr>
-				<tr>
-					<td><input type="radio" name="selectYAxisScalingModeMin" ${object.usingCustomYAxisMin?string('checked', '')} id="diagram_selectYAxisScalingModeMinCustom" value="true">${"$"}{diagramScalingModeCustom}</input>
-					<input type="text" id="diagram_YAxisScalingMinValue" value="${object.customYAxisMin}"></input></td>
-				</tr>
-			</table>
-        </td>
-    </tr>
-	<tr>
-  		<td class="tBodyCell">${"$"}{thDiagramYAxisScalingModeMax}</td>
-        <td class="tBodyCell">
-        	<table>
-				<tr>
-					<td><input type="radio" name="selectYAxisScalingModeMax" ${object.usingCustomYAxisMax?string('', 'checked')} id="diagram_selectYAxisScalingModeMaxAutomatic" value="false">${"$"}{diagramScalingModeAutomatic}</input></td>
-				</tr>
-				<tr>
-					<td><input type="radio" name="selectYAxisScalingModeMax" ${object.usingCustomYAxisMax?string('checked', '')} id="diagram_selectYAxisScalingModeMaxCustom" value="true">${"$"}{diagramScalingModeCustom}</input>
-					<input type="text" id="diagram_YAxisScalingMaxValue" value="${object.customYAxisMax}"></input></td>
-				</tr>
-			</table>
-        </td>
-    </tr>
-	
-  </tbody>
-</table>
-<table id="dataSourcesTable" class="tTable"  border="0" cellpadding="0" cellspacing="0">
-  <thead>
-    <tr>
-      <td class="thCell CLASS04900" colspan="6">
-		${"$"}{thDiagramAssignedDataSourceGroups}
-		</td>
-    </tr>
-    <tr>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceGroupName}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceGroup}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSource}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceType}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceColor}</td>
-      <td class="thCell CLASS04900" >${"$"}{thAction}</td>
-    </tr>
-  </thead>
-  <tbody id="assignedDataSources">
-	<#assign i = 0>
-    <#list object.dataSources as dataSource>
-    <tr class="CLASS04901">		
-  		<td class="tBodyCell CLASS04902" id="assignedGroupName${i}"></td>
-  		<td class="tBodyCell CLASS04907">${dataSource.getGroupId()}</td>
-  		<td class="tBodyCell CLASS04902" id="assignedName${i}"></td>
-        <td class="tBodyCell CLASS04907">${"$"}{diagramValueType${dataSource.getKey()}}</td>        
-        <td class="tBodyCell CLASS04907">
-		<select id="assignedColor${i}" class="dropdown" size="1" style="width:175px;">
-        	<#list [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] as x>
-        		<option value="${x}" class="Colors${x}" data-image="/webui/css/extern/msdropdown/icons/${x}.png" <#if dataSource.getColor() = x>selected</#if> > ${"$"}{diagramColor${colors[x]}}</option>
-        	</#list>
-        </select></td>
-		<!-- Start action column -->        
-		<td class="tBodyCell CLASS04907" >
-		<input type="button" name="btnRemove" value="btnRemove" class="StdButton CLASS04907" onclick="DeleteDataSource(${i});" />
-		</td>
-		<!-- End Action Column -->
-    </tr>
-	<#assign i = i + 1>
-    </#list>
-	<tr>
-      <td height="10" colspan="6">
-	  </td>
-    </tr>
-  </tbody>
-  <thead>
-    <tr>
-      <td class="thCell CLASS04900" colspan="6">
-		<img id="notAssignedDataSourcesPLUS" align="left" width="16px" height="16px" title="${"$"}{btnDiagramShowNotAssigned}" alt="${"$"}{btnDiagramShowNotAssigned}" src="/ise/img/plus.png" onclick="ShowNotAssigned();"></img>
-		<img id="notAssignedDataSourcesMINUS" align="left" width="16px" height="16px" style="display:none;" title="${"$"}{btnDiagramHideNotAssigned}" alt="${"$"}{btnDiagramHideNotAssigned}" src="/ise/img/minus.png" onclick="HideNotAssigned();"></img>
-		${"$"}{thDiagramAllDataSourceGroups}
-		</td>
-    </tr>
-	<#if object.dataSources?size &gt; 14>
-	<tr>
-      <td class="tBodyCell CLASS04900 CLASS21906" colspan="6">
-		${"$"}{diagramTooManyDataSources}
-		</td>
-    </tr>
-	</#if>
-  </thead>
-  <tbody id="notAssignedDataSources" style="display:none;">
-    <tr>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceGroupName}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceGroup}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSource}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceType}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceColor}</td>
-      <td class="thCell CLASS04900" >${"$"}{thAction}</td>
-    </tr>
-	<#assign i = 0>
-    <#list notAssignedDataSources as dataSource>
-    <tr class="CLASS04901">		
-  		<td class="tBodyCell CLASS04902" id="notAssignedGroupName${i}"></td>
-  		<td class="tBodyCell CLASS04907">${dataSource.getGroupId()}</td>
-  		<td class="tBodyCell CLASS04902" id="notAssignedName${i}"></td>
-        <td class="tBodyCell CLASS04907">${"$"}{diagramValueType${dataSource.getKey()}}</td>        
-        <td class="tBodyCell CLASS04907">
-        <select id="notAssignedColor${i}" class="dropdown" style="width:175px;" size="1">
-        	<#list [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] as x>
-        		<option value="${x}" class="Colors${x}" data-image="/webui/css/extern/msdropdown/icons/${x}.png" <#if dataSource.getColor() = x>selected</#if> > ${"$"}{diagramColor${colors[x]}}</option>
-        	</#list>
-        </select></td>
-		<!-- Start action column -->        
-		<td class="tBodyCell CLASS04907" >
-		<#if object.dataSources?size &lt; 15>
-			<input type="button" name="btnAddDataSource" value="btnAddDataSource" class="StdButton CLASS04907" onclick="AddDataSource('${dataSource.getGroupId()}', '${dataSource.getId()}', '${i}');" />
-		</#if>
-		</td>
-		<!-- End Action Column --> 
-    </tr>
-	<#assign i = i + 1>
-    </#list>
-  </tbody>
-</table>
-
-<script type="text/javascript">	
-  AddDataSource = function(dataSourceGroupId, dataSourceId, notAssignedIndex) {  
-	if(!IsDiagramTextValid())	{
-		return;
-	}
-	
-	if(!IsDiagramYAxisValid())	{
-		return;
-	}
-	
-	var colorId = "#notAssignedColor" + notAssignedIndex;
-	
-	var url = '/pages/jpages/diagram/settings/addDataSource?sid='+SessionId;
-    var pb = "{";
-	pb += '"notAssignedVisible" : "' + notAssignedVisible + '", ';
-	pb += '"id" : "${object.id}", ';
-	pb += '"dataSourceGroupId" : "' + dataSourceGroupId + '", ';
-	pb += '"colorIndex" : "' + jQuery(colorId).val() + '", ';
-	pb += '"dataSourceId" : "' + dataSourceId + '", ';
-    pb += GetCurrentDiagram();
-    pb += '}';
-    var opt = {
-        postBody: pb, 
-        onComplete: function(t){
-			var response = JSON.parse(t.responseText);
-			if(!response.isSuccessful)
-			{
-				if(response.errorCode == "42")
-				{
-					jQuery("#content").html(response.content);
-				} else {
-					alert(translateKey(response.content));
-				}
-			} else {			
-				jQuery("#content").html(response.content);
-			}
-        }
-    }
-	new Ajax.Request(url,opt);
-  };
-  
-  DeleteDataSource = function(dataSourceIndex) {
-	if(!IsDiagramTextValid())	{
-		return;
-	}
-	
-	if(!IsDiagramYAxisValid())	{
-		return;
-	}
-	
-    var url = '/pages/jpages/diagram/settings/removeDataSource?sid='+SessionId;
-    var pb = "{";
-	pb += '"notAssignedVisible" : "' + notAssignedVisible + '", ';
-	pb += '"id" : "${object.id}", ';
-	pb += '"dataSourceIndex" : "' + dataSourceIndex + '", ';
-    pb += GetCurrentDiagram();
-    pb += '}';
-    var opt = {
-        postBody: pb, 
-        onComplete: function(t){
-	        var response = JSON.parse(t.responseText);
-			if(!response.isSuccessful)
-			{
-				if(response.errorCode == "42")
-				{
-					jQuery("#content").html(response.content);
-				} else {
-					alert(translateKey(response.content));
-				}
-			} else {			
-				jQuery("#content").html(response.content);
-			}
-        }
-    }
-	new Ajax.Request(url,opt);
-  };
-  
-  SaveDiagram = function() {  	
-	<#if object.dataSources?size = 0>
-	alert(translateKey('diagramErrorNoDataSources'));
-	return;
-	</#if>
-	
-	if(!IsDiagramTextValid())	{
-		return;
-	}
-	
-	if(!IsDiagramYAxisValid())	{
-		return;
-	}
-	
-	MessageBox.show(translateKey('diagramSaveMessageTitle'), '<br/><br/><img id="messageBoxDiagramGraph" src="/ise/img/anim_bargraph.gif"><br/>',
-	'','320','90', 'messageBoxDiagram', 'messageBoxDiagramGraph');
-  
-  	var url = '/pages/jpages/diagram/settings/save?sid='+SessionId;
-    var pb = "{";
-	pb += '"id" : "${object.id}", ';
-    pb += GetCurrentDiagram();
-    pb += '}';
-    var opt = {
-        postBody: pb,
-        onComplete: function(t){
-			jQuery("#messageBoxDiagram").remove();
-			var response = JSON.parse(t.responseText);
-			if(!response.isSuccessful)
-			{
-				if(response.errorCode == "42")
-				{
-					jQuery("#content").html(response.content);
-				} else {
-					alert(translateKey('diagramErrorCouldNotSave'));
-				}
-			} else {			
-        		ReturnToListWithoutSave();
-			}
-        }
-    }
-	new Ajax.Request(url,opt);
-  };
-  
-  IsDiagramTextValid = function() {
-	var name = jQuery("#diagram_name").val();
-	var description = jQuery("#diagram_description").val();
-	var unit = jQuery("#diagram_displayedUnit").val();
-	var forbidden   = /['\"\\]/;
-	var isForbiddenName = forbidden.test( name );
-	var isForbiddenDescription = forbidden.test( description );
-	var isForbiddenUnit = forbidden.test( unit );
-	
-	if (isForbiddenName || isForbiddenDescription || isForbiddenUnit) {
-		alert(translateKey('alertDiagramCharsNotAllowed'));
-		return false;
-	}
-	
-	return true;
-  };
-  
-  IsDiagramYAxisValid = function() {
-	var minValue = parseFloat(jQuery("#diagram_YAxisScalingMinValue").val().replace(",", "."));
-	var maxValue = parseFloat(jQuery("#diagram_YAxisScalingMaxValue").val().replace(",", "."));
-	
-	if (isNaN(minValue)) {
-		minValue = 0.0;
-	}
-	
-	if (isNaN(maxValue)) {
-		maxValue = 0.0;
-	}
-	
-	var usingYAxisMin = jQuery('input[name=selectYAxisScalingModeMin]:checked', '#parameterTable').val();
-	var usingYAxisMax = jQuery('input[name=selectYAxisScalingModeMax]:checked', '#parameterTable').val();
-	
-	if(usingYAxisMin == "false" || usingYAxisMax == "false") {
-		return true;
-	}
-	
-	if(minValue > maxValue) {
-		alert(translateKey('alertDiagramMinLowerThanMax'));
-		return false;
-	}
-	
-	return true;
-  }
-  
-  GetCurrentDiagram = function() {
-	var minValue = parseFloat(jQuery("#diagram_YAxisScalingMinValue").val().replace(",", "."));
-	var maxValue = parseFloat(jQuery("#diagram_YAxisScalingMaxValue").val().replace(",", "."));
-	
-	if (isNaN(minValue)) {
-		minValue = 0.0;
-	}
-	
-	if (isNaN(maxValue)) {
-		maxValue = 0.0;
-	}
-	
-	var name = jQuery("#diagram_name").val().replace("'", "").replace("\"", "").replace("\\", "");
-	conInfo("Diagram name: " + name);
-	var description = jQuery("#diagram_description").val().replace("'", "").replace("\"", "").replace("\\", "");
-	var unit = jQuery("#diagram_displayedUnit").val().replace("'", "").replace("\"", "").replace("\\", "");
-	name = escape(name);
-	description = escape(description);
-	unit = escape(unit);
-	
-	diagram = '"diagram" : {';
-	diagram += '"id" : ${object.id}, ';	
-	diagram += '"name" : "' + name + '", ';
-	diagram += '"description" : "' + description + '", ';
-	diagram += '"type" : "' + jQuery("#diagram_type").val() + '", ';
-	diagram += '"templateId" : ' + jQuery("#diagram_templateId").val() + ', ';
-	diagram += '"defaultPeriod" : ' + jQuery("#diagram_defaultPeriod").val() + ', ';
-	diagram += '"defaultConsolidationFunction" : ' + jQuery("#diagram_defaultConsolidationFunction").val() + ', ';
-	diagram += '"displayedUnit" : "' + unit + '", ';	
-	diagram += '"active" : ${object.active?string('true', 'false')}, ';
-	diagram += '"operable" : ${object.operable?string('true', 'false')}, ';
-	diagram += '"visible" : ${object.visible?string('true', 'false')}, ';
-	diagram += '"usingCustomYAxisMin" : ' + jQuery('input[name=selectYAxisScalingModeMin]:checked', '#parameterTable').val() + ', ';	
-	diagram += '"usingCustomYAxisMax" : ' + jQuery('input[name=selectYAxisScalingModeMax]:checked', '#parameterTable').val() + ', ';
-	diagram += '"customYAxisMin" : ' + minValue + ', ';	
-	diagram += '"customYAxisMax" : ' + maxValue + ', ';
-	diagram += '"dataSources" : [';
-	
-	<#assign i = 0>
-    <#list object.dataSources as dataSource>
-	diagram += '{"id" : "${dataSource.id}", ';
-	diagram += '"groupId" : "${dataSource.groupId}",';
-	diagram += '"key" : "${dataSource.key}", ';
-	diagram += '"type" : ${dataSource.type}, ';
-	diagram += '"color" : ' + jQuery("#assignedColor${i}").val() + '}, ';
-	<#assign i = i + 1>
-    </#list>	
-	// remove last ", "
-	<#if object.dataSources?size != 0>
-	diagram = diagram.substring(0, diagram.length - 2);
-	</#if>
-	diagram += ']';
-    diagram += '}';
-	return diagram;
-  };
-  
-  ReturnToListWithoutSave = function() {  
-    var url = '/pages/jpages/diagram/settings?sid='+SessionId;
-    var pb = "{}";
-    var opt =
-    {
-      postBody: pb,
-      onComplete: function(t)
-      {
-		jQuery("#content").html(t.responseText);
-      }
-    }
-    new Ajax.Request(url,opt);
-  };
-</script>
-</form>
-</body>
+<html>
+<head>
+
+
+<script type="text/javascript">
+	var notAssignedVisible;
+	var diagramType;
+
+	var jUnitElm = jQuery("#diagram_displayedUnit"),
+	jConsolidationElm = jQuery("#diagram_defaultConsolidationFunction");
+
+  GetDeviceName = function(address) {
+	var dev = DeviceList.getDeviceByAddress(address);
+	if (dev != undefined) {
+		return dev.getName();
+	} else {
+		return address;
+	}
+  };
+  
+  GetChannelName = function(address) {
+	var ch = DeviceList.getChannelByAddress(address);
+	if (ch != undefined) {
+		return ch.getName();
+	} else {
+		return address;
+	}
+  };
+  
+  ShowNotAssigned = function() {
+	jQuery('#notAssignedDataSources').show(); 
+	jQuery('#notAssignedDataSourcesMINUS').show();
+	jQuery('#notAssignedDataSourcesPLUS').hide();
+	notAssignedVisible = 1;
+  };
+  
+  HideNotAssigned = function() {
+	jQuery('#notAssignedDataSources').hide(); 
+	jQuery('#notAssignedDataSourcesMINUS').hide();
+	jQuery('#notAssignedDataSourcesPLUS').show();
+	notAssignedVisible = 0;
+  };
+
+  adaptDefaultPeriodOptions = function() {
+    var arOptions = [
+      translateKey("diagramPeriodToday"),
+      translateKey("diagramPeriodThisWeek"),
+      translateKey("diagramPeriodThisMonth"),
+      translateKey("diagramPeriodThisYear")
+    ];
+
+    jQuery("#diagram_defaultPeriod option").each(function(index) {
+      jQuery(this).text(arOptions[index]);
+    });
+  };
+
+  initDiagramType = function(type) {
+    // type 1 = temperature, 2 = energy, 3 = user
+    // TODO translate the unit values
+    var arUnit = ["","\u00B0C", "Wh", ""];
+    if (jUnitElm.val() == "") {
+      jUnitElm.val(arUnit[type]);
+    }
+    if (type == 1 || type == 2) {
+      // With bargraph diagrams the visible time period changes, e. g. there is no 'Last 24h' but a option 'Today'
+      adaptDefaultPeriodOptions();
+
+      // Select only the value 'Total' and hide the other options.
+      jConsolidationElm.val(3).prop("selected", true).prop("disabled",true);
+      jQuery("[name='nonTotal']").hide();
+      jQuery("[name='total']").show();
+    } else {
+      // Hide the option 'Total'
+      jQuery("[name='nonTotal']").show();
+      jQuery("[name='total']").hide();
+    }
+
+  };
+
+(function () {
+	setPath("<span onclick='WebUI.enter(DiagramDetailPage);'>"+translateKey('menuSettingsPage')+"</span> &gt; "+ translateKey('submenuCreateDiagram'));
+
+	<#if object.id = 0 && object.name == "">
+		jQuery('#diagram_name').val(translateKey('diagramDefaultName'));
+	</#if>
+	
+	var s = "";
+	s += "<table cellspacing='8'>";
+	s += "<tr>";
+	s += "<td align='center' valign='middle'><div class='FooterButton' onclick='ReturnToListWithoutSave();'>"+ translateKey('footerBtnCancel') +"</div></td>";
+	s += "<td align='center' valign='middle'><div class='FooterButton' onclick='SaveDiagram();'>"+ translateKey('footerBtnOk') +"</div></td>";
+	s += "</tr>";
+	s += "</table>";
+	setFooter(s);
+	translateButtons("btnRemove");
+	translateButtons("btnAddDataSource");
+	translatePage("#parameterTable");
+	translatePage("#dataSourcesTable");
+	jQuery("#DiagramDetailPage").show();
+	
+	<#assign i = 0>
+	<#list object.dataSources as dataSource>
+		jQuery('#assignedGroupName${i}').text(GetDeviceName('${dataSource.getGroupId()}'));
+		jQuery('#assignedName${i}').text(GetChannelName('${dataSource.getId()?substring(0,12)}'));	
+	<#assign i = i + 1>		
+	</#list> 
+		
+	<#assign i = 0>
+	<#list notAssignedDataSources as dataSource>
+		jQuery('#notAssignedGroupName${i}').text(GetDeviceName('${dataSource.getGroupId()}'));
+		jQuery('#notAssignedName${i}').text(GetChannelName('${dataSource.getId()?substring(0,12)}'));
+		
+	<#assign i = i + 1>
+	</#list>
+
+
+
+	<#if notAssignedVisible = "1">
+		ShowNotAssigned();
+	<#else>
+		HideNotAssigned();
+	</#if>
+	  initDiagramType(${object.type});
+		initSelectColorDropDowns();
+	})();
+
+	function initSelectColorDropDowns() {
+		jQuery('.dropdown').msDropDown();
+	}
+</script>
+
+<style>
+<#list [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] as x>
+option.Colors${x}{
+<#if 2= x>
+color:#ffffff;
+</#if>
+<#if 2 != x>
+color:#000000;
+</#if>
+background-color:#${colors[x]};
+}
+</#list>
+</style>
+</head>
+<body>
+<form>
+<table id="parameterTable" class="tTable"  border="0" cellpadding="0" cellspacing="0">
+  <thead>
+  <tr>
+      <td class="thCell CLASS04900" >${"$"}{thParameter}</td>
+      <td class="thCell CLASS04900" >${"$"}{thValues}</td>
+    </tr>
+  </thead>
+  <tbody>
+  	<input type="hidden" id="diagram_id" value="${object.id}" />
+  	<tr>
+  		<td class="tBodyCell">${"$"}{thDiagramName}</td>
+        <td class="tBodyCell">
+        	<input type="text" id="diagram_name" value="${object.name}" size="100" maxlength="200"/>
+        </td>
+    </tr>
+  	<tr>
+  		<td class="tBodyCell">${"$"}{thDiagramDescription}</td>
+        <td class="tBodyCell">
+        	<input type="text" id="diagram_description" value="${object.description}" size="100" maxlength="200"/>
+        </td>
+    </tr>
+    <tr class="hidden">
+  		<td class="tBodyCell">${"$"}{thDiagramType}</td>
+        <td class="tBodyCell">
+        	<input type="text" id="diagram_type" value="${object.type}" size="100" maxlength="200"/>
+        </td>
+    </tr>    
+  	<tr>
+  		<td class="tBodyCell">${"$"}{thDiagramTemplate}</td>
+        <td class="tBodyCell">
+        	<select id="diagram_templateId" size="1">	        
+		        <#list templates as template>
+	        		<!--<option value="${template.id}" <#if object.templateId = template.getId()>selected</#if> >${template.getName()} - ${template.getDescription()}</option>-->
+	        		<option value="${template.id}" <#if object.templateId = template.getId()>selected</#if> >${template.getDescription()}</option>
+	        	</#list>
+	        </select>
+        </td>
+    </tr>
+  	<tr>
+  		<td class="tBodyCell">${"$"}{thDiagramDefaultPeriod}</td>
+        <td class="tBodyCell">
+	        <select id="diagram_defaultPeriod" size="1">
+	          <!--<option value="0" <#if object.defaultPeriod = 0>selected</#if> > ${"$"}{diagramPeriodLastHour}</option>-->
+	        	<option value="1" <#if object.defaultPeriod = 1>selected</#if> > ${"$"}{diagramPeriodLastDay}</option>
+	        	<option value="2" <#if object.defaultPeriod = 2>selected</#if> > ${"$"}{diagramPeriodLastWeek}</option>
+	        	<option value="3" <#if object.defaultPeriod = 3>selected</#if> > ${"$"}{diagramPeriodLastMonth}</option>
+	        	<option value="4" <#if object.defaultPeriod = 4>selected</#if> > ${"$"}{diagramPeriodLastYear}</option>
+	        </select>
+        </td>
+    </tr>
+  	<tr>
+  		<td class="tBodyCell">${"$"}{thDiagramDefaultConsolidationFunction}</td>
+        <td class="tBodyCell">
+	        <select id="diagram_defaultConsolidationFunction" size="1">
+	        	<option name="nonTotal" value="0" <#if object.defaultConsolidationFunction = 0>selected</#if> > ${"$"}{diagramConsolidationFunctionAverage}</option>
+	        	<option name="nonTotal" value="1" <#if object.defaultConsolidationFunction = 1>selected</#if> > ${"$"}{diagramConsolidationFunctionMinimum}</option>
+	        	<option name="nonTotal" value="2" <#if object.defaultConsolidationFunction = 2>selected</#if> > ${"$"}{diagramConsolidationFunctionMaximum}</option>
+	        	<option name="total" value="3" <#if object.defaultConsolidationFunction = 3>selected</#if> > ${"$"}{diagramConsolidationFunctionTotal}</option>
+	        </select>
+        </td>
+    </tr>
+	<tr>
+  		<td class="tBodyCell">${"$"}{thDiagramDisplayedUnit}</td>
+        <td class="tBodyCell">
+        	<input type="text" id="diagram_displayedUnit" value="${object.displayedUnit}" size="50" maxlength="50"/>
+        </td>
+    </tr>
+	<tr>
+  		<td class="tBodyCell">${"$"}{thDiagramYAxisScalingModeMin}</td>
+        <td class="tBodyCell">
+			<table>
+				<tr>
+					<td><input type="radio" name="selectYAxisScalingModeMin" ${object.usingCustomYAxisMin?string('', 'checked')} id="diagram_selectYAxisScalingModeMinAutomatic" value="false">${"$"}{diagramScalingModeAutomatic}</input></td>
+				</tr>
+				<tr>
+					<td><input type="radio" name="selectYAxisScalingModeMin" ${object.usingCustomYAxisMin?string('checked', '')} id="diagram_selectYAxisScalingModeMinCustom" value="true">${"$"}{diagramScalingModeCustom}</input>
+					<input type="text" id="diagram_YAxisScalingMinValue" value="${object.customYAxisMin}"></input></td>
+				</tr>
+			</table>
+        </td>
+    </tr>
+	<tr>
+  		<td class="tBodyCell">${"$"}{thDiagramYAxisScalingModeMax}</td>
+        <td class="tBodyCell">
+        	<table>
+				<tr>
+					<td><input type="radio" name="selectYAxisScalingModeMax" ${object.usingCustomYAxisMax?string('', 'checked')} id="diagram_selectYAxisScalingModeMaxAutomatic" value="false">${"$"}{diagramScalingModeAutomatic}</input></td>
+				</tr>
+				<tr>
+					<td><input type="radio" name="selectYAxisScalingModeMax" ${object.usingCustomYAxisMax?string('checked', '')} id="diagram_selectYAxisScalingModeMaxCustom" value="true">${"$"}{diagramScalingModeCustom}</input>
+					<input type="text" id="diagram_YAxisScalingMaxValue" value="${object.customYAxisMax}"></input></td>
+				</tr>
+			</table>
+        </td>
+    </tr>
+	
+  </tbody>
+</table>
+<table id="dataSourcesTable" class="tTable"  border="0" cellpadding="0" cellspacing="0">
+  <thead>
+    <tr>
+      <td class="thCell CLASS04900" colspan="6">
+		${"$"}{thDiagramAssignedDataSourceGroups}
+		</td>
+    </tr>
+    <tr>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceGroupName}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceGroup}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSource}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceType}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceColor}</td>
+      <td class="thCell CLASS04900" >${"$"}{thAction}</td>
+    </tr>
+  </thead>
+  <tbody id="assignedDataSources">
+	<#assign i = 0>
+    <#list object.dataSources as dataSource>
+    <tr class="CLASS04901">		
+  		<td class="tBodyCell CLASS04902" id="assignedGroupName${i}"></td>
+  		<td class="tBodyCell CLASS04907">${dataSource.getGroupId()}</td>
+  		<td class="tBodyCell CLASS04902" id="assignedName${i}"></td>
+        <td class="tBodyCell CLASS04907">${"$"}{diagramValueType${dataSource.getKey()}}</td>        
+        <td class="tBodyCell CLASS04907">
+		<select id="assignedColor${i}" class="dropdown" size="1" style="width:175px;">
+        	<#list [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] as x>
+        		<option value="${x}" class="Colors${x}" data-image="/webui/css/extern/msdropdown/icons/${x}.png" <#if dataSource.getColor() = x>selected</#if> > ${"$"}{diagramColor${colors[x]}}</option>
+        	</#list>
+        </select></td>
+		<!-- Start action column -->        
+		<td class="tBodyCell CLASS04907" >
+		<input type="button" name="btnRemove" value="btnRemove" class="StdButton CLASS04907" onclick="DeleteDataSource(${i});" />
+		</td>
+		<!-- End Action Column -->
+    </tr>
+	<#assign i = i + 1>
+    </#list>
+	<tr>
+      <td height="10" colspan="6">
+	  </td>
+    </tr>
+  </tbody>
+  <thead>
+    <tr>
+      <td class="thCell CLASS04900" colspan="6">
+		<img id="notAssignedDataSourcesPLUS" align="left" width="16px" height="16px" title="${"$"}{btnDiagramShowNotAssigned}" alt="${"$"}{btnDiagramShowNotAssigned}" src="/ise/img/plus.png" onclick="ShowNotAssigned();"></img>
+		<img id="notAssignedDataSourcesMINUS" align="left" width="16px" height="16px" style="display:none;" title="${"$"}{btnDiagramHideNotAssigned}" alt="${"$"}{btnDiagramHideNotAssigned}" src="/ise/img/minus.png" onclick="HideNotAssigned();"></img>
+		${"$"}{thDiagramAllDataSourceGroups}
+		</td>
+    </tr>
+	<#if object.dataSources?size &gt; 14>
+	<tr>
+      <td class="tBodyCell CLASS04900 CLASS21906" colspan="6">
+		${"$"}{diagramTooManyDataSources}
+		</td>
+    </tr>
+	</#if>
+  </thead>
+  <tbody id="notAssignedDataSources" style="display:none;">
+    <tr>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceGroupName}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceGroup}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSource}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceType}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDataSourceColor}</td>
+      <td class="thCell CLASS04900" >${"$"}{thAction}</td>
+    </tr>
+	<#assign i = 0>
+    <#list notAssignedDataSources as dataSource>
+    <tr class="CLASS04901">		
+  		<td class="tBodyCell CLASS04902" id="notAssignedGroupName${i}"></td>
+  		<td class="tBodyCell CLASS04907">${dataSource.getGroupId()}</td>
+  		<td class="tBodyCell CLASS04902" id="notAssignedName${i}"></td>
+        <td class="tBodyCell CLASS04907">${"$"}{diagramValueType${dataSource.getKey()}}</td>        
+        <td class="tBodyCell CLASS04907">
+        <select id="notAssignedColor${i}" class="dropdown" style="width:175px;" size="1">
+        	<#list [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13] as x>
+        		<option value="${x}" class="Colors${x}" data-image="/webui/css/extern/msdropdown/icons/${x}.png" <#if dataSource.getColor() = x>selected</#if> > ${"$"}{diagramColor${colors[x]}}</option>
+        	</#list>
+        </select></td>
+		<!-- Start action column -->        
+		<td class="tBodyCell CLASS04907" >
+		<#if object.dataSources?size &lt; 15>
+			<input type="button" name="btnAddDataSource" value="btnAddDataSource" class="StdButton CLASS04907" onclick="AddDataSource('${dataSource.getGroupId()}', '${dataSource.getId()}', '${i}');" />
+		</#if>
+		</td>
+		<!-- End Action Column --> 
+    </tr>
+	<#assign i = i + 1>
+    </#list>
+  </tbody>
+</table>
+
+<script type="text/javascript">	
+  AddDataSource = function(dataSourceGroupId, dataSourceId, notAssignedIndex) {  
+	if(!IsDiagramTextValid())	{
+		return;
+	}
+	
+	if(!IsDiagramYAxisValid())	{
+		return;
+	}
+	
+	var colorId = "#notAssignedColor" + notAssignedIndex;
+	
+	var url = '/pages/jpages/diagram/settings/addDataSource?sid='+SessionId;
+    var pb = "{";
+	pb += '"notAssignedVisible" : "' + notAssignedVisible + '", ';
+	pb += '"id" : "${object.id}", ';
+	pb += '"dataSourceGroupId" : "' + dataSourceGroupId + '", ';
+	pb += '"colorIndex" : "' + jQuery(colorId).val() + '", ';
+	pb += '"dataSourceId" : "' + dataSourceId + '", ';
+    pb += GetCurrentDiagram();
+    pb += '}';
+    var opt = {
+        postBody: pb, 
+        onComplete: function(t){
+			var response = JSON.parse(t.responseText);
+			if(!response.isSuccessful)
+			{
+				if(response.errorCode == "42")
+				{
+					jQuery("#content").html(response.content);
+				} else {
+					alert(translateKey(response.content));
+				}
+			} else {			
+				jQuery("#content").html(response.content);
+			}
+        }
+    }
+	new Ajax.Request(url,opt);
+  };
+  
+  DeleteDataSource = function(dataSourceIndex) {
+	if(!IsDiagramTextValid())	{
+		return;
+	}
+	
+	if(!IsDiagramYAxisValid())	{
+		return;
+	}
+	
+    var url = '/pages/jpages/diagram/settings/removeDataSource?sid='+SessionId;
+    var pb = "{";
+	pb += '"notAssignedVisible" : "' + notAssignedVisible + '", ';
+	pb += '"id" : "${object.id}", ';
+	pb += '"dataSourceIndex" : "' + dataSourceIndex + '", ';
+    pb += GetCurrentDiagram();
+    pb += '}';
+    var opt = {
+        postBody: pb, 
+        onComplete: function(t){
+	        var response = JSON.parse(t.responseText);
+			if(!response.isSuccessful)
+			{
+				if(response.errorCode == "42")
+				{
+					jQuery("#content").html(response.content);
+				} else {
+					alert(translateKey(response.content));
+				}
+			} else {			
+				jQuery("#content").html(response.content);
+			}
+        }
+    }
+	new Ajax.Request(url,opt);
+  };
+  
+  SaveDiagram = function() {  	
+	<#if object.dataSources?size = 0>
+	alert(translateKey('diagramErrorNoDataSources'));
+	return;
+	</#if>
+	
+	if(!IsDiagramTextValid())	{
+		return;
+	}
+	
+	if(!IsDiagramYAxisValid())	{
+		return;
+	}
+	
+	MessageBox.show(translateKey('diagramSaveMessageTitle'), '<br/><br/><img id="messageBoxDiagramGraph" src="/ise/img/anim_bargraph.gif"><br/>',
+	'','320','90', 'messageBoxDiagram', 'messageBoxDiagramGraph');
+  
+  	var url = '/pages/jpages/diagram/settings/save?sid='+SessionId;
+    var pb = "{";
+	pb += '"id" : "${object.id}", ';
+    pb += GetCurrentDiagram();
+    pb += '}';
+    var opt = {
+        postBody: pb,
+        onComplete: function(t){
+			jQuery("#messageBoxDiagram").remove();
+			var response = JSON.parse(t.responseText);
+			if(!response.isSuccessful)
+			{
+				if(response.errorCode == "42")
+				{
+					jQuery("#content").html(response.content);
+				} else {
+					alert(translateKey('diagramErrorCouldNotSave'));
+				}
+			} else {			
+        		ReturnToListWithoutSave();
+			}
+        }
+    }
+	new Ajax.Request(url,opt);
+  };
+  
+  IsDiagramTextValid = function() {
+	var name = jQuery("#diagram_name").val();
+	var description = jQuery("#diagram_description").val();
+	var unit = jQuery("#diagram_displayedUnit").val();
+	var forbidden   = /['\"\\]/;
+	var isForbiddenName = forbidden.test( name );
+	var isForbiddenDescription = forbidden.test( description );
+	var isForbiddenUnit = forbidden.test( unit );
+	
+	if (isForbiddenName || isForbiddenDescription || isForbiddenUnit) {
+		alert(translateKey('alertDiagramCharsNotAllowed'));
+		return false;
+	}
+	
+	return true;
+  };
+  
+  IsDiagramYAxisValid = function() {
+	var minValue = parseFloat(jQuery("#diagram_YAxisScalingMinValue").val().replace(",", "."));
+	var maxValue = parseFloat(jQuery("#diagram_YAxisScalingMaxValue").val().replace(",", "."));
+	
+	if (isNaN(minValue)) {
+		minValue = 0.0;
+	}
+	
+	if (isNaN(maxValue)) {
+		maxValue = 0.0;
+	}
+	
+	var usingYAxisMin = jQuery('input[name=selectYAxisScalingModeMin]:checked', '#parameterTable').val();
+	var usingYAxisMax = jQuery('input[name=selectYAxisScalingModeMax]:checked', '#parameterTable').val();
+	
+	if(usingYAxisMin == "false" || usingYAxisMax == "false") {
+		return true;
+	}
+	
+	if(minValue > maxValue) {
+		alert(translateKey('alertDiagramMinLowerThanMax'));
+		return false;
+	}
+	
+	return true;
+  }
+  
+  GetCurrentDiagram = function() {
+	var minValue = parseFloat(jQuery("#diagram_YAxisScalingMinValue").val().replace(",", "."));
+	var maxValue = parseFloat(jQuery("#diagram_YAxisScalingMaxValue").val().replace(",", "."));
+	
+	if (isNaN(minValue)) {
+		minValue = 0.0;
+	}
+	
+	if (isNaN(maxValue)) {
+		maxValue = 0.0;
+	}
+	
+	var name = jQuery("#diagram_name").val().replace("'", "").replace("\"", "").replace("\\", "");
+	conInfo("Diagram name: " + name);
+	var description = jQuery("#diagram_description").val().replace("'", "").replace("\"", "").replace("\\", "");
+	var unit = jQuery("#diagram_displayedUnit").val().replace("'", "").replace("\"", "").replace("\\", "");
+	name = escape(name);
+	description = escape(description);
+	unit = escape(unit);
+	
+	diagram = '"diagram" : {';
+	diagram += '"id" : ${object.id}, ';	
+	diagram += '"name" : "' + name + '", ';
+	diagram += '"description" : "' + description + '", ';
+	diagram += '"type" : "' + jQuery("#diagram_type").val() + '", ';
+	diagram += '"templateId" : ' + jQuery("#diagram_templateId").val() + ', ';
+	diagram += '"defaultPeriod" : ' + jQuery("#diagram_defaultPeriod").val() + ', ';
+	diagram += '"defaultConsolidationFunction" : ' + jQuery("#diagram_defaultConsolidationFunction").val() + ', ';
+	diagram += '"displayedUnit" : "' + unit + '", ';	
+	diagram += '"active" : ${object.active?string('true', 'false')}, ';
+	diagram += '"operable" : ${object.operable?string('true', 'false')}, ';
+	diagram += '"visible" : ${object.visible?string('true', 'false')}, ';
+	diagram += '"usingCustomYAxisMin" : ' + jQuery('input[name=selectYAxisScalingModeMin]:checked', '#parameterTable').val() + ', ';	
+	diagram += '"usingCustomYAxisMax" : ' + jQuery('input[name=selectYAxisScalingModeMax]:checked', '#parameterTable').val() + ', ';
+	diagram += '"customYAxisMin" : ' + minValue + ', ';	
+	diagram += '"customYAxisMax" : ' + maxValue + ', ';
+	diagram += '"dataSources" : [';
+	
+	<#assign i = 0>
+    <#list object.dataSources as dataSource>
+	diagram += '{"id" : "${dataSource.id}", ';
+	diagram += '"groupId" : "${dataSource.groupId}",';
+	diagram += '"key" : "${dataSource.key}", ';
+	diagram += '"type" : ${dataSource.type}, ';
+	diagram += '"color" : ' + jQuery("#assignedColor${i}").val() + '}, ';
+	<#assign i = i + 1>
+    </#list>	
+	// remove last ", "
+	<#if object.dataSources?size != 0>
+	diagram = diagram.substring(0, diagram.length - 2);
+	</#if>
+	diagram += ']';
+    diagram += '}';
+	return diagram;
+  };
+  
+  ReturnToListWithoutSave = function() {  
+    var url = '/pages/jpages/diagram/settings?sid='+SessionId;
+    var pb = "{}";
+    var opt =
+    {
+      postBody: pb,
+      onComplete: function(t)
+      {
+		jQuery("#content").html(t.responseText);
+      }
+    }
+    new Ajax.Request(url,opt);
+  };
+</script>
+</form>
+</body>
 </html>
\ No newline at end of file
diff --git a/HMserver/opt/HMServer/pages/DiagramSettingsListPage.ftl b/HMserver/opt/HMServer/pages/DiagramSettingsListPage.ftl
index 77a7e0bf..98f05cd8 100644
--- a/HMserver/opt/HMServer/pages/DiagramSettingsListPage.ftl
+++ b/HMserver/opt/HMServer/pages/DiagramSettingsListPage.ftl
@@ -1,294 +1,294 @@
-<html>
-<head>
-
-
-<script type="text/javascript">
-  setPath("<span onclick='WebUI.enter(SystemConfigPage);'>"+translateKey('menuSettingsPage')+"</span> &gt; "+ translateKey('submenuCreateDiagram'));
-  
- (function () {
-	  if (!${initialized?string('true', 'false')}) {
-		jQuery("#${TableId} td:nth-child(5)").hide();
-		jQuery("#dataloggingError").show();
-	  } else {	  
-		jQuery("#dataloggingError").hide();
-	  }	
-	  
-	  var s = "";
-	  s += "<table cellspacing='8'>";
-	  s += "<tr>";
-	  s += "<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.goBack();'>"+ translateKey('footerBtnPageBack') +"</div></td>";
-	  <#if objectList?size &lt; 50>
-		  if (${initialized?string('true', 'false')}) {
-			s += "<td align='center' valign='middle'><div class='FooterButton' onclick='NewDiagram();'>"+ translateKey('footerBtnNew') +"</div></td>";
-		  }
-		  
-		jQuery("#tooManyDiagramsError").hide();
-	  </#if>
-	  
-	  s += "</tr>";
-	  s += "</table>";
-	  setFooter(s);
-	  translateButtons("btnRemove, btnEdit");
-	  translatePage("#${TableId}");
-	  translatePage("#dataloggingError");
-	  translatePage("#tooManyDiagramsError");
-	  jQuery("#${TableId}").show();  
-	})();
-</script>
-
-</head>
-<body>
-<table id="dataloggingError" class="tTable"  border="0" cellpadding="0" cellspacing="0">
- <tr>
-	<td class="CLASS21906">
-      ${"$"}{diagramDataloggingNotInitialised}
-	</td>
-</tr>
-</table>
-<table id="tooManyDiagramsError" class="tTable"  border="0" cellpadding="0" cellspacing="0">
- <tr>
-	<td class="CLASS21906">
-      ${"$"}{diagramTooManyDiagrams}
-	</td>
-</tr>
-</table>
-
-<table id="${TableId}" class="tTable"  border="0" cellpadding="0" cellspacing="0">
-  <thead>
-    <tr>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramName}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDescription}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramTemplate}</td>
-      <td class="thCell CLASS04900" >${"$"}{thDiagramDefaultPeriod}</td>
-      <td class="thCell CLASS04900" >${"$"}{thAction}</td>
-    </tr>
-  </thead>
-  <tbody>
-  
-    <#list objectList as diagram>
-    <tr class="CLASS04901">
-        <td class="tBodyCell">${diagram.name}</td>
-        <td class="tBodyCell">${diagram.description}</td>
-        <td class="tBodyCell">
-        <#list templates as template>
-	        <#if diagram.templateId = template.id>${template.getName()}</#if>
-	    </#list>
-        </td>
-        <td class="tBodyCell">
-        		<#if diagram.defaultPeriod = 1>${"$"}{diagramPeriodLastDay}</#if>
-	        	<#if diagram.defaultPeriod = 2>${"$"}{diagramPeriodLastWeek}</#if>
-	        	<#if diagram.defaultPeriod = 3>${"$"}{diagramPeriodLastMonth}</#if>
-	        	<#if diagram.defaultPeriod = 4>${"$"}{diagramPeriodLastYear}</#if>
-	    </td>
-
-<!-- Start action column -->        
-<td class="tBodyCell CLASS04902" >
-<table cellpadding="0" cellspacing="0" border="0">
-<tr>
-<td>
-<table cellpadding="0" cellspacing="0" border="0">
-<tr>
-<td class="CLASS04903">
-<input type="button" name="btnRemove" value="btnRemove" class="StdButton CLASS04907" onclick="DeleteDiagram(${diagram.id});" />
-</td>
-</tr>
-<tr>
-<td>
-</td>
-</tr>
-<tr>
-<td class="CLASS04903">
-<input type="button" name="btnEdit" value="btnEdit" class="StdButton CLASS04907" onclick="EditDiagram(${diagram.id});" />
-</td>
-</tr>
-</table>
-</td>
-<td>
-<table cellpadding="0" cellspacing="0" border="0">
-<tr>
-<td class="CLASS04903">
-<label class="CLASS04904"><input type="checkbox" ${diagram.active?string('checked', '')} onclick="SetActive(${diagram.id},this.checked);" />${"$"}{lblActiv}</label>
-</td>
-</tr>
-<tr>
-<td class="CLASS04903">
-<label class="CLASS04904"><input type="checkbox" ${diagram.operable?string('checked', '')} onclick="SetOperable(${diagram.id},this.checked);" />${"$"}{lblUsable}</label>
-</td>
-</tr>
-<tr>
-<td class="CLASS04903">
-<label class="CLASS04904"><input type="checkbox" ${diagram.visible?string('checked', '')} onclick="SetVisible(${diagram.id},this.checked);" />${"$"}{lblVisible}</label>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</td>
-<!-- End Action Column -->        
-        
-    </tr>
-    </#list>  
-  
-
-  </tbody>
-</table>
-
-<script type="text/javascript">
-	SetActive = function(id, active)
-	{
-		var url = '/pages/jpages/diagram/settings/active?sid='+SessionId;
-        var pb = "{";
-        pb += '"id" : "' + id +'",';
-        pb += '"value" :  "' + active +'"}';
-        var opt = {
-	        postBody: pb, 
-	        onComplete: function(t){
-				var response = JSON.parse(t.responseText);
-                if(!response.isSuccessful)
-                {
-					if(response.errorCode == "42")
-					{
-						jQuery("#content").html(response.content);
-					} else {
-						alert(translateKey('diagramErrorCouldNotSave'));
-					}
-	        	}
-	        }
-        }
-    	new Ajax.Request(url,opt);
-	};
-	
-	SetOperable = function(id, operable)
-	{
-		var url = '/pages/jpages/diagram/settings/operable?sid='+SessionId;
-        var pb = "{";
-        pb += '"id" : "' + id +'",';
-        pb += '"value" : "' + operable +'"}';
-        var opt = {
-	        postBody: pb, 
-	        onComplete: function(t){
-		        var response = JSON.parse(t.responseText);
-                if(!response.isSuccessful)
-                {
-					if(response.errorCode == "42")
-					{
-						jQuery("#content").html(response.content);
-					} else {
-						alert(translateKey('diagramErrorCouldNotSave'));
-					}
-	        	}
-	        }
-        }
-    	new Ajax.Request(url,opt);
-	};
-	
-	SetVisible = function(id, visible)
-	{
-		var url = '/pages/jpages/diagram/settings/visible?sid='+SessionId;
-        var pb = "{";
-        pb += '"id" : "' + id +'",';
-        pb += '"value" : "' + visible +'"}';
-        var opt = {
-	        postBody: pb, 
-	        onComplete: function(t){
-		        var response = JSON.parse(t.responseText);
-                if(!response.isSuccessful)
-                {
-					if(response.errorCode == "42")
-					{
-						jQuery("#content").html(response.content);
-					} else {
-						alert(translateKey('diagramErrorCouldNotSave'));
-					}
-	        	}
-	        }
-        }
-    	new Ajax.Request(url,opt);
-	};
-	
-  DeleteDiagram = function(id)
-  {
-    var _id_ = id;
-      new YesNoDialog(translateKey('dialogSafetyCheck'), translateKey('dialogQuestionRemoveDiagram'), function(result) {
-      if (result == YesNoDialog.RESULT_YES)
-      {
-	        var url = '/pages/jpages/diagram/settings/delete?sid='+SessionId;
-	        var pb = "{";
-	        pb += '"id" : "' + _id_ +'"}';
-	        var opt = {
-		        postBody: pb, 
-		        onComplete: function(t){
-		        	var response = JSON.parse(t.responseText);
-					if(!response.isSuccessful)
-					{
-						if(response.errorCode == "42")
-						{
-							jQuery("#content").html(response.content);
-						} else {
-							alert(translateKey('diagramErrorCouldNotDelete'));
-						}
-					} else {					
-						reloadPage();
-					}
-		        }
-	        }
-        	new Ajax.Request(url,opt);
-      }
-    });
-  };
-  
-	EditDiagram = function(id)
-	{
-		var url = '/pages/jpages/diagram/settings/showEdit?sid='+SessionId;
-		var pb = "{";
-		pb += '"id" : "' + id +'"}';
-		var opt =
-		{
-			postBody: pb,
-			onComplete: function(t)
-			{
-				var response = JSON.parse(t.responseText);
-				if(!response.isSuccessful)
-				{
-					if(response.errorCode == "42")
-					{
-						jQuery("#content").html(response.content);
-					} else {
-						alert(translateKey(response.content));
-					}
-				} else {			
-					jQuery("#content").html(response.content);
-				}
-			}
-		}
-		new Ajax.Request(url,opt);
-	};
-  
-	NewDiagram = function()
-	{  
-		var url = '/pages/jpages/diagram/settings/showDiagramType?sid='+SessionId;
-		var opt =
-		{
-			onComplete: function(t)
-			{
-				var response = JSON.parse(t.responseText);
-				
-				if(!response.isSuccessful)
-				{
-					if(response.errorCode == "42")
-					{
-						jQuery("#content").html(response.content);
-					} else {
-						alert(translateKey(response.content));
-					}
-				} else {			
-					CreateCPPopup ("/pages/jpages/diagram/NewDiagramDialog.htm");
-				}
-			}
-		}
-		new Ajax.Request(url,opt);
-	};
-</script>
-</body>
+<html>
+<head>
+
+
+<script type="text/javascript">
+  setPath("<span onclick='WebUI.enter(SystemConfigPage);'>"+translateKey('menuSettingsPage')+"</span> &gt; "+ translateKey('submenuCreateDiagram'));
+  
+ (function () {
+	  if (!${initialized?string('true', 'false')}) {
+		jQuery("#${TableId} td:nth-child(5)").hide();
+		jQuery("#dataloggingError").show();
+	  } else {	  
+		jQuery("#dataloggingError").hide();
+	  }	
+	  
+	  var s = "";
+	  s += "<table cellspacing='8'>";
+	  s += "<tr>";
+	  s += "<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.goBack();'>"+ translateKey('footerBtnPageBack') +"</div></td>";
+	  <#if objectList?size &lt; 50>
+		  if (${initialized?string('true', 'false')}) {
+			s += "<td align='center' valign='middle'><div class='FooterButton' onclick='NewDiagram();'>"+ translateKey('footerBtnNew') +"</div></td>";
+		  }
+		  
+		jQuery("#tooManyDiagramsError").hide();
+	  </#if>
+	  
+	  s += "</tr>";
+	  s += "</table>";
+	  setFooter(s);
+	  translateButtons("btnRemove, btnEdit");
+	  translatePage("#${TableId}");
+	  translatePage("#dataloggingError");
+	  translatePage("#tooManyDiagramsError");
+	  jQuery("#${TableId}").show();  
+	})();
+</script>
+
+</head>
+<body>
+<table id="dataloggingError" class="tTable"  border="0" cellpadding="0" cellspacing="0">
+ <tr>
+	<td class="CLASS21906">
+      ${"$"}{diagramDataloggingNotInitialised}
+	</td>
+</tr>
+</table>
+<table id="tooManyDiagramsError" class="tTable"  border="0" cellpadding="0" cellspacing="0">
+ <tr>
+	<td class="CLASS21906">
+      ${"$"}{diagramTooManyDiagrams}
+	</td>
+</tr>
+</table>
+
+<table id="${TableId}" class="tTable"  border="0" cellpadding="0" cellspacing="0">
+  <thead>
+    <tr>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramName}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDescription}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramTemplate}</td>
+      <td class="thCell CLASS04900" >${"$"}{thDiagramDefaultPeriod}</td>
+      <td class="thCell CLASS04900" >${"$"}{thAction}</td>
+    </tr>
+  </thead>
+  <tbody>
+  
+    <#list objectList as diagram>
+    <tr class="CLASS04901">
+        <td class="tBodyCell">${diagram.name}</td>
+        <td class="tBodyCell">${diagram.description}</td>
+        <td class="tBodyCell">
+        <#list templates as template>
+	        <#if diagram.templateId = template.id>${template.getName()}</#if>
+	    </#list>
+        </td>
+        <td class="tBodyCell">
+        		<#if diagram.defaultPeriod = 1>${"$"}{diagramPeriodLastDay}</#if>
+	        	<#if diagram.defaultPeriod = 2>${"$"}{diagramPeriodLastWeek}</#if>
+	        	<#if diagram.defaultPeriod = 3>${"$"}{diagramPeriodLastMonth}</#if>
+	        	<#if diagram.defaultPeriod = 4>${"$"}{diagramPeriodLastYear}</#if>
+	    </td>
+
+<!-- Start action column -->        
+<td class="tBodyCell CLASS04902" >
+<table cellpadding="0" cellspacing="0" border="0">
+<tr>
+<td>
+<table cellpadding="0" cellspacing="0" border="0">
+<tr>
+<td class="CLASS04903">
+<input type="button" name="btnRemove" value="btnRemove" class="StdButton CLASS04907" onclick="DeleteDiagram(${diagram.id});" />
+</td>
+</tr>
+<tr>
+<td>
+</td>
+</tr>
+<tr>
+<td class="CLASS04903">
+<input type="button" name="btnEdit" value="btnEdit" class="StdButton CLASS04907" onclick="EditDiagram(${diagram.id});" />
+</td>
+</tr>
+</table>
+</td>
+<td>
+<table cellpadding="0" cellspacing="0" border="0">
+<tr>
+<td class="CLASS04903">
+<label class="CLASS04904"><input type="checkbox" ${diagram.active?string('checked', '')} onclick="SetActive(${diagram.id},this.checked);" />${"$"}{lblActiv}</label>
+</td>
+</tr>
+<tr>
+<td class="CLASS04903">
+<label class="CLASS04904"><input type="checkbox" ${diagram.operable?string('checked', '')} onclick="SetOperable(${diagram.id},this.checked);" />${"$"}{lblUsable}</label>
+</td>
+</tr>
+<tr>
+<td class="CLASS04903">
+<label class="CLASS04904"><input type="checkbox" ${diagram.visible?string('checked', '')} onclick="SetVisible(${diagram.id},this.checked);" />${"$"}{lblVisible}</label>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</table>
+</td>
+<!-- End Action Column -->        
+        
+    </tr>
+    </#list>  
+  
+
+  </tbody>
+</table>
+
+<script type="text/javascript">
+	SetActive = function(id, active)
+	{
+		var url = '/pages/jpages/diagram/settings/active?sid='+SessionId;
+        var pb = "{";
+        pb += '"id" : "' + id +'",';
+        pb += '"value" :  "' + active +'"}';
+        var opt = {
+	        postBody: pb, 
+	        onComplete: function(t){
+				var response = JSON.parse(t.responseText);
+                if(!response.isSuccessful)
+                {
+					if(response.errorCode == "42")
+					{
+						jQuery("#content").html(response.content);
+					} else {
+						alert(translateKey('diagramErrorCouldNotSave'));
+					}
+	        	}
+	        }
+        }
+    	new Ajax.Request(url,opt);
+	};
+	
+	SetOperable = function(id, operable)
+	{
+		var url = '/pages/jpages/diagram/settings/operable?sid='+SessionId;
+        var pb = "{";
+        pb += '"id" : "' + id +'",';
+        pb += '"value" : "' + operable +'"}';
+        var opt = {
+	        postBody: pb, 
+	        onComplete: function(t){
+		        var response = JSON.parse(t.responseText);
+                if(!response.isSuccessful)
+                {
+					if(response.errorCode == "42")
+					{
+						jQuery("#content").html(response.content);
+					} else {
+						alert(translateKey('diagramErrorCouldNotSave'));
+					}
+	        	}
+	        }
+        }
+    	new Ajax.Request(url,opt);
+	};
+	
+	SetVisible = function(id, visible)
+	{
+		var url = '/pages/jpages/diagram/settings/visible?sid='+SessionId;
+        var pb = "{";
+        pb += '"id" : "' + id +'",';
+        pb += '"value" : "' + visible +'"}';
+        var opt = {
+	        postBody: pb, 
+	        onComplete: function(t){
+		        var response = JSON.parse(t.responseText);
+                if(!response.isSuccessful)
+                {
+					if(response.errorCode == "42")
+					{
+						jQuery("#content").html(response.content);
+					} else {
+						alert(translateKey('diagramErrorCouldNotSave'));
+					}
+	        	}
+	        }
+        }
+    	new Ajax.Request(url,opt);
+	};
+	
+  DeleteDiagram = function(id)
+  {
+    var _id_ = id;
+      new YesNoDialog(translateKey('dialogSafetyCheck'), translateKey('dialogQuestionRemoveDiagram'), function(result) {
+      if (result == YesNoDialog.RESULT_YES)
+      {
+	        var url = '/pages/jpages/diagram/settings/delete?sid='+SessionId;
+	        var pb = "{";
+	        pb += '"id" : "' + _id_ +'"}';
+	        var opt = {
+		        postBody: pb, 
+		        onComplete: function(t){
+		        	var response = JSON.parse(t.responseText);
+					if(!response.isSuccessful)
+					{
+						if(response.errorCode == "42")
+						{
+							jQuery("#content").html(response.content);
+						} else {
+							alert(translateKey('diagramErrorCouldNotDelete'));
+						}
+					} else {					
+						reloadPage();
+					}
+		        }
+	        }
+        	new Ajax.Request(url,opt);
+      }
+    });
+  };
+  
+	EditDiagram = function(id)
+	{
+		var url = '/pages/jpages/diagram/settings/showEdit?sid='+SessionId;
+		var pb = "{";
+		pb += '"id" : "' + id +'"}';
+		var opt =
+		{
+			postBody: pb,
+			onComplete: function(t)
+			{
+				var response = JSON.parse(t.responseText);
+				if(!response.isSuccessful)
+				{
+					if(response.errorCode == "42")
+					{
+						jQuery("#content").html(response.content);
+					} else {
+						alert(translateKey(response.content));
+					}
+				} else {			
+					jQuery("#content").html(response.content);
+				}
+			}
+		}
+		new Ajax.Request(url,opt);
+	};
+  
+	NewDiagram = function()
+	{  
+		var url = '/pages/jpages/diagram/settings/showDiagramType?sid='+SessionId;
+		var opt =
+		{
+			onComplete: function(t)
+			{
+				var response = JSON.parse(t.responseText);
+				
+				if(!response.isSuccessful)
+				{
+					if(response.errorCode == "42")
+					{
+						jQuery("#content").html(response.content);
+					} else {
+						alert(translateKey(response.content));
+					}
+				} else {			
+					CreateCPPopup ("/pages/jpages/diagram/NewDiagramDialog.htm");
+				}
+			}
+		}
+		new Ajax.Request(url,opt);
+	};
+</script>
+</body>
 </html>
\ No newline at end of file
diff --git a/HMserver/opt/HMServer/pages/GroupChooseDialog.ftl b/HMserver/opt/HMServer/pages/GroupChooseDialog.ftl
index 7d8dd014..1671e106 100644
--- a/HMserver/opt/HMServer/pages/GroupChooseDialog.ftl
+++ b/HMserver/opt/HMServer/pages/GroupChooseDialog.ftl
@@ -1,114 +1,114 @@
-<script type="text/javascript">
-dlgResult = 0;
-//The Viewmodel
-function ChooseGroupViewModel()
-{
-    var self = this;
-    self.groupList = ko.observableArray();
-    <#list possibleGroupsList as group>self.groupList.push(new VirtualGroup("${group.getId()}", "${group.getName()}", translateKey("${group.getGroupDefinition().getGroupType().getLabel()}"), "${group.getGroupDefinition().getGroupType().getId()}"));</#list>
-    self.serialNumber = "${serialNumber}";
-    self.regaID = "${regaID}";
-
-    self.selectedGroupId = ko.observable(self.groupList()[0].id);
-
-    self.groupListHeaders = new Array();
-    self.groupListHeaders.push(new Header(translateKey('groupID'), 'id'));
-    self.groupListHeaders.push(new Header(translateKey('groupGroupName'), 'name'));
-    self.groupListHeaders.push(new Header(translateKey('groupTypeLabel'), 'groupTypeLabel'));
-    self.groupListHeaders.push(new Header(translateKey('choice'), 'choice'));
-
-    self.activeGroupListHeader = self.groupListHeaders[0];
-
-    self.sortGroupList = function(header, event){
-        if(self.activeGroupListHeader === header) {
-            header.asc = !header.asc;
-        } else {
-            self.activeGroupListHeader.isActive(false);
-            self.activeGroupListHeader = header;
-        }
-        header.isActive(true);
-        var prop = header.sortPropertyName;
-        var ascSort = function(a,b){ return a[prop] < b[prop] ? -1 : a[prop] > b[prop] ? 1 : a[prop] == b[prop] ? 0 : 0; };
-        var descSort = function(a,b){ return ascSort(b,a); };
-        var sortFunc = header.asc ? ascSort : descSort;
-        self.groupList.sort(sortFunc);
-    };
-}
-var viewModel = new ChooseGroupViewModel();
-
-// Activates knockout.js
-// This Page needs a new ViewModel
-ko.applyBindings(viewModel, document.getElementById('groupChooseDialogContent'));
-translatePage('#messagebox');
-
-dlgPopup.readaptSize();
-
-OnOK = function() {
-    var data = new Object();
-
-    data.serialNumber = viewModel.serialNumber;
-    data.regaID = viewModel.regaID;
-    data.groupId = viewModel.selectedGroupId();
-
-    var url = '/pages/jpages/group/addDevice?sid='+SessionId;
-    pb = JSON.stringify(data);
-    var opt =
-    {
-        postBody: pb,
-        onComplete: function(t)
-        {
-            var response = JSON.parse(t.responseText);
-            jQuery("#content").html(response.content);
-            PopupClose();
-        }
-    }
-    new Ajax.Request(url,opt);
-}
-
-</script>
-<div class="popupTitle">${"$"}{groupChooserDialogTitle}</div>
-
-<div class="CLASS21114 j_translate" id="groupChooseDialogContent">
-    <table class="popupTable" border=1 width="100%">
-        <tr class="CLASS21115">
-            <td class="CLASS21116">${"$"}{groupChooserDialogGroups}</td>
-            <td  align=left style="width: 80%">
-                <table class="tTable" style="width: 100%; margin: 0" cellspacing="0" cellpadding="0" border="0">
-                    <thead>
-                        <tr data-bind="foreach: groupListHeaders">
-                            <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: $parent.sortGroupList, text: title, css: headerClass, attr: {colspan: colspan}"></td>
-                        </tr>
-                    </thead>
-                    <tbody data-bind="foreach: groupList">
-                        <tr class="CLASS04901">
-                            <td data-bind="text: id" class="tBodyCell" style="width: 65px; text-align: center"></td>
-                            <td data-bind="text: name" class="tBodyCell"></td>
-                            <td class="tBodyCell" data-bind="text: groupTypeLabel"></td>
-                            <td class="tBodyCell" style="padding: 0px">
-                                <input style="width:100%; height: 40%; margin: 0px" type="radio" name="selectGroupGroup" data-bind="value: id, checked: $root.selectedGroupId" />
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </td>
-            <td class="CLASS21113" align="left">
-                <p> ${"$"}{groupChooserDialogGroupChooseHint} </p>
-            </td>
-        </tr>
-    </table>
-</div>
-
-<div class="popupControls">
-    <table>
-        <tr>
-            <td class="CLASS21103">
-                <div class="CLASS21108" onClick="PopupClose()">${"$"}{btnCancel}</div>
-            </td>
-            <td class="CLASS21103">
-                <div class="CLASS21108" onClick="OnOK()">${"$"}{btnOk}</div>
-            </td>
-            <td class="CLASS21109">
-            </td>
-        </tr>
-    </table>
+<script type="text/javascript">
+dlgResult = 0;
+//The Viewmodel
+function ChooseGroupViewModel()
+{
+    var self = this;
+    self.groupList = ko.observableArray();
+    <#list possibleGroupsList as group>self.groupList.push(new VirtualGroup("${group.getId()}", "${group.getName()}", translateKey("${group.getGroupDefinition().getGroupType().getLabel()}"), "${group.getGroupDefinition().getGroupType().getId()}"));</#list>
+    self.serialNumber = "${serialNumber}";
+    self.regaID = "${regaID}";
+
+    self.selectedGroupId = ko.observable(self.groupList()[0].id);
+
+    self.groupListHeaders = new Array();
+    self.groupListHeaders.push(new Header(translateKey('groupID'), 'id'));
+    self.groupListHeaders.push(new Header(translateKey('groupGroupName'), 'name'));
+    self.groupListHeaders.push(new Header(translateKey('groupTypeLabel'), 'groupTypeLabel'));
+    self.groupListHeaders.push(new Header(translateKey('choice'), 'choice'));
+
+    self.activeGroupListHeader = self.groupListHeaders[0];
+
+    self.sortGroupList = function(header, event){
+        if(self.activeGroupListHeader === header) {
+            header.asc = !header.asc;
+        } else {
+            self.activeGroupListHeader.isActive(false);
+            self.activeGroupListHeader = header;
+        }
+        header.isActive(true);
+        var prop = header.sortPropertyName;
+        var ascSort = function(a,b){ return a[prop] < b[prop] ? -1 : a[prop] > b[prop] ? 1 : a[prop] == b[prop] ? 0 : 0; };
+        var descSort = function(a,b){ return ascSort(b,a); };
+        var sortFunc = header.asc ? ascSort : descSort;
+        self.groupList.sort(sortFunc);
+    };
+}
+var viewModel = new ChooseGroupViewModel();
+
+// Activates knockout.js
+// This Page needs a new ViewModel
+ko.applyBindings(viewModel, document.getElementById('groupChooseDialogContent'));
+translatePage('#messagebox');
+
+dlgPopup.readaptSize();
+
+OnOK = function() {
+    var data = new Object();
+
+    data.serialNumber = viewModel.serialNumber;
+    data.regaID = viewModel.regaID;
+    data.groupId = viewModel.selectedGroupId();
+
+    var url = '/pages/jpages/group/addDevice?sid='+SessionId;
+    pb = JSON.stringify(data);
+    var opt =
+    {
+        postBody: pb,
+        onComplete: function(t)
+        {
+            var response = JSON.parse(t.responseText);
+            jQuery("#content").html(response.content);
+            PopupClose();
+        }
+    }
+    new Ajax.Request(url,opt);
+}
+
+</script>
+<div class="popupTitle">${"$"}{groupChooserDialogTitle}</div>
+
+<div class="CLASS21114 j_translate" id="groupChooseDialogContent">
+    <table class="popupTable" border=1 width="100%">
+        <tr class="CLASS21115">
+            <td class="CLASS21116">${"$"}{groupChooserDialogGroups}</td>
+            <td  align=left style="width: 80%">
+                <table class="tTable" style="width: 100%; margin: 0" cellspacing="0" cellpadding="0" border="0">
+                    <thead>
+                        <tr data-bind="foreach: groupListHeaders">
+                            <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: $parent.sortGroupList, text: title, css: headerClass, attr: {colspan: colspan}"></td>
+                        </tr>
+                    </thead>
+                    <tbody data-bind="foreach: groupList">
+                        <tr class="CLASS04901">
+                            <td data-bind="text: id" class="tBodyCell" style="width: 65px; text-align: center"></td>
+                            <td data-bind="text: name" class="tBodyCell"></td>
+                            <td class="tBodyCell" data-bind="text: groupTypeLabel"></td>
+                            <td class="tBodyCell" style="padding: 0px">
+                                <input style="width:100%; height: 40%; margin: 0px" type="radio" name="selectGroupGroup" data-bind="value: id, checked: $root.selectedGroupId" />
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </td>
+            <td class="CLASS21113" align="left">
+                <p> ${"$"}{groupChooserDialogGroupChooseHint} </p>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<div class="popupControls">
+    <table>
+        <tr>
+            <td class="CLASS21103">
+                <div class="CLASS21108" onClick="PopupClose()">${"$"}{btnCancel}</div>
+            </td>
+            <td class="CLASS21103">
+                <div class="CLASS21108" onClick="OnOK()">${"$"}{btnOk}</div>
+            </td>
+            <td class="CLASS21109">
+            </td>
+        </tr>
+    </table>
 </div>
\ No newline at end of file
diff --git a/HMserver/opt/HMServer/pages/GroupConfigureDialog.ftl b/HMserver/opt/HMServer/pages/GroupConfigureDialog.ftl
index 8c98ac73..16321221 100644
--- a/HMserver/opt/HMServer/pages/GroupConfigureDialog.ftl
+++ b/HMserver/opt/HMServer/pages/GroupConfigureDialog.ftl
@@ -1,100 +1,100 @@
-<script type="text/javascript">
-    dlgResult = 0;
-    //The Viewmodel
-    function GroupConfigureViewModel()
-    {
-        var self = this;
-        self.devicesToConfigure = ko.observableArray();
-        <#list devicesList as device>self.devicesToConfigure.push(new GroupDevice("${device.getId()}", "${device.getLabel()}", "${device.getGroupMemberType().getId()}"));</#list>
-
-        self.ignoreConfigure = function()
-        {
-            self.devicesToConfigure.removeAll();
-            PopupClose();
-            WebUI.goBack();
-        };
-
-        self.checkConfigure = function()
-        {
-            var tempDevicesToConfigure = new Array();
-            ko.utils.arrayForEach(self.devicesToConfigure(), function(item) {
-                tempDevicesToConfigure.push(item);
-            });
-
-            ko.utils.arrayForEach(tempDevicesToConfigure, function(item) {
-                if(item.getConfigPending()==false)
-                {
-                    self.devicesToConfigure.remove(item);
-                }
-            });
-
-            if(self.devicesToConfigure().length == 0) {
-                PopupClose();
-                WebUI.goBack();
-            }
-        };
-
-        self.checkConfigure();
-    }
-    var viewModel = new GroupConfigureViewModel();
-    // Activates knockout.js
-    // This Page needs a new ViewModel
-    ko.applyBindings(viewModel, document.getElementById('groupConfigureDialog'));
-    translatePage('#messagebox');
-    dlgPopup.readaptSize();
-
-
-</script>
-<div id="groupConfigureDialog"  style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; z-index: 149; background-image: url('/ise/img/tr50.gif');">
-    <div style="position: absolute; z-index: 159; width: 100%; top: 50%;">
-        <meta content="no-cache" http-equiv="cache-control">
-        <meta content="no-cache" http-equiv="pragma">
-        <meta content="0" http-equiv="expires">
-        <title>response of request with command: removeLink</title>
-        <div style="width: 800px; height: 600px; padding: 0px; position: absolute; left: 50%; margin-left: -400px; margin-top: -150px;">
-            <div class="popupTitle" style="font-weight: bold;">${"$"}{dialogCreateLinkTitle}</div>
-            <div style="overflow: auto; width: 100%; height: 100%;">
-                <div >
-                    <table class="popupTable" border="1">
-                        <thead>
-                        <tr class="popupTableHeaderRow">
-                            <th>${"$"}{thName}</th>
-                            <th>${"$"}{thTypeDescriptorWOLineBreak}</th>
-                            <th>${"$"}{thPicture}</th>
-                            <th>${"$"}{thHint}</th>
-                        </tr>
-                        </thead>
-                        <tbody data-bind="foreach: devicesToConfigure">
-                        <tr class="popupTableRowGray">
-                            <td data-bind="text: name"></td>
-                            <td data-bind="text: type"></td>
-                            <td style="background-color: white;">
-                                <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
-                                    <img data-bind="attr:{src: imagePath, title: name, alt: name}">
-                                </div>
-                            </td>
-                            <td class="toTranslate" align="left" style="padding: 5px; color: red; font-weight: bold;" data-bind="attr:{rowspan: $root.devicesToConfigure().length}, visible: $root.devicesToConfigure()[0] == $data">
-                                ${"$"}{dialogCreateLinkErrorContent1}
-                                <ul>
-                                    <li>
-                                        ${"$"}{dialogCreateLinkErrorContent2}
-                                        <ul>
-                                            <li>${"$"}{dialogCreateLinkErrorContent3}</li>
-                                            <li>${"$"}{dialogCreateLinkErrorContent4}</li>
-                                        </ul>
-                                    </li>
-                                    <li>${"$"}{dialogCreateLinkErrorContent5}</li>
-                                </ul>
-                            </td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div class="CLASS10200">
-                    <span class="CLASS10101 colorGradient borderRadius2px" data-bind="click: checkConfigure">${"$"}{btnDirectDeviceLinkCheckAgain}</span>
-                    <span class="CLASS10101 colorGradient borderRadius2px" data-bind="click: ignoreConfigure">${"$"}{btnDirectDeviceLinkIgnore}</span>
-                </div>
-            </div>
-        </div>
-    </div>
+<script type="text/javascript">
+    dlgResult = 0;
+    //The Viewmodel
+    function GroupConfigureViewModel()
+    {
+        var self = this;
+        self.devicesToConfigure = ko.observableArray();
+        <#list devicesList as device>self.devicesToConfigure.push(new GroupDevice("${device.getId()}", "${device.getLabel()}", "${device.getGroupMemberType().getId()}"));</#list>
+
+        self.ignoreConfigure = function()
+        {
+            self.devicesToConfigure.removeAll();
+            PopupClose();
+            WebUI.goBack();
+        };
+
+        self.checkConfigure = function()
+        {
+            var tempDevicesToConfigure = new Array();
+            ko.utils.arrayForEach(self.devicesToConfigure(), function(item) {
+                tempDevicesToConfigure.push(item);
+            });
+
+            ko.utils.arrayForEach(tempDevicesToConfigure, function(item) {
+                if(item.getConfigPending()==false)
+                {
+                    self.devicesToConfigure.remove(item);
+                }
+            });
+
+            if(self.devicesToConfigure().length == 0) {
+                PopupClose();
+                WebUI.goBack();
+            }
+        };
+
+        self.checkConfigure();
+    }
+    var viewModel = new GroupConfigureViewModel();
+    // Activates knockout.js
+    // This Page needs a new ViewModel
+    ko.applyBindings(viewModel, document.getElementById('groupConfigureDialog'));
+    translatePage('#messagebox');
+    dlgPopup.readaptSize();
+
+
+</script>
+<div id="groupConfigureDialog"  style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; z-index: 149; background-image: url('/ise/img/tr50.gif');">
+    <div style="position: absolute; z-index: 159; width: 100%; top: 50%;">
+        <meta content="no-cache" http-equiv="cache-control">
+        <meta content="no-cache" http-equiv="pragma">
+        <meta content="0" http-equiv="expires">
+        <title>response of request with command: removeLink</title>
+        <div style="width: 800px; height: 600px; padding: 0px; position: absolute; left: 50%; margin-left: -400px; margin-top: -150px;">
+            <div class="popupTitle" style="font-weight: bold;">${"$"}{dialogCreateLinkTitle}</div>
+            <div style="overflow: auto; width: 100%; height: 100%;">
+                <div >
+                    <table class="popupTable" border="1">
+                        <thead>
+                        <tr class="popupTableHeaderRow">
+                            <th>${"$"}{thName}</th>
+                            <th>${"$"}{thTypeDescriptorWOLineBreak}</th>
+                            <th>${"$"}{thPicture}</th>
+                            <th>${"$"}{thHint}</th>
+                        </tr>
+                        </thead>
+                        <tbody data-bind="foreach: devicesToConfigure">
+                        <tr class="popupTableRowGray">
+                            <td data-bind="text: name"></td>
+                            <td data-bind="text: type"></td>
+                            <td style="background-color: white;">
+                                <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
+                                    <img data-bind="attr:{src: imagePath, title: name, alt: name}">
+                                </div>
+                            </td>
+                            <td class="toTranslate" align="left" style="padding: 5px; color: red; font-weight: bold;" data-bind="attr:{rowspan: $root.devicesToConfigure().length}, visible: $root.devicesToConfigure()[0] == $data">
+                                ${"$"}{dialogCreateLinkErrorContent1}
+                                <ul>
+                                    <li>
+                                        ${"$"}{dialogCreateLinkErrorContent2}
+                                        <ul>
+                                            <li>${"$"}{dialogCreateLinkErrorContent3}</li>
+                                            <li>${"$"}{dialogCreateLinkErrorContent4}</li>
+                                        </ul>
+                                    </li>
+                                    <li>${"$"}{dialogCreateLinkErrorContent5}</li>
+                                </ul>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+                <div class="CLASS10200">
+                    <span class="CLASS10101 colorGradient borderRadius2px" data-bind="click: checkConfigure">${"$"}{btnDirectDeviceLinkCheckAgain}</span>
+                    <span class="CLASS10101 colorGradient borderRadius2px" data-bind="click: ignoreConfigure">${"$"}{btnDirectDeviceLinkIgnore}</span>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
\ No newline at end of file
diff --git a/HMserver/opt/HMServer/pages/GroupEditPage.ftl b/HMserver/opt/HMServer/pages/GroupEditPage.ftl
index 93ca337e..c9e683ec 100644
--- a/HMserver/opt/HMServer/pages/GroupEditPage.ftl
+++ b/HMserver/opt/HMServer/pages/GroupEditPage.ftl
@@ -1,533 +1,625 @@
-<!--<html>
-<head>-->
-
-
-<script type="text/javascript">
-  setPath("<span onclick='WebUI.enter(CreateGroupPage);'>"+translateKey('menuGroupListPage')+"</span> &gt; "+ translateKey('groupDetails'));
-</script>
-<!--</head>
-<body>-->
-<form id="groupEditForm" style="display: none">
- <table id="parameter" class="tTable"  border="0" cellpadding="0" cellspacing="0">
-  <thead>
-  <tr>
-      <td class="thCell CLASS04900" >${"$"}{groupParameterName}</td>
-      <td class="thCell CLASS04900" colspan="2">${"$"}{groupValue}</td>
-    </tr>
-  </thead>
-  <tbody>
-  	<input type="hidden" id="group_id" value="${object.id}" />
-  	<tr>
-  		<td class="tBodyCell">${"$"}{groupGroupName}</td>
-        <td class="tBodyCell" colspan="2">
-        	<input type="text" onchange="checkGroupName()" id="group_name" data-bind="value: groupName" size="50"/>
-        </td>
-    </tr>
-  	<tr>
-  		<td class="tBodyCell">${"$"}{groupGroupType}</td>
-        <td class="tBodyCell" colspan="2">
-	        <select size="1" data-bind="options: possibleGroupTypes, value: groupType, optionsText: 'label',  enable: isNew">
-	        </select>
-        </td>
-    </tr>
-    <tr data-bind="visible: !isNew()">
-        <td class="tBodyCell">${"$"}{virtualDeviceSerialNumber}</td>
-        <td class="tBodyCell" data-bind="text: virtualDeviceSerialNumber"></td>
-        <td class="tBodyCell" style="width: 0px">
-            <input style="margin: 5px; display: block" type="button" name="btnVirtualDeviceStateAndOperating" value="btnVirtualDeviceStateAndOperating" class="StdButton CLASS04907" data-bind="click: operateVirtualDevice"/>
-            <input style="margin: 5px; display: block" type="button" name="btnVirtualDeviceConfiguration" value="btnVirtualDeviceConfiguration" class="StdButton CLASS04907" data-bind="click: configureVirtualDevice"/>
-        </td>
-    </tr>
-
-    <tr>
-      <td class="tBodyCell">${"$"}{lblAllowOnlyGroupOperation}</td>
-      <td class="tBodyCell" colspan="2"><input id="allowOnlyGroupOperation"  data-bind="checked: isSingleOperationForbidden" type="checkbox" ></td>
-    </tr>
-	
-  </tbody>
- </table>
- <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
- <thead>
-     <tr>
-         <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupAssignedDevices}</td>
-     </tr>
- </thead>
-  <thead>
-      <tr data-bind="foreach: assignedDeviceHeaders">
-          <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: function(data, event) {$parent.sortDeviceList($parent.assignedDevices, $parent.activeAssignedDeviceListHeader, data, event)}, text: title, css: headerClass"></td>
-      </tr>
-  </thead>
- <tbody data-bind="foreach: assignedDevices">
-      <tr class="CLASS04901">
-          <td class="tBodyCell" data-bind="text: name"></td>
-          <td class="tBodyCell" data-bind="text: type"></td>
-          <td class="tBodyCell" style="background-color: white; width: 10px">
-              <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
-                  <img data-bind="attr:{src: imagePath, title: name, alt: name}">
-              </div>
-          </td>
-          <td class="tBodyCell" data-bind="text: serialNumber"></td>
-
-          <!-- Start action column -->
-          <td class="tBodyCell CLASS04902" style="padding-left: 10px; padding-right: 10px; width: 0px">
-              <input type="button" name="btnGroupRemove" value="btnGroupRemove" class="StdButton CLASS04907" data-bind="click: $root.removeDevice"/>
-          </td>
-          <!-- End Action Column -->
-      </tr>
-  </tbody>
- <tfoot data-bind="visible: assignedDevices().length < 1">
-     <tr class="CLASS04901">
-         <td class="tBodyCell" colspan="5" >${"$"}{groupNoMoreDevices}</td>
-     </tr>
- </tfoot>
- </table>
-
- <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
-  <thead>
-    <tr>
-      <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupAllDevices}</td>
-    </tr>
-  </thead>
-  <thead>
-    <tr data-bind="foreach: assignableDeviceHeaders">
-        <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: function(data, event) {$parent.sortDeviceList($parent.assignableDevices, $parent.activeAssignableDeviceListHeader, data, event)}, text: title, css: headerClass"></td>
-      <!--<th class="thCell CLASS04900" >${"$"}{groupSerialNumber}</th>
-      <th class="thCell CLASS04900" >${"$"}{groupDeviceName}</th>
-      <th class="thCell CLASS04900" >${"$"}{groupAction}</th>-->
-
-    </tr>
-  </thead>
-  <tbody data-bind="foreach: assignableDevices">
-    <tr class="CLASS04901">
-        <td class="tBodyCell" data-bind="text: name"></td>
-        <td class="tBodyCell" data-bind="text: type"></td>
-        <td class="tBodyCell" style="background-color: white; width: 10px">
-            <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
-                <img data-bind="attr:{src: imagePath, title: name, alt: name}">
-            </div>
-        </td>
-        <td class="tBodyCell" data-bind="text: serialNumber"></td>
-
-    	<!-- Start action column -->        
-		<td class="tBodyCell CLASS04902"  style="padding-left: 10px; padding-right: 10px; width: 0px">
-		    <input type="button" name="btnAdd" value="btnAdd" class="StdButton CLASS04907" data-bind="click: $root.addDevice"/>
-		</td>
-		<!-- End Action Column -->       
-    </tr>
-    <!---->
-
-  </tbody>
-  <tfoot data-bind="visible: assignableDevices().length < 1">
-      <tr class="CLASS04901">
-          <td class="tBodyCell" colspan="5" >${"$"}{groupNoMorePossibleDevices}</td>
-      </tr>
-  </tfoot>
- </table>
-
- <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
-     <thead>
-     <tr>
-         <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupLinkedDevices}</td>
-     </tr>
-     </thead>
-     <thead>
-     <tr data-bind="foreach: leftoverDeviceHeaders">
-         <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: function(data, event) {$parent.sortDeviceList($parent.leftoverDevices, $parent.activeLeftoverDeviceListHeader, data, event)}, text: title, css: headerClass"></td>
-
-     </tr>
-     </thead>
-     <tbody data-bind="foreach: leftoverDevices">
-     <tr class="CLASS04901">
-         <td class="tBodyCell" data-bind="text: name"></td>
-         <td class="tBodyCell" data-bind="text: type"></td>
-         <td class="tBodyCell" style="background-color: white; width: 10px">
-             <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
-                 <img data-bind="attr:{src: imagePath, title: name, alt: name}">
-             </div>
-         </td>
-         <td class="tBodyCell" data-bind="text: serialNumber"></td>
-     </tr>
-     <!---->
-
-     </tbody>
-     <tfoot data-bind="visible: leftoverDevices().length < 1">
-     <tr class="CLASS04901">
-         <td class="tBodyCell" colspan="5" >${"$"}{groupNoMoreLeftoverDevices}</td>
-     </tr>
-     </tfoot>
- </table>
-
-<script type="text/javascript">
-
-    // TWIST-589
-    // Replaces the char " by '
-    function checkGroupName() {
-      var groupNameElem = jQuery("#group_name");
-      groupNameElem.val(groupNameElem.val().replace(/"/g, "'"));
-    }
-
-    var sessionTimeoutErrorCode = "42";
-    //Class to represent a GroupType
-    function GroupType(id, label)
-    {
-        var self = this;
-        this.id = id;
-        this.label = label;
-    }
-
-    //The Viewmodel
-    function GroupViewModel()
-    {
-        var self = this;
-
-        self.groupId = ${object.id}
-
-
-        self.isNew = ko.observable(${isNewGroup?c});
-
-
-        /*self.executeDeviceRefresh = true;
-        self.regaId = "2082"*/
-        self.executeDeviceRefresh = ${executeDeviceRefresh?c};
-        self.regaId = "${addedRegaId}"
-
-        self.virtualDeviceSerialNumber = ko.observable("");
-        if(self.isNew())
-        {
-            self.groupName = ko.observable(translateKey('newGroupInputField'));
-        }
-        else
-        {
-            self.groupName = ko.observable("${object.name}");
-            var temp = createVirtualDeviceSerialNumber(${object.id});
-            self.virtualDeviceSerialNumber(temp);
-        }
-
-        self.isSingleOperationForbidden = ${isSingleOperationForbidden}
-        self.isSaving = ko.observable(false);
-
-        self.possibleGroupTypes = new Array();
-        <#list possibleGroupTypes as deviceType>self.possibleGroupTypes.push(new GroupType("${deviceType.getId()}", translateKey('${deviceType.getLabel()}')));</#list>
-
-        ko.utils.arrayForEach(self.possibleGroupTypes, function(item) {
-            if(item.id == "${groupType.getId()}") {
-                self.groupType = ko.observable(item);
-            }
-        });
-
-        self.groupType.subscribe(function(item)
-        {
-            var url = '/pages/jpages/group/suitableGroupMembers?sid='+SessionId;
-
-            var data = new Object();
-
-            data.groupTypeId = item.id;
-
-            pb = JSON.stringify(data);
-
-            var opt =
-            {
-                postBody: pb,
-                onComplete: function(t)
-                {
-                    var parsed = JSON.parse(t.responseText);
-                    viewModel.assignableDevices.removeAll();
-                    viewModel.assignedDevices.removeAll();
-                    viewModel.leftoverDevices.removeAll();
-                    ko.utils.arrayForEach(parsed.assignableGroupMembers, function(item) {
-                        viewModel.assignableDevices.push(new GroupDevice(item.id, item.serialNumber, item.type));
-                    });
-                    ko.utils.arrayForEach(parsed.leftoverGroupMembers, function(item) {
-                        viewModel.leftoverDevices.push(new GroupDevice(item.id, item.serialNumber, item.type));
-                    });
-                    translateButtons("btnAdd");
-                }
-            }
-
-            new Ajax.Request(url,opt);
-        });
-
-        self.assignableDevices = ko.observableArray();
-        <#list assignableDevices as groupMember>self.assignableDevices.push(new GroupDevice("${groupMember.getId()}", "${groupMember.getLabel()}", "${groupMember.getGroupMemberType().getId()}"));</#list>
-
-        self.assignedDevices = ko.observableArray();
-        <#list object.getGroupMembers() as groupMember>self.assignedDevices.push(new GroupDevice("${groupMember.getId()}", "${groupMember.getLabel()}", "${groupMember.getGroupMemberType().getId()}"));</#list>
-
-        self.leftoverDevices = ko.observableArray();
-        <#list leftoverDevices as groupMember>self.leftoverDevices.push(new GroupDevice("${groupMember.getId()}", "${groupMember.getLabel()}", "${groupMember.getGroupMemberType().getId()}"));</#list>
-
-        self.devicesInConfigPending = ko.observableArray();
-
-        self.addDevice = function(device)
-        {
-            self.assignableDevices.remove(device);
-            self.assignedDevices.push(device);
-            translateButtons("btnGroupRemove");
-        }
-
-        self.removeDevice = function(device)
-        {
-            self.assignedDevices.remove(device);
-            self.assignableDevices.push(device);
-            translateButtons("btnAdd");
-        }
-
-        self.configureVirtualDevice = function()
-        {
-            ShowWaitAnim();
-            jQuery.get( "/config/ic_deviceparameters.cgi?sid="+SessionId+"&iface=VirtualDevices&address="+self.virtualDeviceSerialNumber()+"&redirect_url=GO_BACK",
-                    function( data ) {
-                    WebUI.previousPage        = WebUI.currentPage;
-                    WebUI.previousPageOptions = WebUI.currentPageOptions;
-                    WebUI.currentPage = DeviceListPage;
-                    HideWaitAnim();
-                    jQuery("#content").html(data);
-            });
-        }
-
-        self.operateVirtualDevice = function()
-        {
-            var virtualDevice = new GroupDevice(self.virtualDeviceSerialNumber(),self.virtualDeviceSerialNumber(), "VirtualDevice");
-            console.log(virtualDevice);
-            var url = '/pages/tabs/control/devices.htm?sid='+SessionId;
-            var pb = "{}";
-            var opt =
-            {
-                postBody: pb,
-                onComplete: function(t)
-                {
-                    WebUI.previousPage        = WebUI.currentPage;
-                    WebUI.previousPageOptions = WebUI.currentPageOptions;
-                    WebUI.currentPage = ControlDevicesPage;
-                    var regularExpression = new RegExp("loadChannels\\W\\s[0-9]+\\s\\W");
-                    var newContent = t.responseText.replace(regularExpression, "loadChannels("+virtualDevice.device.id+")");
-                    jQuery("#content").html(newContent);
-                }
-            }
-            new Ajax.Request(url,opt);
-        }
-
-        self.assignableDeviceHeaders = new Array();
-        self.assignableDeviceHeaders.push(new Header(translateKey('groupDeviceName'), 'name'));
-        self.assignableDeviceHeaders.push(new Header(translateKey('thTypeDescriptorWOLineBreak'), 'type'));
-        self.assignableDeviceHeaders.push(new Header(translateKey('thPicture'), 'thPicture'));
-
-        self.assignableDeviceHeaders.push(new Header(translateKey('groupSerialNumber'), 'serialNumber'));
-        self.assignableDeviceHeaders.push(new Header(translateKey('groupAction'), 'deviceAction'));
-
-        self.assignedDeviceHeaders = new Array
-        self.assignedDeviceHeaders.push(new Header(translateKey('groupDeviceName'), 'name'));
-        self.assignedDeviceHeaders.push(new Header(translateKey('thTypeDescriptorWOLineBreak'), 'type'));
-        self.assignedDeviceHeaders.push(new Header(translateKey('thPicture'), 'thPicture'));
-        self.assignedDeviceHeaders.push(new Header(translateKey('groupSerialNumber'), 'serialNumber'));
-        self.assignedDeviceHeaders.push(new Header(translateKey('groupAction'), 'deviceAction'));
-
-        self.leftoverDeviceHeaders = new Array
-        self.leftoverDeviceHeaders.push(new Header(translateKey('groupDeviceName'), 'name'));
-        self.leftoverDeviceHeaders.push(new Header(translateKey('thTypeDescriptorWOLineBreak'), 'type'));
-        self.leftoverDeviceHeaders.push(new Header(translateKey('thPicture'), 'thPicture'));
-        self.leftoverDeviceHeaders.push(new Header(translateKey('groupSerialNumber'), 'serialNumber'));
-
-        self.activeAssignableDeviceListHeader = self.assignableDeviceHeaders[0];
-        self.activeAssignedDeviceListHeader = self.assignedDeviceHeaders[0];
-        self.activeLeftoverDeviceListHeader = self.leftoverDeviceHeaders[0];
-
-        self.sortDeviceList = function(deviceList, lastHeader, header, event){
-            if(lastHeader === header) {
-                header.asc = !header.asc;
-            } else {
-                lastHeader.isActive(false);
-                if(lastHeader === self.activeAssignableDeviceListHeader)
-                {
-                    self.activeAssignableDeviceListHeader = header;
-                }
-                else if(lastHeader === self.activeAssignedDeviceListHeader)
-                {
-                    self.activeAssignedDeviceListHeader = header;
-                }
-                else if(lastHeader === self.activeLeftoverDeviceListHeader)
-                {
-                    self.activeLeftoverDeviceListHeader = header;
-                }
-            }
-            header.isActive(true);
-            var prop = header.sortPropertyName;
-            var ascSort = function(a,b){ return a[prop] < b[prop] ? -1 : a[prop] > b[prop] ? 1 : a[prop] == b[prop] ? 0 : 0; };
-            var descSort = function(a,b){ return ascSort(b,a); };
-            var sortFunc = header.asc ? ascSort : descSort;
-            deviceList.sort(sortFunc);
-        }
-    }
-
-    var viewModel = new GroupViewModel();
-
-    // Activates knockout.js
-    // This Page needs a new ViewModel
-    ko.applyBindings(viewModel, document.getElementById('groupEditForm'));
-
-    ReturnToListWithoutSave = function()
-    {
-        var tempPreviousPage = WebUI.previousPage;
-        var tempPreviousPageOptions = WebUI.previousPageOptions;
-        WebUI.previousPage        = WebUI.currentPage;
-        WebUI.previousPageOptions = WebUI.currentPageOptions;
-        WebUI.currentPage = tempPreviousPage;
-        WebUI.currentPageOptions = tempPreviousPageOptions;
-        WebUI.goBack();
-    };
-
-    ReturnToListAfterSave = function(devicesInPendingState)
-    {
-        var data = new Object();
-
-        data.devicesToConfigure = new Array();
-
-        ko.utils.arrayForEach(devicesInPendingState, function(item) {
-            var device = new Object();
-            device.id = item.id;
-            device.serialNumber = item.serialNumber;
-            device.type = item.type;
-            data.devicesToConfigure.push(device);
-        });
-
-        var url = '/pages/jpages/group/list?sid='+SessionId;
-        pb = JSON.stringify(data);
-        var opt =
-        {
-            postBody: pb,
-            onComplete: function(t)
-            {
-                jQuery("#content").html(t.responseText);
-            }
-        }
-        new Ajax.Request(url,opt);
-    }
-
-    refreshDeviceFromHomematic = function(serialNumberParam) {
-        homematic("Device.listAllDetail", null, function(deviceList) {
-            jQuery.each(deviceList, function (index, data) {
-                if (data !== null)
-                {
-                    var serialNumber = data["address"];
-                    if(serialNumber == serialNumberParam)
-                    {
-                        DeviceList.beginUpdateDevice(data["id"]);
-                    }
-                }
-
-            });
-        });
-    }
-
-    SaveGroup = function()
-    {
-        viewModel.isSaving(true);
-        var url = '/pages/jpages/group/save?sid='+SessionId;
-
-        var data = new Object();
-
-        data.groupId = viewModel.groupId;
-        data.groupName = escape(viewModel.groupName());
-        data.groupTypeId = viewModel.groupType().id;
-        data.forbidSingleOperation = viewModel.isSingleOperationForbidden;
-        data.assignedDevicesIds = new Array();
-        data.isNewGroup = viewModel.isNew();
-
-        ko.utils.arrayForEach(viewModel.assignedDevices(), function(item) {
-            data.assignedDevicesIds.push(item.id);
-        });
-
-        pb = JSON.stringify(data);
-
-        var opt =
-        {
-            postBody: pb,
-            onComplete: function(t)
-            {
-                var response = JSON.parse(t.responseText);
-                if(response.isSuccessful)
-                {
-                    if(viewModel.executeDeviceRefresh && viewModel.regaId != "")
-                    {
-                        iseDevices.setReadyConfig(viewModel.regaId);
-                    }
-                    ko.utils.arrayForEach(viewModel.assignedDevices(), function(item) {
-                        SetOperateGroupOnly(item, jQuery("#allowOnlyGroupOperation").prop("checked"));
-                        if(item.getConfigPending())
-                        {
-                            viewModel.devicesInConfigPending.push(item);
-                        }
-                    });
-                    ko.utils.arrayForEach(viewModel.assignableDevices(), function(item) {
-                        SetOperateGroupOnly(item, false)
-                        if(item.getConfigPending())
-                        {
-                            viewModel.devicesInConfigPending.push(item);
-                        }
-                    });
-
-                    if(viewModel.isNew()) {
-                        var virtualSerialNumber = createVirtualDeviceSerialNumber(response.content);
-                        refreshDeviceFromHomematic(virtualSerialNumber);
-                    }
-                    viewModel.isSaving(false);
-                    ReturnToListAfterSave(viewModel.devicesInConfigPending());
-                }
-                else
-                {
-                    viewModel.isSaving(false);
-                    if(response.errorCode == sessionTimeoutErrorCode)
-                    {
-                        jQuery("#content").html(response.content);
-                    }
-                }
-            }
-        }
-
-        new Ajax.Request(url,opt);
-    }
-
-    SetOperateGroupOnly = function(item, mode) {
-      homematic("Device.setOperateGroupOnly", {id:item.device.id, mode: mode}, function() {
-        DeviceList.devices[item.device.id].isOperateGroupOnly = mode;
-      });
-    }
-
-
-  var s = "";
-  s += "<table cellspacing='8'>";
-  s += "<tr>";
-  s += "<td align='center' valign='middle'><div class='FooterButton' onclick='ReturnToListWithoutSave();'>"+ translateKey('footerBtnCancel') +"</div></td>";
-  s += "<td align='center' valign='middle'><div class='FooterButton' onclick='SaveGroup();'>"+ translateKey('footerBtnOk') +"</div></td>";
-  s += "</tr>";
-  s += "</table>";
-  setFooter(s);
-  translateButtons("btnGroupRemove");
-  translateButtons("btnAdd");
-  translateButtons("btnVirtualDeviceStateAndOperating");
-  translateButtons("btnVirtualDeviceConfiguration");
-  translatePage();
-  jQuery( "#groupEditForm" ).submit(function( event ) {
-    event.preventDefault();
-  });
-  jQuery("#groupEditForm").show();
-
-</script>
- <div class="DialogLayer" style="z-index: 200; position: absolute; top: 0px; left: 0px; display: none" data-bind="visible: isSaving">
-     <div class="UIFrame" style="width: 324px; height:86px; top: 260px; left: 480px">
-         <div class="UIFrameTitle" style="top: 2px; left: 2px; width: 320px; height: 20px; line-height: 20px;">
-             ${"$"}{groupWillBeSavedHeader}
-         </div>
-         <div class="UIFrameContent" style="top: 24px; left: 2px; width: 320px; height: 60px;">
-             <div class="UIText" style="top: 10px; left:10px; width:310px">
-                 <img src="/ise/img/ajaxload_white.gif" style="float:left;margin-right:10px" />${"$"}{groupWillBeSavedContent}
-             </div>
-         </div>
-     </div>
- </div>
-</form>
-
-
-
-<!--</body>
+<!--<html>
+<head>-->
+
+
+<script type="text/javascript">
+  setPath("<span onclick='WebUI.enter(CreateGroupPage);'>"+translateKey('menuGroupListPage')+"</span> &gt; "+ translateKey('groupDetails'));
+</script>
+<!--</head>
+<body>-->
+<form id="groupEditForm" style="display: none">
+ <table id="parameter" class="tTable"  border="0" cellpadding="0" cellspacing="0">
+  <thead>
+  <tr>
+      <td class="thCell CLASS04900" >${"$"}{groupParameterName}</td>
+      <td class="thCell CLASS04900" colspan="2">${"$"}{groupValue}</td>
+    </tr>
+  </thead>
+  <tbody>
+  	<input type="hidden" id="group_id" value="${object.id}" />
+  	<tr>
+  		<td class="tBodyCell">${"$"}{groupGroupName}</td>
+        <td class="tBodyCell" colspan="2">
+        	<input type="text" onchange="checkGroupName();" onclick="storeGroupName();" id="group_name" data-bind="value: groupName" size="50"/>
+        	<div id="attentionDeviceNameChange" class='hidden attention'>${"$"}{lblAttentionGroupNameChange}</div>
+        </td>
+    </tr>
+  	<tr>
+  		<td class="tBodyCell">${"$"}{groupGroupType}</td>
+        <td class="tBodyCell" colspan="2">
+	        <select size="1" data-bind="options: possibleGroupTypes, value: groupType, optionsText: 'label',  enable: isNew">
+	        </select>
+        </td>
+    </tr>
+    <tr data-bind="visible: !isNew()">
+        <td class="tBodyCell">${"$"}{virtualDeviceSerialNumber}</td>
+        <!-- <td id="virtualDeviceSerialNumber" class="tBodyCell" data-bind="text: virtualDeviceSerialNumber"></td> -->
+        <td class="tBodyCell" data-bind="text: groupDeviceName"></td>
+        <td class="tBodyCell" style="width: 0px">
+            <input style="margin: 5px; display: block" type="button" name="btnVirtualDeviceStateAndOperating" value="btnVirtualDeviceStateAndOperating" class="StdButton CLASS04907" data-bind="click: operateVirtualDevice"/>
+            <input style="margin: 5px; display: block" type="button" name="btnVirtualDeviceConfiguration" value="btnVirtualDeviceConfiguration" class="StdButton CLASS04907" data-bind="click: configureVirtualDevice"/>
+        </td>
+    </tr>
+
+    <tr class="hidden">
+      <td class="tBodyCell">${"$"}{lblAllowOnlyGroupOperation}</td>
+      <td class="tBodyCell" colspan="2"><input id="allowOnlyGroupOperation"  data-bind="checked: isSingleOperationForbidden" type="checkbox" ></td>
+    </tr>
+	
+  </tbody>
+ </table>
+ <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+ <thead>
+     <tr>
+         <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupAssignedDevices}</td>
+     </tr>
+ </thead>
+  <thead>
+      <tr data-bind="foreach: assignedDeviceHeaders">
+          <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: function(data, event) {$parent.sortDeviceList($parent.assignedDevices, $parent.activeAssignedDeviceListHeader, data, event)}, text: title, css: headerClass"></td>
+      </tr>
+  </thead>
+ <tbody data-bind="foreach: assignedDevices">
+      <tr class="CLASS04901">
+          <td class="tBodyCell" data-bind="text: name"></td>
+          <td class="tBodyCell" data-bind="text: type"></td>
+          <td class="tBodyCell" style="background-color: white; width: 10px">
+              <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
+                  <img data-bind="attr:{src: imagePath, title: name, alt: name}">
+              </div>
+          </td>
+          <td class="tBodyCell" data-bind="text: serialNumber"></td>
+
+          <!-- Start action column -->
+          <td class="tBodyCell CLASS04902" style="padding-left: 10px; padding-right: 10px; width: 0px">
+              <input type="button" name="btnGroupRemove" value="btnGroupRemove" class="StdButton CLASS04907" data-bind="click: $root.removeDevice"/>
+          </td>
+          <!-- End Action Column -->
+      </tr>
+  </tbody>
+ <tfoot data-bind="visible: assignedDevices().length < 1">
+     <tr class="CLASS04901">
+         <td class="tBodyCell" colspan="5" >${"$"}{groupNoMoreDevices}</td>
+     </tr>
+ </tfoot>
+ </table>
+
+ <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+  <thead>
+    <tr>
+      <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupAllDevices}</td>
+    </tr>
+  </thead>
+  <thead>
+    <tr data-bind="foreach: assignableDeviceHeaders">
+        <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: function(data, event) {$parent.sortDeviceList($parent.assignableDevices, $parent.activeAssignableDeviceListHeader, data, event)}, text: title, css: headerClass"></td>
+      <!--<th class="thCell CLASS04900" >${"$"}{groupSerialNumber}</th>
+      <th class="thCell CLASS04900" >${"$"}{groupDeviceName}</th>
+      <th class="thCell CLASS04900" >${"$"}{groupAction}</th>-->
+
+    </tr>
+  </thead>
+  <tbody data-bind="foreach: assignableDevices">
+    <tr class="CLASS04901">
+        <td class="tBodyCell" data-bind="text: name"></td>
+        <td class="tBodyCell" data-bind="text: type"></td>
+        <td class="tBodyCell" style="background-color: white; width: 10px">
+            <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
+                <img data-bind="attr:{src: imagePath, title: name, alt: name}">
+            </div>
+        </td>
+        <td class="tBodyCell" data-bind="text: serialNumber"></td>
+
+    	<!-- Start action column -->        
+		<td class="tBodyCell CLASS04902"  style="padding-left: 10px; padding-right: 10px; width: 0px">
+		    <input type="button" name="btnAdd" value="btnAdd" class="StdButton CLASS04907" data-bind="click: $root.addDevice"/>
+		</td>
+		<!-- End Action Column -->       
+    </tr>
+    <!---->
+
+  </tbody>
+  <tfoot data-bind="visible: assignableDevices().length < 1">
+      <tr class="CLASS04901">
+          <td class="tBodyCell" colspan="5" >${"$"}{groupNoMorePossibleDevices}</td>
+      </tr>
+  </tfoot>
+ </table>
+
+ <table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+     <thead>
+     <tr>
+         <td class="thCell CLASS04900" colspan="5" style="font-size: 16px !important">${"$"}{groupLinkedDevices}</td>
+     </tr>
+     </thead>
+     <thead>
+     <tr data-bind="foreach: leftoverDeviceHeaders">
+         <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: function(data, event) {$parent.sortDeviceList($parent.leftoverDevices, $parent.activeLeftoverDeviceListHeader, data, event)}, text: title, css: headerClass"></td>
+
+     </tr>
+     </thead>
+     <tbody data-bind="foreach: leftoverDevices">
+     <tr class="CLASS04901">
+         <td class="tBodyCell" data-bind="text: name"></td>
+         <td class="tBodyCell" data-bind="text: type"></td>
+         <td class="tBodyCell" style="background-color: white; width: 10px">
+             <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
+                 <img data-bind="attr:{src: imagePath, title: name, alt: name}">
+             </div>
+         </td>
+         <td class="tBodyCell" data-bind="text: serialNumber"></td>
+     </tr>
+     <!---->
+
+     </tbody>
+     <tfoot data-bind="visible: leftoverDevices().length < 1">
+     <tr class="CLASS04901">
+         <td class="tBodyCell" colspan="5" >${"$"}{groupNoMoreLeftoverDevices}</td>
+     </tr>
+     </tfoot>
+ </table>
+
+<script type="text/javascript">
+
+     this.groupNameHasChanged = false;
+    // TWIST-589
+    // Replaces the char " by '
+    function checkGroupName() {
+      var groupNameElem = jQuery("#group_name");
+      groupNameElem.val(groupNameElem.val().replace(/"/g, "'"));
+      this.groupNameHasChanged = true;
+    }
+
+    function storeGroupName() {
+      if (viewModel.origGroupName == "") {
+        viewModel.origGroupName = viewModel.groupName() + " " + viewModel.virtualDeviceSerialNumber();
+      }
+    }
+
+    var sessionTimeoutErrorCode = "42";
+    //Class to represent a GroupType
+    function GroupType(id, label)
+    {
+        var self = this;
+        this.id = id;
+        this.label = label;
+    }
+
+    //The Viewmodel
+    function GroupViewModel()
+    {
+        var self = this;
+        self.changeVirtualDeviceName = true;
+        self.origGroupName = "";
+        self.groupId = ${object.id};
+        self.isNew = ko.observable(${isNewGroup?c});
+        /*self.executeDeviceRefresh = true;
+        self.regaId = "2082"*/
+        self.executeDeviceRefresh = ${executeDeviceRefresh?c};
+        self.regaId = "${addedRegaId}"
+
+        self.virtualDeviceSerialNumber = ko.observable("");
+        self.groupDeviceName = ko.observable("");
+
+        if(self.isNew())
+        {
+            self.groupName = ko.observable(translateKey('newGroupInputField'));
+        }
+        else
+        {
+            self.groupName = ko.observable("${object.name}");
+            var temp = createVirtualDeviceSerialNumber(${object.id});
+            self.virtualDeviceSerialNumber(temp);
+
+            <#if object.groupDeviceName??>
+              self.groupDeviceName("${object.groupDeviceName}");
+            <#else>
+               self.groupDeviceName("");
+            </#if>
+        }
+        self.device = DeviceList.getDeviceByAddress(self.virtualDeviceSerialNumber());
+        self.isSingleOperationForbidden = ${isSingleOperationForbidden}
+        self.isSaving = ko.observable(false);
+
+        self.possibleGroupTypes = new Array();
+        <#list possibleGroupTypes as deviceType>self.possibleGroupTypes.push(new GroupType("${deviceType.getId()}", translateKey('${deviceType.getLabel()}')));</#list>
+
+        ko.utils.arrayForEach(self.possibleGroupTypes, function(item) {
+            if(item.id == "${groupType.getId()}") {
+                self.groupType = ko.observable(item);
+            }
+        });
+
+        self.groupType.subscribe(function(item)
+        {
+            var url = '/pages/jpages/group/suitableGroupMembers?sid='+SessionId;
+
+            var data = new Object();
+
+            data.groupTypeId = item.id;
+
+            pb = JSON.stringify(data);
+
+            var opt =
+            {
+                postBody: pb,
+                onComplete: function(t)
+                {
+                    var parsed = JSON.parse(t.responseText);
+                    viewModel.assignableDevices.removeAll();
+                    viewModel.assignedDevices.removeAll();
+                    viewModel.leftoverDevices.removeAll();
+                    ko.utils.arrayForEach(parsed.assignableGroupMembers, function(item) {
+                        viewModel.assignableDevices.push(new GroupDevice(item.id, item.serialNumber, item.type));
+                    });
+                    ko.utils.arrayForEach(parsed.leftoverGroupMembers, function(item) {
+                        viewModel.leftoverDevices.push(new GroupDevice(item.id, item.serialNumber, item.type));
+                    });
+                    translateButtons("btnAdd");
+                }
+            }
+
+            new Ajax.Request(url,opt);
+        });
+
+        self.assignableDevices = ko.observableArray();
+        <#list assignableDevices as groupMember>self.assignableDevices.push(new GroupDevice("${groupMember.getId()}", "${groupMember.getLabel()}", "${groupMember.getGroupMemberType().getId()}"));</#list>
+
+        self.assignedDevices = ko.observableArray();
+        <#list object.getGroupMembers() as groupMember>self.assignedDevices.push(new GroupDevice("${groupMember.getId()}", "${groupMember.getLabel()}", "${groupMember.getGroupMemberType().getId()}"));</#list>
+
+        self.leftoverDevices = ko.observableArray();
+        <#list leftoverDevices as groupMember>self.leftoverDevices.push(new GroupDevice("${groupMember.getId()}", "${groupMember.getLabel()}", "${groupMember.getGroupMemberType().getId()}"));</#list>
+
+        self.devicesInConfigPending = ko.observableArray();
+
+        self.addDevice = function(device)
+        {
+            self.assignableDevices.remove(device);
+            self.assignedDevices.push(device);
+            translateButtons("btnGroupRemove");
+        }
+
+        self.removeDevice = function(device)
+        {
+            self.assignedDevices.remove(device);
+            self.assignableDevices.push(device);
+            translateButtons("btnAdd");
+        }
+
+        self.configureVirtualDevice = function()
+        {
+            ShowWaitAnim();
+            jQuery.get( "/config/ic_deviceparameters.cgi?sid="+SessionId+"&iface=VirtualDevices&address="+self.virtualDeviceSerialNumber()+"&redirect_url=GO_BACK",
+                    function( data ) {
+                    WebUI.previousPage        = WebUI.currentPage;
+                    WebUI.previousPageOptions = WebUI.currentPageOptions;
+                    WebUI.currentPage = DeviceListPage;
+                    HideWaitAnim();
+                    jQuery("#content").html(data);
+            });
+        }
+
+        self.operateVirtualDevice = function()
+        {
+            var virtualDevice = new GroupDevice(self.virtualDeviceSerialNumber(),self.virtualDeviceSerialNumber(), "VirtualDevice");
+            var url = '/pages/tabs/control/devices.htm?sid='+SessionId;
+            var pb = "{}";
+            var opt =
+            {
+                postBody: pb,
+                onComplete: function(t)
+                {
+                    WebUI.previousPage        = WebUI.currentPage;
+                    WebUI.previousPageOptions = WebUI.currentPageOptions;
+                    WebUI.currentPage = ControlDevicesPage;
+                    var regularExpression = new RegExp("loadChannels\\W\\s[0-9]+\\s\\W");
+                    var newContent = t.responseText.replace(regularExpression, "loadChannels("+virtualDevice.device.id+")");
+                    jQuery("#content").html(newContent);
+                }
+            }
+            new Ajax.Request(url,opt);
+        }
+
+        self.assignableDeviceHeaders = new Array();
+        self.assignableDeviceHeaders.push(new Header(translateKey('groupDeviceName'), 'name'));
+        self.assignableDeviceHeaders.push(new Header(translateKey('thTypeDescriptorWOLineBreak'), 'type'));
+        self.assignableDeviceHeaders.push(new Header(translateKey('thPicture'), 'thPicture'));
+
+        self.assignableDeviceHeaders.push(new Header(translateKey('groupSerialNumber'), 'serialNumber'));
+        self.assignableDeviceHeaders.push(new Header(translateKey('groupAction'), 'deviceAction'));
+
+        self.assignedDeviceHeaders = new Array
+        self.assignedDeviceHeaders.push(new Header(translateKey('groupDeviceName'), 'name'));
+        self.assignedDeviceHeaders.push(new Header(translateKey('thTypeDescriptorWOLineBreak'), 'type'));
+        self.assignedDeviceHeaders.push(new Header(translateKey('thPicture'), 'thPicture'));
+        self.assignedDeviceHeaders.push(new Header(translateKey('groupSerialNumber'), 'serialNumber'));
+        self.assignedDeviceHeaders.push(new Header(translateKey('groupAction'), 'deviceAction'));
+
+        self.leftoverDeviceHeaders = new Array
+        self.leftoverDeviceHeaders.push(new Header(translateKey('groupDeviceName'), 'name'));
+        self.leftoverDeviceHeaders.push(new Header(translateKey('thTypeDescriptorWOLineBreak'), 'type'));
+        self.leftoverDeviceHeaders.push(new Header(translateKey('thPicture'), 'thPicture'));
+        self.leftoverDeviceHeaders.push(new Header(translateKey('groupSerialNumber'), 'serialNumber'));
+
+        self.activeAssignableDeviceListHeader = self.assignableDeviceHeaders[0];
+        self.activeAssignedDeviceListHeader = self.assignedDeviceHeaders[0];
+        self.activeLeftoverDeviceListHeader = self.leftoverDeviceHeaders[0];
+
+        self.sortDeviceList = function(deviceList, lastHeader, header, event){
+            if(lastHeader === header) {
+                header.asc = !header.asc;
+            } else {
+                lastHeader.isActive(false);
+                if(lastHeader === self.activeAssignableDeviceListHeader)
+                {
+                    self.activeAssignableDeviceListHeader = header;
+                }
+                else if(lastHeader === self.activeAssignedDeviceListHeader)
+                {
+                    self.activeAssignedDeviceListHeader = header;
+                }
+                else if(lastHeader === self.activeLeftoverDeviceListHeader)
+                {
+                    self.activeLeftoverDeviceListHeader = header;
+                }
+            }
+            header.isActive(true);
+            var prop = header.sortPropertyName;
+            var ascSort = function(a,b){ return a[prop] < b[prop] ? -1 : a[prop] > b[prop] ? 1 : a[prop] == b[prop] ? 0 : 0; };
+            var descSort = function(a,b){ return ascSort(b,a); };
+            var sortFunc = header.asc ? ascSort : descSort;
+            deviceList.sort(sortFunc);
+        }
+    }
+
+    var viewModel = new GroupViewModel();
+
+    // Activates knockout.js
+    // This Page needs a new ViewModel
+    ko.applyBindings(viewModel, document.getElementById('groupEditForm'));
+
+    ReturnToListWithoutSave = function()
+    {
+        var tempPreviousPage = WebUI.previousPage;
+        var tempPreviousPageOptions = WebUI.previousPageOptions;
+        WebUI.previousPage        = WebUI.currentPage;
+        WebUI.previousPageOptions = WebUI.currentPageOptions;
+        WebUI.currentPage = tempPreviousPage;
+        WebUI.currentPageOptions = tempPreviousPageOptions;
+        WebUI.goBack();
+    };
+
+    ReturnToListAfterSave = function(devicesInPendingState)
+    {
+        var data = new Object();
+
+        data.devicesToConfigure = new Array();
+
+        ko.utils.arrayForEach(devicesInPendingState, function(item) {
+            var device = new Object();
+            device.id = item.id;
+            device.serialNumber = item.serialNumber;
+            device.type = item.type;
+            data.devicesToConfigure.push(device);
+        });
+
+        var url = '/pages/jpages/group/list?sid='+SessionId;
+        pb = JSON.stringify(data);
+        var opt =
+        {
+            postBody: pb,
+            onComplete: function(t)
+            {
+                jQuery("#content").html(t.responseText);
+            }
+        }
+        new Ajax.Request(url,opt);
+    }
+
+    adaptChannelNames = function(id, groupName) {
+      var device = DeviceList.getDevice(id);
+      if (device) {
+        jQuery.each(device.channels, function(index, channel) {
+          homematic("Channel.setName", {id: channel.id, name: groupName+":"+(index+1)}, function(result) {
+            if (index+1 == device.channels.length) {
+              DeviceList.beginUpdateDevice(id, function() {
+                conInfo("Device list actualized");
+              });
+            }
+          });
+        });
+      }
+    };
+
+    refreshDeviceFromHomematic = function(serialNumberParam, groupName) {
+        var changeVirtualDevice = viewModel.changeVirtualDeviceName;
+        homematic("Device.getReGaIDByAddress",{address:serialNumberParam}, function(result) {
+            if(changeVirtualDevice) {
+              // Set Name of the device
+              homematic("Device.setName", {id: result, name: groupName}, function() {
+                  homematic("Device.listAllDetail", null, function(deviceList) {
+                      jQuery.each(deviceList, function (index, data) {
+                          if (data !== null)
+                          {
+                              var serialNumber = data["address"];
+                              if(serialNumber == serialNumberParam)
+                              {
+                                DeviceList.beginUpdateDevice(data["id"], function() {
+                                  //change the channelnames of the new created device
+                                   adaptChannelNames(data["id"], groupName) ;
+                                });
+                              }
+                          }
+                      });
+                      window.setTimeout(function() {
+                        WebUI.enter(CreateGroupPage);
+                        homematic("system.saveObjectModel", {}, function () {
+                          conInfo("ObjectModel saved");
+                        });
+                      }, 2500);
+
+                  });
+              });
+            }
+        });
+    }
+
+    SaveGroup = function() {
+      var showMessage = false;
+
+      if ( !viewModel.isNew() && (viewModel.origGroupName != "") && (viewModel.origGroupName != viewModel.groupDeviceName())) {
+        showMessage = true;
+      }
+
+      if (viewModel.device && !viewModel.isNew()) {
+        jQuery.each(viewModel.device.channels, function(index,channel) {
+          if (((viewModel.origGroupName != "")) && viewModel.origGroupName + ":" + (index + 1) != channel.name) {
+            showMessage = true;
+          }
+        });
+      }
+      if (showMessage) {
+        new YesNoDialog(translateKey("dialogRenameVirtualGroupDeviceTitle"), translateKey("dialogVirtualGroupDeviceContent"), function(result) {
+          viewModel.changeVirtualDeviceName = false;
+          if (result == YesNoDialog.RESULT_YES)
+          {
+            viewModel.changeVirtualDeviceName = true;
+          }
+          _SaveGroup();
+
+        });
+      } else { _SaveGroup();}
+    }
+
+    _SaveGroup = function()
+    {
+
+        var self = this;
+        viewModel.isSaving(true);
+        var url = '/pages/jpages/group/save?sid='+SessionId;
+
+        var data = new Object();
+
+        data.groupId = viewModel.groupId;
+        data.groupName = escape(viewModel.groupName());
+        data.groupTypeId = viewModel.groupType().id;
+        data.forbidSingleOperation = viewModel.isSingleOperationForbidden;
+        data.assignedDevicesIds = new Array();
+        data.isNewGroup = viewModel.isNew();
+        data.groupDeviceName = jQuery("#group_name").val() + " " + viewModel.virtualDeviceSerialNumber();
+
+        ko.utils.arrayForEach(viewModel.assignedDevices(), function(item) {
+            data.assignedDevicesIds.push(item.id);
+        });
+
+        pb = JSON.stringify(data);
+
+        var opt =
+        {
+            postBody: pb,
+            onComplete: function(t)
+            {
+                var response = JSON.parse(t.responseText);
+                if(response.isSuccessful)
+                {
+                    if(viewModel.executeDeviceRefresh && viewModel.regaId != "")
+                    {
+                        //iseDevices.setOperateGroupOnly(jQuery("#allowOnlyGroupOperation").prop("checked"));
+                        iseDevices.setReadyConfig(viewModel.regaId);
+                    }
+
+                    ko.utils.arrayForEach(viewModel.assignedDevices(), function(item) {
+                       if(item.device != undefined) {
+                        //SetOperateGroupOnly(item, jQuery("#allowOnlyGroupOperation").prop("checked"));
+                       }
+                        if(item.getConfigPending())
+                        {
+                            viewModel.devicesInConfigPending.push(item);
+                        }
+                    });
+
+                    ko.utils.arrayForEach(viewModel.assignableDevices(), function(item) {
+                        if(item.device != undefined) {
+                          //SetOperateGroupOnly(item, false)
+                        }
+
+                        if(item.getConfigPending())
+                        {
+                            viewModel.devicesInConfigPending.push(item);
+                        }
+                    });
+
+                    if(viewModel.isNew()) {
+                        var virtualSerialNumber = createVirtualDeviceSerialNumber(response.content);
+                        refreshDeviceFromHomematic(virtualSerialNumber, viewModel.groupName() + " " + virtualSerialNumber);
+                    }
+
+                    if ((! viewModel.isNew()) && (self.groupNameHasChanged)){
+                        var virtualSerialNumber = viewModel.virtualDeviceSerialNumber();
+                        var newGroupName = (viewModel.changeVirtualDeviceName) ? jQuery("#group_name").val() + " " + virtualSerialNumber : viewModel.groupDeviceName();
+                        refreshDeviceFromHomematic(virtualSerialNumber, newGroupName);
+                      }
+
+                    viewModel.isSaving(false);
+                    ReturnToListAfterSave(viewModel.devicesInConfigPending());
+                }
+                else
+                {
+                    viewModel.isSaving(false);
+                    if(response.errorCode == sessionTimeoutErrorCode)
+                    {
+                        jQuery("#content").html(response.content);
+                    }
+                }
+            }
+        }
+
+        new Ajax.Request(url,opt);
+    }
+
+    SetOperateGroupOnly = function(item, mode) {
+      homematic("Device.setOperateGroupOnly", {id:item.device.id, mode: mode}, function(result) {
+        if (DeviceList.devices[item.device.id]) {
+          DeviceList.devices[item.device.id].isOperateGroupOnly = mode;
+        }
+      });
+    }
+
+  var s = "";
+  s += "<table cellspacing='8'>";
+  s += "<tr>";
+  s += "<td align='center' valign='middle'><div class='FooterButton' onclick='ReturnToListWithoutSave();'>"+ translateKey('footerBtnCancel') +"</div></td>";
+  s += "<td align='center' valign='middle'><div class='FooterButton' onclick='SaveGroup();'>"+ translateKey('footerBtnOk') +"</div></td>";
+  s += "</tr>";
+  s += "</table>";
+  setFooter(s);
+  translateButtons("btnGroupRemove");
+  translateButtons("btnAdd");
+  translateButtons("btnVirtualDeviceStateAndOperating");
+  translateButtons("btnVirtualDeviceConfiguration");
+  translatePage();
+  jQuery( "#groupEditForm" ).submit(function( event ) {
+    event.preventDefault();
+  });
+  jQuery("#groupEditForm").show();
+
+</script>
+ <div class="DialogLayer" style="z-index: 200; position: absolute; top: 0px; left: 0px; display: none" data-bind="visible: isSaving">
+     <div class="UIFrame" style="width: 324px; height:86px; top: 260px; left: 480px">
+         <div class="UIFrameTitle" style="top: 2px; left: 2px; width: 320px; height: 20px; line-height: 20px;">
+             ${"$"}{groupWillBeSavedHeader}
+         </div>
+         <div class="UIFrameContent" style="top: 24px; left: 2px; width: 320px; height: 60px;">
+             <div class="UIText" style="top: 10px; left:10px; width:310px">
+                 <img src="/ise/img/ajaxload_white.gif" style="float:left;margin-right:10px" />${"$"}{groupWillBeSavedContent}
+             </div>
+         </div>
+     </div>
+ </div>
+</form>
+
+
+
+<!--</body>
 </html>-->
\ No newline at end of file
diff --git a/HMserver/opt/HMServer/pages/GroupListPage.ftl b/HMserver/opt/HMServer/pages/GroupListPage.ftl
index a4b98446..35fd21f6 100644
--- a/HMserver/opt/HMServer/pages/GroupListPage.ftl
+++ b/HMserver/opt/HMServer/pages/GroupListPage.ftl
@@ -1,346 +1,346 @@
-<!--<html>
-<head>-->
-
-
-<script type="text/javascript">
-  setPath("<span onclick='WebUI.enter(GroupsPage);'>"+translateKey('menuGroupListPage')+"</span>");
-</script>
-<!--</head>
-<body>-->
-<div id="GroupListBody" style="display: none">
-<table class="tTable"  border="0" cellpadding="0" cellspacing="0">
-    <thead>
-    <tr data-bind="foreach: groupListHeaders">
-        <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: $parent.sortGroupList, text: title, css: headerClass, attr: {colspan: colspan}"></td>
-    </tr>
-    </thead>
-  <tbody data-bind="foreach: groupList">
-
-    <tr class="CLASS04901">
-        <td class="tBodyCell" data-bind="text: id" style="width: 65px; text-align: center"></td>
-        <td class="tBodyCell" data-bind="text: name"></td>
-        <td class="tBodyCell" data-bind="text: groupTypeLabel"></td>
-
-
-
-        <td class="tBodyCell" data-bind="text: virtualDeviceSerialNumber"></td>
-        <td class="tBodyCell" data-bind="text: virtualDeviceName"></td>
-        <td class="tBodyCell"  style="width: 0; padding-left: 10px; padding-right: 10px">
-            <input style="margin: 5px; display: block" type="button" name="btnVirtualDeviceStateAndOperating" value="btnVirtualDeviceStateAndOperating" class="StdButton CLASS04907" data-bind="click: operateVirtualDevice"/>
-            <input style="margin: 5px; display: block" type="button" name="btnVirtualDeviceConfiguration" value="btnVirtualDeviceConfiguration" class="StdButton CLASS04907" data-bind="click: configureVirtualDevice"/>
-        </td>
-
-        <!-- Start action column -->
-        <td class="tBodyCell CLASS04902" style="width: 0; padding-left: 10px; padding-right: 10px">
-            <table cellpadding="0" cellspacing="0" border="0">
-                <tr>
-                    <td>
-                        <table cellpadding="0" cellspacing="0" border="0">
-                            <tr>
-                                <td class="CLASS04903">
-                                    <input type="button" name="btnRemove" value="btnRemove" class="StdButton CLASS04907" data-bind="click: $root.removeGroup"/>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>
-                                </td>
-                            </tr>
-                            <tr>
-                                <td class="CLASS04903">
-                                    <input type="button" name="btnEdit" value="btnEdit" class="StdButton CLASS04907" data-bind="click: $root.editGroup"/>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-  
-
-  </tbody>
-</table>
-<script type="text/javascript">
-
-    var sessionTimeoutErrorCode = "42";
-
-
-
-    //The Viewmodel
-    function GroupListViewModel()
-    {
-        var self = this;
-        var devicesToConfigureAsJson = JSON.parse('{"devices" : ${devicesToConfigure}}');
-
-        self.isDeleting = ko.observable(false);
-
-        self.devicesToConfigure = ko.observableArray();
-
-        ko.utils.arrayForEach(devicesToConfigureAsJson.devices, function(item) {
-            self.devicesToConfigure.push(new GroupDevice(item.id, item.serialNumber, item.type));
-        });
-
-        self.areDevicesToConfigure = ko.computed( function()
-        {
-            return self.isDeleting() == false && self.devicesToConfigure().length > 0;
-        });
-
-        self.groupList = ko.observableArray();
-        <#list objectList as group>self.groupList.push(new VirtualGroup("${group.getId()}", "${group.getName()}", translateKey("${group.getGroupDefinition().getGroupType().getLabel()}"), "${group.getGroupDefinition().getGroupType().getId()}"));</#list>
-
-        self.groupListHeaders = new Array();
-        self.groupListHeaders.push(new Header(translateKey('groupID'), 'id'));
-        self.groupListHeaders.push(new Header(translateKey('groupGroupName'), 'name'));
-        self.groupListHeaders.push(new Header(translateKey('groupTypeLabel'), 'groupTypeLabel'));
-
-        var header = new Header(translateKey('virtualDeviceSerialNumber'), 'virtualDeviceSerialNumber');
-        header.colspan = 3;
-        self.groupListHeaders.push(header);
-        self.groupListHeaders.push(new Header(translateKey('groupAction'), 'groupAction'));
-        self.activeGroupListHeader = self.groupListHeaders[0];
-
-        self.sortGroupList = function(header, event){
-            if(self.activeGroupListHeader === header) {
-                header.asc = !header.asc;
-            } else {
-                self.activeGroupListHeader.isActive(false);
-                self.activeGroupListHeader = header;
-            }
-            header.isActive(true);
-            var prop = header.sortPropertyName;
-            var ascSort = function(a,b){ return a[prop] < b[prop] ? -1 : a[prop] > b[prop] ? 1 : a[prop] == b[prop] ? 0 : 0; };
-            var descSort = function(a,b){ return ascSort(b,a); };
-            var sortFunc = header.asc ? ascSort : descSort;
-            self.groupList.sort(sortFunc);
-        };
-
-        self.editGroup = function(group)
-        {
-            ShowWaitAnim();
-            var url = '/pages/jpages/group/edit?sid='+SessionId;
-            var data = new Object();
-            data.groupId = group.id;
-            var pb = JSON.stringify(data);
-            var opt = {
-                postBody: pb,
-                onComplete: function(t)
-                {
-                    HideWaitAnim();
-                    var response = JSON.parse(t.responseText);
-                    if(response.isSuccessful)
-                    {
-                        jQuery("#content").html(response.content);
-                    }
-                    else
-                    {
-                        if(response.errorCode == sessionTimeoutErrorCode)
-                        {
-                            jQuery("#content").html(response.content);
-                        }
-                    }
-                }
-            }
-
-            new Ajax.Request(url,opt);
-        };
-
-        self.removeGroup = function(group)
-        {
-            self.isDeleting(true);
-            var url = '/pages/jpages/group/delete?sid='+SessionId;
-            var data = new Object();
-            data.groupId = group.id;
-            var pb = JSON.stringify(data);
-            var opt = {
-                postBody: pb,
-                onComplete: function(t){
-                    var response = JSON.parse(t.responseText);
-                    self.isDeleting(false);
-                    if(response.isSuccessful)
-                    {
-                        self.groupList.remove(group);
-                        var devicesToConfigureFromGroup = JSON.parse('{"devices" : '+response.content+'}');
-                        ko.utils.arrayForEach(devicesToConfigureFromGroup.devices, function(item){
-                            homematic("Device.getReGaIDByAddress", {address:item.id}, function(result) {
-                               homematic("Device.setOperateGroupOnly", {id:result, mode: false}, function() {
-                                 DeviceList.devices[result].isOperateGroupOnly = false;
-                              });
-                            })
-                            self.addDeviceToList(item.id, item.name, item.type);
-                        });
-                        translatePage(".toTranslate");
-                    }
-                    else
-                    {
-                        if(response.errorCode == sessionTimeoutErrorCode)
-                        {
-                            jQuery("#content").html(response.content);
-                        }
-                    }
-                }
-            }
-
-            new Ajax.Request(url,opt);
-        };
-
-        self.addDeviceToList = function (id, name, type)
-        {
-            var device = new GroupDevice(id, name, type);
-            self.devicesToConfigure.push(device);
-        }
-
-        self.ignoreConfigure = function()
-        {
-            self.devicesToConfigure.removeAll();
-        };
-
-        self.checkConfigure = function()
-        {
-            var tempDevicesToConfigure = new Array();
-            ko.utils.arrayForEach(self.devicesToConfigure(), function(item) {
-                tempDevicesToConfigure.push(item);
-            });
-
-            ko.utils.arrayForEach(tempDevicesToConfigure, function(item) {
-                if(item.getConfigPending()==false)
-                {
-                    self.devicesToConfigure.remove(item);
-                }
-            });
-        };
-
-        self.checkConfigurePending = function(group)
-        {
-            console.log(group);
-            var data = '{ "virtualDeviceSerialNumber" : "' + group.virtualDeviceSerialNumber + '" }';
-            CreateCPPopup("/pages/jpages/group/configureDevices", data);
-        };
-
-
-
-    }
-    var viewModel = new GroupListViewModel();
-
-    // Activates knockout.js
-    // This Page needs a new ViewModel
-    ko.applyBindings(viewModel, document.getElementById('GroupListBody'));
-
-
-  NewGroup = function()
-  {
-    ShowWaitAnim();
-	jQuery.ajax({
-	url: "/pages/jpages/group/create?sid="+SessionId,
-	context: document.body,
-	cache : false
-	}).done(function(data) {
-        HideWaitAnim();
-        var response = JSON.parse(data);
-
-        if(response.isSuccessful)
-        {
-            jQuery("#content").html(response.content);
-        }
-        else
-        {
-            if(response.errorCode == sessionTimeoutErrorCode)
-            {
-                jQuery("#content").html(response.content);
-            }
-            else {
-                jQuery("#content").html(translateKey(response.content));
-            }
-        }
-    });
-  };
-
-  /*OpenDevice = function() {
-        var data = '{ "serialNumber" : "KEQ0319053", "regaID" : "2254" }';
-        CreateCPPopup("/pages/jpages/group/listPossibleGroups", data);
-    } */
- 
-  var s = "";
-  s += "<table cellspacing='8'>";
-  s += "<tr>";
-    s += "<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.goBack();'>"+ translateKey('footerBtnPageBack') +"</div></td>";
-    s += "<td align='center' valign='middle'><div class='FooterButton' onclick='NewGroup();'>"+ translateKey('footerBtnNew') +"</div></td>";
-    /*s += "<td align='center' valign='middle'><div class='FooterButton' onclick='OpenDevice();'>Knopf</div></td>";*/
-   s += "</tr>";
-  s += "</table>";
-  setFooter(s);
-  translateButtons("btnRemove, btnEdit");
-  translateButtons("btnVirtualDeviceStateAndOperating");
-  translateButtons("btnVirtualDeviceConfiguration");
-  translatePage();
-  jQuery("#GroupListBody").show();
-
-</script>
-<div class="DialogLayer" style="z-index: 200; position: absolute; top: 0px; left: 0px; display: none" data-bind="visible: isDeleting">
-    <div class="UIFrame" style="width: 324px; height:86px; top: 260px; left: 480px">
-        <div class="UIFrameTitle" style="top: 2px; left: 2px; width: 320px; height: 20px; line-height: 20px;">
-            ${"$"}{groupWillBeDeletedHeader}
-        </div>
-        <div class="UIFrameContent" style="top: 24px; left: 2px; width: 320px; height: 60px;">
-            <div class="UIText" style="top: 10px; left:10px; width:310px">
-                <img src="/ise/img/ajaxload_white.gif" style="float:left;margin-right:10px" />${"$"}{groupWillBeDeletedContent}
-            </div>
-        </div>
-    </div>
-</div>
-<div data-bind="visible: areDevicesToConfigure"  style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; z-index: 149; background-image: url('/ise/img/tr50.gif'); display: none">
-<div style="position: absolute; z-index: 159; width: 100%; top: 50%;">
-    <meta content="no-cache" http-equiv="cache-control">
-    <meta content="no-cache" http-equiv="pragma">
-    <meta content="0" http-equiv="expires">
-    <title>response of request with command: removeLink</title>
-    <div style="width: 800px; height: 600px; padding: 0px; position: absolute; left: 50%; margin-left: -400px; margin-top: -150px;">
-        <div class="popupTitle" style="font-weight: bold;">${"$"}{dialogCreateLinkTitle}</div>
-        <div style="overflow: auto; width: 100%; height: 50%;">
-            <div >
-                <table class="popupTable" border="1">
-                    <thead>
-                    <tr class="popupTableHeaderRow">
-                        <th>${"$"}{thName}</th>
-                        <th>${"$"}{thTypeDescriptorWOLineBreak}</th>
-                        <th>${"$"}{thPicture}</th>
-                        <th>${"$"}{thHint}</th>
-                    </tr>
-                    </thead>
-                    <tbody data-bind="foreach: devicesToConfigure">
-                        <tr class="popupTableRowGray">
-                            <td data-bind="text: name"></td>
-                            <td data-bind="text: type"></td>
-                            <td style="background-color: white;">
-                                <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
-                                    <img data-bind="attr:{src: imagePath, title: name, alt: name}">
-                                </div>
-                            </td>
-                            <td class="toTranslate" align="left" style="padding: 5px; color: red; font-weight: bold;" data-bind="attr:{rowspan: $root.devicesToConfigure().length}, visible: $root.devicesToConfigure()[0] == $data">
-                                ${"$"}{dialogCreateLinkErrorContent1}
-                                <ul>
-                                    <li>
-                                        ${"$"}{dialogCreateLinkErrorContent2}
-                                        <ul>
-                                            <li>${"$"}{dialogCreateLinkErrorContent3}</li>
-                                            <li>${"$"}{dialogCreateLinkErrorContent4}</li>
-                                        </ul>
-                                    </li>
-                                    <li>${"$"}{dialogCreateLinkErrorContent5}</li>
-                                </ul>
-                            </td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="CLASS10200">
-                <span class="CLASS10101 colorGradient borderRadius2px" data-bind="click: checkConfigure">${"$"}{btnDirectDeviceLinkCheckAgain}</span>
-                <span class="CLASS10101 colorGradient borderRadius2px" data-bind="click: ignoreConfigure">${"$"}{btnDirectDeviceLinkIgnore}</span>
-            </div>
-        </div>
-    </div>
-</div>
-</div>
-</div>
-
-<!--</body>
+<!--<html>
+<head>-->
+
+
+<script type="text/javascript">
+  setPath("<span onclick='WebUI.enter(GroupsPage);'>"+translateKey('menuGroupListPage')+"</span>");
+</script>
+<!--</head>
+<body>-->
+<div id="GroupListBody" style="display: none">
+<table class="tTable"  border="0" cellpadding="0" cellspacing="0">
+    <thead>
+    <tr data-bind="foreach: groupListHeaders">
+        <td style="height: 40px" class="thCell CLASS04900 clickable" data-bind="click: $parent.sortGroupList, text: title, css: headerClass, attr: {colspan: colspan}"></td>
+    </tr>
+    </thead>
+  <tbody data-bind="foreach: groupList">
+
+    <tr class="CLASS04901">
+        <td class="tBodyCell" data-bind="text: id" style="width: 65px; text-align: center"></td>
+        <td class="tBodyCell" data-bind="text: name"></td>
+        <td class="tBodyCell" data-bind="text: groupTypeLabel"></td>
+
+        <td class="tBodyCell" data-bind="text: virtualDeviceSerialNumber"></td>
+        <!--<td class="tBodyCell" data-bind="text: virtualDeviceName"></td>-->
+        <td class="tBodyCell" data-bind="text: groupDeviceName"></td>
+        <td class="tBodyCell"  style="width: 0; padding-left: 10px; padding-right: 10px">
+            <input style="margin: 5px; display: block" type="button" name="btnVirtualDeviceStateAndOperating" value="btnVirtualDeviceStateAndOperating" class="StdButton CLASS04907" data-bind="click: operateVirtualDevice"/>
+            <input style="margin: 5px; display: block" type="button" name="btnVirtualDeviceConfiguration" value="btnVirtualDeviceConfiguration" class="StdButton CLASS04907" data-bind="click: configureVirtualDevice"/>
+        </td>
+
+        <!-- Start action column -->
+        <td class="tBodyCell CLASS04902" style="width: 0; padding-left: 10px; padding-right: 10px">
+            <table cellpadding="0" cellspacing="0" border="0">
+                <tr>
+                    <td>
+                        <table cellpadding="0" cellspacing="0" border="0">
+                            <tr>
+                                <td class="CLASS04903">
+                                    <input type="button" name="btnRemove" value="btnRemove" class="StdButton CLASS04907" data-bind="click: $root.removeGroup"/>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="CLASS04903">
+                                    <input type="button" name="btnEdit" value="btnEdit" class="StdButton CLASS04907" data-bind="click: $root.editGroup"/>
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+  
+
+  </tbody>
+</table>
+<script type="text/javascript">
+
+    var sessionTimeoutErrorCode = "42";
+
+
+
+    //The Viewmodel
+    function GroupListViewModel()
+    {
+        var self = this;
+        var devicesToConfigureAsJson = JSON.parse('{"devices" : ${devicesToConfigure}}');
+
+        self.isDeleting = ko.observable(false);
+
+        self.devicesToConfigure = ko.observableArray();
+
+        ko.utils.arrayForEach(devicesToConfigureAsJson.devices, function(item) {
+            self.devicesToConfigure.push(new GroupDevice(item.id, item.serialNumber, item.type));
+        });
+
+        self.areDevicesToConfigure = ko.computed( function()
+        {
+            return self.isDeleting() == false && self.devicesToConfigure().length > 0;
+        });
+
+        self.groupList = ko.observableArray();
+        <#list objectList as group>self.groupList.push(new VirtualGroup("${group.getId()}", "${group.getName()}",  translateKey("${group.getGroupDefinition().getGroupType().getLabel()}"), "${group.getGroupDefinition().getGroupType().getId()}"));</#list>
+
+        self.groupListHeaders = new Array();
+        self.groupListHeaders.push(new Header(translateKey('groupID'), 'id'));
+        self.groupListHeaders.push(new Header(translateKey('groupGroupName'), 'name'));
+        self.groupListHeaders.push(new Header(translateKey('groupTypeLabel'), 'groupTypeLabel'));
+
+        var header = new Header(translateKey('virtualDeviceSerialNumber'), 'virtualDeviceSerialNumber');
+        header.colspan = 3;
+        self.groupListHeaders.push(header);
+        self.groupListHeaders.push(new Header(translateKey('groupAction'), 'groupAction'));
+        self.activeGroupListHeader = self.groupListHeaders[0];
+
+        self.sortGroupList = function(header, event){
+            if(self.activeGroupListHeader === header) {
+                header.asc = !header.asc;
+            } else {
+                self.activeGroupListHeader.isActive(false);
+                self.activeGroupListHeader = header;
+            }
+            header.isActive(true);
+            var prop = header.sortPropertyName;
+            var ascSort = function(a,b){ return a[prop] < b[prop] ? -1 : a[prop] > b[prop] ? 1 : a[prop] == b[prop] ? 0 : 0; };
+            var descSort = function(a,b){ return ascSort(b,a); };
+            var sortFunc = header.asc ? ascSort : descSort;
+            self.groupList.sort(sortFunc);
+        };
+
+        self.editGroup = function(group)
+        {
+            ShowWaitAnim();
+            var url = '/pages/jpages/group/edit?sid='+SessionId;
+            var data = new Object();
+            data.groupId = group.id;
+            data.groupDeviceName = (group.device != undefined) ? group.device.getName() : "";
+            var pb = JSON.stringify(data);
+
+            var opt = {
+                postBody: pb,
+                onComplete: function(t)
+                {
+                    HideWaitAnim();
+                    var response = JSON.parse(t.responseText);
+                    if(response.isSuccessful)
+                    {
+                        jQuery("#content").html(response.content);
+                    }
+                    else
+                    {
+                        if(response.errorCode == sessionTimeoutErrorCode)
+                        {
+                            jQuery("#content").html(response.content);
+                        }
+                    }
+                }
+            }
+
+            new Ajax.Request(url,opt);
+        };
+
+        self.removeGroup = function(group)
+        {
+            self.isDeleting(true);
+            var url = '/pages/jpages/group/delete?sid='+SessionId;
+            var data = new Object();
+            data.groupId = group.id;
+            var pb = JSON.stringify(data);
+            var opt = {
+                postBody: pb,
+                onComplete: function(t){
+                    var response = JSON.parse(t.responseText);
+                    self.isDeleting(false);
+                    if(response.isSuccessful)
+                    {
+                        self.groupList.remove(group);
+                        var devicesToConfigureFromGroup = JSON.parse('{"devices" : '+response.content+'}');
+                        ko.utils.arrayForEach(devicesToConfigureFromGroup.devices, function(item){
+                            homematic("Device.getReGaIDByAddress", {address:item.id}, function(result) {
+                               homematic("Device.setOperateGroupOnly", {id:result, mode: false}, function() {
+                                 DeviceList.devices[result].isOperateGroupOnly = false;
+                              });
+                            })
+                            self.addDeviceToList(item.id, item.name, item.type);
+                        });
+                        translatePage(".toTranslate");
+                    }
+                    else
+                    {
+                        if(response.errorCode == sessionTimeoutErrorCode)
+                        {
+                            jQuery("#content").html(response.content);
+                        }
+                    }
+                }
+            }
+
+            new Ajax.Request(url,opt);
+        };
+
+        self.addDeviceToList = function (id, name, type)
+        {
+            var device = new GroupDevice(id, name, type);
+            self.devicesToConfigure.push(device);
+        }
+
+        self.ignoreConfigure = function()
+        {
+            self.devicesToConfigure.removeAll();
+        };
+
+        self.checkConfigure = function()
+        {
+            var tempDevicesToConfigure = new Array();
+            ko.utils.arrayForEach(self.devicesToConfigure(), function(item) {
+                tempDevicesToConfigure.push(item);
+            });
+
+            ko.utils.arrayForEach(tempDevicesToConfigure, function(item) {
+                if(item.getConfigPending()==false)
+                {
+                    self.devicesToConfigure.remove(item);
+                }
+            });
+        };
+
+        self.checkConfigurePending = function(group)
+        {
+            var data = '{ "virtualDeviceSerialNumber" : "' + group.virtualDeviceSerialNumber + '" }';
+            CreateCPPopup("/pages/jpages/group/configureDevices", data);
+        };
+
+
+
+    }
+    var viewModel = new GroupListViewModel();
+
+    // Activates knockout.js
+    // This Page needs a new ViewModel
+    ko.applyBindings(viewModel, document.getElementById('GroupListBody'));
+
+
+  NewGroup = function()
+  {
+    ShowWaitAnim();
+	jQuery.ajax({
+	url: "/pages/jpages/group/create?sid="+SessionId,
+	context: document.body,
+	cache : false
+	}).done(function(data) {
+        HideWaitAnim();
+        var response = JSON.parse(data);
+
+        if(response.isSuccessful)
+        {
+            jQuery("#content").html(response.content);
+        }
+        else
+        {
+            if(response.errorCode == sessionTimeoutErrorCode)
+            {
+                jQuery("#content").html(response.content);
+            }
+            else {
+                jQuery("#content").html(translateKey(response.content));
+            }
+        }
+    });
+  };
+
+  /*OpenDevice = function() {
+        var data = '{ "serialNumber" : "KEQ0319053", "regaID" : "2254" }';
+        CreateCPPopup("/pages/jpages/group/listPossibleGroups", data);
+    } */
+ 
+  var s = "";
+  s += "<table cellspacing='8'>";
+  s += "<tr>";
+    s += "<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.goBack();'>"+ translateKey('footerBtnPageBack') +"</div></td>";
+    s += "<td align='center' valign='middle'><div class='FooterButton' onclick='NewGroup();'>"+ translateKey('footerBtnNew') +"</div></td>";
+    /*s += "<td align='center' valign='middle'><div class='FooterButton' onclick='OpenDevice();'>Knopf</div></td>";*/
+   s += "</tr>";
+  s += "</table>";
+  setFooter(s);
+  translateButtons("btnRemove, btnEdit");
+  translateButtons("btnVirtualDeviceStateAndOperating");
+  translateButtons("btnVirtualDeviceConfiguration");
+  translatePage();
+  jQuery("#GroupListBody").show();
+
+</script>
+<div class="DialogLayer" style="z-index: 200; position: absolute; top: 0px; left: 0px; display: none" data-bind="visible: isDeleting">
+    <div class="UIFrame" style="width: 324px; height:86px; top: 260px; left: 480px">
+        <div class="UIFrameTitle" style="top: 2px; left: 2px; width: 320px; height: 20px; line-height: 20px;">
+            ${"$"}{groupWillBeDeletedHeader}
+        </div>
+        <div class="UIFrameContent" style="top: 24px; left: 2px; width: 320px; height: 60px;">
+            <div class="UIText" style="top: 10px; left:10px; width:310px">
+                <img src="/ise/img/ajaxload_white.gif" style="float:left;margin-right:10px" />${"$"}{groupWillBeDeletedContent}
+            </div>
+        </div>
+    </div>
+</div>
+<div data-bind="visible: areDevicesToConfigure"  style="position: absolute; top: 0px; left: 0px; width: 100%; height: 100%; z-index: 149; background-image: url('/ise/img/tr50.gif'); display: none">
+<div style="position: absolute; z-index: 159; width: 100%; top: 50%;">
+    <meta content="no-cache" http-equiv="cache-control">
+    <meta content="no-cache" http-equiv="pragma">
+    <meta content="0" http-equiv="expires">
+    <title>response of request with command: removeLink</title>
+    <div style="width: 800px; height: 600px; padding: 0px; position: absolute; left: 50%; margin-left: -400px; margin-top: -150px;">
+        <div class="popupTitle" style="font-weight: bold;">${"$"}{dialogCreateLinkTitle}</div>
+        <div style="overflow: auto; width: 100%; height: 50%;">
+            <div >
+                <table class="popupTable" border="1">
+                    <thead>
+                    <tr class="popupTableHeaderRow">
+                        <th>${"$"}{thName}</th>
+                        <th>${"$"}{thTypeDescriptorWOLineBreak}</th>
+                        <th>${"$"}{thPicture}</th>
+                        <th>${"$"}{thHint}</th>
+                    </tr>
+                    </thead>
+                    <tbody data-bind="foreach: devicesToConfigure">
+                        <tr class="popupTableRowGray">
+                            <td data-bind="text: name"></td>
+                            <td data-bind="text: type"></td>
+                            <td style="background-color: white;">
+                                <div style="position: relative;" data-bind="event: {mouseover: showDevicePicture, mouseout: hideDevicePicture}">
+                                    <img data-bind="attr:{src: imagePath, title: name, alt: name}">
+                                </div>
+                            </td>
+                            <td class="toTranslate" align="left" style="padding: 5px; color: red; font-weight: bold;" data-bind="attr:{rowspan: $root.devicesToConfigure().length}, visible: $root.devicesToConfigure()[0] == $data">
+                                ${"$"}{dialogCreateLinkErrorContent1}
+                                <ul>
+                                    <li>
+                                        ${"$"}{dialogCreateLinkErrorContent2}
+                                        <ul>
+                                            <li>${"$"}{dialogCreateLinkErrorContent3}</li>
+                                            <li>${"$"}{dialogCreateLinkErrorContent4}</li>
+                                        </ul>
+                                    </li>
+                                    <li>${"$"}{dialogCreateLinkErrorContent5}</li>
+                                </ul>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+            <div class="CLASS10200">
+                <span class="CLASS10101 colorGradient borderRadius2px" data-bind="click: checkConfigure">${"$"}{btnDirectDeviceLinkCheckAgain}</span>
+                <span class="CLASS10101 colorGradient borderRadius2px" data-bind="click: ignoreConfigure">${"$"}{btnDirectDeviceLinkIgnore}</span>
+            </div>
+        </div>
+    </div>
+</div>
+</div>
+</div>
+
+<!--</body>
 </html>-->
\ No newline at end of file
diff --git a/HMserver/opt/HMServer/pages/NewDiagramDialog.ftl b/HMserver/opt/HMServer/pages/NewDiagramDialog.ftl
index 2bf23d71..bcda65e7 100644
--- a/HMserver/opt/HMServer/pages/NewDiagramDialog.ftl
+++ b/HMserver/opt/HMServer/pages/NewDiagramDialog.ftl
@@ -1,69 +1,69 @@
-<script>
-	translatePage('#messagebox');
-  dlgPopup.setWidth(600);
-	dlgPopup.readaptSize();
-
-	CreateDiagram = function()
-	{
-		var element = document.getElementById("DiagramType");
-		var diagramType = element.options[element.selectedIndex].value;
-		var url = '/pages/jpages/diagram/settings/showAdd?sid='+SessionId +'&diagramType=' + diagramType;
-		var opt =
-		{
-			onComplete: function(t)
-			{
-				var response = JSON.parse(t.responseText);
-				
-				if(!response.isSuccessful)
-				{
-					if(response.errorCode == "42")
-					{
-						jQuery("#content").html(response.content);
-					} else {
-						alert(translateKey(response.content));
-					}
-				} else {			
-					jQuery("#content").html(response.content);
-				}
-			}
-		}
-		new Ajax.Request(url,opt);
-		
-    }
-    
-</script>
-<div class="popupTitle">${"$"}{dialogNewDiagramTitle}</div>
-<div class="CLASS21114 j_translate">
-	<table class="popupTable" border=1 width="100%">
-		<tr class="CLASS21115">
-			<td class="CLASS21116">${"$"}{dialogNewDiagramSettings}</td>
-			<td  align="center">
-				<table>
-					<tr>
-            <td>
-              <select id="DiagramType" size="1">
-                  <option value="1">${"$"}{temperatureMeasurement}</option>
-                  <option value="2">${"$"}{energyMeasurement}</option>
-                  <option value="3">${"$"}{powerMeasurement}</option>
-                  <option value="4">${"$"}{userSpecific}</option>
-              </select>
-            </td>
-					</tr>
-				</table>
-			</td>
-		</tr>
-	</table>
-</div>
-
-<div class="popupControls">
-	<table>
-		<tr>
-			<td class="CLASS21103">
-				<div class="CLASS21108" onClick="PopupClose()">${"$"}{footerBtnPageBack}</div>
-			</td>
-			<td class="CLASS21103" align=right>
-				<div class="CLASS21108" onClick="CreateDiagram();PopupClose()">${"$"}{footerBtnOk}</div>
-			</td>
-		</tr>
-	</table>
-</div>
+<script>
+	translatePage('#messagebox');
+  dlgPopup.setWidth(600);
+	dlgPopup.readaptSize();
+
+	CreateDiagram = function()
+	{
+		var element = document.getElementById("DiagramType");
+		var diagramType = element.options[element.selectedIndex].value;
+		var url = '/pages/jpages/diagram/settings/showAdd?sid='+SessionId +'&diagramType=' + diagramType;
+		var opt =
+		{
+			onComplete: function(t)
+			{
+				var response = JSON.parse(t.responseText);
+				
+				if(!response.isSuccessful)
+				{
+					if(response.errorCode == "42")
+					{
+						jQuery("#content").html(response.content);
+					} else {
+						alert(translateKey(response.content));
+					}
+				} else {			
+					jQuery("#content").html(response.content);
+				}
+			}
+		}
+		new Ajax.Request(url,opt);
+		
+    }
+    
+</script>
+<div class="popupTitle">${"$"}{dialogNewDiagramTitle}</div>
+<div class="CLASS21114 j_translate">
+	<table class="popupTable" border=1 width="100%">
+		<tr class="CLASS21115">
+			<td class="CLASS21116">${"$"}{dialogNewDiagramSettings}</td>
+			<td  align="center">
+				<table>
+					<tr>
+            <td>
+              <select id="DiagramType" size="1">
+                  <option value="1">${"$"}{temperatureMeasurement}</option>
+                  <option value="2">${"$"}{energyMeasurement}</option>
+                  <option value="3">${"$"}{powerMeasurement}</option>
+                  <option value="4">${"$"}{userSpecific}</option>
+              </select>
+            </td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</div>
+
+<div class="popupControls">
+	<table>
+		<tr>
+			<td class="CLASS21103">
+				<div class="CLASS21108" onClick="PopupClose()">${"$"}{footerBtnPageBack}</div>
+			</td>
+			<td class="CLASS21103" align=right>
+				<div class="CLASS21108" onClick="CreateDiagram();PopupClose()">${"$"}{footerBtnOk}</div>
+			</td>
+		</tr>
+	</table>
+</div>
diff --git a/HMserver/opt/HMServer/pages/StorageSettingsDialog.ftl b/HMserver/opt/HMServer/pages/StorageSettingsDialog.ftl
index f4907c4b..b85c2b20 100644
--- a/HMserver/opt/HMServer/pages/StorageSettingsDialog.ftl
+++ b/HMserver/opt/HMServer/pages/StorageSettingsDialog.ftl
@@ -1,266 +1,266 @@
-<script>
-	var enableInitaliseSDCardButton = ${SDCardEnableInitButton};
-	var enableBackupSDCardButton = ${SDCardEnableBackupButton};
-  var arCurrency = ["EUR", "TRY", "GBP", "CHF", "PLN"],
-  curSelBoxElm = jQuery("#currency"),
-  curPricePerKWhElm = jQuery("#curPricePerKWh"),
-  gasPricePerKWhElm = jQuery("#gasPricePerKWh"),
-  gasHeatingValueElm = jQuery("#gasHeatingValue"),
-  gasConditionNumberElm = jQuery("#gasConditionNumber");
-
-	var base_url = "/pages/jpages/system/StorageSettings/";
-    dlgResult = 0;
-
-	OnInitaliseSDCard = function() {
-		MessageBox.show(
-			translateKey('dialogSettingsInitialisingMessageTitle'), 
-			'<br/><br/><img id="messageBoxSdCardGraph" src="/ise/img/anim_bargraph.gif"><br/>',
-			'',
-			'320',
-			'90',
-			'messageBoxSdCard', 
-			'messageBoxSdCardGraph');
-  
-		var opt = {
-			onComplete: function(t){
-				jQuery("#messageBoxSdCard").remove();
-				CreateCPPopup("/pages/jpages/system/StorageSettings/show");
-			}
-		}
-		url = base_url + "initialize?sid=" + SessionId
-		new Ajax.Request(url,opt);
-	};
-
-	OnEjectSDCard = function() {
-		// alert ("Init Button pressed");
-		var opt = {
-			onComplete: function(t){
-				CreateCPPopup("/pages/jpages/system/StorageSettings/show");        			
-			}
-		}
-		
-		url = base_url + "eject?sid=" + SessionId
-		new Ajax.Request(url,opt);
-	};
-	
-	OnBackupSDCard = function() {
-		var url = base_url + "backup?sid=" + SessionId;
-		window.open(url,'_blank')	
-	};
-
-	OnRestoreSDCard = function() {				
-		var url = base_url + "restore?sid=" + SessionId;
-		jQuery('#uploadForm').attr("action", url);
-		jQuery("#uploadForm").submit();
-	};            
-	
-	enable_disable = function () {
-		if(enableInitaliseSDCardButton == false) {
-			jQuery('#initaliseSDCardButton').hide();
-		} else {		
-			jQuery('#initaliseSDCardButton').show();
-		}
-
-		if(enableBackupSDCardButton == false) {
-			jQuery('#backupSDCardButton').hide();
-		} else {
-			jQuery('#backupSDCardButton').show();
-		}
-	};
-        
-	enable_disable();
-
-	jQuery("#btnRestoreSDCard").prop('value', translateKey('dialogSettingsStorageSettingsBtnRecovery'));
-
-  readPricePerKWh = function() {
-    var url = "/pages/jpages/system/EnergyPriceController/readPricePerKWh?sid=" + SessionId;
-    var opt = {
-      onComplete: function(t) {
-        var arResponse = t.responseText.split(","),
-        currency = arResponse[0];
-        priceCur = arResponse[1];
-        priceGas = arResponse[2];
-        gasHeatingValue = arResponse[3];
-        gasConditionNumber = arResponse[4];
-
-        if ((arResponse.length == 6) && (t.responseText != "noConfig")) {
-          curSelBoxElm.val(currency.replace(/\"/g,""));
-          curPricePerKWhElm.val(priceCur.replace(/\"/g,""));
-          gasPricePerKWhElm.val(priceGas.replace(/\"/g,""));
-          gasHeatingValueElm.val(gasHeatingValue.replace(/\"/g,""));
-          gasConditionNumberElm.val(gasConditionNumber.replace(/\"/g,""));
-        } else if (arResponse.length == 3 && t.responseText != "noConfig") {
-            // This is for compatibility reasons - the first version of the config file
-            // consists only of the values for the electricity bill.
-            curSelBoxElm.val(arResponse[1]);
-            curPricePerKWhElm.val(arResponse[0].toString());
-        } else {
-          conInfo("No energy price available!");
-        }
-      }
-    }
-    new Ajax.Request(url,opt);
-  };
-
-  simulateBtnPress = function(elmId) {
-    var saveBtnElm = jQuery("#"+elmId);
-    saveBtnElm.addClass("border2px");
-    setTimeout(function() {
-      saveBtnElm.removeClass("border2px");
-    }, 1500);
-  };
-
-  savePricePerKWh = function(saveBtn) {
-    simulateBtnPress(saveBtn.id);
-    var url = "/pages/jpages/system/EnergyPriceController/savePricePerKWh?sid=" + SessionId;
-    var currency = curSelBoxElm.val(),
-    curPricePerKWh = curPricePerKWhElm.val().replace(",","."),
-    gasPricePerKWh = gasPricePerKWhElm.val().replace(",","."),
-    gasHeatingValue = gasHeatingValueElm.val().replace(",","."),
-    gasConditionNumber = gasConditionNumberElm.val().replace(",",".");
-
-    var pb ='{';
-      pb += '"currency": ' + '"' + currency + '",';
-      pb += '"curPricePerKWh": ' + '"' + curPricePerKWh + '",';
-      pb += '"gasPricePerKWh": ' + '"' + gasPricePerKWh + '",';
-      pb += '"gasHeatingValue": ' + '"' + gasHeatingValue + '",';
-      pb += '"gasConditionNumber": ' + '"' + gasConditionNumber + '"';
-
-    pb += '}'
-    var opt = {
-      postBody: pb,
-      onComplete: function(t){
-        conInfo("Response savePricePerKWh: " + t.responseText);
-      }
-    }
-    new Ajax.Request(url,opt);
-  };
-
-  jQuery.each(arCurrency, function(index, val) {
-    curSelBoxElm.append("<option value='"+val+"'>"+val+"</option>");
-  });
-  readPricePerKWh();
-	translatePage('#messagebox');
-	dlgPopup.readaptSize();
-
-</script>
-<div class="popupTitle">${"$"}{dialogSettingsGeneralSettingsTitle}</div>
-<div class="CLASS21114 j_translate">
-	<table class="popupTable" border=1 width="100%">
-		<tr class="CLASS21115">
-			<td class="CLASS21116">${"$"}{dialogSettingsSDCardSettings}</td>
-			<td  align="center"  width="35%">
-				<table>
-					<tr>
-						<td class="CLASS21112">${"$"}{dialogSettingsSDCardStatus}:</td>
-						<td>${SDCardStatus}</td>
-					</tr>
-					<tr>
-						<td align="center" class="CLASS21112" colspan="2" >
-							<div class="popupControls CLASS21107">
-								<table>
-								<tr>
-									<td align="right">
-										<div id="initaliseSDCardButton" class="StdButton CLASS04907" onClick="OnInitaliseSDCard()">${"$"}{dialogSettingsStorageSettingsBtnInitaliseSDCard}</div>
-									</td>
-									<td align="right">
-										<div id="backupSDCardButton" class="StdButton CLASS04907" onClick="OnBackupSDCard()">${"$"}{dialogSettingsStorageSettingsBtnBackup}</div>
-									</td>
-								</tr>
-								</table>
-							</div>
-								<!--<div id="ejectSDCardButton" class="StdButton" onClick="OnEjectSDCard()">${"$"}{dialogSettingsStorageSettingsBtnEjectSDCard}</div> -->
-						</td>
-					</tr>
-				</table>
-			</td>
-			<td class="CLASS21113" align="left">
-				<p> ${"$"}{dialogSettingsStorageHintSDCardP1} </p>
-				<p> ${"$"}{dialogSettingsStorageHintSDCardP2} </p>
-			</td>
-		</tr>
-		<tr class="CLASS21115">
-		  <td class="CLASS21116">
-       ${"$"}{tdPowerCost}
-		  </td>
-		  <td align="center">
-
-		    <table>
-		      <tr>
-		        <td>
-              <table>
-                <tr>
-                  <td>
-                    <b>${"$"}{lblCurrency}</b>
-                  </td>
-                  <td>
-                    <select id="currency"/>
-                  </td>
-                </tr>
-                <tr><td colspan="2"><hr></td></tr>
-                <tr><td><b>${"$"}{lblGeneralSettingsCurrent}</b></td></tr>
-                <tr>
-                  <td>
-                    ${"$"}{lblPowerCost}
-                  </td>
-                  <td>
-                    <input id="curPricePerKWh" type="text" size="5" value="0.00" style="text-align:center"/>
-                  </td>
-                </tr>
-                <tr><td colspan="2"><hr></td></tr>
-                <tr><td><b>${"$"}{lblGeneralSettingsGas}</b></td></tr>
-                <tr>
-                  <td>
-                    ${"$"}{lblPowerCost}
-                  </td>
-                  <td>
-                    <input id="gasPricePerKWh" type="text" size="5" value="0.00" style="text-align:center"/>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    ${"$"}{lblGeneralSettingsHeatingValue}
-                  </td>
-                  <td>
-                    <input id="gasHeatingValue" type="text" size="5" value="0.00" style="text-align:center"/>
-                  </td>
-                </tr>
-                <tr>
-                  <td>
-                    ${"$"}{lblGeneralSettingsConditionNumber}
-                  </td>
-                  <td>
-                    <input id="gasConditionNumber" type="text" size="5" value="0.00" style="text-align:center"/>
-                  </td>
-                </tr>
-              </table>
-		        </td>
-		      </tr>
-
-		      <tr><td colspan="2"><hr></td></tr>
-		      <tr>
-		        <td colspan="2" align="center">
-					    <div id="savePriceKWhBtn" class="StdButton CLASS04907" onClick="savePricePerKWh(this)">${"$"}{btnSavePowerCost}</div>
-		        </td>
-		      </tr>
-
-		    </table>
-
-  	  </td>
-  	  <td align="left">
-      ${"$"}{helpPowerCost}
-  	  </td>
-		</tr>
-
-	</table>
-</div>
-
-<div class="popupControls">
-	<table>
-		<tr>
-			<td class="CLASS21103">
-				<div class="CLASS21108" onClick="PopupClose()">${"$"}{footerBtnPageBack}</div>
-			</td>
-		</tr>
-	</table>
-</div>
+<script>
+	var enableInitaliseSDCardButton = ${SDCardEnableInitButton};
+	var enableBackupSDCardButton = ${SDCardEnableBackupButton};
+  var arCurrency = ["EUR", "TRY", "GBP", "CHF", "PLN"],
+  curSelBoxElm = jQuery("#currency"),
+  curPricePerKWhElm = jQuery("#curPricePerKWh"),
+  gasPricePerKWhElm = jQuery("#gasPricePerKWh"),
+  gasHeatingValueElm = jQuery("#gasHeatingValue"),
+  gasConditionNumberElm = jQuery("#gasConditionNumber");
+
+	var base_url = "/pages/jpages/system/StorageSettings/";
+    dlgResult = 0;
+
+	OnInitaliseSDCard = function() {
+		MessageBox.show(
+			translateKey('dialogSettingsInitialisingMessageTitle'), 
+			'<br/><br/><img id="messageBoxSdCardGraph" src="/ise/img/anim_bargraph.gif"><br/>',
+			'',
+			'320',
+			'90',
+			'messageBoxSdCard', 
+			'messageBoxSdCardGraph');
+  
+		var opt = {
+			onComplete: function(t){
+				jQuery("#messageBoxSdCard").remove();
+				CreateCPPopup("/pages/jpages/system/StorageSettings/show");
+			}
+		}
+		url = base_url + "initialize?sid=" + SessionId
+		new Ajax.Request(url,opt);
+	};
+
+	OnEjectSDCard = function() {
+		// alert ("Init Button pressed");
+		var opt = {
+			onComplete: function(t){
+				CreateCPPopup("/pages/jpages/system/StorageSettings/show");        			
+			}
+		}
+		
+		url = base_url + "eject?sid=" + SessionId
+		new Ajax.Request(url,opt);
+	};
+	
+	OnBackupSDCard = function() {
+		var url = base_url + "backup?sid=" + SessionId;
+		window.open(url,'_blank')	
+	};
+
+	OnRestoreSDCard = function() {				
+		var url = base_url + "restore?sid=" + SessionId;
+		jQuery('#uploadForm').attr("action", url);
+		jQuery("#uploadForm").submit();
+	};            
+	
+	enable_disable = function () {
+		if(enableInitaliseSDCardButton == false) {
+			jQuery('#initaliseSDCardButton').hide();
+		} else {		
+			jQuery('#initaliseSDCardButton').show();
+		}
+
+		if(enableBackupSDCardButton == false) {
+			jQuery('#backupSDCardButton').hide();
+		} else {
+			jQuery('#backupSDCardButton').show();
+		}
+	};
+        
+	enable_disable();
+
+	jQuery("#btnRestoreSDCard").prop('value', translateKey('dialogSettingsStorageSettingsBtnRecovery'));
+
+  readPricePerKWh = function() {
+    var url = "/pages/jpages/system/EnergyPriceController/readPricePerKWh?sid=" + SessionId;
+    var opt = {
+      onComplete: function(t) {
+        var arResponse = t.responseText.split(","),
+        currency = arResponse[0];
+        priceCur = arResponse[1];
+        priceGas = arResponse[2];
+        gasHeatingValue = arResponse[3];
+        gasConditionNumber = arResponse[4];
+
+        if ((arResponse.length == 6) && (t.responseText != "noConfig")) {
+          curSelBoxElm.val(currency.replace(/\"/g,""));
+          curPricePerKWhElm.val(priceCur.replace(/\"/g,""));
+          gasPricePerKWhElm.val(priceGas.replace(/\"/g,""));
+          gasHeatingValueElm.val(gasHeatingValue.replace(/\"/g,""));
+          gasConditionNumberElm.val(gasConditionNumber.replace(/\"/g,""));
+        } else if (arResponse.length == 3 && t.responseText != "noConfig") {
+            // This is for compatibility reasons - the first version of the config file
+            // consists only of the values for the electricity bill.
+            curSelBoxElm.val(arResponse[1]);
+            curPricePerKWhElm.val(arResponse[0].toString());
+        } else {
+          conInfo("No energy price available!");
+        }
+      }
+    }
+    new Ajax.Request(url,opt);
+  };
+
+  simulateBtnPress = function(elmId) {
+    var saveBtnElm = jQuery("#"+elmId);
+    saveBtnElm.addClass("border2px");
+    setTimeout(function() {
+      saveBtnElm.removeClass("border2px");
+    }, 1500);
+  };
+
+  savePricePerKWh = function(saveBtn) {
+    simulateBtnPress(saveBtn.id);
+    var url = "/pages/jpages/system/EnergyPriceController/savePricePerKWh?sid=" + SessionId;
+    var currency = curSelBoxElm.val(),
+    curPricePerKWh = curPricePerKWhElm.val().replace(",","."),
+    gasPricePerKWh = gasPricePerKWhElm.val().replace(",","."),
+    gasHeatingValue = gasHeatingValueElm.val().replace(",","."),
+    gasConditionNumber = gasConditionNumberElm.val().replace(",",".");
+
+    var pb ='{';
+      pb += '"currency": ' + '"' + currency + '",';
+      pb += '"curPricePerKWh": ' + '"' + curPricePerKWh + '",';
+      pb += '"gasPricePerKWh": ' + '"' + gasPricePerKWh + '",';
+      pb += '"gasHeatingValue": ' + '"' + gasHeatingValue + '",';
+      pb += '"gasConditionNumber": ' + '"' + gasConditionNumber + '"';
+
+    pb += '}'
+    var opt = {
+      postBody: pb,
+      onComplete: function(t){
+        conInfo("Response savePricePerKWh: " + t.responseText);
+      }
+    }
+    new Ajax.Request(url,opt);
+  };
+
+  jQuery.each(arCurrency, function(index, val) {
+    curSelBoxElm.append("<option value='"+val+"'>"+val+"</option>");
+  });
+  readPricePerKWh();
+	translatePage('#messagebox');
+	dlgPopup.readaptSize();
+
+</script>
+<div class="popupTitle">${"$"}{dialogSettingsGeneralSettingsTitle}</div>
+<div class="CLASS21114 j_translate">
+	<table class="popupTable" border=1 width="100%">
+		<tr class="CLASS21115">
+			<td class="CLASS21116">${"$"}{dialogSettingsSDCardSettings}</td>
+			<td  align="center"  width="35%">
+				<table>
+					<tr>
+						<td class="CLASS21112">${"$"}{dialogSettingsSDCardStatus}:</td>
+						<td>${SDCardStatus}</td>
+					</tr>
+					<tr>
+						<td align="center" class="CLASS21112" colspan="2" >
+							<div class="popupControls CLASS21107">
+								<table>
+								<tr>
+									<td align="right">
+										<div id="initaliseSDCardButton" class="StdButton CLASS04907" onClick="OnInitaliseSDCard()">${"$"}{dialogSettingsStorageSettingsBtnInitaliseSDCard}</div>
+									</td>
+									<td align="right">
+										<div id="backupSDCardButton" class="StdButton CLASS04907" onClick="OnBackupSDCard()">${"$"}{dialogSettingsStorageSettingsBtnBackup}</div>
+									</td>
+								</tr>
+								</table>
+							</div>
+								<!--<div id="ejectSDCardButton" class="StdButton" onClick="OnEjectSDCard()">${"$"}{dialogSettingsStorageSettingsBtnEjectSDCard}</div> -->
+						</td>
+					</tr>
+				</table>
+			</td>
+			<td class="CLASS21113" align="left">
+				<p> ${"$"}{dialogSettingsStorageHintSDCardP1} </p>
+				<p> ${"$"}{dialogSettingsStorageHintSDCardP2} </p>
+			</td>
+		</tr>
+		<tr class="CLASS21115">
+		  <td class="CLASS21116">
+       ${"$"}{tdPowerCost}
+		  </td>
+		  <td align="center">
+
+		    <table>
+		      <tr>
+		        <td>
+              <table>
+                <tr>
+                  <td>
+                    <b>${"$"}{lblCurrency}</b>
+                  </td>
+                  <td>
+                    <select id="currency"/>
+                  </td>
+                </tr>
+                <tr><td colspan="2"><hr></td></tr>
+                <tr><td><b>${"$"}{lblGeneralSettingsCurrent}</b></td></tr>
+                <tr>
+                  <td>
+                    ${"$"}{lblPowerCost}
+                  </td>
+                  <td>
+                    <input id="curPricePerKWh" type="text" size="5" value="0.00" style="text-align:center"/>
+                  </td>
+                </tr>
+                <tr><td colspan="2"><hr></td></tr>
+                <tr><td><b>${"$"}{lblGeneralSettingsGas}</b></td></tr>
+                <tr>
+                  <td>
+                    ${"$"}{lblPowerCost}
+                  </td>
+                  <td>
+                    <input id="gasPricePerKWh" type="text" size="5" value="0.00" style="text-align:center"/>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    ${"$"}{lblGeneralSettingsHeatingValue}
+                  </td>
+                  <td>
+                    <input id="gasHeatingValue" type="text" size="5" value="0.00" style="text-align:center"/>
+                  </td>
+                </tr>
+                <tr>
+                  <td>
+                    ${"$"}{lblGeneralSettingsConditionNumber}
+                  </td>
+                  <td>
+                    <input id="gasConditionNumber" type="text" size="5" value="0.00" style="text-align:center"/>
+                  </td>
+                </tr>
+              </table>
+		        </td>
+		      </tr>
+
+		      <tr><td colspan="2"><hr></td></tr>
+		      <tr>
+		        <td colspan="2" align="center">
+					    <div id="savePriceKWhBtn" class="StdButton CLASS04907" onClick="savePricePerKWh(this)">${"$"}{btnSavePowerCost}</div>
+		        </td>
+		      </tr>
+
+		    </table>
+
+  	  </td>
+  	  <td align="left">
+      ${"$"}{helpPowerCost}
+  	  </td>
+		</tr>
+
+	</table>
+</div>
+
+<div class="popupControls">
+	<table>
+		<tr>
+			<td class="CLASS21103">
+				<div class="CLASS21108" onClick="PopupClose()">${"$"}{footerBtnPageBack}</div>
+			</td>
+		</tr>
+	</table>
+</div>
diff --git a/WebUI/www/api/methods/bidcosrf/setconfiguration-rf.tcl b/WebUI/www/api/methods/bidcosrf/setconfiguration-rf.tcl
index 28c26103..70208405 100755
--- a/WebUI/www/api/methods/bidcosrf/setconfiguration-rf.tcl
+++ b/WebUI/www/api/methods/bidcosrf/setconfiguration-rf.tcl
@@ -1,69 +1,69 @@
-##
-# BidCoS_RF.setConfigurationCCU2
-# Setzt die Konfiguration des BidCoS Services. Die Konfiguration wird es
-# nach erneutem Starten der HomeMatic Zentrale übernommen.
-#
-# Parameter:
-#   interfaces         : [array] Jedes Element enthält die Konfiguration eines
-#                                HM-CFG-LAN:
-#	  type		   : [string] Typ des Interfaces (Lan Interface)
-#     serialNumber : [string] Seriennummer
-#     encryptionKey: [string] Zugangsschlüssel
-#     ipAddress    : [string] IP Adresse (Optional)
-##
-
-set result true
-
-# Read header of current rfd.conf until [Interface 1] (exclusive)
-set fd [open /etc/config/rfd.conf r]
-while { [gets $fd line] >= 0 } {
-        if {  ![regexp {.*\[Interface [1-9]*\].*} $line ] } then {
-                append header $line "\n"
-        } else {
-                break
-        }
-}
-close $fd
-
-
-# Write new file
-set fd [open /etc/config/rfd.conf w]
-  
-# Write back header and [Interface 0] section
-puts $fd $header
-
-#Write Lan Interface sections (if any)
-set i 1
-  
-if { [catch {
-  foreach _interface_ $args(interfaces) {
-    array set interface $_interface_
-
-	  set type          [array_getValue interface type]
-	  set userName      [array_getValue interface userName]
-    set serialNumber  [array_getValue interface serialNumber]
-    set encryptionKey [array_getValue interface encryptionKey]
-    set ipAddress     [array_getValue interface ipAddress]
-      
-    puts $fd "\[Interface $i\]"
-    puts $fd "Type = $type"
-    puts $fd "Name = $userName"
-    puts $fd "Serial Number = $serialNumber"
-    puts $fd "Encryption Key = $encryptionKey"
-    if { {} != $ipAddress } then {
-      puts $fd "IP Address = $ipAddress"
-    }
-    puts $fd ""
-      
-    array_clear interface
-    incr i
-  }
-} ]} then {
-  set result false
-}
-  
-
-
-close $fd
-
-jsonrpc_response $result
+##
+# BidCoS_RF.setConfigurationCCU2
+# Setzt die Konfiguration des BidCoS Services. Die Konfiguration wird es
+# nach erneutem Starten der HomeMatic Zentrale übernommen.
+#
+# Parameter:
+#   interfaces         : [array] Jedes Element enthält die Konfiguration eines
+#                                HM-CFG-LAN:
+#	  type		   : [string] Typ des Interfaces (Lan Interface)
+#     serialNumber : [string] Seriennummer
+#     encryptionKey: [string] Zugangsschlüssel
+#     ipAddress    : [string] IP Adresse (Optional)
+##
+
+set result true
+
+# Read header of current rfd.conf until [Interface 1] (exclusive)
+set fd [open /etc/config/rfd.conf r]
+while { [gets $fd line] >= 0 } {
+        if {  ![regexp {.*\[Interface [1-9]*\].*} $line ] } then {
+                append header $line "\n"
+        } else {
+                break
+        }
+}
+close $fd
+
+
+# Write new file
+set fd [open /etc/config/rfd.conf w]
+  
+# Write back header and [Interface 0] section
+puts $fd $header
+
+#Write Lan Interface sections (if any)
+set i 1
+  
+if { [catch {
+  foreach _interface_ $args(interfaces) {
+    array set interface $_interface_
+
+	  set type          [array_getValue interface type]
+	  set userName      [array_getValue interface userName]
+    set serialNumber  [array_getValue interface serialNumber]
+    set encryptionKey [array_getValue interface encryptionKey]
+    set ipAddress     [array_getValue interface ipAddress]
+      
+    puts $fd "\[Interface $i\]"
+    puts $fd "Type = $type"
+    puts $fd "Name = $userName"
+    puts $fd "Serial Number = $serialNumber"
+    puts $fd "Encryption Key = $encryptionKey"
+    if { {} != $ipAddress } then {
+      puts $fd "IP Address = $ipAddress"
+    }
+    puts $fd ""
+      
+    array_clear interface
+    incr i
+  }
+} ]} then {
+  set result false
+}
+  
+
+
+close $fd
+
+jsonrpc_response $result
diff --git a/WebUI/www/api/methods/firewall/getconfiguration.tcl b/WebUI/www/api/methods/firewall/getconfiguration.tcl
index 0e90ef01..7b204f89 100755
--- a/WebUI/www/api/methods/firewall/getconfiguration.tcl
+++ b/WebUI/www/api/methods/firewall/getconfiguration.tcl
@@ -29,25 +29,25 @@ set result "\{"
 set first 1
 append result "\"services\": \["
 foreach id [array names Firewall_SERVICES] {
-	array set service $Firewall_SERVICES($id)
-	
-	if { 0 == $first } then { append result "," } else { set first 0 }
-	
-	append result "\{"
-	append result "\"id\": [json_toString $id],"
-	append result "\"access\": [json_toString $service(ACCESS)],"
-	
-	set _first 1
-	append result "\"ports\": \["
-	foreach port $service(PORTS) {
-		if { 0 == $_first } then { append result "," } else { set _first 0 }
-		append result $port
-	}
-	append result "\]"
-	
-	append result "\}"
-	
-	array_clear service
+  array set service $Firewall_SERVICES($id)
+  
+  if { 0 == $first } then { append result "," } else { set first 0 }
+  
+  append result "\{"
+  append result "\"id\": [json_toString $id],"
+  append result "\"access\": [json_toString $service(ACCESS)],"
+  
+  set _first 1
+  append result "\"ports\": \["
+  foreach port $service(PORTS) {
+    if { 0 == $_first } then { append result "," } else { set _first 0 }
+    append result $port
+  }
+  append result "\]"
+  
+  append result "\}"
+  
+  array_clear service
 }
 append result "\],"
 
@@ -56,8 +56,8 @@ append result "\],"
 set first 1
 append result "\"ips\": \["
 foreach ip $Firewall_IPS {
-	if { 0 == $first } then { append result "," } else { set first 0 }
-	append result [json_toString $ip]
+  if { 0 == $first } then { append result "," } else { set first 0 }
+  append result [json_toString $ip]
 }
 append result "\]"
 
diff --git a/WebUI/www/api/methods/firewall/setconfiguration.tcl b/WebUI/www/api/methods/firewall/setconfiguration.tcl
index 135dc039..d0882fdf 100755
--- a/WebUI/www/api/methods/firewall/setconfiguration.tcl
+++ b/WebUI/www/api/methods/firewall/setconfiguration.tcl
@@ -25,19 +25,19 @@ Firewall_loadConfiguration
 set Firewall_IPS $ips
 
 foreach _service $services {
-	array set service $_service
-	
-	set name   $service(name)
-	set access $service(access)
-	
-	if { [info exists Firewall_SERVICES($name)] } then {
-		array set knownService  $Firewall_SERVICES($name)
-		set knownService(ACCESS) $access
-		set Firewall_SERVICES($name) [array get knownService]
-		array_clear knownService
-	}
-	
-	array_clear service
+  array set service $_service
+  
+  set name   $service(name)
+  set access $service(access)
+  
+  if { [info exists Firewall_SERVICES($name)] } then {
+    array set knownService  $Firewall_SERVICES($name)
+    set knownService(ACCESS) $access
+    set Firewall_SERVICES($name) [array get knownService]
+    array_clear knownService
+  }
+  
+  array_clear service
 }
 
 Firewall_saveConfiguration
diff --git a/WebUI/www/config/devdescr/DEVDB.tcl b/WebUI/www/config/devdescr/DEVDB.tcl
index 0f78d7ba..7e36aed5 100755
--- a/WebUI/www/config/devdescr/DEVDB.tcl
+++ b/WebUI/www/config/devdescr/DEVDB.tcl
@@ -1,8 +1,8 @@
 #!/bin/tclsh
-set DEV_LIST {HM-LC-Sw1-Pl-DN-R3 HM-LC-Sw2-DR {263 146} HM-LC-Sw1-Ba-PCB HM-WS550STH-O HM-RC-2-PBU-FM HM-LC-Sw1-SM-ATmega168 HM-Sen-MDIR-O-2 HM-Sec-Key-S HM-Sec-SD-2-Team HM-PB-4-WM HM-LC-Sw1-Pl-OM54 HM-ES-PMSw1-Pl-DN-R5 HMW-LC-Bl1-DR-2 OLIGO.smart.iq.HM HM-Sec-SD-Team HM-CC-RT-DN HM-LC-Sw1-Pl-CT-R1 HMW-IO-4-FM HM-LC-Dim1L-Pl-2 WS550 HM-LC-Sw1-Pl {ZEL STG RM FSS UP3} HM-LC-Sw1-DR HM-WS550-US HM-LC-Sw4-PCB HM-ES-PMSw1-DR 263_149_/_263_150 HM-ES-PMSw1-Pl-DN-R1 HM-LC-Sw1-SM HmIP-SWDO HM-Dis-TD-T HMW-LC-Sw2-DR HM-RC-4-B HM-LC-Sw4-SM-2 HM-EM-CMM HM-Sec-SC-2 HM-LC-Dim1T-FM HM-PB-6-WM55 {ZEL STG RM FFK} HM-RC-4-2 HM-LC-Dim1L-Pl-644 HM-MOD-EM-8 HM-PB-4Dis-WM HM-CC-VD HM-WDS100-C6-O-2 {263 145} HM-RC-19-SW {263 144} HM-WDS10-TH-O HM-LC-Dim2L-SM-644 HmIP-PS HMW-RCV-50 {263 132} HM-CC-TC HM-WS550ST-IO HM-RC-4-3 HM-WS550STH-I HM-LC-Dim1TPBU-FM-2 HMW-Sen-SC-12-FM HM-LC-Sw4-SM-ATmega168 HM-LC-Dim1L-CV-2 {263 131} HM-Sen-DB-PCB HM-LC-Bl1-SM HM-LC-Dim1T-Pl-3 HmIP-WRC2 HM-Dis-WM55 HM-LC-Dim1T-Pl-2 {263 130} {263 158} HM-LC-Sw1-Pl-DN-R2 HM-LC-Dim1T-CV-644 HMIP-WRC2 {263 157} HM-TC-IT-WM-W-EU HM-PBI-4-FM HM-RC-Sec4-2 HM-RC-Sec3 HM-LC-Sw1-FM {ZEL STG RM WT 2} HM-Sec-SFA-SM HM-WDS30-OT2-SM HMW-LC-Dim1L-DR {ZEL STG RM HS 4} HM-LC-Sw1-PB-FM HMW-Sec-TR-FM HM-LC-DDC1-PCB HM-EM-CCM HM-LC-Sw4-Ba-PCB HM-WDS30-T-O HM-Sen-MDIR-WM55 HM-Sec-MDIR {ZEL STG RM FSA} HM-LC-Sw1-SM-2 HM-CC-VG-1 {263 135} HM-LC-Dim1T-FM-644 {263 167} HM-LC-Bl1-FM HM-ES-PMSw1-Pl-DN-R3 HM-LC-Sw4-PCB-2 HM-LC-Dim1PWM-CV WS888 HM-PB-2-FM HM-Sec-SCo HM-Sec-Key HMW-IO-12-Sw7-DR {ZEL STG RM FWT} HM-Sen-EP HM-LC-Dim1L-Pl-3 HM-Sys-sRP-Pl HM-WDC7000 HM-LC-Dim1T-FM-2 HM-LC-Sw2-FM-2 HM-LC-Sw2-FM {ZEL STG RM FST UP4} HM-RC-Dis-H-x-EU HM-LC-Bl1-SM-2 HM-RC-Key3 HM-PB-2-WM55-2 HM-ES-PMSw1-Pl HM-LC-Sw2-PB-FM HM-Sec-SD-2 HMW-Sen-SC-12-DR HmIP-eTRV HMIP-SWDO HmIP-WTH HM-Sen-Wa-Od HM-Sen-RD-O HM-LC-Sw1PBU-FM HM-MOD-Re-8 HM-LC-Sw1-Pl-DN-R4 HM-Sec-RHS HM-WDS40-TH-I HM-LC-Dim2L-SM HM-LC-Dim2T-SM-2 HM-LC-Dim1T-Pl HM-LC-Dim2T-SM HM-PB-2-WM {ZEL STG RM FZS-2} HM-LC-Sw1-Pl-DN-R1 HM-LC-Dim1TPBU-FM HM-LC-Dim2L-SM-2 HM-RC-Sec3-B HM-RC-8 HM-LC-Sw4-DR-2 HM-LC-Sw4-WM {263 155} HM-Sec-WDS-2 KS550 HM-RC-P1 HMW-LC-Bl1-DR HM-RC-12 HMW-IO-12-FM HM-RC-12-B HM-RC-4-3-D HM-RC-Key4-3 {ZEL STG RM FEP 230V} HM-Sec-TiS HMIP-eTRV {263 162} HM-LC-Sw1-FM-2 HM-Sen-MDIR-O HM-LC-Bl1-FM-2 HM-Sec-WDS HM-ES-TX-WM HMW-IO-12-Sw14-DR HM-LC-Dim1L-CV-644 {ZEL STG RM DWT 10} HMIP-PS HM-PB-2-WM55 HM-LC-Dim1L-CV HM-WDS100-C6-O {ZEL STG RM FZS} HM-OU-LED16 HM-RCV-50 HM-Sec-SD BRC-H HM-Sec-Key-O HM-Sec-MDIR-3 HM-LC-Sw4-WM-2 HM-Sec-Win HM-LC-Dim2T-SM-644 HMIP-PSM HM-RC-Sec4-3 HM-WDS40-TH-I-2 HM-RC-19-B HM-OU-CM-PCB HM-RC-Key3-B HMIP-WTH HM-SCI-3-FM HM-RC-19 HM-RC-4 HM-LC-Sw4-SM HM-LC-Dim1T-Pl-644 HM-LC-RGBW-WM HM-LC-Sw2-DR-2 HM-Sec-SC HMW-WSTH-SM HM-LC-Sw4-DR HmIP-PSM HM-LC-Dim1L-Pl {263 147} HM-RC-Key4-2 HM-LC-Dim1T-CV HMW-WSE-SM HM-SwI-3-FM HmIP-eTRV-2 HM-CCU-1 {ZEL STG RM FDK} HM-LC-Dim1T-CV-2 HM-CC-SCD HM-LC-Sw1-Pl-3 HM-ES-PMSw1-SM {263 133} HmIP-KRC4 HM-LC-Bl1PBU-FM {263 167 Gruppe} HMW-Sys-PS7-DR HM-LC-Bl1-PB-FM HM-ES-PMSw1-Pl-DN-R4 atent {263 134} HM-LC-Sw1-Pl-DN-R5 HM-LC-Dim1PWM-CV-2 DEVICE HM-ES-PMSw1-Pl-DN-R2 HM-LC-Sw1-Pl-2 HM-OU-CFM-Pl HM-OU-CF-Pl HM-OU-CFM-TW HM-LC-Dim1T-FM-LF {263 160} HM-Sec-MDIR-2 HM-PB-4Dis-WM-2 HM-Sen-MDIR-SM}
-array set DEV_DESCRIPTION {HM-Dis-TD-T HM-Dis-TD-T {ZEL STG RM FWT} ZEL_STG_RM_FWT HM-EM-CCM HM-EM-CCM HMW-RCV-50 HMW-RCV-50 HM-LC-Sw4-Ba-PCB HM-LC-Sw4-Ba-PCB {ZEL STG RM FST UP4} ZEL_STG_RM_FST_UP4 HM-LC-Sw1-PB-FM HM-LC-Sw1-PB-FM HmIP-eTRV TRV HmIP-WTH WTH HM-RC-Key3 HM-RC-Key3 HM-OU-CFM-Pl HM-OU-CFM-Pl HM-RC-Sec3 HM-RC-Sec3 HM-LC-Dim1T-CV HM-LC-Dim1T-CV BRC-H BRC-H HM-PB-4Dis-WM HM-PB-4Dis-WM HM-CC-VG-1 HM-CC-VG-1 HMIP-SWDO SWD HM-WDS40-TH-I-2 HM-WDS40-TH-I {ZEL STG RM FZS} ZEL_STG_RM_FZS HMW-WSTH-SM HMW-WSTH-SM HM-LC-Sw2-DR-2 HM-LC-Sw2-DR HM-LC-Sw4-WM HM-LC-Sw4-WM HM-ES-PMSw1-Pl-DN-R1 HM-ES-PMSw1-Pl-DN-R1 HM-ES-PMSw1-Pl-DN-R2 HM-ES-PMSw1-Pl-DN-R2 HM-OU-CFM-TW HM-OU-CFM-TW HM-Sec-SFA-SM HM-Sec-SFA-SM HM-ES-PMSw1-Pl-DN-R3 HM-ES-PMSw1-Pl-DN-R3 HM-ES-PMSw1-Pl-DN-R4 HM-ES-PMSw1-Pl-DN-R4 HM-ES-PMSw1-Pl-DN-R5 HM-ES-PMSw1-Pl-DN-R5 HM-SwI-3-FM HM-SwI-3-FM HMW-WSE-SM HMW-WSE-SM HM-LC-Dim1T-FM HM-LC-Dim1T-FM HM-Sec-SD-Team HM-Sec-SD-Team HM-RC-Dis-H-x-EU HM-RC-Dis-H-x-EU HM-Sec-Key-O HM-Sec-Key-O HM-RC-Key4-2 HM-RC-Key4-2 HM-LC-RGBW-WM HM-LC-RGBW-WM HM-RC-Key4-3 HM-RC-4 HM-WDS100-C6-O-2 HM-WDS100-C6-O HM-LC-Dim2L-SM-2 HM-LC-Dim2L-SM HM-Sec-TiS HM-Sec-TiS HM-Sec-Key-S HM-Sec-Key-S HM-Sys-sRP-Pl HM-Sys-sRP-Pl HM-LC-Bl1-FM-2 HM-LC-Bl1-FM HM-OU-CF-Pl HM-OU-CF-Pl HMW-LC-Bl1-DR-2 HMW-LC-Bl1-DR HM-LC-Bl1-SM-2 HM-LC-Bl1-SM HM-SCI-3-FM HM-SCI-3-FM HM-LC-Dim1PWM-CV-2 HM-LC-Dim1PWM-CV HM-ES-PMSw1-DR HM-ES-PMSw1-DR HMW-LC-Sw2-DR HMW-LC-Sw2-DR HM-PB-4-WM HM-PB-4-WM HM-LC-Dim1T-CV-644 HM-LC-Dim1T-CV HMW-LC-Bl1-DR HMW-LC-Bl1-DR HmIP-SWDO SWD HM-Sec-Win HM-Sec-Win HM-LC-Sw2-FM-2 HM-LC-Sw2-FM HM-LC-Sw1-Pl-DN-R1 HM-LC-Sw1-Pl-DN-R1 HM-LC-Sw1-Pl-DN-R2 HM-LC-Sw1-Pl-DN-R2 HM-LC-Sw1-Pl-DN-R3 HM-LC-Sw1-Pl-DN-R3 HM-LC-Dim2T-SM HM-LC-Dim2T-SM HM-LC-Sw1-Pl-DN-R4 HM-LC-Sw1-Pl-DN-R4 HM-LC-Sw1-Pl-DN-R5 HM-LC-Sw1-Pl-DN-R5 HM-LC-Sw1-SM-ATmega168 HM-LC-Sw1-SM-ATmega168 HM-LC-Dim1TPBU-FM-2 HM-LC-Dim1TPBU-FM-2 HM-Sen-MDIR-O HM-Sen-MDIR-O HM-RC-12-B HM-RC-12-B HM-LC-Bl1-SM HM-LC-Bl1-SM HM-LC-Dim1L-CV HM-LC-Dim1L-CV {ZEL STG RM FDK} ZEL_STG_RM_FDK HM-Sen-RD-O HM-Sen-RD-O HM-WDS30-T-O HM-WDS30-T-O HM-CC-RT-DN HM-CC-RT-DN HM-WS550ST-IO HM-WS550ST-IO {ZEL STG RM FZS-2} ZEL_STG_RM_FZS-2 HM-Sec-Key HM-Sec-Key HM-Sec-SD-2-Team HM-Sec-SD-Team HM-RC-19-SW HM-RC-19-SW KS550 KS550 HMW-IO-4-FM HMW-IO-4-FM HM-LC-Sw4-PCB-2 HM-LC-Sw4-PCB HM-EM-CMM HM-EM-CMM HM-LC-Dim2T-SM-644 HM-LC-Dim2T-SM {ZEL STG RM FFK} ZEL_STG_RM_FFK HM-Sec-RHS HM-Sec-RHS HMW-IO-12-Sw14-DR HMW-IO-12-Sw14-DR HM-MOD-Re-8 HM-MOD-Re-8 HM-WDS40-TH-I HM-WDS40-TH-I {263 167 Gruppe} 263_167_Gruppe {ZEL STG RM FSS UP3} ZEL_STG_RM_FSS_UP3 {263 130} 263_130 HM-RC-4 HM-RC-4 {263 131} 263_131 {263 132} 263_132 {263 133} 263_133 {263 134} 263_134 {263 135} 263_135 HM-RC-8 HM-RC-8 HM-Sen-DB-PCB HM-Sen-DB-PCB HM-LC-Sw1-SM HM-LC-Sw1-SM HM-LC-Sw4-DR-2 HM-LC-Sw4-DR HM-LC-Dim1L-CV-644 HM-LC-Dim1L-CV HM-CC-SCD HM-CC-SCD HMW-LC-Dim1L-DR HMW-LC-Dim1L-DR HM-LC-Sw1PBU-FM HM-LC-Sw1PBU-FM HM-LC-Sw1-Pl HM-LC-Sw1-Pl HM-LC-Dim2T-SM-2 HM-LC-Dim2T-SM HM-LC-Dim2L-SM HM-LC-Dim2L-SM HM-WDS100-C6-O HM-WDS100-C6-O {263 144} 263_144 HM-LC-DDC1-PCB HM-LC-DDC1-PCB {263 145} 263_145 {263 146} 263_146 {263 147} 263_147 HM-LC-Sw4-DR HM-LC-Sw4-DR HM-Sec-SC-2 HM-Sec-SC-2 HM-PB-6-WM55 HM-PB-6-WM55 HM-LC-Dim1T-FM-2 HM-LC-Dim1T-FM HM-LC-Dim1L-Pl-2 HM-LC-Dim1L-Pl-2 HM-PB-2-WM55-2 HM-PB-2-WM55 HM-RC-19-B HM-RC-19-B HM-LC-Dim1L-Pl-3 HM-LC-Dim1L-Pl-3 {263 155} 263_155 HM-RCV-50 HM-RCV-50 {263 157} 263_157 {263 158} 263_158 {263 160} 263_160 HM-LC-Dim1L-CV-2 HM-LC-Dim1L-CV HM-LC-Bl1-PB-FM HM-LC-Bl1-PB-FM HM-PB-2-WM HM-PB-2-WM {263 162} 263_162 HM-LC-Dim1T-FM-644 HM-LC-Dim1T-FM {263 167} 263_167 HM-RC-Sec3-B HM-RC-Sec3-B HM-RC-4-3-D HM-RC-4 HM-LC-Dim1T-FM-LF HM-LC-Dim1T-FM HM-Dis-WM55 HM-Dis-WM55 HM-LC-Sw4-SM-2 HM-LC-Sw4-SM HM-LC-Sw1-FM-2 HM-LC-Sw1-FM {ZEL STG RM DWT 10} ZEL_STG_RM_DWT_10 HM-Sen-EP HM-Sen-EP HmIP-eTRV-2 TRV HM-LC-Sw1-SM-2 HM-LC-Sw1-SM HM-WDS10-TH-O HM-WDS10-TH-O HM-LC-Dim2L-SM-644 HM-LC-Dim2L-SM HM-Sec-WDS-2 HM-Sec-WDS-2 HM-LC-Sw1-Ba-PCB HM-LC-Sw1-Ba-PCB atent atent HM-Sen-MDIR-O-2 HM-Sen-MDIR-O HM-CC-TC HM-CC-TC HM-LC-Dim1T-Pl HM-LC-Dim1T-Pl HM-Sec-SCo HM-Sec-SCo HM-LC-Dim1T-Pl-644 HM-LC-Dim1T-Pl HM-ES-TX-WM HM-ES-TX-WM HMW-IO-12-FM HMW-IO-12-FM 263_149_/_263_150 263_149_/_263_150 HM-LC-Sw1-Pl-CT-R1 HM-LC-Sw1-Pl-CT-R1 HM-PBI-4-FM HM-PBI-4-FM HM-CC-VD HM-CC-VD HM-RC-4-2 HM-RC-4-2 HM-Sec-SC HM-Sec-SC HM-RC-4-3 HM-RC-4 HM-Sec-SD HM-Sec-SD HMIP-PSM PSM HM-ES-PMSw1-SM HM-ES-PMSw1-SM HM-Sen-MDIR-WM55 HM-Sen-MDIR-WM55 HM-LC-Sw4-PCB HM-LC-Sw4-PCB HMIP-PS PS HmIP-KRC4 KRC4 HM-ES-PMSw1-Pl HM-ES-PMSw1-Pl HM-LC-Dim1TPBU-FM HM-LC-Dim1TPBU-FM HM-PB-4Dis-WM-2 HM-PB-4Dis-WM-2 {ZEL STG RM FEP 230V} ZEL_STG_RM_FEP_230V HM-RC-4-B HM-RC-4-B HM-RC-12 HM-RC-12 HMIP-WRC2 WRC2 OLIGO.smart.iq.HM OLIGO.smart.iq.HM HM-LC-Sw2-DR HM-LC-Sw2-DR HM-LC-Dim1T-Pl-2 HM-LC-Dim1T-Pl-2 HMW-Sen-SC-12-DR HMW-Sen-SC-12-DR HM-RC-19 HM-RC-19 HM-MOD-EM-8 HM-MOD-EM-8 HM-LC-Dim1T-Pl-3 HM-LC-Dim1T-Pl-3 HM-TC-IT-WM-W-EU HM-TC-IT-WM-W-EU HM-Sec-SD-2 HM-Sec-SD HM-LC-Dim1T-CV-2 HM-LC-Dim1T-CV HM-RC-Sec4-2 HM-RC-Sec4-2 {ZEL STG RM FSA} ZEL_STG_RM_FSA HM-RC-Sec4-3 HM-RC-4 HM-OU-CM-PCB HM-OU-CM-PCB HM-Sec-MDIR HM-Sec-MDIR HM-Sec-WDS HM-Sec-WDS HMW-Sen-SC-12-FM HMW-Sen-SC-12-FM HM-LC-Sw2-FM HM-LC-Sw2-FM HM-CCU-1 HM-CCU-1 HmIP-PSM PSM HM-LC-Bl1-FM HM-LC-Bl1-FM HM-RC-P1 HM-RC-P1 HM-LC-Dim1L-Pl HM-LC-Dim1L-Pl HmIP-PS PS HM-PB-2-WM55 HM-PB-2-WM55 {ZEL STG RM HS 4} ZEL_STG_RM_HS_4 HM-LC-Sw1-Pl-2 HM-LC-Sw1-Pl HM-LC-Dim1L-Pl-644 HM-LC-Dim1L-Pl HM-LC-Sw1-Pl-3 HM-LC-Sw1-Pl HMW-IO-12-Sw7-DR HMW-IO-12-Sw7-DR HM-WS550STH-I HM-WS550STH-I {ZEL STG RM WT 2} ZEL_STG_RM_WT_2 HM-Sen-MDIR-SM HM-Sen-MDIR-SM HM-WS550STH-O HM-WS550STH-O HmIP-WRC2 WRC2 HMW-Sys-PS7-DR HMW-Sys-PS7-DR WS550 {Funk- Wetterstation} HM-Sen-Wa-Od HM-Sen-Wa-Od HM-RC-Key3-B HM-RC-Key3-B DEVICE DEVICE HM-WDS30-OT2-SM HM-WDS30-OT2-SM HM-PB-2-FM HM-PB-2-FM HM-LC-Bl1PBU-FM HM-LC-Bl1PBU-FM HM-LC-Sw1-DR HM-LC-Sw1-DR HMIP-eTRV TRV HMIP-WTH WTH HM-RC-2-PBU-FM HM-RC-2-PBU-FM HM-LC-Sw1-Pl-OM54 HM-LC-Sw1-Pl-OM54 HM-LC-Sw4-WM-2 HM-LC-Sw4-WM HM-Sec-MDIR-2 HM-Sec-MDIR HM-Sec-MDIR-3 HM-Sec-MDIR HMW-Sec-TR-FM HMW-Sec-TR-FM HM-WDC7000 HM-WDC7000 HM-OU-LED16 HM-OU-LED16 HM-LC-Sw4-SM HM-LC-Sw4-SM HM-LC-Sw1-FM HM-LC-Sw1-FM HM-LC-Sw2-PB-FM HM-LC-Sw2-PB-FM WS888 WS888 HM-WS550-US HM-WS550-US HM-LC-Dim1PWM-CV HM-LC-Dim1PWM-CV HM-LC-Sw4-SM-ATmega168 HM-LC-Sw4-SM-ATmega168}
-array set DEV_PATHS       {HM-Dis-TD-T {{50 /config/img/devices/50/81_hm-dis-td-t_thumb.png} {250 /config/img/devices/250/81_hm-dis-td-t.png}} {ZEL STG RM FWT} {{50 /config/img/devices/50/42_hm-cc-tc_thumb.png} {250 /config/img/devices/250/42_hm-cc-tc.png}} HM-EM-CCM {{50 /config/img/devices/50/44_hm-em-ccm_thumb.png} {250 /config/img/devices/250/44_hm-em-ccm.png}} HMW-RCV-50 {{50 /config/img/devices/50/CCU2_thumb.png} {250 /config/img/devices/250/CCU2.png}} HM-LC-Sw4-Ba-PCB {{50 /config/img/devices/50/88_hm-lc-sw4-ba-pcb_thumb.png} {250 /config/img/devices/250/88_hm-lc-sw4-ba-pcb.png}} {ZEL STG RM FST UP4} {{50 /config/img/devices/50/38_hm-pbi-4-fm_thumb.png} {250 /config/img/devices/250/38_hm-pbi-4-fm.png}} HM-LC-Sw1-PB-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HmIP-eTRV {{50 /config/img/devices/50/120_hmip-etrv_thumb.png} {250 /config/img/devices/250/120_hmip-etrv.png}} HmIP-WTH {{50 /config/img/devices/50/121_hmip-wth_thumb.png} {250 /config/img/devices/250/121_hmip-wth.png}} HM-RC-Key3 {{50 /config/img/devices/50/23_hm-rc-key3-b_thumb.png} {250 /config/img/devices/250/23_hm-rc-key3-b.png}} HM-OU-CFM-Pl {{50 /config/img/devices/50/60_hm-ou-cf-pl_thumb.png} {250 /config/img/devices/250/60_hm-ou-cf-pl.png}} HM-RC-Sec3 {{50 /config/img/devices/50/22_hm-rc-sec3-b_thumb.png} {250 /config/img/devices/250/22_hm-rc-sec3-b.png}} HM-LC-Dim1T-CV {{50 /config/img/devices/50/66_hm-lc-dim1t-cv_thumb.png} {250 /config/img/devices/250/66_hm-lc-dim1t-cv.png}} BRC-H {{50 /config/img/devices/50/72_hm-rc-brc-h_thumb.png} {250 /config/img/devices/250/72_hm-rc-brc-h.png}} HM-PB-4Dis-WM {{50 /config/img/devices/50/70_hm-pb-4dis-wm_thumb.png} {250 /config/img/devices/250/70_hm-pb-4dis-wm.png}} HM-CC-VG-1 {{50 /config/img/devices/50/95_group_hm-cc-vg-1_thumb.png} {250 /config/img/devices/250/95_group_hm-cc-vg-1.png}} HMIP-SWDO {{50 /config/img/devices/50/118_hmip-swdo_thumb.png} {250 /config/img/devices/250/118_hmip-swdo.png}} HM-WDS40-TH-I-2 {{50 /config/img/devices/50/13_hm-ws550sth-i_thumb.png} {250 /config/img/devices/250/13_hm-ws550sth-i.png}} {ZEL STG RM FZS} {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HMW-WSTH-SM {{50 /config/img/devices/50/32_hmw-wsth-sm_thumb.png} {250 /config/img/devices/250/32_hmw-wsth-sm.png}} HM-LC-Sw2-DR-2 {{50 /config/img/devices/50/69_hm-lc-sw2-dr_thumb.png} {250 /config/img/devices/250/69_hm-lc-sw2-dr.png}} HM-LC-Sw4-WM {{50 /config/img/devices/50/76_hm-lc-sw4-wm_thumb.png} {250 /config/img/devices/250/76_hm-lc-sw4-wm.png}} HM-ES-PMSw1-Pl-DN-R1 {{50 /config/img/devices/50/93_hm-es-pmsw1-pl_thumb.png} {250 /config/img/devices/250/93_hm-es-pmsw1-pl.png}} HM-ES-PMSw1-Pl-DN-R2 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R2_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R2.png}} HM-OU-CFM-TW {{50 /config/img/devices/50/117_hm-ou-cfm-tw_thumb.png} {250 /config/img/devices/250/117_hm-ou-cfm-tw.png}} HM-Sec-SFA-SM {{50 /config/img/devices/50/55_hm-sec-sfa-sm_thumb.png} {250 /config/img/devices/250/55_hm-sec-sfa-sm.png}} HM-ES-PMSw1-Pl-DN-R3 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R3_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R3.png}} HM-ES-PMSw1-Pl-DN-R4 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R4_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R4.png}} HM-ES-PMSw1-Pl-DN-R5 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R5_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R5.png}} HM-SwI-3-FM {{50 /config/img/devices/50/39_hm-swi-3-fm_thumb.png} {250 /config/img/devices/250/39_hm-swi-3-fm.png}} HMW-WSE-SM {{50 /config/img/devices/50/31_hmw-wse-sm_thumb.png} {250 /config/img/devices/250/31_hmw-wse-sm.png}} HM-LC-Dim1T-FM {{50 /config/img/devices/50/65_hm-lc-dim1t-fm_thumb.png} {250 /config/img/devices/250/65_hm-lc-dim1t-fm.png}} HM-Sec-SD-Team {{50 /config/img/devices/50/52_hm-sec-sd-team_thumb.png} {250 /config/img/devices/250/52_hm-sec-sd-team.png}} HM-RC-Dis-H-x-EU {{50 /config/img/devices/50/108_hm-rc-dis-h-x-eu_thump.png} {250 /config/img/devices/250/108_hm-rc-dis-h-x-eu.png}} HM-Sec-Key-O {{50 /config/img/devices/50/14_hm-sec-key_thumb.png} {250 /config/img/devices/250/14_hm-sec-key.png}} HM-RC-Key4-2 {{50 /config/img/devices/50/85_hm-rc-key4-2_thumb.png} {250 /config/img/devices/250/85_hm-rc-key4-2.png}} HM-LC-RGBW-WM {{50 /config/img/devices/50/111_hm-lc-rgbw-wm_thumb.png} {250 /config/img/devices/250/111_hm-lc-rgbw-wm.png}} HM-RC-Key4-3 {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/86_hm-rc-key4-3.png}} HM-WDS100-C6-O-2 {{50 /config/img/devices/50/WeatherCombiSensor_thumb.png} {250 /config/img/devices/250/WeatherCombiSensor.png}} HM-LC-Dim2L-SM-2 {{50 /config/img/devices/50/45_hm-lc-dim2l-sm_thumb.png} {250 /config/img/devices/250/45_hm-lc-dim2l-sm.png}} HM-Sec-TiS {{50 /config/img/devices/50/47_hm-sec-tis_thumb.png} {250 /config/img/devices/250/47_hm-sec-tis.png}} HM-Sec-Key-S {{50 /config/img/devices/50/14_hm-sec-key_thumb.png} {250 /config/img/devices/250/14_hm-sec-key.png}} HM-Sys-sRP-Pl {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Bl1-FM-2 {{50 /config/img/devices/50/7_hm-lc-bl1-fm_thumb.png} {250 /config/img/devices/250/7_hm-lc-bl1-fm.png}} HM-OU-CF-Pl {{50 /config/img/devices/50/60_hm-ou-cf-pl_thumb.png} {250 /config/img/devices/250/60_hm-ou-cf-pl.png}} HMW-LC-Bl1-DR-2 {{50 /config/img/devices/50/27_hmw-lc-bl1-dr_thumb.png} {250 /config/img/devices/250/27_hmw-lc-bl1-dr.png}} HM-LC-Bl1-SM-2 {{50 /config/img/devices/50/6_hm-lc-bl1-sm_thumb.png} {250 /config/img/devices/250/6_hm-lc-bl1-sm.png}} HM-SCI-3-FM {{50 /config/img/devices/50/67_hm-sci-3-fm_thumb.png} {250 /config/img/devices/250/67_hm-sci-3-fm.png}} HM-LC-Dim1PWM-CV-2 {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/79_hm-lc-dim1pwm-cv.png}} HM-ES-PMSw1-DR {{50 /config/img/devices/50/110_hm-es-pmsw1-dr_thump.png} {250 /config/img/devices/250/110_hm-es-pmsw1-dr.png}} HMW-LC-Sw2-DR {{50 /config/img/devices/50/26_hmw-lc-sw2-dr_thumb.png} {250 /config/img/devices/250/26_hmw-lc-sw2-dr.png}} HM-PB-4-WM {{50 /config/img/devices/50/PushButton-4ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-4ch-wm.png}} HM-LC-Dim1T-CV-644 {{50 /config/img/devices/50/66_hm-lc-dim1t-cv_thumb.png} {250 /config/img/devices/250/66_hm-lc-dim1t-cv.png}} HMW-LC-Bl1-DR {{50 /config/img/devices/50/27_hmw-lc-bl1-dr_thumb.png} {250 /config/img/devices/250/27_hmw-lc-bl1-dr.png}} HmIP-SWDO {{50 /config/img/devices/50/118_hmip-swdo_thumb.png} {250 /config/img/devices/250/118_hmip-swdo.png}} HM-Sec-Win {{50 /config/img/devices/50/15_hm-sec-win_thumb.png} {250 /config/img/devices/250/15_hm-sec-win.png}} HM-LC-Sw2-FM-2 {{50 /config/img/devices/50/5_hm-lc-sw2-fm_thumb.png} {250 /config/img/devices/250/5_hm-lc-sw2-fm.png}} HM-LC-Sw1-Pl-DN-R1 {{50 /config/img/devices/50/93_hm-es-pmsw1-pl_thumb.png} {250 /config/img/devices/250/93_hm-es-pmsw1-pl.png}} HM-LC-Sw1-Pl-DN-R2 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R2_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R2.png}} HM-LC-Sw1-Pl-DN-R3 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R3_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R3.png}} HM-LC-Dim2T-SM {{50 /config/img/devices/50/64_hm-lc-dim2T-sm_thumb.png} {250 /config/img/devices/250/64_hm-lc-dim2T-sm.png}} HM-LC-Sw1-Pl-DN-R4 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R4_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R4.png}} HM-LC-Sw1-Pl-DN-R5 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R5_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R5.png}} HM-LC-Sw1-SM-ATmega168 {{50 /config/img/devices/50/8_hm-lc-sw1-sm_thumb.png} {250 /config/img/devices/250/8_hm-lc-sw1-sm.png}} HM-LC-Dim1TPBU-FM-2 {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-Sen-MDIR-O {{50 /config/img/devices/50/80_hm-sen-mdir-o_thumb.png} {250 /config/img/devices/250/80_hm-sen-mdir-o.png}} HM-RC-12-B {{50 /config/img/devices/50/19_hm-rc-12_thumb.png} {250 /config/img/devices/250/19_hm-rc-12.png}} HM-LC-Bl1-SM {{50 /config/img/devices/50/6_hm-lc-bl1-sm_thumb.png} {250 /config/img/devices/250/6_hm-lc-bl1-sm.png}} HM-LC-Dim1L-CV {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/2_hm-lc-dim1l-cv.png}} {ZEL STG RM FDK} {{50 /config/img/devices/50/17_hm-sec-rhs_thumb.png} {250 /config/img/devices/250/17_hm-sec-rhs.png}} HM-Sen-RD-O {{50 /config/img/devices/50/87_hm-sen-rd-o_thumb.png} {250 /config/img/devices/250/87_hm-sen-rd-o.png}} HM-WDS30-T-O {{50 /config/img/devices/50/IP65_G201_thumb.png} {250 /config/img/devices/250/IP65_G201.png}} HM-CC-RT-DN {{50 /config/img/devices/50/83_hm-cc-rt-dn_thumb.png} {250 /config/img/devices/250/83_hm-cc-rt-dn.png}} HM-WS550ST-IO {{50 /config/img/devices/50/IP65_G201_thumb.png} {250 /config/img/devices/250/IP65_G201.png}} {ZEL STG RM FZS-2} {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-Sec-Key {{50 /config/img/devices/50/14_hm-sec-key_thumb.png} {250 /config/img/devices/250/14_hm-sec-key.png}} HM-Sec-SD-2-Team {{50 /config/img/devices/50/105_hm-sec-sd-2-team_thumb.png} {250 /config/img/devices/250/105_hm-sec-sd-2-team.png}} HM-RC-19-SW {{50 /config/img/devices/50/20_hm-rc-19_thumb.png} {250 /config/img/devices/250/20_hm-rc-19.png}} KS550 {{50 /config/img/devices/50/WeatherCombiSensor_thumb.png} {250 /config/img/devices/250/WeatherCombiSensor.png}} HMW-IO-4-FM {{50 /config/img/devices/50/29_hmw-io-4-fm_thumb.png} {250 /config/img/devices/250/29_hmw-io-4-fm.png}} HM-LC-Sw4-PCB-2 {{50 /config/img/devices/50/46_hm-lc-sw4-pcb_thumb.png} {250 /config/img/devices/250/46_hm-lc-sw4-pcb.png}} HM-EM-CMM {{50 /config/img/devices/50/25_hm-em-cmm_thumb.png} {250 /config/img/devices/250/25_hm-em-cmm.png}} HM-LC-Dim2T-SM-644 {{50 /config/img/devices/50/64_hm-lc-dim2T-sm_thumb.png} {250 /config/img/devices/250/64_hm-lc-dim2T-sm.png}} {ZEL STG RM FFK} {{50 /config/img/devices/50/16_hm-sec-sc_thumb.png} {250 /config/img/devices/250/16_hm-sec-sc.png}} HM-Sec-RHS {{50 /config/img/devices/50/17_hm-sec-rhs_thumb.png} {250 /config/img/devices/250/17_hm-sec-rhs.png}} HMW-IO-12-Sw14-DR {{50 /config/img/devices/50/71_hmw-io-12-sw14-dr_thumb.png} {250 /config/img/devices/250/71_hmw-io-12-sw14-dr.png}} HM-MOD-Re-8 {{50 /config/img/devices/50/94_hm-mod-re-8_thumb.png} {250 /config/img/devices/250/94_hm-mod-re-8.png}} HM-WDS40-TH-I {{50 /config/img/devices/50/13_hm-ws550sth-i_thumb.png} {250 /config/img/devices/250/13_hm-ws550sth-i.png}} {263 167 Gruppe} {{50 /config/img/devices/50/52_hm-sec-sd-team_thumb.png} {250 /config/img/devices/250/52_hm-sec-sd-team.png}} {ZEL STG RM FSS UP3} {{50 /config/img/devices/50/39_hm-swi-3-fm_thumb.png} {250 /config/img/devices/250/39_hm-swi-3-fm.png}} {263 130} {{50 /config/img/devices/50/4_hm-lc-sw1-fm_thumb.png} {250 /config/img/devices/250/4_hm-lc-sw1-fm.png}} HM-RC-4 {{50 /config/img/devices/50/18_hm-rc-4_thumb.png} {250 /config/img/devices/250/18_hm-rc-4.png}} {263 131} {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} {263 132} {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/2_hm-lc-dim1l-cv.png}} {263 133} {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} {263 134} {{50 /config/img/devices/50/66_hm-lc-dim1t-cv_thumb.png} {250 /config/img/devices/250/66_hm-lc-dim1t-cv.png}} {263 135} {{50 /config/img/devices/50/75_hm-pb-2-wm55_thumb.png} {250 /config/img/devices/250/75_hm-pb-2-wm55.png}} HM-RC-8 {{50 /config/img/devices/50/100_hm-rc-8_thumb.png} {250 /config/img/devices/250/100_hm-rc-8.png}} HM-Sen-DB-PCB {{50 /config/img/devices/50/101_hm-sen-db-pcb_thumb.png} {250 /config/img/devices/250/101_hm-sen-db-pcb.png}} HM-LC-Sw1-SM {{50 /config/img/devices/50/8_hm-lc-sw1-sm_thumb.png} {250 /config/img/devices/250/8_hm-lc-sw1-sm.png}} HM-LC-Sw4-DR-2 {{50 /config/img/devices/50/68_hm-lc-sw4-dr_thumb.png} {250 /config/img/devices/250/68_hm-lc-sw4-dr.png}} HM-LC-Dim1L-CV-644 {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/2_hm-lc-dim1l-cv.png}} HM-CC-SCD {{50 /config/img/devices/50/57_hm-cc-scd_thumb.png} {250 /config/img/devices/250/57_hm-cc-scd.png}} HMW-LC-Dim1L-DR {{50 /config/img/devices/50/28_hmw-lc-dim1l-dr_thumb.png} {250 /config/img/devices/250/28_hmw-lc-dim1l-dr.png}} HM-LC-Sw1PBU-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Sw1-Pl {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Dim2T-SM-2 {{50 /config/img/devices/50/64_hm-lc-dim2T-sm_thumb.png} {250 /config/img/devices/250/64_hm-lc-dim2T-sm.png}} HM-LC-Dim2L-SM {{50 /config/img/devices/50/45_hm-lc-dim2l-sm_thumb.png} {250 /config/img/devices/250/45_hm-lc-dim2l-sm.png}} HM-WDS100-C6-O {{50 /config/img/devices/50/WeatherCombiSensor_thumb.png} {250 /config/img/devices/250/WeatherCombiSensor.png}} {263 144} {{50 /config/img/devices/50/39_hm-swi-3-fm_thumb.png} {250 /config/img/devices/250/39_hm-swi-3-fm.png}} HM-LC-DDC1-PCB {{50 /config/img/devices/50/54a_lc-ddc1_thumb.png} {250 /config/img/devices/250/54a_lc-ddc1-pcb.png}} {263 145} {{50 /config/img/devices/50/38_hm-pbi-4-fm_thumb.png} {250 /config/img/devices/250/38_hm-pbi-4-fm.png}} {263 146} {{50 /config/img/devices/50/7_hm-lc-bl1-fm_thumb.png} {250 /config/img/devices/250/7_hm-lc-bl1-fm.png}} {263 147} {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Sw4-DR {{50 /config/img/devices/50/68_hm-lc-sw4-dr_thumb.png} {250 /config/img/devices/250/68_hm-lc-sw4-dr.png}} HM-Sec-SC-2 {{50 /config/img/devices/50/16_hm-sec-sc_thumb.png} {250 /config/img/devices/250/16_hm-sec-sc.png}} HM-PB-6-WM55 {{50 /config/img/devices/50/86_hm-pb-6-wm55_thumb.png} {250 /config/img/devices/250/86_hm-pb-6-wm55.png}} HM-LC-Dim1T-FM-2 {{50 /config/img/devices/50/65_hm-lc-dim1t-fm_thumb.png} {250 /config/img/devices/250/65_hm-lc-dim1t-fm.png}} HM-LC-Dim1L-Pl-2 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-PB-2-WM55-2 {{50 /config/img/devices/50/75_hm-pb-2-wm55_thumb.png} {250 /config/img/devices/250/75_hm-pb-2-wm55.png}} HM-RC-19-B {{50 /config/img/devices/50/20_hm-rc-19_thumb.png} {250 /config/img/devices/250/20_hm-rc-19.png}} HM-LC-Dim1L-Pl-3 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} {263 155} {{50 /config/img/devices/50/70_hm-pb-4dis-wm_thumb.png} {250 /config/img/devices/250/70_hm-pb-4dis-wm.png}} HM-RCV-50 {{50 /config/img/devices/50/CCU2_thumb.png} {250 /config/img/devices/250/CCU2.png}} {263 157} {{50 /config/img/devices/50/13_hm-ws550sth-i_thumb.png} {250 /config/img/devices/250/13_hm-ws550sth-i.png}} {263 158} {{50 /config/img/devices/50/TH_CS_thumb.png} {250 /config/img/devices/250/TH_CS.png}} {263 160} {{50 /config/img/devices/50/57_hm-cc-scd_thumb.png} {250 /config/img/devices/250/57_hm-cc-scd.png}} HM-LC-Dim1L-CV-2 {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/2_hm-lc-dim1l-cv.png}} HM-LC-Bl1-PB-FM {{50 /config/img/devices/50/61_hm-lc-bl1-pb-fm_thumb.png} {250 /config/img/devices/250/61_hm-lc-bl1-pb-fm.png}} HM-PB-2-WM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} {263 162} {{50 /config/img/devices/50/124_hm-sec-mdir_thumb.png} {250 /config/img/devices/250/124_hm-sec-mdir.png}} HM-LC-Dim1T-FM-644 {{50 /config/img/devices/50/65_hm-lc-dim1t-fm_thumb.png} {250 /config/img/devices/250/65_hm-lc-dim1t-fm.png}} {263 167} {{50 /config/img/devices/50/51_hm-sec-sd_thumb.png} {250 /config/img/devices/250/51_hm-sec-sd.png}} HM-RC-Sec3-B {{50 /config/img/devices/50/22_hm-rc-sec3-b_thumb.png} {250 /config/img/devices/250/22_hm-rc-sec3-b.png}} HM-RC-4-3-D {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/116_hm-rc-4-3_brc-h3.png}} HM-LC-Dim1T-FM-LF {{50 /config/img/devices/50/114_hm-lc-dim1t-fm-lf_thumb_3.png} {250 /config/img/devices/250/114_hm-lc-dim1t-fm-lf_3.png}} HM-Dis-WM55 {{50 /config/img/devices/50/97_hm-dis-wm55_thumb.png} {250 /config/img/devices/250/97_hm-dis-wm55.png}} HM-LC-Sw4-SM-2 {{50 /config/img/devices/50/3_hm-lc-sw4-sm_thumb.png} {250 /config/img/devices/250/3_hm-lc-sw4-sm.png}} HM-LC-Sw1-FM-2 {{50 /config/img/devices/50/4_hm-lc-sw1-fm_thumb.png} {250 /config/img/devices/250/4_hm-lc-sw1-fm.png}} {ZEL STG RM DWT 10} {{50 /config/img/devices/50/70_hm-pb-4dis-wm_thumb.png} {250 /config/img/devices/250/70_hm-pb-4dis-wm.png}} HM-Sen-EP {{50 /config/img/devices/50/48_hm-sen-ep_thumb.png} {250 /config/img/devices/250/48_hm-sen-ep.png}} HmIP-eTRV-2 {{50 /config/img/devices/50/120_hmip-etrv_thumb.png} {250 /config/img/devices/250/120_hmip-etrv.png}} HM-LC-Sw1-SM-2 {{50 /config/img/devices/50/8_hm-lc-sw1-sm_thumb.png} {250 /config/img/devices/250/8_hm-lc-sw1-sm.png}} HM-WDS10-TH-O {{50 /config/img/devices/50/TH_CS_thumb.png} {250 /config/img/devices/250/TH_CS.png}} HM-LC-Dim2L-SM-644 {{50 /config/img/devices/50/45_hm-lc-dim2l-sm_thumb.png} {250 /config/img/devices/250/45_hm-lc-dim2l-sm.png}} HM-Sec-WDS-2 {{50 /config/img/devices/50/49_hm-sec-wds_thumb.png} {250 /config/img/devices/250/49_hm-sec-wds.png}} HM-LC-Sw1-Ba-PCB {{50 /config/img/devices/50/77_hm-lc-sw1-ba-pcb_thumb.png} {250 /config/img/devices/250/77_hm-lc-sw1-ba-pcb.png}} atent {{50 /config/img/devices/50/73_hm-atent_thumb.png} {250 /config/img/devices/250/73_hm-atent.png}} HM-Sen-MDIR-O-2 {{50 /config/img/devices/50/80_hm-sen-mdir-o_thumb.png} {250 /config/img/devices/250/80_hm-sen-mdir-o.png}} HM-CC-TC {{50 /config/img/devices/50/42_hm-cc-tc_thumb.png} {250 /config/img/devices/250/42_hm-cc-tc.png}} HM-LC-Dim1T-Pl {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-Sec-SCo {{50 /config/img/devices/50/98_hm-sec-sco_thumb.png} {250 /config/img/devices/250/98_hm-sec-sco.png}} HM-LC-Dim1T-Pl-644 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-ES-TX-WM {{50 /config/img/devices/50/102_hm-es-tx-wm_thumb.png} {250 /config/img/devices/250/102_hm-es-tx-wm.png}} HMW-IO-12-FM {{50 /config/img/devices/50/59_hmw-io-12-fm_thumb.png} {250 /config/img/devices/250/59_hmw-io-12-fm.png}} 263_149_/_263_150 {{50 /config/img/devices/50/hm_resc-win-pcb-sc_thumb.png} {250 /config/img/devices/250/hm_resc-win-pcb-sc.png}} HM-LC-Sw1-Pl-CT-R1 {{50 /config/img/devices/50/109_hm-lc-sw1-pl-ct_thump.png} {250 /config/img/devices/250/109_hm-lc-sw1-pl-ct.png}} HM-PBI-4-FM {{50 /config/img/devices/50/38_hm-pbi-4-fm_thumb.png} {250 /config/img/devices/250/38_hm-pbi-4-fm.png}} HM-CC-VD {{50 /config/img/devices/50/43_hm-cc-vd_thumb.png} {250 /config/img/devices/250/43_hm-cc-vd.png}} HM-RC-4-2 {{50 /config/img/devices/50/84_hm-rc-4-2_thumb.png} {250 /config/img/devices/250/84_hm-rc-4-2.png}} HM-Sec-SC {{50 /config/img/devices/50/16_hm-sec-sc_thumb.png} {250 /config/img/devices/250/16_hm-sec-sc.png}} HM-RC-4-3 {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/84_hm-rc-4-3.png}} HM-Sec-SD {{50 /config/img/devices/50/51_hm-sec-sd_thumb.png} {250 /config/img/devices/250/51_hm-sec-sd.png}} HMIP-PSM {{50 /config/img/devices/50/113_hmip-psm_thumb.png} {250 /config/img/devices/250/113_hmip-psm.png}} HM-ES-PMSw1-SM {{50 /config/img/devices/50/115_hm-es-pmsw1-sm_thumb.png} {250 /config/img/devices/250/115_hm-es-pmsw1-sm.png}} HM-Sen-MDIR-WM55 {{50 /config/img/devices/50/103_hm-sen-mdir-wm55_thumb.png} {250 /config/img/devices/250/103_hm-sen-mdir-wm55.png}} HM-LC-Sw4-PCB {{50 /config/img/devices/50/46_hm-lc-sw4-pcb_thumb.png} {250 /config/img/devices/250/46_hm-lc-sw4-pcb.png}} HMIP-PS {{50 /config/img/devices/50/113_hmip-psm_thumb.png} {250 /config/img/devices/250/113_hmip-psm.png}} HmIP-KRC4 {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/84_hm-rc-4-3.png}} HM-ES-PMSw1-Pl {{50 /config/img/devices/50/93_hm-es-pmsw1-pl_thumb.png} {250 /config/img/devices/250/93_hm-es-pmsw1-pl.png}} HM-LC-Dim1TPBU-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-PB-4Dis-WM-2 {{50 /config/img/devices/50/70_hm-pb-4dis-wm_thumb.png} {250 /config/img/devices/250/70_hm-pb-4dis-wm.png}} {ZEL STG RM FEP 230V} {{50 /config/img/devices/50/7_hm-lc-bl1-fm_thumb.png} {250 /config/img/devices/250/7_hm-lc-bl1-fm.png}} HM-RC-4-B {{50 /config/img/devices/50/18_hm-rc-4_thumb.png} {250 /config/img/devices/250/18_hm-rc-4.png}} HM-RC-12 {{50 /config/img/devices/50/19_hm-rc-12_thumb.png} {250 /config/img/devices/250/19_hm-rc-12.png}} HMIP-WRC2 {{50 /config/img/devices/50/112_hmip-wrc2_thumb.png} {250 /config/img/devices/250/112_hmip-wrc2.png}} OLIGO.smart.iq.HM {{50 /config/img/devices/50/123_oligo.smart.ip.hm_thumb.png} {250 /config/img/devices/250/123_oligo.smart.ip.hm.png}} HM-LC-Sw2-DR {{50 /config/img/devices/50/69_hm-lc-sw2-dr_thumb.png} {250 /config/img/devices/250/69_hm-lc-sw2-dr.png}} HM-LC-Dim1T-Pl-2 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HMW-Sen-SC-12-DR {{50 /config/img/devices/50/56_hmw-sen-sc-12-dr_thumb.png} {250 /config/img/devices/250/56_hmw-sen-sc-12-dr.png}} HM-RC-19 {{50 /config/img/devices/50/20_hm-rc-19_thumb.png} {250 /config/img/devices/250/20_hm-rc-19.png}} HM-MOD-EM-8 {{50 /config/img/devices/50/99_hm-mod-em-8_thumb.png} {250 /config/img/devices/250/99_hm-mod-em-8.png}} HM-LC-Dim1T-Pl-3 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-TC-IT-WM-W-EU {{50 /config/img/devices/50/96_hm-tc-it-wm-w-eu_thumb.png} {250 /config/img/devices/250/96_hm-tc-it-wm-w-eu.png}} HM-Sec-SD-2 {{50 /config/img/devices/50/104_hm-sec-sd-2_thumb.png} {250 /config/img/devices/250/104_hm-sec-sd-2.png}} HM-LC-Dim1T-CV-2 {{50 /config/img/devices/50/66_hm-lc-dim1t-cv_thumb.png} {250 /config/img/devices/250/66_hm-lc-dim1t-cv.png}} HM-RC-Sec4-2 {{50 /config/img/devices/50/86_hm-rc-sec4-2_thumb.png} {250 /config/img/devices/250/86_hm-rc-sec4-2.png}} {ZEL STG RM FSA} {{50 /config/img/devices/50/43_hm-cc-vd_thumb.png} {250 /config/img/devices/250/43_hm-cc-vd.png}} HM-RC-Sec4-3 {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/85_hm-rc-sec4-3.png}} HM-OU-CM-PCB {{50 /config/img/devices/50/92_hm-ou-cm-pcb_thumb.png} {250 /config/img/devices/250/92_hm-ou-cm-pcb.png}} HM-Sec-MDIR {{50 /config/img/devices/50/124_hm-sec-mdir_thumb.png} {250 /config/img/devices/250/124_hm-sec-mdir.png}} HM-Sec-WDS {{50 /config/img/devices/50/49_hm-sec-wds_thumb.png} {250 /config/img/devices/250/49_hm-sec-wds.png}} HMW-Sen-SC-12-FM {{50 /config/img/devices/50/58_hmw-sen-sc-12-fm_thumb.png} {250 /config/img/devices/250/58_hmw-sen-sc-12-fm.png}} HM-LC-Sw2-FM {{50 /config/img/devices/50/5_hm-lc-sw2-fm_thumb.png} {250 /config/img/devices/250/5_hm-lc-sw2-fm.png}} HM-CCU-1 {{50 /config/img/devices/50/24_hm-cen-3-1_thumb.png} {250 /config/img/devices/250/24_hm-cen-3-1.png}} HmIP-PSM {{50 /config/img/devices/50/113_hmip-psm_thumb.png} {250 /config/img/devices/250/113_hmip-psm.png}} HM-LC-Bl1-FM {{50 /config/img/devices/50/7_hm-lc-bl1-fm_thumb.png} {250 /config/img/devices/250/7_hm-lc-bl1-fm.png}} HM-RC-P1 {{50 /config/img/devices/50/21_hm-rc-p1_thumb.png} {250 /config/img/devices/250/21_hm-rc-p1.png}} HM-LC-Dim1L-Pl {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HmIP-PS {{50 /config/img/devices/50/113_hmip-psm_thumb.png} {250 /config/img/devices/250/113_hmip-psm.png}} HM-PB-2-WM55 {{50 /config/img/devices/50/75_hm-pb-2-wm55_thumb.png} {250 /config/img/devices/250/75_hm-pb-2-wm55.png}} {ZEL STG RM HS 4} {{50 /config/img/devices/50/18_hm-rc-4_thumb.png} {250 /config/img/devices/250/18_hm-rc-4.png}} HM-LC-Sw1-Pl-2 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Dim1L-Pl-644 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Sw1-Pl-3 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HMW-IO-12-Sw7-DR {{50 /config/img/devices/50/30_hmw-io-12-sw7-dr_thumb.png} {250 /config/img/devices/250/30_hmw-io-12-sw7-dr.png}} HM-WS550STH-I {{50 /config/img/devices/50/13_hm-ws550sth-i_thumb.png} {250 /config/img/devices/250/13_hm-ws550sth-i.png}} {ZEL STG RM WT 2} {{50 /config/img/devices/50/75_hm-pb-2-wm55_thumb.png} {250 /config/img/devices/250/75_hm-pb-2-wm55.png}} HM-Sen-MDIR-SM {{50 /config/img/devices/50/53_hm-sen-mdir-sm_thumb.png} {250 /config/img/devices/250/53_hm-sen-mdir-sm.png}} HM-WS550STH-O {{50 /config/img/devices/50/TH_CS_thumb.png} {250 /config/img/devices/250/TH_CS.png}} HmIP-WRC2 {{50 /config/img/devices/50/112_hmip-wrc2_thumb.png} {250 /config/img/devices/250/112_hmip-wrc2.png}} HMW-Sys-PS7-DR {{50 /config/img/devices/50/36_hmw-sys-ps7-dr_thumb.png} {250 /config/img/devices/250/36_hmw-sys-ps7-dr.png}} WS550 {{50 /config/img/devices/50/9_hm-ws550-us_thumb.png} {250 /config/img/devices/250/9_hm-ws550-us.png}} HM-Sen-Wa-Od {{50 /config/img/devices/50/82_hm-sen-wa-od_thumb.png} {250 /config/img/devices/250/82_hm-sen-wa-od.png}} HM-RC-Key3-B {{50 /config/img/devices/50/23_hm-rc-key3-b_thumb.png} {250 /config/img/devices/250/23_hm-rc-key3-b.png}} DEVICE {{50 /config/img/devices/50/unknown_device_thumb.png} {250 /config/img/devices/250/unknown_device.png}} HM-WDS30-OT2-SM {{50 /config/img/devices/50/IP65_G201_thumb.png} {250 /config/img/devices/250/IP65_G201.png}} HM-PB-2-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Bl1PBU-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Sw1-DR {{50 /config/img/devices/50/35_hmw-sys-tm-dr_thumb.png} {250 /config/img/devices/250/106_hm-lc-sw1-dr.png}} HMIP-eTRV {{50 /config/img/devices/50/120_hmip-etrv_thumb.png} {250 /config/img/devices/250/120_hmip-etrv.png}} HMIP-WTH {{50 /config/img/devices/50/121_hmip-wth_thumb.png} {250 /config/img/devices/250/121_hmip-wth.png}} HM-RC-2-PBU-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Sw1-Pl-OM54 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Sw4-WM-2 {{50 /config/img/devices/50/76_hm-lc-sw4-wm_thumb.png} {250 /config/img/devices/250/76_hm-lc-sw4-wm.png}} HM-Sec-MDIR-2 {{50 /config/img/devices/50/124_hm-sec-mdir_thumb.png} {250 /config/img/devices/250/124_hm-sec-mdir.png}} HM-Sec-MDIR-3 {{50 /config/img/devices/50/124_hm-sec-mdir_thumb.png} {250 /config/img/devices/250/124_hm-sec-mdir.png}} HMW-Sec-TR-FM {{50 /config/img/devices/50/33_hmw-sec-tr-fm_thumb.png} {250 /config/img/devices/250/33_hmw-sec-tr-fm.png}} HM-WDC7000 {{50 /config/img/devices/50/9_hm-ws550-us_thumb.png} {250 /config/img/devices/250/9_hm-ws550-us.png}} HM-OU-LED16 {{50 /config/img/devices/50/78_hm-ou-led16_thumb.png} {250 /config/img/devices/250/78_hm-ou-led16.png}} HM-LC-Sw4-SM {{50 /config/img/devices/50/3_hm-lc-sw4-sm_thumb.png} {250 /config/img/devices/250/3_hm-lc-sw4-sm.png}} HM-LC-Sw1-FM {{50 /config/img/devices/50/4_hm-lc-sw1-fm_thumb.png} {250 /config/img/devices/250/4_hm-lc-sw1-fm.png}} HM-LC-Sw2-PB-FM {{50 /config/img/devices/50/PushButton-4ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-4ch-wm.png}} WS888 {{50 /config/img/devices/50/9_hm-ws550-us_thumb.png} {250 /config/img/devices/250/9_hm-ws550-us.png}} HM-WS550-US {{50 /config/img/devices/50/9_hm-ws550-us_thumb.png} {250 /config/img/devices/250/9_hm-ws550-us.png}} HM-LC-Dim1PWM-CV {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/79_hm-lc-dim1pwm-cv.png}} HM-LC-Sw4-SM-ATmega168 {{50 /config/img/devices/50/3_hm-lc-sw4-sm_thumb.png} {250 /config/img/devices/250/3_hm-lc-sw4-sm.png}}}
-array set DEV_HIGHLIGHT   {HM-Dis-TD-T {} {ZEL STG RM FWT} {} HM-EM-CCM {} HMW-RCV-50 {{"RF_1" 4 0.364 0.048 0.028 0.028} {"RF_2" 6 0.4 0.052 0.544 0.004 0.016} {"RF_3" 6 0.4 0.052 0.6 0.052 0.016} {"RF_4" 6 0.4 0.052 0.544 0.104 0.016} {"RF_5" 6 0.168 0.052 0.344 0.052 0.016} {"RF_6" 6 0.168 0 0.344 0.052 0.016} {"RF_7" 6 0.168 0.104 0.344 0.052 0.016} {"RF" 5   'RF_1'  'RF_2'  'RF_3'  'RF_4'  'RF_5'  'RF_6'  'RF_7'  } { "S1"  3 0.25 0.15  '1'  0.3 'verdana' Font.BOLD} { "S2"  3 0.25 0.15  '2'  0.3 'verdana' Font.BOLD} { "S3"  3 0.25 0.15  '3'  0.3 'verdana' Font.BOLD} { "S4"  3 0.25 0.15  '4'  0.3 'verdana' Font.BOLD} { "S5"  3 0.25 0.15  '5'  0.3 'verdana' Font.BOLD} { "S6"  3 0.25 0.15  '6'  0.3 'verdana' Font.BOLD} { "S7"  3 0.25 0.15  '7'  0.3 'verdana' Font.BOLD} { "S8"  3 0.25 0.15  '8'  0.3 'verdana' Font.BOLD} { "S9"  3 0.25 0.15  '9'  0.3 'verdana' Font.BOLD} {"S10"  3 0.175 0.15 '10'  0.3 'verdana' Font.BOLD} {"S11"  3 0.175 0.15 '11'  0.3 'verdana' Font.BOLD} {"S12"  3 0.175 0.15 '12'  0.3 'verdana' Font.BOLD} {"S13"  3 0.175 0.15 '13'  0.3 'verdana' Font.BOLD} {"S14"  3 0.175 0.15 '14'  0.3 'verdana' Font.BOLD} {"S15"  3 0.175 0.15 '15'  0.3 'verdana' Font.BOLD} {"S16"  3 0.175 0.15 '16'  0.3 'verdana' Font.BOLD} {"S17"  3 0.175 0.15 '17'  0.3 'verdana' Font.BOLD} {"S18"  3 0.175 0.15 '18'  0.3 'verdana' Font.BOLD} {"S19"  3 0.175 0.15 '19'  0.3 'verdana' Font.BOLD} {"S20"  3 0.175 0.15 '20'  0.3 'verdana' Font.BOLD} {"S21"  3 0.175 0.15 '21'  0.3 'verdana' Font.BOLD} {"S22"  3 0.175 0.15 '22'  0.3 'verdana' Font.BOLD} {"S23"  3 0.175 0.15 '23'  0.3 'verdana' Font.BOLD} {"S24"  3 0.175 0.15 '24'  0.3 'verdana' Font.BOLD} {"S25"  3 0.175 0.15 '25'  0.3 'verdana' Font.BOLD} {"S26"  3 0.175 0.15 '26'  0.3 'verdana' Font.BOLD} {"S27"  3 0.175 0.15 '27'  0.3 'verdana' Font.BOLD} {"S28"  3 0.175 0.15 '28'  0.3 'verdana' Font.BOLD} {"S29"  3 0.175 0.15 '29'  0.3 'verdana' Font.BOLD} {"S30"  3 0.175 0.15 '30'  0.3 'verdana' Font.BOLD} {"S31"  3 0.175 0.15 '31'  0.3 'verdana' Font.BOLD} {"S32"  3 0.175 0.15 '32'  0.3 'verdana' Font.BOLD} {"S33"  3 0.175 0.15 '33'  0.3 'verdana' Font.BOLD} {"S34"  3 0.175 0.15 '34'  0.3 'verdana' Font.BOLD} {"S35"  3 0.175 0.15 '35'  0.3 'verdana' Font.BOLD} {"S36"  3 0.175 0.15 '36'  0.3 'verdana' Font.BOLD} {"S37"  3 0.175 0.15 '37'  0.3 'verdana' Font.BOLD} {"S38"  3 0.175 0.15 '38'  0.3 'verdana' Font.BOLD} {"S39"  3 0.175 0.15 '39'  0.3 'verdana' Font.BOLD} {"S40"  3 0.175 0.15 '40'  0.3 'verdana' Font.BOLD} {"S41"  3 0.175 0.15 '41'  0.3 'verdana' Font.BOLD} {"S42"  3 0.175 0.15 '42'  0.3 'verdana' Font.BOLD} {"S43"  3 0.175 0.15 '43'  0.3 'verdana' Font.BOLD} {"S44"  3 0.175 0.15 '44'  0.3 'verdana' Font.BOLD} {"S45"  3 0.175 0.15 '45'  0.3 'verdana' Font.BOLD} {"S46"  3 0.175 0.15 '46'  0.3 'verdana' Font.BOLD} {"S47"  3 0.175 0.15 '47'  0.3 'verdana' Font.BOLD} {"S48"  3 0.175 0.15 '48'  0.3 'verdana' Font.BOLD} {"S49"  3 0.175 0.15 '49'  0.3 'verdana' Font.BOLD} {"S50"  3 0.175 0.15 '50'  0.3 'verdana' Font.BOLD} {"1" 5 'S1' } {"2" 5 'S2' } {"3" 5 'S3' } {"4" 5 'S4' } {"5" 5 'S5' } {"6" 5 'S6' } {"7" 5 'S7' } {"8" 5 'S8' } {"9" 5 'S9' } {"10" 5 'S10' } {"11" 5 'S11' } {"12" 5 'S12' } {"13" 5 'S13' } {"14" 5 'S14' } {"15" 5 'S15' } {"16" 5 'S16' } {"17" 5 'S17' } {"18" 5 'S18' } {"19" 5 'S19' } {"20" 5 'S20' } {"21" 5 'S21' } {"22" 5 'S22' } {"23" 5 'S23' } {"24" 5 'S24' } {"25" 5 'S25' } {"26" 5 'S26' } {"27" 5 'S27' } {"28" 5 'S28' } {"29" 5 'S29' } {"30" 5 'S30' } {"31" 5 'S31' } {"32" 5 'S32' } {"33" 5 'S33' } {"34" 5 'S34' } {"35" 5 'S35' } {"36" 5 'S36' } {"37" 5 'S37' } {"38" 5 'S38' } {"39" 5 'S39' } {"40" 5 'S40' } {"41" 5 'S41' } {"42" 5 'S42' } {"43" 5 'S43' } {"44" 5 'S44' } {"45" 5 'S45' } {"46" 5 'S46' } {"47" 5 'S47' } {"48" 5 'S48' } {"49" 5 'S49' } {"50" 5 'S50' }} HM-LC-Sw4-Ba-PCB {{"1" 2 0.140 0.704 0.092 0.052} {"2" 2 0.328 0.704 0.092 0.052} {"3" 2 0.512 0.704 0.092 0.052} {"4" 2 0.688 0.704 0.092 0.052}} {ZEL STG RM FST UP4} {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.265 0.500 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.287 0.465 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.309 0.430 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' } {"4_Key" 3 0.18 0.216 '4' 0.14 'verdana' Font.BOLD} {"4_Kreis" 4 0.331 0.395 0.028 0.028} {"4" 5 '4_Key' '4_Kreis' }} HM-LC-Sw1-PB-FM {} HmIP-eTRV {} HmIP-WTH {} HM-RC-Key3 {{"1" 4 0.252 0.2 0.16 0.18} {"2" 4 0.492 0.2 0.16 0.18} {"3" 4 0.34 0.484 0.228 0.252} {"1+2" 5   '1'  '2' }} HM-OU-CFM-Pl {{"Light_circle" 4 0.688 0.224 0.118 0.112} {"Light_beam_1" 6 0.628 0.28 0.656 0.28 0.016} {"Light_beam_2" 6 0.656 0.2 0.68 0.22 0.016} {"Light_beam_3" 6 0.74 0.168 0.74 0.196 0.016} {"Light_beam_4" 6 0.82 0.196 0.8 0.216 0.016} {"Light_beam_5" 6 0.824 0.28 0.856 0.28 0.016} {"Light_beam_6" 6 0.68 0.34 0.664 0.36 0.016} {"Light_beam_7" 6 0.74 0.364 0.74 0.392 0.016} {"Light_beam_8" 6 0.8 0.34 0.82 0.36 0.016} {"1" 5 'Light_circle'  'Light_beam_1'  'Light_beam_2'  'Light_beam_3'  'Light_beam_4'  'Light_beam_5' 'Light_beam_6' 'Light_beam_7' 'Light_beam_8'  } {"SP_1" 6 0.644 0.676 0.672 0.676 0.016} {"SP_2" 6 0.672 0.676 0.672 0.816 0.016} {"SP_3" 6 0.644 0.816 0.672 0.816 0.016} {"SP_4" 6 0.644 0.676 0.644 0.816 0.016} {"SP_5" 6 0.672 0.676 0.716 0.632 0.016} {"SP_6" 6 0.716 0.632 0.716 0.86 0.016} {"SP_7" 6 0.672 0.816 0.716 0.86 0.016} {"SP_beam_1" 6 0.75 0.7 0.832 0.632 0.016} {"SP_beam_2" 6 0.75 0.748 0.832 0.748 0.016} {"SP_beam_3" 6 0.75 0.796 0.832 0.86 0.016} {"2" 5   'SP_1'  'SP_2'  'SP_3'  'SP_4'  'SP_5'  'SP_6'  'SP_7' 'SP_beam_1' 'SP_beam_2' 'SP_beam_3' }} HM-RC-Sec3 {{"1" 4 0.252 0.2 0.16 0.176} {"2" 4 0.492 0.2 0.16 0.176} {"3" 4 0.34 0.48 0.224 0.248} {"1+2" 5   '1'  '2' }} HM-LC-Dim1T-CV {} BRC-H {{"1" 4 0.196 0.222 0.162 0.164} {"2" 4 0.417 0.222 0.162 0.164} {"3" 4 0.196 0.482 0.162 0.164} {"4" 4 0.417 0.482 0.162 0.164}} HM-PB-4Dis-WM {{"2" 2 0.204 0.244 0.556 0.12} {"1" 2 0.204 0.68 0.556 0.12} {"4" 2 0.204 0.244 0.556 0.12} {"3" 2 0.204 0.68 0.556 0.12} {"6" 2 0.204 0.244 0.556 0.12} {"5" 2 0.204 0.68 0.556 0.12} {"8" 2 0.204 0.244 0.556 0.12} {"7" 2 0.204 0.68 0.556 0.12} {"10" 2 0.204 0.244 0.556 0.12} {"9" 2 0.204 0.68 0.556 0.12} {"12" 2 0.204 0.244 0.556 0.12} {"11" 2 0.204 0.68 0.556 0.12} {"14" 2 0.204 0.244 0.556 0.12} {"13" 2 0.204 0.68 0.556 0.12} {"16" 2 0.204 0.244 0.556 0.12} {"15" 2 0.204 0.68 0.556 0.12} {"18" 2 0.204 0.244 0.556 0.12} {"17" 2 0.204 0.68 0.556 0.12} {"20" 2 0.204 0.244 0.556 0.12} {"19" 2 0.204 0.68 0.556 0.12}} HM-CC-VG-1 {} HMIP-SWDO {} HM-WDS40-TH-I-2 {} {ZEL STG RM FZS} {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HMW-WSTH-SM {} HM-LC-Sw2-DR-2 {{"1" 4 0.095 0.556 0.045 0.04} {"2" 4 0.285 0.556 0.045 0.04}} HM-LC-Sw4-WM {{"Channel1" 2 0.208 0.766 0.065 0.060} {"Channel2" 2 0.276 0.766 0.065 0.060} {"Channel3" 2 0.344 0.766 0.065 0.060} {"Channel4" 2 0.412 0.766 0.065 0.060} {"1_val" 3 0.372 0.288 '1' 0.14 'verdana' Font.BOLD} {"2_val" 3 0.372 0.288 '2' 0.14 'verdana' Font.BOLD} {"3_val" 3 0.372 0.288 '3' 0.14 'verdana' Font.BOLD} {"4_val" 3 0.372 0.288 '4' 0.14 'verdana' Font.BOLD} {"Circle1" 4 0.534 0.762 0.044 0.044} {"Circle2" 4 0.583 0.762 0.044 0.044} {"Circle3" 4 0.637 0.762 0.044 0.044} {"Circle4" 4 0.693 0.762 0.044 0.044} {"1" 5   'Channel1'  '1_val' 'Circle1'} {"2" 5   'Channel2'  '2_val' 'Circle2'} {"3" 5   'Channel3'  '3_val' 'Circle3'} {"4" 5   'Channel4'  '4_val' 'Circle4'}} HM-ES-PMSw1-Pl-DN-R1 {} HM-ES-PMSw1-Pl-DN-R2 {} HM-OU-CFM-TW {{Light_circle 4 0.8079999999999999 0.656 0.118 0.112} {Light_beam_1 6 0.748 0.712 0.776 0.712 0.016} {Light_beam_2 6 0.776 0.632 0.8 0.652 0.016} {Light_beam_3 6 0.86 0.6 0.86 0.628 0.016} {Light_beam_4 6 0.94 0.628 0.92 0.648 0.016} {Light_beam_5 6 0.944 0.712 0.976 0.712 0.016} {Light_beam_6 6 0.8 0.772 0.784 0.792 0.016} {Light_beam_7 6 0.86 0.796 0.86 0.8240000000000001 0.016} {Light_beam_8 6 0.92 0.772 0.94 0.792 0.016} {"1" 5 'Light_circle'  'Light_beam_1'  'Light_beam_2'  'Light_beam_3'  'Light_beam_4'  'Light_beam_5' 'Light_beam_6' 'Light_beam_7' 'Light_beam_8'  } {SP_1 6 0.764 0.12 0.792 0.12 0.016} {SP_2 6 0.792 0.12 0.792 0.2599999999999999 0.016} {SP_3 6 0.764 0.2599999999999999 0.792 0.2599999999999999 0.016} {SP_4 6 0.764 0.12 0.764 0.2599999999999999 0.016} {SP_5 6 0.792 0.12 0.836 0.07599999999999996 0.016} {SP_6 6 0.836 0.07599999999999996 0.836 0.30399999999999994 0.016} {SP_7 6 0.792 0.2599999999999999 0.836 0.30399999999999994 0.016} {SP_beam_1 6 0.87 0.1439999999999999 0.952 0.07599999999999996 0.016} {SP_beam_2 6 0.87 0.19199999999999995 0.952 0.19199999999999995 0.016} {SP_beam_3 6 0.87 0.24 0.952 0.30399999999999994 0.016} {"2" 5   'SP_1'  'SP_2'  'SP_3'  'SP_4'  'SP_5'  'SP_6'  'SP_7' 'SP_beam_1' 'SP_beam_2' 'SP_beam_3' }} HM-Sec-SFA-SM {{"1_Taster" 4 0.348 0.388 0.08 0.08} {"1_Led" 4 0.372 0.304 0.036 0.036} {"1" 5 '1_Taster' '1_Led'} {"2_Taster" 4 0.552 0.388 0.08 0.08} {"2_Led" 4 0.576 0.304 0.036 0.036} {"2" 5 '2_Taster' '2_Led'}} HM-ES-PMSw1-Pl-DN-R3 {} HM-ES-PMSw1-Pl-DN-R4 {} HM-ES-PMSw1-Pl-DN-R5 {} HM-SwI-3-FM {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.220 0.480 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.265 0.405 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.310 0.33 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' }} HMW-WSE-SM {} HM-LC-Dim1T-FM {} HM-Sec-SD-Team {} HM-RC-Dis-H-x-EU {} HM-Sec-Key-O {} HM-RC-Key4-2 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"1_Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"2_Arrow" 7 '1_Arrow' 0.028 0.156} {"3_Arrow" 7 '1_Arrow' 0.028 0.312} {"4_Arrow" 7 '1_Arrow' 0.012 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-LC-RGBW-WM {{"1"   1 0.280 0.569 0.014} {"2"   1 0.280 0.645 0.014} {"3"   1 0.280 0.721 0.014}} HM-RC-Key4-3 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"1_Arrow" 7 'Arrow' 0.25 0.0} {"2_Arrow" 7 'Arrow' 0.238 0.156} {"3_Arrow" 7 'Arrow' 0.228 0.312} {"4_Arrow" 7 'Arrow' 0.212 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-WDS100-C6-O-2 {} HM-LC-Dim2L-SM-2 {{"1_Part1" 6 0.530 0.896 0.530 0.98 0.012} {"1_Part2" 6 0.530 0.98 0.49 0.916 0.012} {"1_Part3" 6 0.530 0.98 0.574 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.168 0} {"1_Key" 4 0.25 0.33 0.04 0.044} {"2_Key" 4 0.328 0.33 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-Sec-TiS {} HM-Sec-Key-S {} HM-Sys-sRP-Pl {} HM-LC-Bl1-FM-2 {} HM-OU-CF-Pl {{"Light_circle" 4 0.688 0.224 0.118 0.112} {"Light_beam_1" 6 0.628 0.28 0.656 0.28 0.016} {"Light_beam_2" 6 0.656 0.2 0.68 0.22 0.016} {"Light_beam_3" 6 0.74 0.168 0.74 0.196 0.016} {"Light_beam_4" 6 0.82 0.196 0.8 0.216 0.016} {"Light_beam_5" 6 0.824 0.28 0.856 0.28 0.016} {"Light_beam_6" 6 0.68 0.34 0.664 0.36 0.016} {"Light_beam_7" 6 0.74 0.364 0.74 0.392 0.016} {"Light_beam_8" 6 0.8 0.34 0.82 0.36 0.016} {"1" 5 'Light_circle'  'Light_beam_1'  'Light_beam_2'  'Light_beam_3'  'Light_beam_4'  'Light_beam_5' 'Light_beam_6' 'Light_beam_7' 'Light_beam_8'  } {"SP_1" 6 0.644 0.676 0.672 0.676 0.016} {"SP_2" 6 0.672 0.676 0.672 0.816 0.016} {"SP_3" 6 0.644 0.816 0.672 0.816 0.016} {"SP_4" 6 0.644 0.676 0.644 0.816 0.016} {"SP_5" 6 0.672 0.676 0.716 0.632 0.016} {"SP_6" 6 0.716 0.632 0.716 0.86 0.016} {"SP_7" 6 0.672 0.816 0.716 0.86 0.016} {"SP_beam_1" 6 0.75 0.7 0.832 0.632 0.016} {"SP_beam_2" 6 0.75 0.748 0.832 0.748 0.016} {"SP_beam_3" 6 0.75 0.796 0.832 0.86 0.016} {"2" 5   'SP_1'  'SP_2'  'SP_3'  'SP_4'  'SP_5'  'SP_6'  'SP_7' 'SP_beam_1' 'SP_beam_2' 'SP_beam_3' }} HMW-LC-Bl1-DR-2 {{"1" 2 0.452 0.772 0.044 0.06} {"2" 2 0.5 0.772 0.048 0.06} {"3" 2 0.452 0.388 0.096 0.06}} HM-LC-Bl1-SM-2 {} HM-SCI-3-FM {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.220 0.480 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.265 0.405 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.310 0.33 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' }} HM-LC-Dim1PWM-CV-2 {} HM-ES-PMSw1-DR {} HMW-LC-Sw2-DR {{"1" 2 0.448 0.764 0.048 0.064} {"2" 2 0.496 0.764 0.052 0.068} {"3" 2 0.232 0.384 0.104 0.068} {"4" 2 0.448 0.384 0.104 0.068}} HM-PB-4-WM {{"2" 2 0.24 0.312 0.204 0.168} {"1" 2 0.24 0.556 0.204 0.168} {"3" 2 0.46 0.556 0.204 0.168} {"4" 2 0.46 0.312 0.204 0.168} {"1+2" 2 0.24 0.312 0.204 0.412} {"3+4" 2 0.46 0.312 0.204 0.412}} HM-LC-Dim1T-CV-644 {} HMW-LC-Bl1-DR {{"1" 2 0.452 0.772 0.044 0.06} {"2" 2 0.5 0.772 0.048 0.06} {"3" 2 0.452 0.388 0.096 0.06}} HmIP-SWDO {} HM-Sec-Win {} HM-LC-Sw2-FM-2 {{"1_AUS" 2 0.34 0.66 0.068 0.148} {"1_EIN" 2 0.6 0.66 0.068 0.148} {"2_AUS" 2 0.256 0.66 0.068 0.148} {"2_EIN" 2 0.508 0.66 0.068 0.148} {"1" 5   '1_AUS'  '1_EIN'  } {"2" 5   '2_AUS'  '2_EIN'  }} HM-LC-Sw1-Pl-DN-R1 {} HM-LC-Sw1-Pl-DN-R2 {} HM-LC-Sw1-Pl-DN-R3 {} HM-LC-Dim2T-SM {{"1_Part1" 6 0.539 0.864 0.539 0.948 0.012} {"1_Part2" 6 0.539 0.948 0.49 0.884 0.012} {"1_Part3" 6 0.539 0.948 0.588 0.884 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.179 0} {"1_Key" 4 0.25 0.26 0.04 0.044} {"2_Key" 4 0.328 0.26 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-LC-Sw1-Pl-DN-R4 {} HM-LC-Sw1-Pl-DN-R5 {} HM-LC-Sw1-SM-ATmega168 {} HM-LC-Dim1TPBU-FM-2 {} HM-Sen-MDIR-O {} HM-RC-12-B {{"1" 2 0.252 0.412 0.044 0.072} {"3" 2 0.252 0.508 0.044 0.072} {"5" 2 0.252 0.604 0.044 0.072} {"7" 2 0.252 0.7 0.044 0.072} {"9" 2 0.252 0.8 0.044 0.072} {"10" 2 0.476 0.8 0.044 0.072} {"8" 2 0.476 0.7 0.044 0.072} {"6" 2 0.476 0.604 0.044 0.072} {"4" 2 0.476 0.508 0.044 0.072} {"2" 2 0.476 0.412 0.044 0.072} {"11" 2 0.62 0.8 0.068 0.064} {"12" 2 0.62 0.704 0.068 0.064} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  }} HM-LC-Bl1-SM {} HM-LC-Dim1L-CV {} {ZEL STG RM FDK} {} HM-Sen-RD-O {} HM-WDS30-T-O {} HM-CC-RT-DN {} HM-WS550ST-IO {} {ZEL STG RM FZS-2} {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-Sec-Key {} HM-Sec-SD-2-Team {} HM-RC-19-SW {{"1" 2 0.296 0.344 0.036 0.052} {"3" 2 0.296 0.416 0.036 0.052} {"5" 2 0.296 0.488 0.036 0.052} {"7" 2 0.296 0.56 0.036 0.052} {"9" 2 0.296 0.628 0.036 0.052} {"11" 2 0.296 0.704 0.036 0.048} {"13" 2 0.296 0.772 0.036 0.052} {"15" 2 0.296 0.844 0.036 0.052} {"2" 2 0.468 0.344 0.036 0.052} {"4" 2 0.468 0.416 0.036 0.052} {"6" 2 0.468 0.488 0.036 0.052} {"8" 2 0.468 0.56 0.036 0.052} {"10" 2 0.468 0.628 0.036 0.052} {"12" 2 0.468 0.704 0.036 0.048} {"14" 2 0.468 0.772 0.036 0.052} {"16" 2 0.468 0.844 0.036 0.052} {"17" 2 0.58 0.84 0.044 0.056} {"18" 2 0.312 0.188 0.168 0.088} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  } {"13+14" 5 '13'  '14'  } {"15+16" 5 '15'  '16'  }} KS550 {} HMW-IO-4-FM {{"1" 6 0.616 0.736 0.612 0.836 0.02} {"2" 6 0.672 0.736 0.668 0.836 0.02} {"3" 6 0.724 0.736 0.724 0.836 0.02} {"4" 6 0.78 0.736 0.78 0.836 0.02}} HM-LC-Sw4-PCB-2 {{"Channel1" 2 0.176 0.78 0.068 0.064} {"Channel2" 2 0.244 0.78 0.068 0.064} {"Channel3" 2 0.312 0.78 0.068 0.064} {"Channel4" 2 0.38 0.78 0.068 0.064} {"1_val" 3 0.372 0.288 '1' 0.14 'verdana' Font.BOLD} {"2_val" 3 0.372 0.288 '2' 0.14 'verdana' Font.BOLD} {"3_val" 3 0.372 0.288 '3' 0.14 'verdana' Font.BOLD} {"4_val" 3 0.372 0.288 '4' 0.14 'verdana' Font.BOLD} {"Circle1" 4 0.512 0.784 0.044 0.044} {"Circle2" 4 0.570 0.784 0.044 0.044} {"Circle3" 4 0.628 0.784 0.044 0.044} {"Circle4" 4 0.686 0.784 0.044 0.044} {"1" 5   'Channel1'  '1_val' 'Circle1'} {"2" 5   'Channel2'  '2_val' 'Circle2'} {"3" 5   'Channel3'  '3_val' 'Circle3'} {"4" 5   'Channel4'  '4_val' 'Circle4'}} HM-EM-CMM {} HM-LC-Dim2T-SM-644 {{"1_Part1" 6 0.539 0.864 0.539 0.948 0.012} {"1_Part2" 6 0.539 0.948 0.49 0.884 0.012} {"1_Part3" 6 0.539 0.948 0.588 0.884 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.179 0} {"1_Key" 4 0.25 0.26 0.04 0.044} {"2_Key" 4 0.328 0.26 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} {ZEL STG RM FFK} {} HM-Sec-RHS {} HMW-IO-12-Sw14-DR {{"1" 2 0.106 0.398 0.06 0.06} {"2" 2 0.230 0.398 0.06 0.06} {"3" 2 0.294 0.398 0.06 0.06} {"4" 2 0.422 0.398 0.06 0.06} {"5" 2 0.482 0.398 0.06 0.06} {"6" 2 0.602 0.398 0.06 0.06} {"7" 2 0.046 0.458 0.06 0.06} {"8" 2 0.106 0.458 0.06 0.06} {"9" 2 0.230 0.458 0.06 0.06} {"10" 2 0.294 0.458 0.06 0.06} {"11" 2 0.422 0.458 0.06 0.06} {"12" 2 0.482 0.458 0.06 0.06} {"13" 2 0.602 0.458 0.06 0.06} {"14" 2 0.666 0.458 0.06 0.06} {"15" 2 0.230 0.69 0.06 0.06} {"16" 2 0.294 0.69 0.06 0.06} {"17" 2 0.422 0.69 0.06 0.06} {"18" 2 0.482 0.69 0.06 0.06} {"19" 2 0.602 0.69 0.06 0.06} {"20" 2 0.666 0.69 0.06 0.06} {"21" 2 0.230 0.755 0.06 0.06} {"22" 2 0.294 0.755 0.06 0.06} {"23" 2 0.422 0.755 0.06 0.06} {"24" 2 0.482 0.755 0.06 0.06} {"25" 2 0.602 0.755 0.06 0.06} {"26" 2 0.666 0.755 0.06 0.06}} HM-MOD-Re-8 {} HM-WDS40-TH-I {} {263 167 Gruppe} {} {ZEL STG RM FSS UP3} {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.220 0.480 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.265 0.405 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.310 0.33 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' }} {263 130} {{"1_AUS" 2 0.288 0.66 0.068 0.152} {"1_EIN" 2 0.548 0.66 0.068 0.152} {"1" 5   '1_AUS'  '1_EIN'  }} HM-RC-4 {{"1" 4 0.268 0.236 0.16 0.164} {"2" 4 0.476 0.236 0.16 0.164} {"3" 4 0.268 0.48 0.16 0.164} {"4" 4 0.476 0.48 0.16 0.164} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4' }} {263 131} {{"1a" 2 0.244 0.312 0.428 0.168} {"1b" 2 0.244 0.56 0.428 0.168} {"1" 5 '1a' '1b'}} {263 132} {} {263 133} {} {263 134} {} {263 135} {{"2" 2 0.204 0.23 0.546 0.128} {"1" 2 0.204 0.65 0.546 0.128}} HM-RC-8 {{"1" 1 0.374 0.192 0.02} {"2" 1 0.537 0.248 0.02} {"3" 1 0.374 0.284 0.02} {"4" 1 0.537 0.340 0.02} {"5" 1 0.374 0.378 0.02} {"6" 1 0.537 0.434 0.02} {"7" 1 0.374 0.470 0.02} {"8" 1 0.537 0.526 0.02} {"1+2" 5 '1' '2'} {"3+4" 5 '3' '4'} {"5+6" 5 '5' '6'} {"7+8" 5 '7' '8'}} HM-Sen-DB-PCB {} HM-LC-Sw1-SM {} HM-LC-Sw4-DR-2 {{"1" 4 0.088 0.556 0.048 0.04} {"2" 4 0.280 0.556 0.048 0.04} {"3" 4 0.472 0.556 0.048 0.04} {"4" 4 0.656 0.556 0.048 0.04}} HM-LC-Dim1L-CV-644 {} HM-CC-SCD {} HMW-LC-Dim1L-DR {{"1" 2 0.312 0.756 0.056 0.06} {"2" 2 0.368 0.752 0.048 0.068} {"3" 2 0.368 0.388 0.048 0.064}} HM-LC-Sw1PBU-FM {{"1a" 2 0.244 0.312 0.428 0.168} {"1b" 2 0.244 0.56 0.428 0.168} {"1" 5 '1a' '1b'}} HM-LC-Sw1-Pl {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-LC-Dim2T-SM-2 {{"1_Part1" 6 0.539 0.864 0.539 0.948 0.012} {"1_Part2" 6 0.539 0.948 0.49 0.884 0.012} {"1_Part3" 6 0.539 0.948 0.588 0.884 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.179 0} {"1_Key" 4 0.25 0.26 0.04 0.044} {"2_Key" 4 0.328 0.26 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-LC-Dim2L-SM {{"1_Part1" 6 0.530 0.896 0.530 0.98 0.012} {"1_Part2" 6 0.530 0.98 0.49 0.916 0.012} {"1_Part3" 6 0.530 0.98 0.574 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.168 0} {"1_Key" 4 0.25 0.33 0.04 0.044} {"2_Key" 4 0.328 0.33 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-WDS100-C6-O {} {263 144} {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.220 0.480 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.265 0.405 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.310 0.33 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' }} HM-LC-DDC1-PCB {} {263 145} {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.265 0.500 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.287 0.465 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.309 0.430 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' } {"4_Key" 3 0.18 0.216 '4' 0.14 'verdana' Font.BOLD} {"4_Kreis" 4 0.331 0.395 0.028 0.028} {"4" 5 '4_Key' '4_Kreis' }} {263 146} {} {263 147} {{"1a" 2 0.244 0.312 0.428 0.168} {"1b" 2 0.244 0.56 0.428 0.168} {"1" 5 '1a' '1b'}} HM-LC-Sw4-DR {{"1" 4 0.088 0.556 0.048 0.04} {"2" 4 0.280 0.556 0.048 0.04} {"3" 4 0.472 0.556 0.048 0.04} {"4" 4 0.656 0.556 0.048 0.04}} HM-Sec-SC-2 {} HM-PB-6-WM55 {{"1" 2 0.164 0.232 0.112 0.156} {"2" 2 0.588 0.232 0.112 0.156} {"3" 2 0.164 0.428 0.112 0.156} {"4" 2 0.588 0.428 0.112 0.156} {"5" 2 0.164 0.616 0.112 0.156} {"6" 2 0.588 0.616 0.112 0.156} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  }} HM-LC-Dim1T-FM-2 {} HM-LC-Dim1L-Pl-2 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-PB-2-WM55-2 {{"2" 2 0.204 0.23 0.546 0.128} {"1" 2 0.204 0.65 0.546 0.128}} HM-RC-19-B {{"1" 2 0.296 0.344 0.036 0.052} {"3" 2 0.296 0.416 0.036 0.052} {"5" 2 0.296 0.488 0.036 0.052} {"7" 2 0.296 0.56 0.036 0.052} {"9" 2 0.296 0.628 0.036 0.052} {"11" 2 0.296 0.704 0.036 0.048} {"13" 2 0.296 0.772 0.036 0.052} {"15" 2 0.296 0.844 0.036 0.052} {"2" 2 0.468 0.344 0.036 0.052} {"4" 2 0.468 0.416 0.036 0.052} {"6" 2 0.468 0.488 0.036 0.052} {"8" 2 0.468 0.56 0.036 0.052} {"10" 2 0.468 0.628 0.036 0.052} {"12" 2 0.468 0.704 0.036 0.048} {"14" 2 0.468 0.772 0.036 0.052} {"16" 2 0.468 0.844 0.036 0.052} {"17" 2 0.58 0.84 0.044 0.056} {"18" 2 0.312 0.188 0.168 0.088} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  } {"13+14" 5 '13'  '14'  } {"15+16" 5 '15'  '16'  }} HM-LC-Dim1L-Pl-3 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} {263 155} {{"2" 2 0.204 0.244 0.556 0.12} {"1" 2 0.204 0.68 0.556 0.12} {"4" 2 0.204 0.244 0.556 0.12} {"3" 2 0.204 0.68 0.556 0.12} {"6" 2 0.204 0.244 0.556 0.12} {"5" 2 0.204 0.68 0.556 0.12} {"8" 2 0.204 0.244 0.556 0.12} {"7" 2 0.204 0.68 0.556 0.12} {"10" 2 0.204 0.244 0.556 0.12} {"9" 2 0.204 0.68 0.556 0.12} {"12" 2 0.204 0.244 0.556 0.12} {"11" 2 0.204 0.68 0.556 0.12} {"14" 2 0.204 0.244 0.556 0.12} {"13" 2 0.204 0.68 0.556 0.12} {"16" 2 0.204 0.244 0.556 0.12} {"15" 2 0.204 0.68 0.556 0.12} {"18" 2 0.204 0.244 0.556 0.12} {"17" 2 0.204 0.68 0.556 0.12} {"20" 2 0.204 0.244 0.556 0.12} {"19" 2 0.204 0.68 0.556 0.12}} HM-RCV-50 {{"RF_1" 4 0.364 0.048 0.028 0.028} {"RF_2" 6 0.4 0.052 0.544 0.004 0.016} {"RF_3" 6 0.4 0.052 0.6 0.052 0.016} {"RF_4" 6 0.4 0.052 0.544 0.104 0.016} {"RF_5" 6 0.168 0.052 0.344 0.052 0.016} {"RF_6" 6 0.168 0 0.344 0.052 0.016} {"RF_7" 6 0.168 0.104 0.344 0.052 0.016} {"RF" 5   'RF_1'  'RF_2'  'RF_3'  'RF_4'  'RF_5'  'RF_6'  'RF_7'  } { "S1"  3 0.25 0.15  '1'  0.3 'verdana' Font.BOLD} { "S2"  3 0.25 0.15  '2'  0.3 'verdana' Font.BOLD} { "S3"  3 0.25 0.15  '3'  0.3 'verdana' Font.BOLD} { "S4"  3 0.25 0.15  '4'  0.3 'verdana' Font.BOLD} { "S5"  3 0.25 0.15  '5'  0.3 'verdana' Font.BOLD} { "S6"  3 0.25 0.15  '6'  0.3 'verdana' Font.BOLD} { "S7"  3 0.25 0.15  '7'  0.3 'verdana' Font.BOLD} { "S8"  3 0.25 0.15  '8'  0.3 'verdana' Font.BOLD} { "S9"  3 0.25 0.15  '9'  0.3 'verdana' Font.BOLD} {"S10"  3 0.175 0.15 '10'  0.3 'verdana' Font.BOLD} {"S11"  3 0.175 0.15 '11'  0.3 'verdana' Font.BOLD} {"S12"  3 0.175 0.15 '12'  0.3 'verdana' Font.BOLD} {"S13"  3 0.175 0.15 '13'  0.3 'verdana' Font.BOLD} {"S14"  3 0.175 0.15 '14'  0.3 'verdana' Font.BOLD} {"S15"  3 0.175 0.15 '15'  0.3 'verdana' Font.BOLD} {"S16"  3 0.175 0.15 '16'  0.3 'verdana' Font.BOLD} {"S17"  3 0.175 0.15 '17'  0.3 'verdana' Font.BOLD} {"S18"  3 0.175 0.15 '18'  0.3 'verdana' Font.BOLD} {"S19"  3 0.175 0.15 '19'  0.3 'verdana' Font.BOLD} {"S20"  3 0.175 0.15 '20'  0.3 'verdana' Font.BOLD} {"S21"  3 0.175 0.15 '21'  0.3 'verdana' Font.BOLD} {"S22"  3 0.175 0.15 '22'  0.3 'verdana' Font.BOLD} {"S23"  3 0.175 0.15 '23'  0.3 'verdana' Font.BOLD} {"S24"  3 0.175 0.15 '24'  0.3 'verdana' Font.BOLD} {"S25"  3 0.175 0.15 '25'  0.3 'verdana' Font.BOLD} {"S26"  3 0.175 0.15 '26'  0.3 'verdana' Font.BOLD} {"S27"  3 0.175 0.15 '27'  0.3 'verdana' Font.BOLD} {"S28"  3 0.175 0.15 '28'  0.3 'verdana' Font.BOLD} {"S29"  3 0.175 0.15 '29'  0.3 'verdana' Font.BOLD} {"S30"  3 0.175 0.15 '30'  0.3 'verdana' Font.BOLD} {"S31"  3 0.175 0.15 '31'  0.3 'verdana' Font.BOLD} {"S32"  3 0.175 0.15 '32'  0.3 'verdana' Font.BOLD} {"S33"  3 0.175 0.15 '33'  0.3 'verdana' Font.BOLD} {"S34"  3 0.175 0.15 '34'  0.3 'verdana' Font.BOLD} {"S35"  3 0.175 0.15 '35'  0.3 'verdana' Font.BOLD} {"S36"  3 0.175 0.15 '36'  0.3 'verdana' Font.BOLD} {"S37"  3 0.175 0.15 '37'  0.3 'verdana' Font.BOLD} {"S38"  3 0.175 0.15 '38'  0.3 'verdana' Font.BOLD} {"S39"  3 0.175 0.15 '39'  0.3 'verdana' Font.BOLD} {"S40"  3 0.175 0.15 '40'  0.3 'verdana' Font.BOLD} {"S41"  3 0.175 0.15 '41'  0.3 'verdana' Font.BOLD} {"S42"  3 0.175 0.15 '42'  0.3 'verdana' Font.BOLD} {"S43"  3 0.175 0.15 '43'  0.3 'verdana' Font.BOLD} {"S44"  3 0.175 0.15 '44'  0.3 'verdana' Font.BOLD} {"S45"  3 0.175 0.15 '45'  0.3 'verdana' Font.BOLD} {"S46"  3 0.175 0.15 '46'  0.3 'verdana' Font.BOLD} {"S47"  3 0.175 0.15 '47'  0.3 'verdana' Font.BOLD} {"S48"  3 0.175 0.15 '48'  0.3 'verdana' Font.BOLD} {"S49"  3 0.175 0.15 '49'  0.3 'verdana' Font.BOLD} {"S50"  3 0.175 0.15 '50'  0.3 'verdana' Font.BOLD} {"1" 5 'S1' } {"2" 5 'S2' } {"3" 5 'S3' } {"4" 5 'S4' } {"5" 5 'S5' } {"6" 5 'S6' } {"7" 5 'S7' } {"8" 5 'S8' } {"9" 5 'S9' } {"10" 5 'S10' } {"11" 5 'S11' } {"12" 5 'S12' } {"13" 5 'S13' } {"14" 5 'S14' } {"15" 5 'S15' } {"16" 5 'S16' } {"17" 5 'S17' } {"18" 5 'S18' } {"19" 5 'S19' } {"20" 5 'S20' } {"21" 5 'S21' } {"22" 5 'S22' } {"23" 5 'S23' } {"24" 5 'S24' } {"25" 5 'S25' } {"26" 5 'S26' } {"27" 5 'S27' } {"28" 5 'S28' } {"29" 5 'S29' } {"30" 5 'S30' } {"31" 5 'S31' } {"32" 5 'S32' } {"33" 5 'S33' } {"34" 5 'S34' } {"35" 5 'S35' } {"36" 5 'S36' } {"37" 5 'S37' } {"38" 5 'S38' } {"39" 5 'S39' } {"40" 5 'S40' } {"41" 5 'S41' } {"42" 5 'S42' } {"43" 5 'S43' } {"44" 5 'S44' } {"45" 5 'S45' } {"46" 5 'S46' } {"47" 5 'S47' } {"48" 5 'S48' } {"49" 5 'S49' } {"50" 5 'S50' }} {263 157} {} {263 158} {} {263 160} {} HM-LC-Dim1L-CV-2 {} HM-LC-Bl1-PB-FM {} HM-PB-2-WM {{"2" 2 0.244 0.312 0.428 0.168} {"1" 2 0.244 0.56 0.428 0.168} {"1+2" 2 0.244 0.308 0.428 0.416}} {263 162} {} HM-LC-Dim1T-FM-644 {} {263 167} {} HM-RC-Sec3-B {{"1" 4 0.252 0.2 0.16 0.176} {"2" 4 0.492 0.2 0.16 0.176} {"3" 4 0.34 0.48 0.224 0.248} {"1+2" 5   '1'  '2' }} HM-RC-4-3-D {} HM-LC-Dim1T-FM-LF {} HM-Dis-WM55 {} HM-LC-Sw4-SM-2 {{"1_Part1" 6 0.136 0.896 0.136 0.98 0.012} {"1_Part2" 6 0.136 0.98 0.096 0.916 0.012} {"1_Part3" 6 0.136 0.98 0.176 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.164 0} {"3_Arrow" 7 '1_Arrow' 0.328 0} {"4_Arrow" 7 '1_Arrow' 0.492 0} {"1_Key" 4 0.244 0.372 0.04 0.044} {"2_Key" 4 0.328 0.372 0.04 0.044} {"3_Key" 4 0.404 0.372 0.04 0.044} {"4_Key" 4 0.484 0.372 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  } {"3" 5   '3_Arrow'  '3_Key'  } {"4" 5   '4_Arrow'  '4_Key'  }} HM-LC-Sw1-FM-2 {{"1_AUS" 2 0.288 0.66 0.068 0.152} {"1_EIN" 2 0.548 0.66 0.068 0.152} {"1" 5   '1_AUS'  '1_EIN'  }} {ZEL STG RM DWT 10} {{"2" 2 0.204 0.244 0.556 0.12} {"1" 2 0.204 0.68 0.556 0.12} {"4" 2 0.204 0.244 0.556 0.12} {"3" 2 0.204 0.68 0.556 0.12} {"6" 2 0.204 0.244 0.556 0.12} {"5" 2 0.204 0.68 0.556 0.12} {"8" 2 0.204 0.244 0.556 0.12} {"7" 2 0.204 0.68 0.556 0.12} {"10" 2 0.204 0.244 0.556 0.12} {"9" 2 0.204 0.68 0.556 0.12} {"12" 2 0.204 0.244 0.556 0.12} {"11" 2 0.204 0.68 0.556 0.12} {"14" 2 0.204 0.244 0.556 0.12} {"13" 2 0.204 0.68 0.556 0.12} {"16" 2 0.204 0.244 0.556 0.12} {"15" 2 0.204 0.68 0.556 0.12} {"18" 2 0.204 0.244 0.556 0.12} {"17" 2 0.204 0.68 0.556 0.12} {"20" 2 0.204 0.244 0.556 0.12} {"19" 2 0.204 0.68 0.556 0.12}} HM-Sen-EP {{"1_rect" 2 0.14 0.612 0.086 0.05} {"2_rect" 2 0.14 0.740 0.086 0.05} {"1_channel" 3 0.44 0.232 '1' 0.18 'verdana' Font.BOLD} {"1" 5 '1_channel' '1_rect'} {"2_channel" 3 0.44 0.232 '2' 0.18 'verdana' Font.BOLD} {"2" 5 '2_channel' '2_rect'}} HmIP-eTRV-2 {} HM-LC-Sw1-SM-2 {} HM-WDS10-TH-O {} HM-LC-Dim2L-SM-644 {{"1_Part1" 6 0.530 0.896 0.530 0.98 0.012} {"1_Part2" 6 0.530 0.98 0.49 0.916 0.012} {"1_Part3" 6 0.530 0.98 0.574 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.168 0} {"1_Key" 4 0.25 0.33 0.04 0.044} {"2_Key" 4 0.328 0.33 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-Sec-WDS-2 {} HM-LC-Sw1-Ba-PCB {} atent {{"1" 4 0.177 0.216 0.166 0.166} {"2" 4 0.438 0.216 0.166 0.166} {"3" 4 0.273 0.49 0.24 0.235} {"1+2" 5   '1'  '2' }} HM-Sen-MDIR-O-2 {} HM-CC-TC {} HM-LC-Dim1T-Pl {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-Sec-SCo {} HM-LC-Dim1T-Pl-644 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-ES-TX-WM {} HMW-IO-12-FM {{"1_num" 3 0.744 0.636 '1' 0.164 'verdana' Font.BOLD} {"1_line" 6 0.77 0.08 0.860  0.08 0.016} {"1" 5 '1_num' '1_line'} {"2_num" 3 0.744 0.636 '2' 0.164 'verdana' Font.BOLD} {"2_line" 6 0.77 0.136  0.86 0.136 0.016} {"2" 5 '2_num' '2_line'} {"3_num" 3 0.744 0.636 '3' 0.164 'verdana' Font.BOLD} {"3_line" 6 0.77 0.194  0.86 0.194 0.016} {"3" 5 '3_num' '3_line'} {"4_num" 3 0.744 0.636 '4' 0.164 'verdana' Font.BOLD} {"4_line" 6 0.77 0.25  0.86 0.25 0.016} {"4" 5 '4_num' '4_line'} {"5_num" 3 0.744 0.636 '5' 0.164 'verdana' Font.BOLD} {"5_line" 6 0.77 0.308  0.86 0.308 0.016} {"5" 5 '5_num' '5_line'} {"6_num" 3 0.744 0.636 '6' 0.164 'verdana' Font.BOLD} {"6_line" 6 0.77 0.366  0.86 0.366 0.016} {"6" 5 '6_num' '6_line'} {"7_num" 3 0.744 0.636 '7' 0.164 'verdana' Font.BOLD} {"7_line" 6 0.77 0.424  0.86 0.424 0.016} {"7" 5 '7_num' '7_line'} {"8_num" 3 0.744 0.636 '8' 0.164 'verdana' Font.BOLD} {"8_arc" 4 0.370 0.748  0.036  0.036 0.036} {"8" 5 '8_num' '8_arc'} {"9_num" 3 0.744 0.636 '9' 0.164 'verdana' Font.BOLD} {"9_arc" 4 0.3895 0.704  0.036  0.036 0.036} {"9" 5 '9_num' '9_arc'} {"10_num" 3 0.744 0.636 '10' 0.164 'verdana' Font.BOLD} {"10_arc" 4 0.41 0.65  0.035  0.036 0.036} {"10" 5 '10_num' '10_arc'} {"11_num" 3 0.744 0.636 '11' 0.164 'verdana' Font.BOLD} {"11_arc" 4 0.4293 0.612  0.036  0.036 0.036} {"11" 5 '11_num' '11_arc'} {"12_num" 3 0.744 0.636 '12' 0.164 'verdana' Font.BOLD} {"12_arc" 4 0.448 0.564  0.036  0.036 0.036} {"12" 5 '12_num' '12_arc'}} 263_149_/_263_150 {} HM-LC-Sw1-Pl-CT-R1 {} HM-PBI-4-FM {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.265 0.500 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.287 0.465 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.309 0.430 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' } {"4_Key" 3 0.18 0.216 '4' 0.14 'verdana' Font.BOLD} {"4_Kreis" 4 0.331 0.395 0.028 0.028} {"4" 5 '4_Key' '4_Kreis' }} HM-CC-VD {} HM-RC-4-2 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"1_Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"2_Arrow" 7 '1_Arrow' 0.028 0.156} {"3_Arrow" 7 '1_Arrow' 0.028 0.312} {"4_Arrow" 7 '1_Arrow' 0.012 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-Sec-SC {} HM-RC-4-3 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"1_Arrow" 7 'Arrow' 0.25 0.0} {"2_Arrow" 7 'Arrow' 0.238 0.156} {"3_Arrow" 7 'Arrow' 0.228 0.312} {"4_Arrow" 7 'Arrow' 0.212 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-Sec-SD {} HMIP-PSM {} HM-ES-PMSw1-SM {} HM-Sen-MDIR-WM55 {{"1" 2 0.192 0.660 0.524 0.12} {"2" 2 0.192 0.252 0.524 0.12} {"1+2" 5   '1'  '2' }} HM-LC-Sw4-PCB {{"Channel1" 2 0.176 0.78 0.068 0.064} {"Channel2" 2 0.244 0.78 0.068 0.064} {"Channel3" 2 0.312 0.78 0.068 0.064} {"Channel4" 2 0.38 0.78 0.068 0.064} {"1_val" 3 0.372 0.288 '1' 0.14 'verdana' Font.BOLD} {"2_val" 3 0.372 0.288 '2' 0.14 'verdana' Font.BOLD} {"3_val" 3 0.372 0.288 '3' 0.14 'verdana' Font.BOLD} {"4_val" 3 0.372 0.288 '4' 0.14 'verdana' Font.BOLD} {"Circle1" 4 0.512 0.784 0.044 0.044} {"Circle2" 4 0.570 0.784 0.044 0.044} {"Circle3" 4 0.628 0.784 0.044 0.044} {"Circle4" 4 0.686 0.784 0.044 0.044} {"1" 5   'Channel1'  '1_val' 'Circle1'} {"2" 5   'Channel2'  '2_val' 'Circle2'} {"3" 5   'Channel3'  '3_val' 'Circle3'} {"4" 5   'Channel4'  '4_val' 'Circle4'}} HMIP-PS {} HmIP-KRC4 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"1_Arrow" 7 'Arrow' 0.25 0.0} {"2_Arrow" 7 'Arrow' 0.238 0.156} {"3_Arrow" 7 'Arrow' 0.228 0.312} {"4_Arrow" 7 'Arrow' 0.212 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-ES-PMSw1-Pl {} HM-LC-Dim1TPBU-FM {} HM-PB-4Dis-WM-2 {{"2" 2 0.204 0.244 0.556 0.12} {"1" 2 0.204 0.68 0.556 0.12} {"4" 2 0.204 0.244 0.556 0.12} {"3" 2 0.204 0.68 0.556 0.12} {"6" 2 0.204 0.244 0.556 0.12} {"5" 2 0.204 0.68 0.556 0.12} {"8" 2 0.204 0.244 0.556 0.12} {"7" 2 0.204 0.68 0.556 0.12} {"10" 2 0.204 0.244 0.556 0.12} {"9" 2 0.204 0.68 0.556 0.12} {"12" 2 0.204 0.244 0.556 0.12} {"11" 2 0.204 0.68 0.556 0.12} {"14" 2 0.204 0.244 0.556 0.12} {"13" 2 0.204 0.68 0.556 0.12} {"16" 2 0.204 0.244 0.556 0.12} {"15" 2 0.204 0.68 0.556 0.12} {"18" 2 0.204 0.244 0.556 0.12} {"17" 2 0.204 0.68 0.556 0.12} {"20" 2 0.204 0.244 0.556 0.12} {"19" 2 0.204 0.68 0.556 0.12}} {ZEL STG RM FEP 230V} {} HM-RC-4-B {{"1" 4 0.268 0.236 0.16 0.164} {"2" 4 0.476 0.236 0.16 0.164} {"3" 4 0.268 0.48 0.16 0.164} {"4" 4 0.476 0.48 0.16 0.164} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4' }} HM-RC-12 {{"1" 2 0.252 0.412 0.044 0.072} {"3" 2 0.252 0.508 0.044 0.072} {"5" 2 0.252 0.604 0.044 0.072} {"7" 2 0.252 0.7 0.044 0.072} {"9" 2 0.252 0.8 0.044 0.072} {"10" 2 0.476 0.8 0.044 0.072} {"8" 2 0.476 0.7 0.044 0.072} {"6" 2 0.476 0.604 0.044 0.072} {"4" 2 0.476 0.508 0.044 0.072} {"2" 2 0.476 0.412 0.044 0.072} {"11" 2 0.62 0.8 0.068 0.064} {"12" 2 0.62 0.704 0.068 0.064} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  }} HMIP-WRC2 {{"2" 4 0.540 0.366 0.04 0.044} {"1" 4 0.540 0.622 0.04 0.044}} OLIGO.smart.iq.HM {} HM-LC-Sw2-DR {{"1" 4 0.095 0.556 0.045 0.04} {"2" 4 0.285 0.556 0.045 0.04}} HM-LC-Dim1T-Pl-2 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HMW-Sen-SC-12-DR {{"1" 2 0.244 0.688 0.06 0.06} {"2" 2 0.304 0.688 0.06 0.06} {"3" 2 0.436 0.688 0.06 0.06} {"4" 2 0.496 0.688 0.06 0.06} {"5" 2 0.62 0.688 0.06 0.06} {"6" 2 0.68 0.688 0.06 0.06} {"7" 2 0.244 0.752 0.06 0.06} {"8" 2 0.304 0.752 0.06 0.06} {"9" 2 0.436 0.752 0.06 0.06} {"10" 2 0.496 0.752 0.06 0.06} {"11" 2 0.62 0.752 0.06 0.06} {"12" 2 0.68 0.752 0.06 0.06}} HM-RC-19 {{"1" 2 0.296 0.344 0.036 0.052} {"3" 2 0.296 0.416 0.036 0.052} {"5" 2 0.296 0.488 0.036 0.052} {"7" 2 0.296 0.56 0.036 0.052} {"9" 2 0.296 0.628 0.036 0.052} {"11" 2 0.296 0.704 0.036 0.048} {"13" 2 0.296 0.772 0.036 0.052} {"15" 2 0.296 0.844 0.036 0.052} {"2" 2 0.468 0.344 0.036 0.052} {"4" 2 0.468 0.416 0.036 0.052} {"6" 2 0.468 0.488 0.036 0.052} {"8" 2 0.468 0.56 0.036 0.052} {"10" 2 0.468 0.628 0.036 0.052} {"12" 2 0.468 0.704 0.036 0.048} {"14" 2 0.468 0.772 0.036 0.052} {"16" 2 0.468 0.844 0.036 0.052} {"17" 2 0.58 0.84 0.044 0.056} {"18" 2 0.312 0.188 0.168 0.088} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  } {"13+14" 5 '13'  '14'  } {"15+16" 5 '15'  '16'  }} HM-MOD-EM-8 {} HM-LC-Dim1T-Pl-3 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-TC-IT-WM-W-EU {} HM-Sec-SD-2 {} HM-LC-Dim1T-CV-2 {} HM-RC-Sec4-2 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"1_Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"2_Arrow" 7 '1_Arrow' 0.028 0.156} {"3_Arrow" 7 '1_Arrow' 0.028 0.312} {"4_Arrow" 7 '1_Arrow' 0.012 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} {ZEL STG RM FSA} {} HM-RC-Sec4-3 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"1_Arrow" 7 'Arrow' 0.25 0.0} {"2_Arrow" 7 'Arrow' 0.238 0.156} {"3_Arrow" 7 'Arrow' 0.228 0.312} {"4_Arrow" 7 'Arrow' 0.212 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-OU-CM-PCB {} HM-Sec-MDIR {} HM-Sec-WDS {} HMW-Sen-SC-12-FM {{"1_num" 3 0.744 0.636 '1' 0.164 'verdana' Font.BOLD} {"1_line" 6 0.77 0.055 0.860  0.055 0.016} {"1" 5 '1_num' '1_line'} {"2_num" 3 0.744 0.636 '2' 0.164 'verdana' Font.BOLD} {"2_line" 6 0.77 0.115  0.86 0.115 0.016} {"2" 5 '2_num' '2_line'} {"3_num" 3 0.744 0.636 '3' 0.164 'verdana' Font.BOLD} {"3_line" 6 0.77 0.173  0.86 0.173 0.016} {"3" 5 '3_num' '3_line'} {"4_num" 3 0.744 0.636 '4' 0.164 'verdana' Font.BOLD} {"4_line" 6 0.77 0.226  0.86 0.226 0.016} {"4" 5 '4_num' '4_line'} {"5_num" 3 0.744 0.636 '5' 0.164 'verdana' Font.BOLD} {"5_line" 6 0.77 0.288  0.86 0.288 0.016} {"5" 5 '5_num' '5_line'} {"6_num" 3 0.744 0.636 '6' 0.164 'verdana' Font.BOLD} {"6_line" 6 0.77 0.348  0.86 0.348 0.016} {"6" 5 '6_num' '6_line'} {"7_num" 3 0.744 0.636 '7' 0.164 'verdana' Font.BOLD} {"7_line" 6 0.77 0.403  0.86 0.403 0.016} {"7" 5 '7_num' '7_line'} {"8_num" 3 0.744 0.636 '8' 0.164 'verdana' Font.BOLD} {"8_arc" 4 0.370 0.730  0.036  0.036 0.036} {"8" 5 '8_num' '8_arc'} {"9_num" 3 0.744 0.636 '9' 0.164 'verdana' Font.BOLD} {"9_arc" 4 0.3895 0.685  0.036  0.036 0.0368} {"9" 5 '9_num' '9_arc'} {"10_num" 3 0.744 0.636 '10' 0.164 'verdana' Font.BOLD} {"10_arc" 4 0.41 0.64  0.036  0.036 0.036} {"10" 5 '10_num' '10_arc'} {"11_num" 3 0.744 0.636 '11' 0.164 'verdana' Font.BOLD} {"11_arc" 4 0.43 0.589  0.036  0.036 0.036} {"11" 5 '11_num' '11_arc'} {"12_num" 3 0.744 0.636 '12' 0.164 'verdana' Font.BOLD} {"12_arc" 4 0.45 0.542  0.036  0.036 0.036} {"12" 5 '12_num' '12_arc'}} HM-LC-Sw2-FM {{"1_AUS" 2 0.34 0.66 0.068 0.148} {"1_EIN" 2 0.6 0.66 0.068 0.148} {"2_AUS" 2 0.256 0.66 0.068 0.148} {"2_EIN" 2 0.508 0.66 0.068 0.148} {"1" 5   '1_AUS'  '1_EIN'  } {"2" 5   '2_AUS'  '2_EIN'  }} HM-CCU-1 {} HmIP-PSM {} HM-LC-Bl1-FM {} HM-RC-P1 {{"1" 4 0.26 0.248 0.38 0.42}} HM-LC-Dim1L-Pl {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HmIP-PS {} HM-PB-2-WM55 {{"2" 2 0.204 0.23 0.546 0.128} {"1" 2 0.204 0.65 0.546 0.128}} {ZEL STG RM HS 4} {{"1" 4 0.268 0.236 0.16 0.164} {"2" 4 0.476 0.236 0.16 0.164} {"3" 4 0.268 0.48 0.16 0.164} {"4" 4 0.476 0.48 0.16 0.164} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4' }} HM-LC-Sw1-Pl-2 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-LC-Dim1L-Pl-644 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-LC-Sw1-Pl-3 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HMW-IO-12-Sw7-DR {{"1" 2 0.264 0.7 0.06 0.06} {"2" 2 0.328 0.7 0.06 0.06} {"3" 2 0.46 0.7 0.06 0.06} {"4" 2 0.524 0.7 0.06 0.06} {"5" 2 0.648 0.7 0.06 0.06} {"6" 2 0.708 0.7 0.06 0.06} {"8" 2 0.328 0.764 0.06 0.06} {"7" 2 0.264 0.764 0.06 0.06} {"9" 2 0.46 0.764 0.06 0.06} {"10" 2 0.524 0.764 0.06 0.06} {"11" 2 0.644 0.764 0.06 0.06} {"12" 2 0.708 0.764 0.06 0.06} {"13" 2 0.268 0.396 0.12 0.06} {"14" 2 0.46 0.396 0.12 0.06} {"15" 2 0.648 0.396 0.12 0.06} {"16" 2 0.076 0.46 0.12 0.06} {"17" 2 0.264 0.46 0.12 0.06} {"18" 2 0.46 0.46 0.12 0.06} {"19" 2 0.648 0.46 0.12 0.06}} HM-WS550STH-I {} {ZEL STG RM WT 2} {{"2" 2 0.204 0.23 0.546 0.128} {"1" 2 0.204 0.65 0.546 0.128}} HM-Sen-MDIR-SM {} HM-WS550STH-O {} HmIP-WRC2 {{"2" 4 0.540 0.366 0.04 0.044} {"1" 4 0.540 0.622 0.04 0.044}} HMW-Sys-PS7-DR {} WS550 {{"1" 3 0.440 0.200 '1' 0.124 'verdana' Font.BOLD} {"2" 3 0.440 0.200 '2' 0.124 'verdana' Font.BOLD} {"3" 3 0.440 0.200 '3' 0.124 'verdana' Font.BOLD} {"4" 3 0.440 0.200 '4' 0.124 'verdana' Font.BOLD} {"5" 3 0.440 0.200 '5' 0.124 'verdana' Font.BOLD} {"6" 3 0.440 0.200 '6' 0.124 'verdana' Font.BOLD} {"7" 3 0.440 0.200 '7' 0.124 'verdana' Font.BOLD} {"8" 3 0.440 0.200 '8' 0.124 'verdana' Font.BOLD} {"9" 3 0.440 0.200 '9' 0.124 'verdana' Font.BOLD} {"10" 3 0.405 0.200 '10' 0.124 'verdana' Font.BOLD}} HM-Sen-Wa-Od {} HM-RC-Key3-B {{"1" 4 0.252 0.2 0.16 0.18} {"2" 4 0.492 0.2 0.16 0.18} {"3" 4 0.34 0.484 0.228 0.252} {"1+2" 5   '1'  '2' }} DEVICE {{"Icon" 3 0.092 0.6 'Icon_folgt' 0.14 'verdana' Font.BOLD} {"1_channel" 3 0.44 0.232 '1' 0.18 'verdana' Font.BOLD} {"1" 5 '1_channel' 'Icon'} {"2_channel" 3 0.44 0.232 '2' 0.18 'verdana' Font.BOLD} {"2" 5 '2_channel' 'Icon'}} HM-WDS30-OT2-SM {} HM-PB-2-FM {{"2" 2 0.244 0.312 0.428 0.168} {"1" 2 0.244 0.56 0.428 0.168} {"1+2" 2 0.244 0.308 0.428 0.416}} HM-LC-Bl1PBU-FM {{"1a" 2 0.244 0.312 0.428 0.168} {"1b" 2 0.244 0.56 0.428 0.168} {"1" 5 '1a' '1b'}} HM-LC-Sw1-DR {} HMIP-eTRV {} HMIP-WTH {} HM-RC-2-PBU-FM {{"2" 2 0.244 0.312 0.428 0.168} {"1" 2 0.244 0.56 0.428 0.168} {"1+2" 2 0.244 0.308 0.428 0.416}} HM-LC-Sw1-Pl-OM54 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-LC-Sw4-WM-2 {{"Channel1" 2 0.208 0.766 0.065 0.060} {"Channel2" 2 0.276 0.766 0.065 0.060} {"Channel3" 2 0.344 0.766 0.065 0.060} {"Channel4" 2 0.412 0.766 0.065 0.060} {"1_val" 3 0.372 0.288 '1' 0.14 'verdana' Font.BOLD} {"2_val" 3 0.372 0.288 '2' 0.14 'verdana' Font.BOLD} {"3_val" 3 0.372 0.288 '3' 0.14 'verdana' Font.BOLD} {"4_val" 3 0.372 0.288 '4' 0.14 'verdana' Font.BOLD} {"Circle1" 4 0.534 0.762 0.044 0.044} {"Circle2" 4 0.583 0.762 0.044 0.044} {"Circle3" 4 0.637 0.762 0.044 0.044} {"Circle4" 4 0.693 0.762 0.044 0.044} {"1" 5   'Channel1'  '1_val' 'Circle1'} {"2" 5   'Channel2'  '2_val' 'Circle2'} {"3" 5   'Channel3'  '3_val' 'Circle3'} {"4" 5   'Channel4'  '4_val' 'Circle4'}} HM-Sec-MDIR-2 {} HM-Sec-MDIR-3 {} HMW-Sec-TR-FM {} HM-WDC7000 {{"1" 3 0.440 0.200 '1' 0.124 'verdana' Font.BOLD} {"2" 3 0.440 0.200 '2' 0.124 'verdana' Font.BOLD} {"3" 3 0.440 0.200 '3' 0.124 'verdana' Font.BOLD} {"4" 3 0.440 0.200 '4' 0.124 'verdana' Font.BOLD} {"5" 3 0.440 0.200 '5' 0.124 'verdana' Font.BOLD} {"6" 3 0.440 0.200 '6' 0.124 'verdana' Font.BOLD} {"7" 3 0.440 0.200 '7' 0.124 'verdana' Font.BOLD} {"8" 3 0.440 0.200 '8' 0.124 'verdana' Font.BOLD} {"9" 3 0.440 0.200 '9' 0.124 'verdana' Font.BOLD} {"10" 3 0.405 0.200 '10' 0.124 'verdana' Font.BOLD}} HM-OU-LED16 {{"1" 2 0.152 0.218 0.064 0.056} {"2" 2 0.152 0.277 0.064 0.056} {"3" 2 0.152 0.336 0.064 0.056} {"4" 2 0.152 0.395 0.064 0.056} {"5" 2 0.152 0.454 0.064 0.056} {"6" 2 0.152 0.513 0.064 0.056} {"7" 2 0.152 0.572 0.064 0.056} {"8" 2 0.152 0.631 0.064 0.056} {"9" 2 0.728 0.218 0.064 0.056} {"10" 2 0.728 0.277 0.064 0.056} {"11" 2 0.728 0.336 0.064 0.056} {"12" 2 0.728 0.395 0.064 0.056} {"13" 2 0.728 0.454 0.064 0.056} {"14" 2 0.728 0.513 0.064 0.056} {"15" 2 0.728 0.572 0.064 0.056} {"16" 2 0.728 0.631 0.064 0.056}} HM-LC-Sw4-SM {{"1_Part1" 6 0.136 0.896 0.136 0.98 0.012} {"1_Part2" 6 0.136 0.98 0.096 0.916 0.012} {"1_Part3" 6 0.136 0.98 0.176 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.164 0} {"3_Arrow" 7 '1_Arrow' 0.328 0} {"4_Arrow" 7 '1_Arrow' 0.492 0} {"1_Key" 4 0.244 0.372 0.04 0.044} {"2_Key" 4 0.328 0.372 0.04 0.044} {"3_Key" 4 0.404 0.372 0.04 0.044} {"4_Key" 4 0.484 0.372 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  } {"3" 5   '3_Arrow'  '3_Key'  } {"4" 5   '4_Arrow'  '4_Key'  }} HM-LC-Sw1-FM {{"1_AUS" 2 0.288 0.66 0.068 0.152} {"1_EIN" 2 0.548 0.66 0.068 0.152} {"1" 5   '1_AUS'  '1_EIN'  }} HM-LC-Sw2-PB-FM {{"1" 2 0.24 0.312 0.204 0.412} {"2" 2 0.46 0.312 0.204 0.412}} WS888 {{"1" 3 0.440 0.200 '1' 0.124 'verdana' Font.BOLD} {"2" 3 0.440 0.200 '2' 0.124 'verdana' Font.BOLD} {"3" 3 0.440 0.200 '3' 0.124 'verdana' Font.BOLD} {"4" 3 0.440 0.200 '4' 0.124 'verdana' Font.BOLD} {"5" 3 0.440 0.200 '5' 0.124 'verdana' Font.BOLD} {"6" 3 0.440 0.200 '6' 0.124 'verdana' Font.BOLD} {"7" 3 0.440 0.200 '7' 0.124 'verdana' Font.BOLD} {"8" 3 0.440 0.200 '8' 0.124 'verdana' Font.BOLD} {"9" 3 0.440 0.200 '9' 0.124 'verdana' Font.BOLD} {"10" 3 0.405 0.200 '10' 0.124 'verdana' Font.BOLD}} HM-WS550-US {{"1" 3 0.440 0.200 '1' 0.124 'verdana' Font.BOLD} {"2" 3 0.440 0.200 '2' 0.124 'verdana' Font.BOLD} {"3" 3 0.440 0.200 '3' 0.124 'verdana' Font.BOLD} {"4" 3 0.440 0.200 '4' 0.124 'verdana' Font.BOLD} {"5" 3 0.440 0.200 '5' 0.124 'verdana' Font.BOLD} {"6" 3 0.440 0.200 '6' 0.124 'verdana' Font.BOLD} {"7" 3 0.440 0.200 '7' 0.124 'verdana' Font.BOLD} {"8" 3 0.440 0.200 '8' 0.124 'verdana' Font.BOLD} {"9" 3 0.440 0.200 '9' 0.124 'verdana' Font.BOLD} {"10" 3 0.405 0.200 '10' 0.124 'verdana' Font.BOLD}} HM-LC-Dim1PWM-CV {} HM-LC-Sw4-SM-ATmega168 {{"1_Part1" 6 0.136 0.896 0.136 0.98 0.012} {"1_Part2" 6 0.136 0.98 0.096 0.916 0.012} {"1_Part3" 6 0.136 0.98 0.176 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.164 0} {"3_Arrow" 7 '1_Arrow' 0.328 0} {"4_Arrow" 7 '1_Arrow' 0.492 0} {"1_Key" 4 0.244 0.372 0.04 0.044} {"2_Key" 4 0.328 0.372 0.04 0.044} {"3_Key" 4 0.404 0.372 0.04 0.044} {"4_Key" 4 0.484 0.372 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  } {"3" 5   '3_Arrow'  '3_Key'  } {"4" 5   '4_Arrow'  '4_Key'  }}}
+set DEV_LIST {HM-LC-Sw1-Pl-DN-R3 HM-LC-Sw2-DR {263 146} HM-LC-Sw1-Ba-PCB HM-WS550STH-O HM-RC-2-PBU-FM HM-LC-Sw1-SM-ATmega168 HM-Sen-MDIR-O-2 HM-Sec-Key-S HM-Sec-SD-2-Team HM-PB-4-WM HM-LC-Sw1-Pl-OM54 HM-ES-PMSw1-Pl-DN-R5 HMW-LC-Bl1-DR-2 OLIGO.smart.iq.HM HM-Sec-SD-Team HM-CC-RT-DN HM-LC-Sw1-Pl-CT-R1 HMW-IO-4-FM HM-LC-Dim1L-Pl-2 WS550 HM-LC-Sw1-Pl {ZEL STG RM FSS UP3} HM-LC-Sw1-DR HM-WS550-US HM-LC-Sw4-PCB HM-ES-PMSw1-DR 263_149_/_263_150 HM-ES-PMSw1-Pl-DN-R1 HM-LC-Sw1-SM HmIP-SWDO HM-Dis-TD-T HMW-LC-Sw2-DR HM-RC-4-B HM-LC-Sw4-SM-2 HM-EM-CMM HM-Sec-SC-2 HM-LC-Dim1T-FM HM-PB-6-WM55 {ZEL STG RM FFK} HM-RC-4-2 HM-LC-Dim1L-Pl-644 HM-MOD-EM-8 HM-PB-4Dis-WM HM-CC-VD HM-WDS100-C6-O-2 {263 145} HM-RC-19-SW {263 144} HM-WDS10-TH-O HM-LC-Dim2L-SM-644 HmIP-PS HMW-RCV-50 {263 132} HM-CC-TC HM-WS550ST-IO HM-RC-4-3 HM-WS550STH-I HM-LC-Dim1TPBU-FM-2 HMW-Sen-SC-12-FM HM-LC-Sw4-SM-ATmega168 HM-LC-Dim1L-CV-2 {263 131} HM-Sen-DB-PCB HM-LC-Bl1-SM HM-LC-Dim1T-Pl-3 HmIP-WRC2 HM-Dis-WM55 HM-LC-Dim1T-Pl-2 {263 130} {263 158} HM-LC-Sw1-Pl-DN-R2 HM-LC-Dim1T-CV-644 HMIP-WRC2 {263 157} HM-TC-IT-WM-W-EU HM-PBI-4-FM HM-RC-Sec4-2 HM-RC-Sec3 HM-LC-Sw1-FM {ZEL STG RM WT 2} HM-Sec-SFA-SM HM-WDS30-OT2-SM HMW-LC-Dim1L-DR {ZEL STG RM HS 4} HM-LC-Sw1-PB-FM HMW-Sec-TR-FM HM-LC-DDC1-PCB HM-EM-CCM HM-LC-Sw4-Ba-PCB HM-WDS30-T-O HM-Sen-MDIR-WM55 HM-Sec-MDIR {ZEL STG RM FSA} HM-LC-Sw1-SM-2 HM-CC-VG-1 {263 135} HM-LC-Dim1T-FM-644 {263 167} HM-LC-Bl1-FM HM-ES-PMSw1-Pl-DN-R3 HM-LC-Sw4-PCB-2 HM-LC-Dim1PWM-CV WS888 HM-PB-2-FM HM-Sec-SCo HM-Sec-Key HM-Sen-LI-O HMW-IO-12-Sw7-DR {ZEL STG RM FWT} HM-Sen-EP HM-LC-Dim1L-Pl-3 HM-Sys-sRP-Pl HM-WDC7000 HM-LC-Dim1T-FM-2 HM-LC-Sw2-FM-2 HM-LC-Sw2-FM {ZEL STG RM FST UP4} HM-RC-Dis-H-x-EU HM-LC-Bl1-SM-2 HM-RC-Key3 HM-PB-2-WM55-2 HM-ES-PMSw1-Pl HM-LC-Sw2-PB-FM HM-Sec-SD-2 HMW-Sen-SC-12-DR HmIP-eTRV HMIP-SWDO HmIP-WTH HM-Sen-Wa-Od HM-Sen-RD-O HM-LC-Sw1PBU-FM HM-MOD-Re-8 HM-LC-Sw1-Pl-DN-R4 HM-Sec-RHS HM-WDS40-TH-I HM-LC-Dim2L-SM HM-LC-Dim2T-SM-2 HM-LC-Dim1T-Pl HM-LC-Dim2T-SM HM-PB-2-WM {ZEL STG RM FZS-2} HM-LC-Sw1-Pl-DN-R1 HM-LC-Dim1TPBU-FM HM-LC-Dim2L-SM-2 HM-RC-Sec3-B HM-RC-8 HM-LC-Sw4-DR-2 HM-LC-Sw4-WM {263 155} HM-Sec-WDS-2 KS550 HM-RC-P1 HMW-LC-Bl1-DR HM-RC-12 HMW-IO-12-FM HM-RC-12-B HM-RC-4-3-D HM-RC-Key4-3 HM-Sec-Sir-WM {ZEL STG RM FEP 230V} HM-Sec-TiS HMIP-eTRV {263 162} HM-LC-Sw1-FM-2 HM-Sen-MDIR-O HM-LC-Bl1-FM-2 HM-Sec-WDS HM-ES-TX-WM HMW-IO-12-Sw14-DR HM-LC-Dim1L-CV-644 {ZEL STG RM DWT 10} HMIP-PS HM-PB-2-WM55 HM-LC-Dim1L-CV HM-WDS100-C6-O {ZEL STG RM FZS} HM-OU-LED16 HM-RCV-50 HM-Sec-SD BRC-H HM-Sec-Key-O HM-Sec-MDIR-3 HM-LC-Sw4-WM-2 HM-Sec-Win HM-LC-Dim2T-SM-644 HMIP-PSM HM-RC-Sec4-3 HM-WDS40-TH-I-2 HM-RC-19-B HM-OU-CM-PCB HM-RC-Key3-B HMIP-WTH HM-SCI-3-FM HM-RC-19 HM-RC-4 HM-LC-Sw4-SM HM-LC-Dim1T-Pl-644 HM-LC-RGBW-WM HM-LC-Sw2-DR-2 HM-Sec-SC HMW-WSTH-SM HM-LC-Sw4-DR HmIP-PSM HM-LC-Dim1L-Pl {263 147} HM-RC-Key4-2 HM-LC-Dim1T-CV HMW-WSE-SM HM-SwI-3-FM HmIP-eTRV-2 HM-CCU-1 {ZEL STG RM FDK} HM-LC-Dim1T-CV-2 HM-CC-SCD HM-LC-Sw1-Pl-3 HM-ES-PMSw1-SM {263 133} HmIP-KRC4 HM-LC-Bl1PBU-FM {263 167 Gruppe} HMW-Sys-PS7-DR HM-LC-Bl1-PB-FM HM-ES-PMSw1-Pl-DN-R4 atent {263 134} HM-LC-Sw1-Pl-DN-R5 HM-LC-Dim1PWM-CV-2 DEVICE HM-ES-PMSw1-Pl-DN-R2 HM-LC-Sw1-Pl-2 HM-OU-CFM-Pl HM-OU-CF-Pl HM-WDS30-OT2-SM-2 HM-OU-CFM-TW HM-LC-Dim1T-FM-LF {263 160} HM-Sec-MDIR-2 HM-PB-4Dis-WM-2 HM-Sen-MDIR-SM}
+array set DEV_DESCRIPTION {HM-Dis-TD-T HM-Dis-TD-T {ZEL STG RM FWT} ZEL_STG_RM_FWT HM-EM-CCM HM-EM-CCM HMW-RCV-50 HMW-RCV-50 HM-LC-Sw4-Ba-PCB HM-LC-Sw4-Ba-PCB {ZEL STG RM FST UP4} ZEL_STG_RM_FST_UP4 HM-LC-Sw1-PB-FM HM-LC-Sw1-PB-FM HmIP-eTRV TRV HmIP-WTH WTH HM-RC-Key3 HM-RC-Key3 HM-OU-CFM-Pl HM-OU-CFM-Pl HM-RC-Sec3 HM-RC-Sec3 HM-LC-Dim1T-CV HM-LC-Dim1T-CV BRC-H BRC-H HM-PB-4Dis-WM HM-PB-4Dis-WM HM-CC-VG-1 HM-CC-VG-1 HMIP-SWDO SWD HM-WDS40-TH-I-2 HM-WDS40-TH-I {ZEL STG RM FZS} ZEL_STG_RM_FZS HMW-WSTH-SM HMW-WSTH-SM HM-LC-Sw2-DR-2 HM-LC-Sw2-DR HM-LC-Sw4-WM HM-LC-Sw4-WM HM-ES-PMSw1-Pl-DN-R1 HM-ES-PMSw1-Pl-DN-R1 HM-ES-PMSw1-Pl-DN-R2 HM-ES-PMSw1-Pl-DN-R2 HM-OU-CFM-TW HM-OU-CFM-TW HM-Sec-SFA-SM HM-Sec-SFA-SM HM-ES-PMSw1-Pl-DN-R3 HM-ES-PMSw1-Pl-DN-R3 HM-ES-PMSw1-Pl-DN-R4 HM-ES-PMSw1-Pl-DN-R4 HM-ES-PMSw1-Pl-DN-R5 HM-ES-PMSw1-Pl-DN-R5 HM-SwI-3-FM HM-SwI-3-FM HMW-WSE-SM HMW-WSE-SM HM-LC-Dim1T-FM HM-LC-Dim1T-FM HM-Sec-SD-Team HM-Sec-SD-Team HM-RC-Dis-H-x-EU HM-RC-Dis-H-x-EU HM-Sec-Key-O HM-Sec-Key-O HM-RC-Key4-2 HM-RC-Key4-2 HM-LC-RGBW-WM HM-LC-RGBW-WM HM-RC-Key4-3 HM-RC-4 HM-WDS100-C6-O-2 HM-WDS100-C6-O HM-LC-Dim2L-SM-2 HM-LC-Dim2L-SM HM-Sec-TiS HM-Sec-TiS HM-Sec-Key-S HM-Sec-Key-S HM-Sys-sRP-Pl HM-Sys-sRP-Pl HM-LC-Bl1-FM-2 HM-LC-Bl1-FM HM-OU-CF-Pl HM-OU-CF-Pl HMW-LC-Bl1-DR-2 HMW-LC-Bl1-DR HM-SCI-3-FM HM-SCI-3-FM HM-LC-Bl1-SM-2 HM-LC-Bl1-SM HM-LC-Dim1PWM-CV-2 HM-LC-Dim1PWM-CV HM-ES-PMSw1-DR HM-ES-PMSw1-DR HMW-LC-Sw2-DR HMW-LC-Sw2-DR HM-PB-4-WM HM-PB-4-WM HM-LC-Dim1T-CV-644 HM-LC-Dim1T-CV HMW-LC-Bl1-DR HMW-LC-Bl1-DR HmIP-SWDO SWD HM-Sec-Win HM-Sec-Win HM-LC-Sw2-FM-2 HM-LC-Sw2-FM HM-LC-Sw1-Pl-DN-R1 HM-LC-Sw1-Pl-DN-R1 HM-LC-Sw1-Pl-DN-R2 HM-LC-Sw1-Pl-DN-R2 HM-LC-Sw1-Pl-DN-R3 HM-LC-Sw1-Pl-DN-R3 HM-LC-Dim2T-SM HM-LC-Dim2T-SM HM-LC-Sw1-Pl-DN-R4 HM-LC-Sw1-Pl-DN-R4 HM-LC-Sw1-Pl-DN-R5 HM-LC-Sw1-Pl-DN-R5 HM-LC-Sw1-SM-ATmega168 HM-LC-Sw1-SM-ATmega168 HM-LC-Dim1TPBU-FM-2 HM-LC-Dim1TPBU-FM-2 HM-Sen-MDIR-O HM-Sen-MDIR-O HM-RC-12-B HM-RC-12-B HM-LC-Bl1-SM HM-LC-Bl1-SM HM-LC-Dim1L-CV HM-LC-Dim1L-CV {ZEL STG RM FDK} ZEL_STG_RM_FDK HM-Sen-RD-O HM-Sen-RD-O HM-WDS30-T-O HM-WDS30-T-O HM-CC-RT-DN HM-CC-RT-DN HM-WS550ST-IO HM-WS550ST-IO {ZEL STG RM FZS-2} ZEL_STG_RM_FZS-2 HM-Sec-Key HM-Sec-Key HM-Sec-SD-2-Team HM-Sec-SD-Team HM-RC-19-SW HM-RC-19-SW KS550 KS550 HMW-IO-4-FM HMW-IO-4-FM HM-LC-Sw4-PCB-2 HM-LC-Sw4-PCB HM-EM-CMM HM-EM-CMM HM-LC-Dim2T-SM-644 HM-LC-Dim2T-SM {ZEL STG RM FFK} ZEL_STG_RM_FFK HM-Sec-RHS HM-Sec-RHS HMW-IO-12-Sw14-DR HMW-IO-12-Sw14-DR HM-MOD-Re-8 HM-MOD-Re-8 HM-WDS40-TH-I HM-WDS40-TH-I {263 167 Gruppe} 263_167_Gruppe {ZEL STG RM FSS UP3} ZEL_STG_RM_FSS_UP3 {263 130} 263_130 HM-RC-4 HM-RC-4 {263 131} 263_131 {263 132} 263_132 {263 133} 263_133 {263 134} 263_134 {263 135} 263_135 HM-RC-8 HM-RC-8 HM-Sen-DB-PCB HM-Sen-DB-PCB HM-LC-Sw1-SM HM-LC-Sw1-SM HM-LC-Sw4-DR-2 HM-LC-Sw4-DR HM-LC-Dim1L-CV-644 HM-LC-Dim1L-CV HM-CC-SCD HM-CC-SCD HMW-LC-Dim1L-DR HMW-LC-Dim1L-DR HM-LC-Sw1PBU-FM HM-LC-Sw1PBU-FM HM-LC-Sw1-Pl HM-LC-Sw1-Pl HM-LC-Dim2T-SM-2 HM-LC-Dim2T-SM HM-LC-Dim2L-SM HM-LC-Dim2L-SM HM-WDS100-C6-O HM-WDS100-C6-O {263 144} 263_144 HM-LC-DDC1-PCB HM-LC-DDC1-PCB {263 145} 263_145 {263 146} 263_146 {263 147} 263_147 HM-LC-Sw4-DR HM-LC-Sw4-DR HM-Sec-SC-2 HM-Sec-SC-2 HM-PB-6-WM55 HM-PB-6-WM55 HM-LC-Dim1T-FM-2 HM-LC-Dim1T-FM HM-LC-Dim1L-Pl-2 HM-LC-Dim1L-Pl-2 HM-PB-2-WM55-2 HM-PB-2-WM55 HM-RC-19-B HM-RC-19-B HM-LC-Dim1L-Pl-3 HM-LC-Dim1L-Pl-3 {263 155} 263_155 HM-RCV-50 HM-RCV-50 {263 157} 263_157 {263 158} 263_158 {263 160} 263_160 HM-LC-Dim1L-CV-2 HM-LC-Dim1L-CV HM-LC-Bl1-PB-FM HM-LC-Bl1-PB-FM HM-PB-2-WM HM-PB-2-WM {263 162} 263_162 HM-LC-Dim1T-FM-644 HM-LC-Dim1T-FM {263 167} 263_167 HM-RC-Sec3-B HM-RC-Sec3-B HM-RC-4-3-D HM-RC-4 HM-LC-Dim1T-FM-LF HM-LC-Dim1T-FM HM-Dis-WM55 HM-Dis-WM55 HM-LC-Sw4-SM-2 HM-LC-Sw4-SM HM-LC-Sw1-FM-2 HM-LC-Sw1-FM {ZEL STG RM DWT 10} ZEL_STG_RM_DWT_10 HM-Sen-EP HM-Sen-EP HmIP-eTRV-2 TRV HM-LC-Sw1-SM-2 HM-LC-Sw1-SM HM-WDS10-TH-O HM-WDS10-TH-O HM-LC-Dim2L-SM-644 HM-LC-Dim2L-SM HM-Sec-WDS-2 HM-Sec-WDS-2 HM-LC-Sw1-Ba-PCB HM-LC-Sw1-Ba-PCB atent atent HM-Sen-MDIR-O-2 HM-Sen-MDIR-O HM-CC-TC HM-CC-TC HM-LC-Dim1T-Pl HM-LC-Dim1T-Pl HM-Sec-SCo HM-Sec-SCo HM-LC-Dim1T-Pl-644 HM-LC-Dim1T-Pl HM-ES-TX-WM HM-ES-TX-WM HMW-IO-12-FM HMW-IO-12-FM 263_149_/_263_150 263_149_/_263_150 HM-LC-Sw1-Pl-CT-R1 HM-LC-Sw1-Pl-CT-R1 HM-PBI-4-FM HM-PBI-4-FM HM-CC-VD HM-CC-VD HM-RC-4-2 HM-RC-4-2 HM-Sec-SC HM-Sec-SC HM-RC-4-3 HM-RC-4 HM-Sec-SD HM-Sec-SD HMIP-PSM PSM HM-ES-PMSw1-SM HM-ES-PMSw1-SM HM-Sen-MDIR-WM55 HM-Sen-MDIR-WM55 HM-LC-Sw4-PCB HM-LC-Sw4-PCB HMIP-PS PS HmIP-KRC4 KRC4 HM-ES-PMSw1-Pl HM-ES-PMSw1-Pl HM-LC-Dim1TPBU-FM HM-LC-Dim1TPBU-FM HM-PB-4Dis-WM-2 HM-PB-4Dis-WM-2 {ZEL STG RM FEP 230V} ZEL_STG_RM_FEP_230V HM-RC-4-B HM-RC-4-B HM-RC-12 HM-RC-12 HMIP-WRC2 WRC2 OLIGO.smart.iq.HM OLIGO.smart.iq.HM HM-LC-Sw2-DR HM-LC-Sw2-DR HM-LC-Dim1T-Pl-2 HM-LC-Dim1T-Pl-2 HMW-Sen-SC-12-DR HMW-Sen-SC-12-DR HM-RC-19 HM-RC-19 HM-MOD-EM-8 HM-MOD-EM-8 HM-LC-Dim1T-Pl-3 HM-LC-Dim1T-Pl-3 HM-TC-IT-WM-W-EU HM-TC-IT-WM-W-EU HM-Sec-SD-2 HM-Sec-SD HM-LC-Dim1T-CV-2 HM-LC-Dim1T-CV HM-RC-Sec4-2 HM-RC-Sec4-2 {ZEL STG RM FSA} ZEL_STG_RM_FSA HM-RC-Sec4-3 HM-RC-4 HM-OU-CM-PCB HM-OU-CM-PCB HM-Sec-MDIR HM-Sec-MDIR HM-Sen-LI-O HM-Sen-LI-O HM-Sec-WDS HM-Sec-WDS HM-WDS30-OT2-SM-2 HM-WDS30-OT2-SM HM-Sec-Sir-WM HM-Sec-Sir-WM HMW-Sen-SC-12-FM HMW-Sen-SC-12-FM HM-LC-Sw2-FM HM-LC-Sw2-FM HM-CCU-1 HM-CCU-1 HmIP-PSM PSM HM-LC-Bl1-FM HM-LC-Bl1-FM HM-RC-P1 HM-RC-P1 HM-LC-Dim1L-Pl HM-LC-Dim1L-Pl HmIP-PS PS HM-PB-2-WM55 HM-PB-2-WM55 {ZEL STG RM HS 4} ZEL_STG_RM_HS_4 HM-LC-Sw1-Pl-2 HM-LC-Sw1-Pl HM-LC-Dim1L-Pl-644 HM-LC-Dim1L-Pl HM-LC-Sw1-Pl-3 HM-LC-Sw1-Pl HMW-IO-12-Sw7-DR HMW-IO-12-Sw7-DR HM-WS550STH-I HM-WS550STH-I {ZEL STG RM WT 2} ZEL_STG_RM_WT_2 HM-Sen-MDIR-SM HM-Sen-MDIR-SM HM-WS550STH-O HM-WS550STH-O HmIP-WRC2 WRC2 HMW-Sys-PS7-DR HMW-Sys-PS7-DR WS550 {Funk- Wetterstation} HM-Sen-Wa-Od HM-Sen-Wa-Od HM-RC-Key3-B HM-RC-Key3-B DEVICE DEVICE HM-WDS30-OT2-SM HM-WDS30-OT2-SM HM-PB-2-FM HM-PB-2-FM HM-LC-Bl1PBU-FM HM-LC-Bl1PBU-FM HM-LC-Sw1-DR HM-LC-Sw1-DR HMIP-eTRV TRV HMIP-WTH WTH HM-RC-2-PBU-FM HM-RC-2-PBU-FM HM-LC-Sw1-Pl-OM54 HM-LC-Sw1-Pl-OM54 HM-LC-Sw4-WM-2 HM-LC-Sw4-WM HM-Sec-MDIR-2 HM-Sec-MDIR HM-Sec-MDIR-3 HM-Sec-MDIR HMW-Sec-TR-FM HMW-Sec-TR-FM HM-WDC7000 HM-WDC7000 HM-OU-LED16 HM-OU-LED16 HM-LC-Sw4-SM HM-LC-Sw4-SM HM-LC-Sw1-FM HM-LC-Sw1-FM HM-LC-Sw2-PB-FM HM-LC-Sw2-PB-FM WS888 WS888 HM-WS550-US HM-WS550-US HM-LC-Dim1PWM-CV HM-LC-Dim1PWM-CV HM-LC-Sw4-SM-ATmega168 HM-LC-Sw4-SM-ATmega168}
+array set DEV_PATHS       {HM-Dis-TD-T {{50 /config/img/devices/50/81_hm-dis-td-t_thumb.png} {250 /config/img/devices/250/81_hm-dis-td-t.png}} {ZEL STG RM FWT} {{50 /config/img/devices/50/42_hm-cc-tc_thumb.png} {250 /config/img/devices/250/42_hm-cc-tc.png}} HM-EM-CCM {{50 /config/img/devices/50/44_hm-em-ccm_thumb.png} {250 /config/img/devices/250/44_hm-em-ccm.png}} HMW-RCV-50 {{50 /config/img/devices/50/CCU2_thumb.png} {250 /config/img/devices/250/CCU2.png}} HM-LC-Sw4-Ba-PCB {{50 /config/img/devices/50/88_hm-lc-sw4-ba-pcb_thumb.png} {250 /config/img/devices/250/88_hm-lc-sw4-ba-pcb.png}} {ZEL STG RM FST UP4} {{50 /config/img/devices/50/38_hm-pbi-4-fm_thumb.png} {250 /config/img/devices/250/38_hm-pbi-4-fm.png}} HM-LC-Sw1-PB-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HmIP-eTRV {{50 /config/img/devices/50/120_hmip-etrv_thumb.png} {250 /config/img/devices/250/120_hmip-etrv.png}} HmIP-WTH {{50 /config/img/devices/50/121_hmip-wth_thumb.png} {250 /config/img/devices/250/121_hmip-wth.png}} HM-RC-Key3 {{50 /config/img/devices/50/23_hm-rc-key3-b_thumb.png} {250 /config/img/devices/250/23_hm-rc-key3-b.png}} HM-OU-CFM-Pl {{50 /config/img/devices/50/60_hm-ou-cf-pl_thumb.png} {250 /config/img/devices/250/60_hm-ou-cf-pl.png}} HM-RC-Sec3 {{50 /config/img/devices/50/22_hm-rc-sec3-b_thumb.png} {250 /config/img/devices/250/22_hm-rc-sec3-b.png}} HM-LC-Dim1T-CV {{50 /config/img/devices/50/66_hm-lc-dim1t-cv_thumb.png} {250 /config/img/devices/250/66_hm-lc-dim1t-cv.png}} BRC-H {{50 /config/img/devices/50/72_hm-rc-brc-h_thumb.png} {250 /config/img/devices/250/72_hm-rc-brc-h.png}} HM-PB-4Dis-WM {{50 /config/img/devices/50/70_hm-pb-4dis-wm_thumb.png} {250 /config/img/devices/250/70_hm-pb-4dis-wm.png}} HM-CC-VG-1 {{50 /config/img/devices/50/95_group_hm-cc-vg-1_thumb.png} {250 /config/img/devices/250/95_group_hm-cc-vg-1.png}} HMIP-SWDO {{50 /config/img/devices/50/118_hmip-swdo_thumb.png} {250 /config/img/devices/250/118_hmip-swdo.png}} HM-WDS40-TH-I-2 {{50 /config/img/devices/50/13_hm-ws550sth-i_thumb.png} {250 /config/img/devices/250/13_hm-ws550sth-i.png}} {ZEL STG RM FZS} {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HMW-WSTH-SM {{50 /config/img/devices/50/32_hmw-wsth-sm_thumb.png} {250 /config/img/devices/250/32_hmw-wsth-sm.png}} HM-LC-Sw2-DR-2 {{50 /config/img/devices/50/69_hm-lc-sw2-dr_thumb.png} {250 /config/img/devices/250/69_hm-lc-sw2-dr.png}} HM-LC-Sw4-WM {{50 /config/img/devices/50/76_hm-lc-sw4-wm_thumb.png} {250 /config/img/devices/250/76_hm-lc-sw4-wm.png}} HM-ES-PMSw1-Pl-DN-R1 {{50 /config/img/devices/50/93_hm-es-pmsw1-pl_thumb.png} {250 /config/img/devices/250/93_hm-es-pmsw1-pl.png}} HM-ES-PMSw1-Pl-DN-R2 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R2_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R2.png}} HM-OU-CFM-TW {{50 /config/img/devices/50/117_hm-ou-cfm-tw_thumb.png} {250 /config/img/devices/250/117_hm-ou-cfm-tw.png}} HM-Sec-SFA-SM {{50 /config/img/devices/50/55_hm-sec-sfa-sm_thumb.png} {250 /config/img/devices/250/55_hm-sec-sfa-sm.png}} HM-ES-PMSw1-Pl-DN-R3 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R3_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R3.png}} HM-ES-PMSw1-Pl-DN-R4 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R4_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R4.png}} HM-ES-PMSw1-Pl-DN-R5 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R5_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R5.png}} HM-SwI-3-FM {{50 /config/img/devices/50/39_hm-swi-3-fm_thumb.png} {250 /config/img/devices/250/39_hm-swi-3-fm.png}} HMW-WSE-SM {{50 /config/img/devices/50/31_hmw-wse-sm_thumb.png} {250 /config/img/devices/250/31_hmw-wse-sm.png}} HM-LC-Dim1T-FM {{50 /config/img/devices/50/65_hm-lc-dim1t-fm_thumb.png} {250 /config/img/devices/250/65_hm-lc-dim1t-fm.png}} HM-Sec-SD-Team {{50 /config/img/devices/50/52_hm-sec-sd-team_thumb.png} {250 /config/img/devices/250/52_hm-sec-sd-team.png}} HM-RC-Dis-H-x-EU {{50 /config/img/devices/50/108_hm-rc-dis-h-x-eu_thump.png} {250 /config/img/devices/250/108_hm-rc-dis-h-x-eu.png}} HM-Sec-Key-O {{50 /config/img/devices/50/14_hm-sec-key_thumb.png} {250 /config/img/devices/250/14_hm-sec-key.png}} HM-RC-Key4-2 {{50 /config/img/devices/50/85_hm-rc-key4-2_thumb.png} {250 /config/img/devices/250/85_hm-rc-key4-2.png}} HM-LC-RGBW-WM {{50 /config/img/devices/50/111_hm-lc-rgbw-wm_thumb.png} {250 /config/img/devices/250/111_hm-lc-rgbw-wm.png}} HM-RC-Key4-3 {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/86_hm-rc-key4-3.png}} HM-WDS100-C6-O-2 {{50 /config/img/devices/50/WeatherCombiSensor_thumb.png} {250 /config/img/devices/250/WeatherCombiSensor.png}} HM-LC-Dim2L-SM-2 {{50 /config/img/devices/50/45_hm-lc-dim2l-sm_thumb.png} {250 /config/img/devices/250/45_hm-lc-dim2l-sm.png}} HM-Sec-TiS {{50 /config/img/devices/50/47_hm-sec-tis_thumb.png} {250 /config/img/devices/250/47_hm-sec-tis.png}} HM-Sec-Key-S {{50 /config/img/devices/50/14_hm-sec-key_thumb.png} {250 /config/img/devices/250/14_hm-sec-key.png}} HM-Sys-sRP-Pl {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Bl1-FM-2 {{50 /config/img/devices/50/7_hm-lc-bl1-fm_thumb.png} {250 /config/img/devices/250/7_hm-lc-bl1-fm.png}} HM-OU-CF-Pl {{50 /config/img/devices/50/60_hm-ou-cf-pl_thumb.png} {250 /config/img/devices/250/60_hm-ou-cf-pl.png}} HMW-LC-Bl1-DR-2 {{50 /config/img/devices/50/27_hmw-lc-bl1-dr_thumb.png} {250 /config/img/devices/250/27_hmw-lc-bl1-dr.png}} HM-SCI-3-FM {{50 /config/img/devices/50/67_hm-sci-3-fm_thumb.png} {250 /config/img/devices/250/67_hm-sci-3-fm.png}} HM-LC-Bl1-SM-2 {{50 /config/img/devices/50/6_hm-lc-bl1-sm_thumb.png} {250 /config/img/devices/250/6_hm-lc-bl1-sm.png}} HM-LC-Dim1PWM-CV-2 {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/79_hm-lc-dim1pwm-cv.png}} HM-ES-PMSw1-DR {{50 /config/img/devices/50/110_hm-es-pmsw1-dr_thump.png} {250 /config/img/devices/250/110_hm-es-pmsw1-dr.png}} HMW-LC-Sw2-DR {{50 /config/img/devices/50/26_hmw-lc-sw2-dr_thumb.png} {250 /config/img/devices/250/26_hmw-lc-sw2-dr.png}} HM-PB-4-WM {{50 /config/img/devices/50/PushButton-4ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-4ch-wm.png}} HM-LC-Dim1T-CV-644 {{50 /config/img/devices/50/66_hm-lc-dim1t-cv_thumb.png} {250 /config/img/devices/250/66_hm-lc-dim1t-cv.png}} HMW-LC-Bl1-DR {{50 /config/img/devices/50/27_hmw-lc-bl1-dr_thumb.png} {250 /config/img/devices/250/27_hmw-lc-bl1-dr.png}} HmIP-SWDO {{50 /config/img/devices/50/118_hmip-swdo_thumb.png} {250 /config/img/devices/250/118_hmip-swdo.png}} HM-Sec-Win {{50 /config/img/devices/50/15_hm-sec-win_thumb.png} {250 /config/img/devices/250/15_hm-sec-win.png}} HM-LC-Sw2-FM-2 {{50 /config/img/devices/50/5_hm-lc-sw2-fm_thumb.png} {250 /config/img/devices/250/5_hm-lc-sw2-fm.png}} HM-LC-Sw1-Pl-DN-R1 {{50 /config/img/devices/50/93_hm-es-pmsw1-pl_thumb.png} {250 /config/img/devices/250/93_hm-es-pmsw1-pl.png}} HM-LC-Sw1-Pl-DN-R2 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R2_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R2.png}} HM-LC-Sw1-Pl-DN-R3 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R3_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R3.png}} HM-LC-Dim2T-SM {{50 /config/img/devices/50/64_hm-lc-dim2T-sm_thumb.png} {250 /config/img/devices/250/64_hm-lc-dim2T-sm.png}} HM-LC-Sw1-Pl-DN-R4 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R4_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R4.png}} HM-LC-Sw1-Pl-DN-R5 {{50 /config/img/devices/50/107_hm-es-pmsw1-pl-R5_thumb.png} {250 /config/img/devices/250/107_hm-es-pmsw1-pl-R5.png}} HM-LC-Sw1-SM-ATmega168 {{50 /config/img/devices/50/8_hm-lc-sw1-sm_thumb.png} {250 /config/img/devices/250/8_hm-lc-sw1-sm.png}} HM-LC-Dim1TPBU-FM-2 {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-Sen-MDIR-O {{50 /config/img/devices/50/80_hm-sen-mdir-o_thumb.png} {250 /config/img/devices/250/80_hm-sen-mdir-o.png}} HM-RC-12-B {{50 /config/img/devices/50/19_hm-rc-12_thumb.png} {250 /config/img/devices/250/19_hm-rc-12.png}} HM-LC-Bl1-SM {{50 /config/img/devices/50/6_hm-lc-bl1-sm_thumb.png} {250 /config/img/devices/250/6_hm-lc-bl1-sm.png}} HM-LC-Dim1L-CV {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/2_hm-lc-dim1l-cv.png}} {ZEL STG RM FDK} {{50 /config/img/devices/50/17_hm-sec-rhs_thumb.png} {250 /config/img/devices/250/17_hm-sec-rhs.png}} HM-Sen-RD-O {{50 /config/img/devices/50/87_hm-sen-rd-o_thumb.png} {250 /config/img/devices/250/87_hm-sen-rd-o.png}} HM-WDS30-T-O {{50 /config/img/devices/50/IP65_G201_thumb.png} {250 /config/img/devices/250/IP65_G201.png}} HM-CC-RT-DN {{50 /config/img/devices/50/83_hm-cc-rt-dn_thumb.png} {250 /config/img/devices/250/83_hm-cc-rt-dn.png}} HM-WS550ST-IO {{50 /config/img/devices/50/IP65_G201_thumb.png} {250 /config/img/devices/250/IP65_G201.png}} {ZEL STG RM FZS-2} {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-Sec-Key {{50 /config/img/devices/50/14_hm-sec-key_thumb.png} {250 /config/img/devices/250/14_hm-sec-key.png}} HM-Sec-SD-2-Team {{50 /config/img/devices/50/105_hm-sec-sd-2-team_thumb.png} {250 /config/img/devices/250/105_hm-sec-sd-2-team.png}} HM-RC-19-SW {{50 /config/img/devices/50/20_hm-rc-19_thumb.png} {250 /config/img/devices/250/20_hm-rc-19.png}} KS550 {{50 /config/img/devices/50/WeatherCombiSensor_thumb.png} {250 /config/img/devices/250/WeatherCombiSensor.png}} HMW-IO-4-FM {{50 /config/img/devices/50/29_hmw-io-4-fm_thumb.png} {250 /config/img/devices/250/29_hmw-io-4-fm.png}} HM-LC-Sw4-PCB-2 {{50 /config/img/devices/50/46_hm-lc-sw4-pcb_thumb.png} {250 /config/img/devices/250/46_hm-lc-sw4-pcb.png}} HM-EM-CMM {{50 /config/img/devices/50/25_hm-em-cmm_thumb.png} {250 /config/img/devices/250/25_hm-em-cmm.png}} HM-LC-Dim2T-SM-644 {{50 /config/img/devices/50/64_hm-lc-dim2T-sm_thumb.png} {250 /config/img/devices/250/64_hm-lc-dim2T-sm.png}} {ZEL STG RM FFK} {{50 /config/img/devices/50/16_hm-sec-sc_thumb.png} {250 /config/img/devices/250/16_hm-sec-sc.png}} HM-Sec-RHS {{50 /config/img/devices/50/17_hm-sec-rhs_thumb.png} {250 /config/img/devices/250/17_hm-sec-rhs.png}} HMW-IO-12-Sw14-DR {{50 /config/img/devices/50/71_hmw-io-12-sw14-dr_thumb.png} {250 /config/img/devices/250/71_hmw-io-12-sw14-dr.png}} HM-MOD-Re-8 {{50 /config/img/devices/50/94_hm-mod-re-8_thumb.png} {250 /config/img/devices/250/94_hm-mod-re-8.png}} HM-WDS40-TH-I {{50 /config/img/devices/50/13_hm-ws550sth-i_thumb.png} {250 /config/img/devices/250/13_hm-ws550sth-i.png}} {263 167 Gruppe} {{50 /config/img/devices/50/52_hm-sec-sd-team_thumb.png} {250 /config/img/devices/250/52_hm-sec-sd-team.png}} {ZEL STG RM FSS UP3} {{50 /config/img/devices/50/39_hm-swi-3-fm_thumb.png} {250 /config/img/devices/250/39_hm-swi-3-fm.png}} {263 130} {{50 /config/img/devices/50/4_hm-lc-sw1-fm_thumb.png} {250 /config/img/devices/250/4_hm-lc-sw1-fm.png}} HM-RC-4 {{50 /config/img/devices/50/18_hm-rc-4_thumb.png} {250 /config/img/devices/250/18_hm-rc-4.png}} {263 131} {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} {263 132} {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/2_hm-lc-dim1l-cv.png}} {263 133} {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} {263 134} {{50 /config/img/devices/50/66_hm-lc-dim1t-cv_thumb.png} {250 /config/img/devices/250/66_hm-lc-dim1t-cv.png}} {263 135} {{50 /config/img/devices/50/75_hm-pb-2-wm55_thumb.png} {250 /config/img/devices/250/75_hm-pb-2-wm55.png}} HM-RC-8 {{50 /config/img/devices/50/100_hm-rc-8_thumb.png} {250 /config/img/devices/250/100_hm-rc-8.png}} HM-Sen-DB-PCB {{50 /config/img/devices/50/101_hm-sen-db-pcb_thumb.png} {250 /config/img/devices/250/101_hm-sen-db-pcb.png}} HM-LC-Sw1-SM {{50 /config/img/devices/50/8_hm-lc-sw1-sm_thumb.png} {250 /config/img/devices/250/8_hm-lc-sw1-sm.png}} HM-LC-Sw4-DR-2 {{50 /config/img/devices/50/68_hm-lc-sw4-dr_thumb.png} {250 /config/img/devices/250/68_hm-lc-sw4-dr.png}} HM-LC-Dim1L-CV-644 {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/2_hm-lc-dim1l-cv.png}} HM-CC-SCD {{50 /config/img/devices/50/57_hm-cc-scd_thumb.png} {250 /config/img/devices/250/57_hm-cc-scd.png}} HMW-LC-Dim1L-DR {{50 /config/img/devices/50/28_hmw-lc-dim1l-dr_thumb.png} {250 /config/img/devices/250/28_hmw-lc-dim1l-dr.png}} HM-LC-Sw1PBU-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Sw1-Pl {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Dim2T-SM-2 {{50 /config/img/devices/50/64_hm-lc-dim2T-sm_thumb.png} {250 /config/img/devices/250/64_hm-lc-dim2T-sm.png}} HM-LC-Dim2L-SM {{50 /config/img/devices/50/45_hm-lc-dim2l-sm_thumb.png} {250 /config/img/devices/250/45_hm-lc-dim2l-sm.png}} HM-WDS100-C6-O {{50 /config/img/devices/50/WeatherCombiSensor_thumb.png} {250 /config/img/devices/250/WeatherCombiSensor.png}} {263 144} {{50 /config/img/devices/50/39_hm-swi-3-fm_thumb.png} {250 /config/img/devices/250/39_hm-swi-3-fm.png}} HM-LC-DDC1-PCB {{50 /config/img/devices/50/54a_lc-ddc1_thumb.png} {250 /config/img/devices/250/54a_lc-ddc1-pcb.png}} {263 145} {{50 /config/img/devices/50/38_hm-pbi-4-fm_thumb.png} {250 /config/img/devices/250/38_hm-pbi-4-fm.png}} {263 146} {{50 /config/img/devices/50/7_hm-lc-bl1-fm_thumb.png} {250 /config/img/devices/250/7_hm-lc-bl1-fm.png}} {263 147} {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Sw4-DR {{50 /config/img/devices/50/68_hm-lc-sw4-dr_thumb.png} {250 /config/img/devices/250/68_hm-lc-sw4-dr.png}} HM-Sec-SC-2 {{50 /config/img/devices/50/16_hm-sec-sc_thumb.png} {250 /config/img/devices/250/16_hm-sec-sc.png}} HM-PB-6-WM55 {{50 /config/img/devices/50/86_hm-pb-6-wm55_thumb.png} {250 /config/img/devices/250/86_hm-pb-6-wm55.png}} HM-LC-Dim1T-FM-2 {{50 /config/img/devices/50/65_hm-lc-dim1t-fm_thumb.png} {250 /config/img/devices/250/65_hm-lc-dim1t-fm.png}} HM-LC-Dim1L-Pl-2 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-PB-2-WM55-2 {{50 /config/img/devices/50/75_hm-pb-2-wm55_thumb.png} {250 /config/img/devices/250/75_hm-pb-2-wm55.png}} HM-RC-19-B {{50 /config/img/devices/50/20_hm-rc-19_thumb.png} {250 /config/img/devices/250/20_hm-rc-19.png}} HM-LC-Dim1L-Pl-3 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} {263 155} {{50 /config/img/devices/50/70_hm-pb-4dis-wm_thumb.png} {250 /config/img/devices/250/70_hm-pb-4dis-wm.png}} HM-RCV-50 {{50 /config/img/devices/50/CCU2_thumb.png} {250 /config/img/devices/250/CCU2.png}} {263 157} {{50 /config/img/devices/50/13_hm-ws550sth-i_thumb.png} {250 /config/img/devices/250/13_hm-ws550sth-i.png}} {263 158} {{50 /config/img/devices/50/TH_CS_thumb.png} {250 /config/img/devices/250/TH_CS.png}} {263 160} {{50 /config/img/devices/50/57_hm-cc-scd_thumb.png} {250 /config/img/devices/250/57_hm-cc-scd.png}} HM-LC-Dim1L-CV-2 {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/2_hm-lc-dim1l-cv.png}} HM-LC-Bl1-PB-FM {{50 /config/img/devices/50/61_hm-lc-bl1-pb-fm_thumb.png} {250 /config/img/devices/250/61_hm-lc-bl1-pb-fm.png}} HM-PB-2-WM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} {263 162} {{50 /config/img/devices/50/124_hm-sec-mdir_thumb.png} {250 /config/img/devices/250/124_hm-sec-mdir.png}} HM-LC-Dim1T-FM-644 {{50 /config/img/devices/50/65_hm-lc-dim1t-fm_thumb.png} {250 /config/img/devices/250/65_hm-lc-dim1t-fm.png}} {263 167} {{50 /config/img/devices/50/51_hm-sec-sd_thumb.png} {250 /config/img/devices/250/51_hm-sec-sd.png}} HM-RC-Sec3-B {{50 /config/img/devices/50/22_hm-rc-sec3-b_thumb.png} {250 /config/img/devices/250/22_hm-rc-sec3-b.png}} HM-RC-4-3-D {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/116_hm-rc-4-3_brc-h3.png}} HM-LC-Dim1T-FM-LF {{50 /config/img/devices/50/114_hm-lc-dim1t-fm-lf_thumb_3.png} {250 /config/img/devices/250/114_hm-lc-dim1t-fm-lf_3.png}} HM-Dis-WM55 {{50 /config/img/devices/50/97_hm-dis-wm55_thumb.png} {250 /config/img/devices/250/97_hm-dis-wm55.png}} HM-LC-Sw4-SM-2 {{50 /config/img/devices/50/3_hm-lc-sw4-sm_thumb.png} {250 /config/img/devices/250/3_hm-lc-sw4-sm.png}} HM-LC-Sw1-FM-2 {{50 /config/img/devices/50/4_hm-lc-sw1-fm_thumb.png} {250 /config/img/devices/250/4_hm-lc-sw1-fm.png}} {ZEL STG RM DWT 10} {{50 /config/img/devices/50/70_hm-pb-4dis-wm_thumb.png} {250 /config/img/devices/250/70_hm-pb-4dis-wm.png}} HM-Sen-EP {{50 /config/img/devices/50/48_hm-sen-ep_thumb.png} {250 /config/img/devices/250/48_hm-sen-ep.png}} HmIP-eTRV-2 {{50 /config/img/devices/50/120_hmip-etrv_thumb.png} {250 /config/img/devices/250/120_hmip-etrv.png}} HM-LC-Sw1-SM-2 {{50 /config/img/devices/50/8_hm-lc-sw1-sm_thumb.png} {250 /config/img/devices/250/8_hm-lc-sw1-sm.png}} HM-WDS10-TH-O {{50 /config/img/devices/50/TH_CS_thumb.png} {250 /config/img/devices/250/TH_CS.png}} HM-LC-Dim2L-SM-644 {{50 /config/img/devices/50/45_hm-lc-dim2l-sm_thumb.png} {250 /config/img/devices/250/45_hm-lc-dim2l-sm.png}} HM-Sec-WDS-2 {{50 /config/img/devices/50/49_hm-sec-wds_thumb.png} {250 /config/img/devices/250/49_hm-sec-wds.png}} HM-LC-Sw1-Ba-PCB {{50 /config/img/devices/50/77_hm-lc-sw1-ba-pcb_thumb.png} {250 /config/img/devices/250/77_hm-lc-sw1-ba-pcb.png}} atent {{50 /config/img/devices/50/73_hm-atent_thumb.png} {250 /config/img/devices/250/73_hm-atent.png}} HM-Sen-MDIR-O-2 {{50 /config/img/devices/50/80_hm-sen-mdir-o_thumb.png} {250 /config/img/devices/250/80_hm-sen-mdir-o.png}} HM-CC-TC {{50 /config/img/devices/50/42_hm-cc-tc_thumb.png} {250 /config/img/devices/250/42_hm-cc-tc.png}} HM-LC-Dim1T-Pl {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-Sec-SCo {{50 /config/img/devices/50/98_hm-sec-sco_thumb.png} {250 /config/img/devices/250/98_hm-sec-sco.png}} HM-LC-Dim1T-Pl-644 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-ES-TX-WM {{50 /config/img/devices/50/102_hm-es-tx-wm_thumb.png} {250 /config/img/devices/250/102_hm-es-tx-wm.png}} HMW-IO-12-FM {{50 /config/img/devices/50/59_hmw-io-12-fm_thumb.png} {250 /config/img/devices/250/59_hmw-io-12-fm.png}} 263_149_/_263_150 {{50 /config/img/devices/50/hm_resc-win-pcb-sc_thumb.png} {250 /config/img/devices/250/hm_resc-win-pcb-sc.png}} HM-LC-Sw1-Pl-CT-R1 {{50 /config/img/devices/50/109_hm-lc-sw1-pl-ct_thump.png} {250 /config/img/devices/250/109_hm-lc-sw1-pl-ct.png}} HM-PBI-4-FM {{50 /config/img/devices/50/38_hm-pbi-4-fm_thumb.png} {250 /config/img/devices/250/38_hm-pbi-4-fm.png}} HM-CC-VD {{50 /config/img/devices/50/43_hm-cc-vd_thumb.png} {250 /config/img/devices/250/43_hm-cc-vd.png}} HM-RC-4-2 {{50 /config/img/devices/50/84_hm-rc-4-2_thumb.png} {250 /config/img/devices/250/84_hm-rc-4-2.png}} HM-Sec-SC {{50 /config/img/devices/50/16_hm-sec-sc_thumb.png} {250 /config/img/devices/250/16_hm-sec-sc.png}} HM-RC-4-3 {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/84_hm-rc-4-3.png}} HM-Sec-SD {{50 /config/img/devices/50/51_hm-sec-sd_thumb.png} {250 /config/img/devices/250/51_hm-sec-sd.png}} HMIP-PSM {{50 /config/img/devices/50/113_hmip-psm_thumb.png} {250 /config/img/devices/250/113_hmip-psm.png}} HM-ES-PMSw1-SM {{50 /config/img/devices/50/115_hm-es-pmsw1-sm_thumb.png} {250 /config/img/devices/250/115_hm-es-pmsw1-sm.png}} HM-Sen-MDIR-WM55 {{50 /config/img/devices/50/103_hm-sen-mdir-wm55_thumb.png} {250 /config/img/devices/250/103_hm-sen-mdir-wm55.png}} HM-LC-Sw4-PCB {{50 /config/img/devices/50/46_hm-lc-sw4-pcb_thumb.png} {250 /config/img/devices/250/46_hm-lc-sw4-pcb.png}} HMIP-PS {{50 /config/img/devices/50/113_hmip-psm_thumb.png} {250 /config/img/devices/250/113_hmip-psm.png}} HmIP-KRC4 {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/84_hm-rc-4-3.png}} HM-ES-PMSw1-Pl {{50 /config/img/devices/50/93_hm-es-pmsw1-pl_thumb.png} {250 /config/img/devices/250/93_hm-es-pmsw1-pl.png}} HM-LC-Dim1TPBU-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-PB-4Dis-WM-2 {{50 /config/img/devices/50/70_hm-pb-4dis-wm_thumb.png} {250 /config/img/devices/250/70_hm-pb-4dis-wm.png}} {ZEL STG RM FEP 230V} {{50 /config/img/devices/50/7_hm-lc-bl1-fm_thumb.png} {250 /config/img/devices/250/7_hm-lc-bl1-fm.png}} HM-RC-4-B {{50 /config/img/devices/50/18_hm-rc-4_thumb.png} {250 /config/img/devices/250/18_hm-rc-4.png}} HM-RC-12 {{50 /config/img/devices/50/19_hm-rc-12_thumb.png} {250 /config/img/devices/250/19_hm-rc-12.png}} HMIP-WRC2 {{50 /config/img/devices/50/112_hmip-wrc2_thumb.png} {250 /config/img/devices/250/112_hmip-wrc2.png}} OLIGO.smart.iq.HM {{50 /config/img/devices/50/123_oligo.smart.ip.hm_thumb.png} {250 /config/img/devices/250/123_oligo.smart.ip.hm.png}} HM-LC-Sw2-DR {{50 /config/img/devices/50/69_hm-lc-sw2-dr_thumb.png} {250 /config/img/devices/250/69_hm-lc-sw2-dr.png}} HM-LC-Dim1T-Pl-2 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HMW-Sen-SC-12-DR {{50 /config/img/devices/50/56_hmw-sen-sc-12-dr_thumb.png} {250 /config/img/devices/250/56_hmw-sen-sc-12-dr.png}} HM-RC-19 {{50 /config/img/devices/50/20_hm-rc-19_thumb.png} {250 /config/img/devices/250/20_hm-rc-19.png}} HM-MOD-EM-8 {{50 /config/img/devices/50/99_hm-mod-em-8_thumb.png} {250 /config/img/devices/250/99_hm-mod-em-8.png}} HM-LC-Dim1T-Pl-3 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-TC-IT-WM-W-EU {{50 /config/img/devices/50/96_hm-tc-it-wm-w-eu_thumb.png} {250 /config/img/devices/250/96_hm-tc-it-wm-w-eu.png}} HM-Sec-SD-2 {{50 /config/img/devices/50/104_hm-sec-sd-2_thumb.png} {250 /config/img/devices/250/104_hm-sec-sd-2.png}} HM-LC-Dim1T-CV-2 {{50 /config/img/devices/50/66_hm-lc-dim1t-cv_thumb.png} {250 /config/img/devices/250/66_hm-lc-dim1t-cv.png}} HM-RC-Sec4-2 {{50 /config/img/devices/50/86_hm-rc-sec4-2_thumb.png} {250 /config/img/devices/250/86_hm-rc-sec4-2.png}} {ZEL STG RM FSA} {{50 /config/img/devices/50/43_hm-cc-vd_thumb.png} {250 /config/img/devices/250/43_hm-cc-vd.png}} HM-RC-Sec4-3 {{50 /config/img/devices/50/84_hm-rc-4-x_thumb.png} {250 /config/img/devices/250/85_hm-rc-sec4-3.png}} HM-OU-CM-PCB {{50 /config/img/devices/50/92_hm-ou-cm-pcb_thumb.png} {250 /config/img/devices/250/92_hm-ou-cm-pcb.png}} HM-Sec-MDIR {{50 /config/img/devices/50/124_hm-sec-mdir_thumb.png} {250 /config/img/devices/250/124_hm-sec-mdir.png}} HM-Sen-LI-O {{50 /config/img/devices/50/126_hm-sen-li-o_thumb.png} {250 /config/img/devices/250/126_hm-sen-li-o.png}} HM-Sec-WDS {{50 /config/img/devices/50/49_hm-sec-wds_thumb.png} {250 /config/img/devices/250/49_hm-sec-wds.png}} HM-WDS30-OT2-SM-2 {{50 /config/img/devices/50/127_hm-wds30-ot2-sm-2_thumb.png} {250 /config/img/devices/250/127_hm-wds30-ot2-sm-2.png}} HM-Sec-Sir-WM {{50 /config/img/devices/50/117_hm-sec-sir-wm_thumb.png} {250 /config/img/devices/250/117_hm-sec-sir-wm.png}} HMW-Sen-SC-12-FM {{50 /config/img/devices/50/58_hmw-sen-sc-12-fm_thumb.png} {250 /config/img/devices/250/58_hmw-sen-sc-12-fm.png}} HM-LC-Sw2-FM {{50 /config/img/devices/50/5_hm-lc-sw2-fm_thumb.png} {250 /config/img/devices/250/5_hm-lc-sw2-fm.png}} HM-CCU-1 {{50 /config/img/devices/50/24_hm-cen-3-1_thumb.png} {250 /config/img/devices/250/24_hm-cen-3-1.png}} HmIP-PSM {{50 /config/img/devices/50/113_hmip-psm_thumb.png} {250 /config/img/devices/250/113_hmip-psm.png}} HM-LC-Bl1-FM {{50 /config/img/devices/50/7_hm-lc-bl1-fm_thumb.png} {250 /config/img/devices/250/7_hm-lc-bl1-fm.png}} HM-RC-P1 {{50 /config/img/devices/50/21_hm-rc-p1_thumb.png} {250 /config/img/devices/250/21_hm-rc-p1.png}} HM-LC-Dim1L-Pl {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HmIP-PS {{50 /config/img/devices/50/113_hmip-psm_thumb.png} {250 /config/img/devices/250/113_hmip-psm.png}} HM-PB-2-WM55 {{50 /config/img/devices/50/75_hm-pb-2-wm55_thumb.png} {250 /config/img/devices/250/75_hm-pb-2-wm55.png}} {ZEL STG RM HS 4} {{50 /config/img/devices/50/18_hm-rc-4_thumb.png} {250 /config/img/devices/250/18_hm-rc-4.png}} HM-LC-Sw1-Pl-2 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Dim1L-Pl-644 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Sw1-Pl-3 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HMW-IO-12-Sw7-DR {{50 /config/img/devices/50/30_hmw-io-12-sw7-dr_thumb.png} {250 /config/img/devices/250/30_hmw-io-12-sw7-dr.png}} HM-WS550STH-I {{50 /config/img/devices/50/13_hm-ws550sth-i_thumb.png} {250 /config/img/devices/250/13_hm-ws550sth-i.png}} {ZEL STG RM WT 2} {{50 /config/img/devices/50/75_hm-pb-2-wm55_thumb.png} {250 /config/img/devices/250/75_hm-pb-2-wm55.png}} HM-Sen-MDIR-SM {{50 /config/img/devices/50/53_hm-sen-mdir-sm_thumb.png} {250 /config/img/devices/250/53_hm-sen-mdir-sm.png}} HM-WS550STH-O {{50 /config/img/devices/50/TH_CS_thumb.png} {250 /config/img/devices/250/TH_CS.png}} HmIP-WRC2 {{50 /config/img/devices/50/112_hmip-wrc2_thumb.png} {250 /config/img/devices/250/112_hmip-wrc2.png}} HMW-Sys-PS7-DR {{50 /config/img/devices/50/36_hmw-sys-ps7-dr_thumb.png} {250 /config/img/devices/250/36_hmw-sys-ps7-dr.png}} WS550 {{50 /config/img/devices/50/9_hm-ws550-us_thumb.png} {250 /config/img/devices/250/9_hm-ws550-us.png}} HM-Sen-Wa-Od {{50 /config/img/devices/50/82_hm-sen-wa-od_thumb.png} {250 /config/img/devices/250/82_hm-sen-wa-od.png}} HM-RC-Key3-B {{50 /config/img/devices/50/23_hm-rc-key3-b_thumb.png} {250 /config/img/devices/250/23_hm-rc-key3-b.png}} DEVICE {{50 /config/img/devices/50/unknown_device_thumb.png} {250 /config/img/devices/250/unknown_device.png}} HM-WDS30-OT2-SM {{50 /config/img/devices/50/IP65_G201_thumb.png} {250 /config/img/devices/250/IP65_G201.png}} HM-PB-2-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Bl1PBU-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Sw1-DR {{50 /config/img/devices/50/35_hmw-sys-tm-dr_thumb.png} {250 /config/img/devices/250/106_hm-lc-sw1-dr.png}} HMIP-eTRV {{50 /config/img/devices/50/120_hmip-etrv_thumb.png} {250 /config/img/devices/250/120_hmip-etrv.png}} HMIP-WTH {{50 /config/img/devices/50/121_hmip-wth_thumb.png} {250 /config/img/devices/250/121_hmip-wth.png}} HM-RC-2-PBU-FM {{50 /config/img/devices/50/PushButton-2ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-2ch-wm.png}} HM-LC-Sw1-Pl-OM54 {{50 /config/img/devices/50/OM55_DimmerSwitch_thumb.png} {250 /config/img/devices/250/OM55_DimmerSwitch.png}} HM-LC-Sw4-WM-2 {{50 /config/img/devices/50/76_hm-lc-sw4-wm_thumb.png} {250 /config/img/devices/250/76_hm-lc-sw4-wm.png}} HM-Sec-MDIR-2 {{50 /config/img/devices/50/124_hm-sec-mdir_thumb.png} {250 /config/img/devices/250/124_hm-sec-mdir.png}} HM-Sec-MDIR-3 {{50 /config/img/devices/50/124_hm-sec-mdir_thumb.png} {250 /config/img/devices/250/124_hm-sec-mdir.png}} HMW-Sec-TR-FM {{50 /config/img/devices/50/33_hmw-sec-tr-fm_thumb.png} {250 /config/img/devices/250/33_hmw-sec-tr-fm.png}} HM-WDC7000 {{50 /config/img/devices/50/9_hm-ws550-us_thumb.png} {250 /config/img/devices/250/9_hm-ws550-us.png}} HM-OU-LED16 {{50 /config/img/devices/50/78_hm-ou-led16_thumb.png} {250 /config/img/devices/250/78_hm-ou-led16.png}} HM-LC-Sw4-SM {{50 /config/img/devices/50/3_hm-lc-sw4-sm_thumb.png} {250 /config/img/devices/250/3_hm-lc-sw4-sm.png}} HM-LC-Sw1-FM {{50 /config/img/devices/50/4_hm-lc-sw1-fm_thumb.png} {250 /config/img/devices/250/4_hm-lc-sw1-fm.png}} HM-LC-Sw2-PB-FM {{50 /config/img/devices/50/PushButton-4ch-wm_thumb.png} {250 /config/img/devices/250/PushButton-4ch-wm.png}} WS888 {{50 /config/img/devices/50/9_hm-ws550-us_thumb.png} {250 /config/img/devices/250/9_hm-ws550-us.png}} HM-WS550-US {{50 /config/img/devices/50/9_hm-ws550-us_thumb.png} {250 /config/img/devices/250/9_hm-ws550-us.png}} HM-LC-Dim1PWM-CV {{50 /config/img/devices/50/2_hm-lc-dim1l-cv_thumb.png} {250 /config/img/devices/250/79_hm-lc-dim1pwm-cv.png}} HM-LC-Sw4-SM-ATmega168 {{50 /config/img/devices/50/3_hm-lc-sw4-sm_thumb.png} {250 /config/img/devices/250/3_hm-lc-sw4-sm.png}}}
+array set DEV_HIGHLIGHT   {HM-Dis-TD-T {} {ZEL STG RM FWT} {} HM-EM-CCM {} HMW-RCV-50 {{"RF_1" 4 0.364 0.048 0.028 0.028} {"RF_2" 6 0.4 0.052 0.544 0.004 0.016} {"RF_3" 6 0.4 0.052 0.6 0.052 0.016} {"RF_4" 6 0.4 0.052 0.544 0.104 0.016} {"RF_5" 6 0.168 0.052 0.344 0.052 0.016} {"RF_6" 6 0.168 0 0.344 0.052 0.016} {"RF_7" 6 0.168 0.104 0.344 0.052 0.016} {"RF" 5   'RF_1'  'RF_2'  'RF_3'  'RF_4'  'RF_5'  'RF_6'  'RF_7'  } { "S1"  3 0.25 0.15  '1'  0.3 'verdana' Font.BOLD} { "S2"  3 0.25 0.15  '2'  0.3 'verdana' Font.BOLD} { "S3"  3 0.25 0.15  '3'  0.3 'verdana' Font.BOLD} { "S4"  3 0.25 0.15  '4'  0.3 'verdana' Font.BOLD} { "S5"  3 0.25 0.15  '5'  0.3 'verdana' Font.BOLD} { "S6"  3 0.25 0.15  '6'  0.3 'verdana' Font.BOLD} { "S7"  3 0.25 0.15  '7'  0.3 'verdana' Font.BOLD} { "S8"  3 0.25 0.15  '8'  0.3 'verdana' Font.BOLD} { "S9"  3 0.25 0.15  '9'  0.3 'verdana' Font.BOLD} {"S10"  3 0.175 0.15 '10'  0.3 'verdana' Font.BOLD} {"S11"  3 0.175 0.15 '11'  0.3 'verdana' Font.BOLD} {"S12"  3 0.175 0.15 '12'  0.3 'verdana' Font.BOLD} {"S13"  3 0.175 0.15 '13'  0.3 'verdana' Font.BOLD} {"S14"  3 0.175 0.15 '14'  0.3 'verdana' Font.BOLD} {"S15"  3 0.175 0.15 '15'  0.3 'verdana' Font.BOLD} {"S16"  3 0.175 0.15 '16'  0.3 'verdana' Font.BOLD} {"S17"  3 0.175 0.15 '17'  0.3 'verdana' Font.BOLD} {"S18"  3 0.175 0.15 '18'  0.3 'verdana' Font.BOLD} {"S19"  3 0.175 0.15 '19'  0.3 'verdana' Font.BOLD} {"S20"  3 0.175 0.15 '20'  0.3 'verdana' Font.BOLD} {"S21"  3 0.175 0.15 '21'  0.3 'verdana' Font.BOLD} {"S22"  3 0.175 0.15 '22'  0.3 'verdana' Font.BOLD} {"S23"  3 0.175 0.15 '23'  0.3 'verdana' Font.BOLD} {"S24"  3 0.175 0.15 '24'  0.3 'verdana' Font.BOLD} {"S25"  3 0.175 0.15 '25'  0.3 'verdana' Font.BOLD} {"S26"  3 0.175 0.15 '26'  0.3 'verdana' Font.BOLD} {"S27"  3 0.175 0.15 '27'  0.3 'verdana' Font.BOLD} {"S28"  3 0.175 0.15 '28'  0.3 'verdana' Font.BOLD} {"S29"  3 0.175 0.15 '29'  0.3 'verdana' Font.BOLD} {"S30"  3 0.175 0.15 '30'  0.3 'verdana' Font.BOLD} {"S31"  3 0.175 0.15 '31'  0.3 'verdana' Font.BOLD} {"S32"  3 0.175 0.15 '32'  0.3 'verdana' Font.BOLD} {"S33"  3 0.175 0.15 '33'  0.3 'verdana' Font.BOLD} {"S34"  3 0.175 0.15 '34'  0.3 'verdana' Font.BOLD} {"S35"  3 0.175 0.15 '35'  0.3 'verdana' Font.BOLD} {"S36"  3 0.175 0.15 '36'  0.3 'verdana' Font.BOLD} {"S37"  3 0.175 0.15 '37'  0.3 'verdana' Font.BOLD} {"S38"  3 0.175 0.15 '38'  0.3 'verdana' Font.BOLD} {"S39"  3 0.175 0.15 '39'  0.3 'verdana' Font.BOLD} {"S40"  3 0.175 0.15 '40'  0.3 'verdana' Font.BOLD} {"S41"  3 0.175 0.15 '41'  0.3 'verdana' Font.BOLD} {"S42"  3 0.175 0.15 '42'  0.3 'verdana' Font.BOLD} {"S43"  3 0.175 0.15 '43'  0.3 'verdana' Font.BOLD} {"S44"  3 0.175 0.15 '44'  0.3 'verdana' Font.BOLD} {"S45"  3 0.175 0.15 '45'  0.3 'verdana' Font.BOLD} {"S46"  3 0.175 0.15 '46'  0.3 'verdana' Font.BOLD} {"S47"  3 0.175 0.15 '47'  0.3 'verdana' Font.BOLD} {"S48"  3 0.175 0.15 '48'  0.3 'verdana' Font.BOLD} {"S49"  3 0.175 0.15 '49'  0.3 'verdana' Font.BOLD} {"S50"  3 0.175 0.15 '50'  0.3 'verdana' Font.BOLD} {"1" 5 'S1' } {"2" 5 'S2' } {"3" 5 'S3' } {"4" 5 'S4' } {"5" 5 'S5' } {"6" 5 'S6' } {"7" 5 'S7' } {"8" 5 'S8' } {"9" 5 'S9' } {"10" 5 'S10' } {"11" 5 'S11' } {"12" 5 'S12' } {"13" 5 'S13' } {"14" 5 'S14' } {"15" 5 'S15' } {"16" 5 'S16' } {"17" 5 'S17' } {"18" 5 'S18' } {"19" 5 'S19' } {"20" 5 'S20' } {"21" 5 'S21' } {"22" 5 'S22' } {"23" 5 'S23' } {"24" 5 'S24' } {"25" 5 'S25' } {"26" 5 'S26' } {"27" 5 'S27' } {"28" 5 'S28' } {"29" 5 'S29' } {"30" 5 'S30' } {"31" 5 'S31' } {"32" 5 'S32' } {"33" 5 'S33' } {"34" 5 'S34' } {"35" 5 'S35' } {"36" 5 'S36' } {"37" 5 'S37' } {"38" 5 'S38' } {"39" 5 'S39' } {"40" 5 'S40' } {"41" 5 'S41' } {"42" 5 'S42' } {"43" 5 'S43' } {"44" 5 'S44' } {"45" 5 'S45' } {"46" 5 'S46' } {"47" 5 'S47' } {"48" 5 'S48' } {"49" 5 'S49' } {"50" 5 'S50' }} HM-LC-Sw4-Ba-PCB {{"1" 2 0.140 0.704 0.092 0.052} {"2" 2 0.328 0.704 0.092 0.052} {"3" 2 0.512 0.704 0.092 0.052} {"4" 2 0.688 0.704 0.092 0.052}} {ZEL STG RM FST UP4} {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.265 0.500 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.287 0.465 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.309 0.430 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' } {"4_Key" 3 0.18 0.216 '4' 0.14 'verdana' Font.BOLD} {"4_Kreis" 4 0.331 0.395 0.028 0.028} {"4" 5 '4_Key' '4_Kreis' }} HM-LC-Sw1-PB-FM {} HmIP-eTRV {} HmIP-WTH {} HM-RC-Key3 {{"1" 4 0.252 0.2 0.16 0.18} {"2" 4 0.492 0.2 0.16 0.18} {"3" 4 0.34 0.484 0.228 0.252} {"1+2" 5   '1'  '2' }} HM-OU-CFM-Pl {{"Light_circle" 4 0.688 0.224 0.118 0.112} {"Light_beam_1" 6 0.628 0.28 0.656 0.28 0.016} {"Light_beam_2" 6 0.656 0.2 0.68 0.22 0.016} {"Light_beam_3" 6 0.74 0.168 0.74 0.196 0.016} {"Light_beam_4" 6 0.82 0.196 0.8 0.216 0.016} {"Light_beam_5" 6 0.824 0.28 0.856 0.28 0.016} {"Light_beam_6" 6 0.68 0.34 0.664 0.36 0.016} {"Light_beam_7" 6 0.74 0.364 0.74 0.392 0.016} {"Light_beam_8" 6 0.8 0.34 0.82 0.36 0.016} {"1" 5 'Light_circle'  'Light_beam_1'  'Light_beam_2'  'Light_beam_3'  'Light_beam_4'  'Light_beam_5' 'Light_beam_6' 'Light_beam_7' 'Light_beam_8'  } {"SP_1" 6 0.644 0.676 0.672 0.676 0.016} {"SP_2" 6 0.672 0.676 0.672 0.816 0.016} {"SP_3" 6 0.644 0.816 0.672 0.816 0.016} {"SP_4" 6 0.644 0.676 0.644 0.816 0.016} {"SP_5" 6 0.672 0.676 0.716 0.632 0.016} {"SP_6" 6 0.716 0.632 0.716 0.86 0.016} {"SP_7" 6 0.672 0.816 0.716 0.86 0.016} {"SP_beam_1" 6 0.75 0.7 0.832 0.632 0.016} {"SP_beam_2" 6 0.75 0.748 0.832 0.748 0.016} {"SP_beam_3" 6 0.75 0.796 0.832 0.86 0.016} {"2" 5   'SP_1'  'SP_2'  'SP_3'  'SP_4'  'SP_5'  'SP_6'  'SP_7' 'SP_beam_1' 'SP_beam_2' 'SP_beam_3' }} HM-RC-Sec3 {{"1" 4 0.252 0.2 0.16 0.176} {"2" 4 0.492 0.2 0.16 0.176} {"3" 4 0.34 0.48 0.224 0.248} {"1+2" 5   '1'  '2' }} HM-LC-Dim1T-CV {} BRC-H {{"1" 4 0.196 0.222 0.162 0.164} {"2" 4 0.417 0.222 0.162 0.164} {"3" 4 0.196 0.482 0.162 0.164} {"4" 4 0.417 0.482 0.162 0.164}} HM-PB-4Dis-WM {{"2" 2 0.204 0.244 0.556 0.12} {"1" 2 0.204 0.68 0.556 0.12} {"4" 2 0.204 0.244 0.556 0.12} {"3" 2 0.204 0.68 0.556 0.12} {"6" 2 0.204 0.244 0.556 0.12} {"5" 2 0.204 0.68 0.556 0.12} {"8" 2 0.204 0.244 0.556 0.12} {"7" 2 0.204 0.68 0.556 0.12} {"10" 2 0.204 0.244 0.556 0.12} {"9" 2 0.204 0.68 0.556 0.12} {"12" 2 0.204 0.244 0.556 0.12} {"11" 2 0.204 0.68 0.556 0.12} {"14" 2 0.204 0.244 0.556 0.12} {"13" 2 0.204 0.68 0.556 0.12} {"16" 2 0.204 0.244 0.556 0.12} {"15" 2 0.204 0.68 0.556 0.12} {"18" 2 0.204 0.244 0.556 0.12} {"17" 2 0.204 0.68 0.556 0.12} {"20" 2 0.204 0.244 0.556 0.12} {"19" 2 0.204 0.68 0.556 0.12}} HM-CC-VG-1 {} HMIP-SWDO {} HM-WDS40-TH-I-2 {} {ZEL STG RM FZS} {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HMW-WSTH-SM {} HM-LC-Sw2-DR-2 {{"1" 4 0.095 0.556 0.045 0.04} {"2" 4 0.285 0.556 0.045 0.04}} HM-LC-Sw4-WM {{"Channel1" 2 0.208 0.766 0.065 0.060} {"Channel2" 2 0.276 0.766 0.065 0.060} {"Channel3" 2 0.344 0.766 0.065 0.060} {"Channel4" 2 0.412 0.766 0.065 0.060} {"1_val" 3 0.372 0.288 '1' 0.14 'verdana' Font.BOLD} {"2_val" 3 0.372 0.288 '2' 0.14 'verdana' Font.BOLD} {"3_val" 3 0.372 0.288 '3' 0.14 'verdana' Font.BOLD} {"4_val" 3 0.372 0.288 '4' 0.14 'verdana' Font.BOLD} {"Circle1" 4 0.534 0.762 0.044 0.044} {"Circle2" 4 0.583 0.762 0.044 0.044} {"Circle3" 4 0.637 0.762 0.044 0.044} {"Circle4" 4 0.693 0.762 0.044 0.044} {"1" 5   'Channel1'  '1_val' 'Circle1'} {"2" 5   'Channel2'  '2_val' 'Circle2'} {"3" 5   'Channel3'  '3_val' 'Circle3'} {"4" 5   'Channel4'  '4_val' 'Circle4'}} HM-ES-PMSw1-Pl-DN-R1 {} HM-ES-PMSw1-Pl-DN-R2 {} HM-OU-CFM-TW {{Light_circle 4 0.8079999999999999 0.656 0.118 0.112} {Light_beam_1 6 0.748 0.712 0.776 0.712 0.016} {Light_beam_2 6 0.776 0.632 0.8 0.652 0.016} {Light_beam_3 6 0.86 0.6 0.86 0.628 0.016} {Light_beam_4 6 0.94 0.628 0.92 0.648 0.016} {Light_beam_5 6 0.944 0.712 0.976 0.712 0.016} {Light_beam_6 6 0.8 0.772 0.784 0.792 0.016} {Light_beam_7 6 0.86 0.796 0.86 0.8240000000000001 0.016} {Light_beam_8 6 0.92 0.772 0.94 0.792 0.016} {"1" 5 'Light_circle'  'Light_beam_1'  'Light_beam_2'  'Light_beam_3'  'Light_beam_4'  'Light_beam_5' 'Light_beam_6' 'Light_beam_7' 'Light_beam_8'  } {SP_1 6 0.764 0.12 0.792 0.12 0.016} {SP_2 6 0.792 0.12 0.792 0.2599999999999999 0.016} {SP_3 6 0.764 0.2599999999999999 0.792 0.2599999999999999 0.016} {SP_4 6 0.764 0.12 0.764 0.2599999999999999 0.016} {SP_5 6 0.792 0.12 0.836 0.07599999999999996 0.016} {SP_6 6 0.836 0.07599999999999996 0.836 0.30399999999999994 0.016} {SP_7 6 0.792 0.2599999999999999 0.836 0.30399999999999994 0.016} {SP_beam_1 6 0.87 0.1439999999999999 0.952 0.07599999999999996 0.016} {SP_beam_2 6 0.87 0.19199999999999995 0.952 0.19199999999999995 0.016} {SP_beam_3 6 0.87 0.24 0.952 0.30399999999999994 0.016} {"2" 5   'SP_1'  'SP_2'  'SP_3'  'SP_4'  'SP_5'  'SP_6'  'SP_7' 'SP_beam_1' 'SP_beam_2' 'SP_beam_3' }} HM-Sec-SFA-SM {{"1_Taster" 4 0.348 0.388 0.08 0.08} {"1_Led" 4 0.372 0.304 0.036 0.036} {"1" 5 '1_Taster' '1_Led'} {"2_Taster" 4 0.552 0.388 0.08 0.08} {"2_Led" 4 0.576 0.304 0.036 0.036} {"2" 5 '2_Taster' '2_Led'}} HM-ES-PMSw1-Pl-DN-R3 {} HM-ES-PMSw1-Pl-DN-R4 {} HM-ES-PMSw1-Pl-DN-R5 {} HM-SwI-3-FM {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.220 0.480 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.265 0.405 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.310 0.33 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' }} HMW-WSE-SM {} HM-LC-Dim1T-FM {} HM-Sec-SD-Team {} HM-RC-Dis-H-x-EU {} HM-Sec-Key-O {} HM-RC-Key4-2 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"1_Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"2_Arrow" 7 '1_Arrow' 0.028 0.156} {"3_Arrow" 7 '1_Arrow' 0.028 0.312} {"4_Arrow" 7 '1_Arrow' 0.012 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-LC-RGBW-WM {{"1"   1 0.280 0.569 0.014} {"2"   1 0.280 0.645 0.014} {"3"   1 0.280 0.721 0.014}} HM-RC-Key4-3 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"1_Arrow" 7 'Arrow' 0.25 0.0} {"2_Arrow" 7 'Arrow' 0.238 0.156} {"3_Arrow" 7 'Arrow' 0.228 0.312} {"4_Arrow" 7 'Arrow' 0.212 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-WDS100-C6-O-2 {} HM-LC-Dim2L-SM-2 {{"1_Part1" 6 0.530 0.896 0.530 0.98 0.012} {"1_Part2" 6 0.530 0.98 0.49 0.916 0.012} {"1_Part3" 6 0.530 0.98 0.574 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.168 0} {"1_Key" 4 0.25 0.33 0.04 0.044} {"2_Key" 4 0.328 0.33 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-Sec-TiS {} HM-Sec-Key-S {} HM-Sys-sRP-Pl {} HM-LC-Bl1-FM-2 {} HM-OU-CF-Pl {{"Light_circle" 4 0.688 0.224 0.118 0.112} {"Light_beam_1" 6 0.628 0.28 0.656 0.28 0.016} {"Light_beam_2" 6 0.656 0.2 0.68 0.22 0.016} {"Light_beam_3" 6 0.74 0.168 0.74 0.196 0.016} {"Light_beam_4" 6 0.82 0.196 0.8 0.216 0.016} {"Light_beam_5" 6 0.824 0.28 0.856 0.28 0.016} {"Light_beam_6" 6 0.68 0.34 0.664 0.36 0.016} {"Light_beam_7" 6 0.74 0.364 0.74 0.392 0.016} {"Light_beam_8" 6 0.8 0.34 0.82 0.36 0.016} {"1" 5 'Light_circle'  'Light_beam_1'  'Light_beam_2'  'Light_beam_3'  'Light_beam_4'  'Light_beam_5' 'Light_beam_6' 'Light_beam_7' 'Light_beam_8'  } {"SP_1" 6 0.644 0.676 0.672 0.676 0.016} {"SP_2" 6 0.672 0.676 0.672 0.816 0.016} {"SP_3" 6 0.644 0.816 0.672 0.816 0.016} {"SP_4" 6 0.644 0.676 0.644 0.816 0.016} {"SP_5" 6 0.672 0.676 0.716 0.632 0.016} {"SP_6" 6 0.716 0.632 0.716 0.86 0.016} {"SP_7" 6 0.672 0.816 0.716 0.86 0.016} {"SP_beam_1" 6 0.75 0.7 0.832 0.632 0.016} {"SP_beam_2" 6 0.75 0.748 0.832 0.748 0.016} {"SP_beam_3" 6 0.75 0.796 0.832 0.86 0.016} {"2" 5   'SP_1'  'SP_2'  'SP_3'  'SP_4'  'SP_5'  'SP_6'  'SP_7' 'SP_beam_1' 'SP_beam_2' 'SP_beam_3' }} HMW-LC-Bl1-DR-2 {{"1" 2 0.452 0.772 0.044 0.06} {"2" 2 0.5 0.772 0.048 0.06} {"3" 2 0.452 0.388 0.096 0.06}} HM-SCI-3-FM {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.220 0.480 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.265 0.405 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.310 0.33 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' }} HM-LC-Bl1-SM-2 {} HM-LC-Dim1PWM-CV-2 {} HM-ES-PMSw1-DR {} HMW-LC-Sw2-DR {{"1" 2 0.448 0.764 0.048 0.064} {"2" 2 0.496 0.764 0.052 0.068} {"3" 2 0.232 0.384 0.104 0.068} {"4" 2 0.448 0.384 0.104 0.068}} HM-PB-4-WM {{"2" 2 0.24 0.312 0.204 0.168} {"1" 2 0.24 0.556 0.204 0.168} {"3" 2 0.46 0.556 0.204 0.168} {"4" 2 0.46 0.312 0.204 0.168} {"1+2" 2 0.24 0.312 0.204 0.412} {"3+4" 2 0.46 0.312 0.204 0.412}} HM-LC-Dim1T-CV-644 {} HMW-LC-Bl1-DR {{"1" 2 0.452 0.772 0.044 0.06} {"2" 2 0.5 0.772 0.048 0.06} {"3" 2 0.452 0.388 0.096 0.06}} HmIP-SWDO {} HM-Sec-Win {} HM-LC-Sw2-FM-2 {{"1_AUS" 2 0.34 0.66 0.068 0.148} {"1_EIN" 2 0.6 0.66 0.068 0.148} {"2_AUS" 2 0.256 0.66 0.068 0.148} {"2_EIN" 2 0.508 0.66 0.068 0.148} {"1" 5   '1_AUS'  '1_EIN'  } {"2" 5   '2_AUS'  '2_EIN'  }} HM-LC-Sw1-Pl-DN-R1 {} HM-LC-Sw1-Pl-DN-R2 {} HM-LC-Sw1-Pl-DN-R3 {} HM-LC-Dim2T-SM {{"1_Part1" 6 0.539 0.864 0.539 0.948 0.012} {"1_Part2" 6 0.539 0.948 0.49 0.884 0.012} {"1_Part3" 6 0.539 0.948 0.588 0.884 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.179 0} {"1_Key" 4 0.25 0.26 0.04 0.044} {"2_Key" 4 0.328 0.26 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-LC-Sw1-Pl-DN-R4 {} HM-LC-Sw1-Pl-DN-R5 {} HM-LC-Sw1-SM-ATmega168 {} HM-LC-Dim1TPBU-FM-2 {} HM-Sen-MDIR-O {} HM-RC-12-B {{"1" 2 0.252 0.412 0.044 0.072} {"3" 2 0.252 0.508 0.044 0.072} {"5" 2 0.252 0.604 0.044 0.072} {"7" 2 0.252 0.7 0.044 0.072} {"9" 2 0.252 0.8 0.044 0.072} {"10" 2 0.476 0.8 0.044 0.072} {"8" 2 0.476 0.7 0.044 0.072} {"6" 2 0.476 0.604 0.044 0.072} {"4" 2 0.476 0.508 0.044 0.072} {"2" 2 0.476 0.412 0.044 0.072} {"11" 2 0.62 0.8 0.068 0.064} {"12" 2 0.62 0.704 0.068 0.064} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  }} HM-LC-Bl1-SM {} HM-LC-Dim1L-CV {} {ZEL STG RM FDK} {} HM-Sen-RD-O {} HM-WDS30-T-O {} HM-CC-RT-DN {} HM-WS550ST-IO {} {ZEL STG RM FZS-2} {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-Sec-Key {} HM-Sec-SD-2-Team {} HM-RC-19-SW {{"1" 2 0.296 0.344 0.036 0.052} {"3" 2 0.296 0.416 0.036 0.052} {"5" 2 0.296 0.488 0.036 0.052} {"7" 2 0.296 0.56 0.036 0.052} {"9" 2 0.296 0.628 0.036 0.052} {"11" 2 0.296 0.704 0.036 0.048} {"13" 2 0.296 0.772 0.036 0.052} {"15" 2 0.296 0.844 0.036 0.052} {"2" 2 0.468 0.344 0.036 0.052} {"4" 2 0.468 0.416 0.036 0.052} {"6" 2 0.468 0.488 0.036 0.052} {"8" 2 0.468 0.56 0.036 0.052} {"10" 2 0.468 0.628 0.036 0.052} {"12" 2 0.468 0.704 0.036 0.048} {"14" 2 0.468 0.772 0.036 0.052} {"16" 2 0.468 0.844 0.036 0.052} {"17" 2 0.58 0.84 0.044 0.056} {"18" 2 0.312 0.188 0.168 0.088} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  } {"13+14" 5 '13'  '14'  } {"15+16" 5 '15'  '16'  }} KS550 {} HMW-IO-4-FM {{"1" 6 0.616 0.736 0.612 0.836 0.02} {"2" 6 0.672 0.736 0.668 0.836 0.02} {"3" 6 0.724 0.736 0.724 0.836 0.02} {"4" 6 0.78 0.736 0.78 0.836 0.02}} HM-LC-Sw4-PCB-2 {{"Channel1" 2 0.176 0.78 0.068 0.064} {"Channel2" 2 0.244 0.78 0.068 0.064} {"Channel3" 2 0.312 0.78 0.068 0.064} {"Channel4" 2 0.38 0.78 0.068 0.064} {"1_val" 3 0.372 0.288 '1' 0.14 'verdana' Font.BOLD} {"2_val" 3 0.372 0.288 '2' 0.14 'verdana' Font.BOLD} {"3_val" 3 0.372 0.288 '3' 0.14 'verdana' Font.BOLD} {"4_val" 3 0.372 0.288 '4' 0.14 'verdana' Font.BOLD} {"Circle1" 4 0.512 0.784 0.044 0.044} {"Circle2" 4 0.570 0.784 0.044 0.044} {"Circle3" 4 0.628 0.784 0.044 0.044} {"Circle4" 4 0.686 0.784 0.044 0.044} {"1" 5   'Channel1'  '1_val' 'Circle1'} {"2" 5   'Channel2'  '2_val' 'Circle2'} {"3" 5   'Channel3'  '3_val' 'Circle3'} {"4" 5   'Channel4'  '4_val' 'Circle4'}} HM-EM-CMM {} HM-LC-Dim2T-SM-644 {{"1_Part1" 6 0.539 0.864 0.539 0.948 0.012} {"1_Part2" 6 0.539 0.948 0.49 0.884 0.012} {"1_Part3" 6 0.539 0.948 0.588 0.884 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.179 0} {"1_Key" 4 0.25 0.26 0.04 0.044} {"2_Key" 4 0.328 0.26 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} {ZEL STG RM FFK} {} HM-Sec-RHS {} HMW-IO-12-Sw14-DR {{"1" 2 0.106 0.398 0.06 0.06} {"2" 2 0.230 0.398 0.06 0.06} {"3" 2 0.294 0.398 0.06 0.06} {"4" 2 0.422 0.398 0.06 0.06} {"5" 2 0.482 0.398 0.06 0.06} {"6" 2 0.602 0.398 0.06 0.06} {"7" 2 0.046 0.458 0.06 0.06} {"8" 2 0.106 0.458 0.06 0.06} {"9" 2 0.230 0.458 0.06 0.06} {"10" 2 0.294 0.458 0.06 0.06} {"11" 2 0.422 0.458 0.06 0.06} {"12" 2 0.482 0.458 0.06 0.06} {"13" 2 0.602 0.458 0.06 0.06} {"14" 2 0.666 0.458 0.06 0.06} {"15" 2 0.230 0.69 0.06 0.06} {"16" 2 0.294 0.69 0.06 0.06} {"17" 2 0.422 0.69 0.06 0.06} {"18" 2 0.482 0.69 0.06 0.06} {"19" 2 0.602 0.69 0.06 0.06} {"20" 2 0.666 0.69 0.06 0.06} {"21" 2 0.230 0.755 0.06 0.06} {"22" 2 0.294 0.755 0.06 0.06} {"23" 2 0.422 0.755 0.06 0.06} {"24" 2 0.482 0.755 0.06 0.06} {"25" 2 0.602 0.755 0.06 0.06} {"26" 2 0.666 0.755 0.06 0.06}} HM-MOD-Re-8 {} HM-WDS40-TH-I {} {263 167 Gruppe} {} {ZEL STG RM FSS UP3} {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.220 0.480 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.265 0.405 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.310 0.33 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' }} {263 130} {{"1_AUS" 2 0.288 0.66 0.068 0.152} {"1_EIN" 2 0.548 0.66 0.068 0.152} {"1" 5   '1_AUS'  '1_EIN'  }} HM-RC-4 {{"1" 4 0.268 0.236 0.16 0.164} {"2" 4 0.476 0.236 0.16 0.164} {"3" 4 0.268 0.48 0.16 0.164} {"4" 4 0.476 0.48 0.16 0.164} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4' }} {263 131} {{"1a" 2 0.244 0.312 0.428 0.168} {"1b" 2 0.244 0.56 0.428 0.168} {"1" 5 '1a' '1b'}} {263 132} {} {263 133} {} {263 134} {} {263 135} {{"2" 2 0.204 0.23 0.546 0.128} {"1" 2 0.204 0.65 0.546 0.128}} HM-RC-8 {{"1" 1 0.374 0.192 0.02} {"2" 1 0.537 0.248 0.02} {"3" 1 0.374 0.284 0.02} {"4" 1 0.537 0.340 0.02} {"5" 1 0.374 0.378 0.02} {"6" 1 0.537 0.434 0.02} {"7" 1 0.374 0.470 0.02} {"8" 1 0.537 0.526 0.02} {"1+2" 5 '1' '2'} {"3+4" 5 '3' '4'} {"5+6" 5 '5' '6'} {"7+8" 5 '7' '8'}} HM-Sen-DB-PCB {} HM-LC-Sw1-SM {} HM-LC-Sw4-DR-2 {{"1" 4 0.088 0.556 0.048 0.04} {"2" 4 0.280 0.556 0.048 0.04} {"3" 4 0.472 0.556 0.048 0.04} {"4" 4 0.656 0.556 0.048 0.04}} HM-LC-Dim1L-CV-644 {} HM-CC-SCD {} HMW-LC-Dim1L-DR {{"1" 2 0.312 0.756 0.056 0.06} {"2" 2 0.368 0.752 0.048 0.068} {"3" 2 0.368 0.388 0.048 0.064}} HM-LC-Sw1PBU-FM {{"1a" 2 0.244 0.312 0.428 0.168} {"1b" 2 0.244 0.56 0.428 0.168} {"1" 5 '1a' '1b'}} HM-LC-Sw1-Pl {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-LC-Dim2T-SM-2 {{"1_Part1" 6 0.539 0.864 0.539 0.948 0.012} {"1_Part2" 6 0.539 0.948 0.49 0.884 0.012} {"1_Part3" 6 0.539 0.948 0.588 0.884 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.179 0} {"1_Key" 4 0.25 0.26 0.04 0.044} {"2_Key" 4 0.328 0.26 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-LC-Dim2L-SM {{"1_Part1" 6 0.530 0.896 0.530 0.98 0.012} {"1_Part2" 6 0.530 0.98 0.49 0.916 0.012} {"1_Part3" 6 0.530 0.98 0.574 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.168 0} {"1_Key" 4 0.25 0.33 0.04 0.044} {"2_Key" 4 0.328 0.33 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-WDS100-C6-O {} {263 144} {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.220 0.480 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.265 0.405 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.310 0.33 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' }} HM-LC-DDC1-PCB {} {263 145} {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.265 0.500 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.287 0.465 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.309 0.430 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' } {"4_Key" 3 0.18 0.216 '4' 0.14 'verdana' Font.BOLD} {"4_Kreis" 4 0.331 0.395 0.028 0.028} {"4" 5 '4_Key' '4_Kreis' }} {263 146} {} {263 147} {{"1a" 2 0.244 0.312 0.428 0.168} {"1b" 2 0.244 0.56 0.428 0.168} {"1" 5 '1a' '1b'}} HM-LC-Sw4-DR {{"1" 4 0.088 0.556 0.048 0.04} {"2" 4 0.280 0.556 0.048 0.04} {"3" 4 0.472 0.556 0.048 0.04} {"4" 4 0.656 0.556 0.048 0.04}} HM-Sec-SC-2 {} HM-PB-6-WM55 {{"1" 2 0.164 0.232 0.112 0.156} {"2" 2 0.588 0.232 0.112 0.156} {"3" 2 0.164 0.428 0.112 0.156} {"4" 2 0.588 0.428 0.112 0.156} {"5" 2 0.164 0.616 0.112 0.156} {"6" 2 0.588 0.616 0.112 0.156} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  }} HM-LC-Dim1T-FM-2 {} HM-LC-Dim1L-Pl-2 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-PB-2-WM55-2 {{"2" 2 0.204 0.23 0.546 0.128} {"1" 2 0.204 0.65 0.546 0.128}} HM-RC-19-B {{"1" 2 0.296 0.344 0.036 0.052} {"3" 2 0.296 0.416 0.036 0.052} {"5" 2 0.296 0.488 0.036 0.052} {"7" 2 0.296 0.56 0.036 0.052} {"9" 2 0.296 0.628 0.036 0.052} {"11" 2 0.296 0.704 0.036 0.048} {"13" 2 0.296 0.772 0.036 0.052} {"15" 2 0.296 0.844 0.036 0.052} {"2" 2 0.468 0.344 0.036 0.052} {"4" 2 0.468 0.416 0.036 0.052} {"6" 2 0.468 0.488 0.036 0.052} {"8" 2 0.468 0.56 0.036 0.052} {"10" 2 0.468 0.628 0.036 0.052} {"12" 2 0.468 0.704 0.036 0.048} {"14" 2 0.468 0.772 0.036 0.052} {"16" 2 0.468 0.844 0.036 0.052} {"17" 2 0.58 0.84 0.044 0.056} {"18" 2 0.312 0.188 0.168 0.088} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  } {"13+14" 5 '13'  '14'  } {"15+16" 5 '15'  '16'  }} HM-LC-Dim1L-Pl-3 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} {263 155} {{"2" 2 0.204 0.244 0.556 0.12} {"1" 2 0.204 0.68 0.556 0.12} {"4" 2 0.204 0.244 0.556 0.12} {"3" 2 0.204 0.68 0.556 0.12} {"6" 2 0.204 0.244 0.556 0.12} {"5" 2 0.204 0.68 0.556 0.12} {"8" 2 0.204 0.244 0.556 0.12} {"7" 2 0.204 0.68 0.556 0.12} {"10" 2 0.204 0.244 0.556 0.12} {"9" 2 0.204 0.68 0.556 0.12} {"12" 2 0.204 0.244 0.556 0.12} {"11" 2 0.204 0.68 0.556 0.12} {"14" 2 0.204 0.244 0.556 0.12} {"13" 2 0.204 0.68 0.556 0.12} {"16" 2 0.204 0.244 0.556 0.12} {"15" 2 0.204 0.68 0.556 0.12} {"18" 2 0.204 0.244 0.556 0.12} {"17" 2 0.204 0.68 0.556 0.12} {"20" 2 0.204 0.244 0.556 0.12} {"19" 2 0.204 0.68 0.556 0.12}} HM-RCV-50 {{"RF_1" 4 0.364 0.048 0.028 0.028} {"RF_2" 6 0.4 0.052 0.544 0.004 0.016} {"RF_3" 6 0.4 0.052 0.6 0.052 0.016} {"RF_4" 6 0.4 0.052 0.544 0.104 0.016} {"RF_5" 6 0.168 0.052 0.344 0.052 0.016} {"RF_6" 6 0.168 0 0.344 0.052 0.016} {"RF_7" 6 0.168 0.104 0.344 0.052 0.016} {"RF" 5   'RF_1'  'RF_2'  'RF_3'  'RF_4'  'RF_5'  'RF_6'  'RF_7'  } { "S1"  3 0.25 0.15  '1'  0.3 'verdana' Font.BOLD} { "S2"  3 0.25 0.15  '2'  0.3 'verdana' Font.BOLD} { "S3"  3 0.25 0.15  '3'  0.3 'verdana' Font.BOLD} { "S4"  3 0.25 0.15  '4'  0.3 'verdana' Font.BOLD} { "S5"  3 0.25 0.15  '5'  0.3 'verdana' Font.BOLD} { "S6"  3 0.25 0.15  '6'  0.3 'verdana' Font.BOLD} { "S7"  3 0.25 0.15  '7'  0.3 'verdana' Font.BOLD} { "S8"  3 0.25 0.15  '8'  0.3 'verdana' Font.BOLD} { "S9"  3 0.25 0.15  '9'  0.3 'verdana' Font.BOLD} {"S10"  3 0.175 0.15 '10'  0.3 'verdana' Font.BOLD} {"S11"  3 0.175 0.15 '11'  0.3 'verdana' Font.BOLD} {"S12"  3 0.175 0.15 '12'  0.3 'verdana' Font.BOLD} {"S13"  3 0.175 0.15 '13'  0.3 'verdana' Font.BOLD} {"S14"  3 0.175 0.15 '14'  0.3 'verdana' Font.BOLD} {"S15"  3 0.175 0.15 '15'  0.3 'verdana' Font.BOLD} {"S16"  3 0.175 0.15 '16'  0.3 'verdana' Font.BOLD} {"S17"  3 0.175 0.15 '17'  0.3 'verdana' Font.BOLD} {"S18"  3 0.175 0.15 '18'  0.3 'verdana' Font.BOLD} {"S19"  3 0.175 0.15 '19'  0.3 'verdana' Font.BOLD} {"S20"  3 0.175 0.15 '20'  0.3 'verdana' Font.BOLD} {"S21"  3 0.175 0.15 '21'  0.3 'verdana' Font.BOLD} {"S22"  3 0.175 0.15 '22'  0.3 'verdana' Font.BOLD} {"S23"  3 0.175 0.15 '23'  0.3 'verdana' Font.BOLD} {"S24"  3 0.175 0.15 '24'  0.3 'verdana' Font.BOLD} {"S25"  3 0.175 0.15 '25'  0.3 'verdana' Font.BOLD} {"S26"  3 0.175 0.15 '26'  0.3 'verdana' Font.BOLD} {"S27"  3 0.175 0.15 '27'  0.3 'verdana' Font.BOLD} {"S28"  3 0.175 0.15 '28'  0.3 'verdana' Font.BOLD} {"S29"  3 0.175 0.15 '29'  0.3 'verdana' Font.BOLD} {"S30"  3 0.175 0.15 '30'  0.3 'verdana' Font.BOLD} {"S31"  3 0.175 0.15 '31'  0.3 'verdana' Font.BOLD} {"S32"  3 0.175 0.15 '32'  0.3 'verdana' Font.BOLD} {"S33"  3 0.175 0.15 '33'  0.3 'verdana' Font.BOLD} {"S34"  3 0.175 0.15 '34'  0.3 'verdana' Font.BOLD} {"S35"  3 0.175 0.15 '35'  0.3 'verdana' Font.BOLD} {"S36"  3 0.175 0.15 '36'  0.3 'verdana' Font.BOLD} {"S37"  3 0.175 0.15 '37'  0.3 'verdana' Font.BOLD} {"S38"  3 0.175 0.15 '38'  0.3 'verdana' Font.BOLD} {"S39"  3 0.175 0.15 '39'  0.3 'verdana' Font.BOLD} {"S40"  3 0.175 0.15 '40'  0.3 'verdana' Font.BOLD} {"S41"  3 0.175 0.15 '41'  0.3 'verdana' Font.BOLD} {"S42"  3 0.175 0.15 '42'  0.3 'verdana' Font.BOLD} {"S43"  3 0.175 0.15 '43'  0.3 'verdana' Font.BOLD} {"S44"  3 0.175 0.15 '44'  0.3 'verdana' Font.BOLD} {"S45"  3 0.175 0.15 '45'  0.3 'verdana' Font.BOLD} {"S46"  3 0.175 0.15 '46'  0.3 'verdana' Font.BOLD} {"S47"  3 0.175 0.15 '47'  0.3 'verdana' Font.BOLD} {"S48"  3 0.175 0.15 '48'  0.3 'verdana' Font.BOLD} {"S49"  3 0.175 0.15 '49'  0.3 'verdana' Font.BOLD} {"S50"  3 0.175 0.15 '50'  0.3 'verdana' Font.BOLD} {"1" 5 'S1' } {"2" 5 'S2' } {"3" 5 'S3' } {"4" 5 'S4' } {"5" 5 'S5' } {"6" 5 'S6' } {"7" 5 'S7' } {"8" 5 'S8' } {"9" 5 'S9' } {"10" 5 'S10' } {"11" 5 'S11' } {"12" 5 'S12' } {"13" 5 'S13' } {"14" 5 'S14' } {"15" 5 'S15' } {"16" 5 'S16' } {"17" 5 'S17' } {"18" 5 'S18' } {"19" 5 'S19' } {"20" 5 'S20' } {"21" 5 'S21' } {"22" 5 'S22' } {"23" 5 'S23' } {"24" 5 'S24' } {"25" 5 'S25' } {"26" 5 'S26' } {"27" 5 'S27' } {"28" 5 'S28' } {"29" 5 'S29' } {"30" 5 'S30' } {"31" 5 'S31' } {"32" 5 'S32' } {"33" 5 'S33' } {"34" 5 'S34' } {"35" 5 'S35' } {"36" 5 'S36' } {"37" 5 'S37' } {"38" 5 'S38' } {"39" 5 'S39' } {"40" 5 'S40' } {"41" 5 'S41' } {"42" 5 'S42' } {"43" 5 'S43' } {"44" 5 'S44' } {"45" 5 'S45' } {"46" 5 'S46' } {"47" 5 'S47' } {"48" 5 'S48' } {"49" 5 'S49' } {"50" 5 'S50' }} {263 157} {} {263 158} {} {263 160} {} HM-LC-Dim1L-CV-2 {} HM-LC-Bl1-PB-FM {} HM-PB-2-WM {{"2" 2 0.244 0.312 0.428 0.168} {"1" 2 0.244 0.56 0.428 0.168} {"1+2" 2 0.244 0.308 0.428 0.416}} {263 162} {} HM-LC-Dim1T-FM-644 {} {263 167} {} HM-RC-Sec3-B {{"1" 4 0.252 0.2 0.16 0.176} {"2" 4 0.492 0.2 0.16 0.176} {"3" 4 0.34 0.48 0.224 0.248} {"1+2" 5   '1'  '2' }} HM-RC-4-3-D {} HM-LC-Dim1T-FM-LF {} HM-Dis-WM55 {} HM-LC-Sw4-SM-2 {{"1_Part1" 6 0.136 0.896 0.136 0.98 0.012} {"1_Part2" 6 0.136 0.98 0.096 0.916 0.012} {"1_Part3" 6 0.136 0.98 0.176 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.164 0} {"3_Arrow" 7 '1_Arrow' 0.328 0} {"4_Arrow" 7 '1_Arrow' 0.492 0} {"1_Key" 4 0.244 0.372 0.04 0.044} {"2_Key" 4 0.328 0.372 0.04 0.044} {"3_Key" 4 0.404 0.372 0.04 0.044} {"4_Key" 4 0.484 0.372 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  } {"3" 5   '3_Arrow'  '3_Key'  } {"4" 5   '4_Arrow'  '4_Key'  }} HM-LC-Sw1-FM-2 {{"1_AUS" 2 0.288 0.66 0.068 0.152} {"1_EIN" 2 0.548 0.66 0.068 0.152} {"1" 5   '1_AUS'  '1_EIN'  }} {ZEL STG RM DWT 10} {{"2" 2 0.204 0.244 0.556 0.12} {"1" 2 0.204 0.68 0.556 0.12} {"4" 2 0.204 0.244 0.556 0.12} {"3" 2 0.204 0.68 0.556 0.12} {"6" 2 0.204 0.244 0.556 0.12} {"5" 2 0.204 0.68 0.556 0.12} {"8" 2 0.204 0.244 0.556 0.12} {"7" 2 0.204 0.68 0.556 0.12} {"10" 2 0.204 0.244 0.556 0.12} {"9" 2 0.204 0.68 0.556 0.12} {"12" 2 0.204 0.244 0.556 0.12} {"11" 2 0.204 0.68 0.556 0.12} {"14" 2 0.204 0.244 0.556 0.12} {"13" 2 0.204 0.68 0.556 0.12} {"16" 2 0.204 0.244 0.556 0.12} {"15" 2 0.204 0.68 0.556 0.12} {"18" 2 0.204 0.244 0.556 0.12} {"17" 2 0.204 0.68 0.556 0.12} {"20" 2 0.204 0.244 0.556 0.12} {"19" 2 0.204 0.68 0.556 0.12}} HM-Sen-EP {{"1_rect" 2 0.14 0.612 0.086 0.05} {"2_rect" 2 0.14 0.740 0.086 0.05} {"1_channel" 3 0.44 0.232 '1' 0.18 'verdana' Font.BOLD} {"1" 5 '1_channel' '1_rect'} {"2_channel" 3 0.44 0.232 '2' 0.18 'verdana' Font.BOLD} {"2" 5 '2_channel' '2_rect'}} HmIP-eTRV-2 {} HM-LC-Sw1-SM-2 {} HM-WDS10-TH-O {} HM-LC-Dim2L-SM-644 {{"1_Part1" 6 0.530 0.896 0.530 0.98 0.012} {"1_Part2" 6 0.530 0.98 0.49 0.916 0.012} {"1_Part3" 6 0.530 0.98 0.574 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.168 0} {"1_Key" 4 0.25 0.33 0.04 0.044} {"2_Key" 4 0.328 0.33 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  }} HM-Sec-WDS-2 {} HM-LC-Sw1-Ba-PCB {} atent {{"1" 4 0.177 0.216 0.166 0.166} {"2" 4 0.438 0.216 0.166 0.166} {"3" 4 0.273 0.49 0.24 0.235} {"1+2" 5   '1'  '2' }} HM-Sen-MDIR-O-2 {} HM-CC-TC {} HM-LC-Dim1T-Pl {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-Sec-SCo {} HM-LC-Dim1T-Pl-644 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-ES-TX-WM {} HMW-IO-12-FM {{"1_num" 3 0.744 0.636 '1' 0.164 'verdana' Font.BOLD} {"1_line" 6 0.77 0.08 0.860  0.08 0.016} {"1" 5 '1_num' '1_line'} {"2_num" 3 0.744 0.636 '2' 0.164 'verdana' Font.BOLD} {"2_line" 6 0.77 0.136  0.86 0.136 0.016} {"2" 5 '2_num' '2_line'} {"3_num" 3 0.744 0.636 '3' 0.164 'verdana' Font.BOLD} {"3_line" 6 0.77 0.194  0.86 0.194 0.016} {"3" 5 '3_num' '3_line'} {"4_num" 3 0.744 0.636 '4' 0.164 'verdana' Font.BOLD} {"4_line" 6 0.77 0.25  0.86 0.25 0.016} {"4" 5 '4_num' '4_line'} {"5_num" 3 0.744 0.636 '5' 0.164 'verdana' Font.BOLD} {"5_line" 6 0.77 0.308  0.86 0.308 0.016} {"5" 5 '5_num' '5_line'} {"6_num" 3 0.744 0.636 '6' 0.164 'verdana' Font.BOLD} {"6_line" 6 0.77 0.366  0.86 0.366 0.016} {"6" 5 '6_num' '6_line'} {"7_num" 3 0.744 0.636 '7' 0.164 'verdana' Font.BOLD} {"7_line" 6 0.77 0.424  0.86 0.424 0.016} {"7" 5 '7_num' '7_line'} {"8_num" 3 0.744 0.636 '8' 0.164 'verdana' Font.BOLD} {"8_arc" 4 0.370 0.748  0.036  0.036 0.036} {"8" 5 '8_num' '8_arc'} {"9_num" 3 0.744 0.636 '9' 0.164 'verdana' Font.BOLD} {"9_arc" 4 0.3895 0.704  0.036  0.036 0.036} {"9" 5 '9_num' '9_arc'} {"10_num" 3 0.744 0.636 '10' 0.164 'verdana' Font.BOLD} {"10_arc" 4 0.41 0.65  0.035  0.036 0.036} {"10" 5 '10_num' '10_arc'} {"11_num" 3 0.744 0.636 '11' 0.164 'verdana' Font.BOLD} {"11_arc" 4 0.4293 0.612  0.036  0.036 0.036} {"11" 5 '11_num' '11_arc'} {"12_num" 3 0.744 0.636 '12' 0.164 'verdana' Font.BOLD} {"12_arc" 4 0.448 0.564  0.036  0.036 0.036} {"12" 5 '12_num' '12_arc'}} 263_149_/_263_150 {} HM-LC-Sw1-Pl-CT-R1 {} HM-PBI-4-FM {{"1_Key" 3 0.18 0.216 '1' 0.14 'verdana' Font.BOLD} {"1_Kreis" 4 0.265 0.500 0.028 0.028} {"1" 5 '1_Key' '1_Kreis' } {"2_Key" 3 0.18 0.216 '2' 0.14 'verdana' Font.BOLD} {"2_Kreis" 4 0.287 0.465 0.028 0.028} {"2" 5 '2_Key' '2_Kreis' } {"3_Key" 3 0.18 0.216 '3' 0.14 'verdana' Font.BOLD} {"3_Kreis" 4 0.309 0.430 0.028 0.028} {"3" 5 '3_Key' '3_Kreis' } {"4_Key" 3 0.18 0.216 '4' 0.14 'verdana' Font.BOLD} {"4_Kreis" 4 0.331 0.395 0.028 0.028} {"4" 5 '4_Key' '4_Kreis' }} HM-CC-VD {} HM-RC-4-2 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"1_Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"2_Arrow" 7 '1_Arrow' 0.028 0.156} {"3_Arrow" 7 '1_Arrow' 0.028 0.312} {"4_Arrow" 7 '1_Arrow' 0.012 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-Sec-SC {} HM-RC-4-3 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"1_Arrow" 7 'Arrow' 0.25 0.0} {"2_Arrow" 7 'Arrow' 0.238 0.156} {"3_Arrow" 7 'Arrow' 0.228 0.312} {"4_Arrow" 7 'Arrow' 0.212 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-Sec-SD {} HMIP-PSM {} HM-ES-PMSw1-SM {} HM-Sen-MDIR-WM55 {{"1" 2 0.192 0.660 0.524 0.12} {"2" 2 0.192 0.252 0.524 0.12} {"1+2" 5   '1'  '2' }} HM-LC-Sw4-PCB {{"Channel1" 2 0.176 0.78 0.068 0.064} {"Channel2" 2 0.244 0.78 0.068 0.064} {"Channel3" 2 0.312 0.78 0.068 0.064} {"Channel4" 2 0.38 0.78 0.068 0.064} {"1_val" 3 0.372 0.288 '1' 0.14 'verdana' Font.BOLD} {"2_val" 3 0.372 0.288 '2' 0.14 'verdana' Font.BOLD} {"3_val" 3 0.372 0.288 '3' 0.14 'verdana' Font.BOLD} {"4_val" 3 0.372 0.288 '4' 0.14 'verdana' Font.BOLD} {"Circle1" 4 0.512 0.784 0.044 0.044} {"Circle2" 4 0.570 0.784 0.044 0.044} {"Circle3" 4 0.628 0.784 0.044 0.044} {"Circle4" 4 0.686 0.784 0.044 0.044} {"1" 5   'Channel1'  '1_val' 'Circle1'} {"2" 5   'Channel2'  '2_val' 'Circle2'} {"3" 5   'Channel3'  '3_val' 'Circle3'} {"4" 5   'Channel4'  '4_val' 'Circle4'}} HMIP-PS {} HmIP-KRC4 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"1_Arrow" 7 'Arrow' 0.25 0.0} {"2_Arrow" 7 'Arrow' 0.238 0.156} {"3_Arrow" 7 'Arrow' 0.228 0.312} {"4_Arrow" 7 'Arrow' 0.212 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-ES-PMSw1-Pl {} HM-LC-Dim1TPBU-FM {} HM-PB-4Dis-WM-2 {{"2" 2 0.204 0.244 0.556 0.12} {"1" 2 0.204 0.68 0.556 0.12} {"4" 2 0.204 0.244 0.556 0.12} {"3" 2 0.204 0.68 0.556 0.12} {"6" 2 0.204 0.244 0.556 0.12} {"5" 2 0.204 0.68 0.556 0.12} {"8" 2 0.204 0.244 0.556 0.12} {"7" 2 0.204 0.68 0.556 0.12} {"10" 2 0.204 0.244 0.556 0.12} {"9" 2 0.204 0.68 0.556 0.12} {"12" 2 0.204 0.244 0.556 0.12} {"11" 2 0.204 0.68 0.556 0.12} {"14" 2 0.204 0.244 0.556 0.12} {"13" 2 0.204 0.68 0.556 0.12} {"16" 2 0.204 0.244 0.556 0.12} {"15" 2 0.204 0.68 0.556 0.12} {"18" 2 0.204 0.244 0.556 0.12} {"17" 2 0.204 0.68 0.556 0.12} {"20" 2 0.204 0.244 0.556 0.12} {"19" 2 0.204 0.68 0.556 0.12}} {ZEL STG RM FEP 230V} {} HM-RC-4-B {{"1" 4 0.268 0.236 0.16 0.164} {"2" 4 0.476 0.236 0.16 0.164} {"3" 4 0.268 0.48 0.16 0.164} {"4" 4 0.476 0.48 0.16 0.164} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4' }} HM-RC-12 {{"1" 2 0.252 0.412 0.044 0.072} {"3" 2 0.252 0.508 0.044 0.072} {"5" 2 0.252 0.604 0.044 0.072} {"7" 2 0.252 0.7 0.044 0.072} {"9" 2 0.252 0.8 0.044 0.072} {"10" 2 0.476 0.8 0.044 0.072} {"8" 2 0.476 0.7 0.044 0.072} {"6" 2 0.476 0.604 0.044 0.072} {"4" 2 0.476 0.508 0.044 0.072} {"2" 2 0.476 0.412 0.044 0.072} {"11" 2 0.62 0.8 0.068 0.064} {"12" 2 0.62 0.704 0.068 0.064} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  }} HMIP-WRC2 {{"2" 4 0.540 0.366 0.04 0.044} {"1" 4 0.540 0.622 0.04 0.044}} OLIGO.smart.iq.HM {} HM-LC-Sw2-DR {{"1" 4 0.095 0.556 0.045 0.04} {"2" 4 0.285 0.556 0.045 0.04}} HM-LC-Dim1T-Pl-2 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HMW-Sen-SC-12-DR {{"1" 2 0.244 0.688 0.06 0.06} {"2" 2 0.304 0.688 0.06 0.06} {"3" 2 0.436 0.688 0.06 0.06} {"4" 2 0.496 0.688 0.06 0.06} {"5" 2 0.62 0.688 0.06 0.06} {"6" 2 0.68 0.688 0.06 0.06} {"7" 2 0.244 0.752 0.06 0.06} {"8" 2 0.304 0.752 0.06 0.06} {"9" 2 0.436 0.752 0.06 0.06} {"10" 2 0.496 0.752 0.06 0.06} {"11" 2 0.62 0.752 0.06 0.06} {"12" 2 0.68 0.752 0.06 0.06}} HM-RC-19 {{"1" 2 0.296 0.344 0.036 0.052} {"3" 2 0.296 0.416 0.036 0.052} {"5" 2 0.296 0.488 0.036 0.052} {"7" 2 0.296 0.56 0.036 0.052} {"9" 2 0.296 0.628 0.036 0.052} {"11" 2 0.296 0.704 0.036 0.048} {"13" 2 0.296 0.772 0.036 0.052} {"15" 2 0.296 0.844 0.036 0.052} {"2" 2 0.468 0.344 0.036 0.052} {"4" 2 0.468 0.416 0.036 0.052} {"6" 2 0.468 0.488 0.036 0.052} {"8" 2 0.468 0.56 0.036 0.052} {"10" 2 0.468 0.628 0.036 0.052} {"12" 2 0.468 0.704 0.036 0.048} {"14" 2 0.468 0.772 0.036 0.052} {"16" 2 0.468 0.844 0.036 0.052} {"17" 2 0.58 0.84 0.044 0.056} {"18" 2 0.312 0.188 0.168 0.088} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4'  } {"5+6" 5   '5'  '6'  } {"7+8" 5   '7'  '8'  } {"9+10" 5  '9'  '10'  } {"11+12" 5 '11'  '12'  } {"13+14" 5 '13'  '14'  } {"15+16" 5 '15'  '16'  }} HM-MOD-EM-8 {} HM-LC-Dim1T-Pl-3 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-TC-IT-WM-W-EU {} HM-Sec-SD-2 {} HM-LC-Dim1T-CV-2 {} HM-RC-Sec4-2 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"1_Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"2_Arrow" 7 '1_Arrow' 0.028 0.156} {"3_Arrow" 7 '1_Arrow' 0.028 0.312} {"4_Arrow" 7 '1_Arrow' 0.012 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} {ZEL STG RM FSA} {} HM-RC-Sec4-3 {{"arrow_part1" 6 0.312 0.288 0.416 0.288 0.012} {"arrow_part2" 6 0.312 0.288 0.352 0.248 0.012} {"arrow_part3" 6 0.312 0.288 0.352 0.328 0.012} {"Arrow" 5 'arrow_part1'  'arrow_part2'  'arrow_part3' } {"1_Arrow" 7 'Arrow' 0.25 0.0} {"2_Arrow" 7 'Arrow' 0.238 0.156} {"3_Arrow" 7 'Arrow' 0.228 0.312} {"4_Arrow" 7 'Arrow' 0.212 0.468} {"1" 5   '2_Arrow' } {"2" 5   '1_Arrow' } {"3" 5   '4_Arrow' } {"4" 5   '3_Arrow' } {"1+2" 5   '1_Arrow' '2_Arrow'} {"3+4" 5   '3_Arrow' '4_Arrow'}} HM-OU-CM-PCB {} HM-Sec-MDIR {} HM-Sen-LI-O {} HM-Sec-WDS {} HM-WDS30-OT2-SM-2 {} HM-Sec-Sir-WM {} HMW-Sen-SC-12-FM {{"1_num" 3 0.744 0.636 '1' 0.164 'verdana' Font.BOLD} {"1_line" 6 0.77 0.055 0.860  0.055 0.016} {"1" 5 '1_num' '1_line'} {"2_num" 3 0.744 0.636 '2' 0.164 'verdana' Font.BOLD} {"2_line" 6 0.77 0.115  0.86 0.115 0.016} {"2" 5 '2_num' '2_line'} {"3_num" 3 0.744 0.636 '3' 0.164 'verdana' Font.BOLD} {"3_line" 6 0.77 0.173  0.86 0.173 0.016} {"3" 5 '3_num' '3_line'} {"4_num" 3 0.744 0.636 '4' 0.164 'verdana' Font.BOLD} {"4_line" 6 0.77 0.226  0.86 0.226 0.016} {"4" 5 '4_num' '4_line'} {"5_num" 3 0.744 0.636 '5' 0.164 'verdana' Font.BOLD} {"5_line" 6 0.77 0.288  0.86 0.288 0.016} {"5" 5 '5_num' '5_line'} {"6_num" 3 0.744 0.636 '6' 0.164 'verdana' Font.BOLD} {"6_line" 6 0.77 0.348  0.86 0.348 0.016} {"6" 5 '6_num' '6_line'} {"7_num" 3 0.744 0.636 '7' 0.164 'verdana' Font.BOLD} {"7_line" 6 0.77 0.403  0.86 0.403 0.016} {"7" 5 '7_num' '7_line'} {"8_num" 3 0.744 0.636 '8' 0.164 'verdana' Font.BOLD} {"8_arc" 4 0.370 0.730  0.036  0.036 0.036} {"8" 5 '8_num' '8_arc'} {"9_num" 3 0.744 0.636 '9' 0.164 'verdana' Font.BOLD} {"9_arc" 4 0.3895 0.685  0.036  0.036 0.0368} {"9" 5 '9_num' '9_arc'} {"10_num" 3 0.744 0.636 '10' 0.164 'verdana' Font.BOLD} {"10_arc" 4 0.41 0.64  0.036  0.036 0.036} {"10" 5 '10_num' '10_arc'} {"11_num" 3 0.744 0.636 '11' 0.164 'verdana' Font.BOLD} {"11_arc" 4 0.43 0.589  0.036  0.036 0.036} {"11" 5 '11_num' '11_arc'} {"12_num" 3 0.744 0.636 '12' 0.164 'verdana' Font.BOLD} {"12_arc" 4 0.45 0.542  0.036  0.036 0.036} {"12" 5 '12_num' '12_arc'}} HM-LC-Sw2-FM {{"1_AUS" 2 0.34 0.66 0.068 0.148} {"1_EIN" 2 0.6 0.66 0.068 0.148} {"2_AUS" 2 0.256 0.66 0.068 0.148} {"2_EIN" 2 0.508 0.66 0.068 0.148} {"1" 5   '1_AUS'  '1_EIN'  } {"2" 5   '2_AUS'  '2_EIN'  }} HM-CCU-1 {} HmIP-PSM {} HM-LC-Bl1-FM {} HM-RC-P1 {{"1" 4 0.26 0.248 0.38 0.42}} HM-LC-Dim1L-Pl {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HmIP-PS {} HM-PB-2-WM55 {{"2" 2 0.204 0.23 0.546 0.128} {"1" 2 0.204 0.65 0.546 0.128}} {ZEL STG RM HS 4} {{"1" 4 0.268 0.236 0.16 0.164} {"2" 4 0.476 0.236 0.16 0.164} {"3" 4 0.268 0.48 0.16 0.164} {"4" 4 0.476 0.48 0.16 0.164} {"1+2" 5   '1'  '2' } {"3+4" 5   '3'  '4' }} HM-LC-Sw1-Pl-2 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-LC-Dim1L-Pl-644 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-LC-Sw1-Pl-3 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HMW-IO-12-Sw7-DR {{"1" 2 0.264 0.7 0.06 0.06} {"2" 2 0.328 0.7 0.06 0.06} {"3" 2 0.46 0.7 0.06 0.06} {"4" 2 0.524 0.7 0.06 0.06} {"5" 2 0.648 0.7 0.06 0.06} {"6" 2 0.708 0.7 0.06 0.06} {"8" 2 0.328 0.764 0.06 0.06} {"7" 2 0.264 0.764 0.06 0.06} {"9" 2 0.46 0.764 0.06 0.06} {"10" 2 0.524 0.764 0.06 0.06} {"11" 2 0.644 0.764 0.06 0.06} {"12" 2 0.708 0.764 0.06 0.06} {"13" 2 0.268 0.396 0.12 0.06} {"14" 2 0.46 0.396 0.12 0.06} {"15" 2 0.648 0.396 0.12 0.06} {"16" 2 0.076 0.46 0.12 0.06} {"17" 2 0.264 0.46 0.12 0.06} {"18" 2 0.46 0.46 0.12 0.06} {"19" 2 0.648 0.46 0.12 0.06}} HM-WS550STH-I {} {ZEL STG RM WT 2} {{"2" 2 0.204 0.23 0.546 0.128} {"1" 2 0.204 0.65 0.546 0.128}} HM-Sen-MDIR-SM {} HM-WS550STH-O {} HmIP-WRC2 {{"2" 4 0.540 0.366 0.04 0.044} {"1" 4 0.540 0.622 0.04 0.044}} HMW-Sys-PS7-DR {} WS550 {{"1" 3 0.440 0.200 '1' 0.124 'verdana' Font.BOLD} {"2" 3 0.440 0.200 '2' 0.124 'verdana' Font.BOLD} {"3" 3 0.440 0.200 '3' 0.124 'verdana' Font.BOLD} {"4" 3 0.440 0.200 '4' 0.124 'verdana' Font.BOLD} {"5" 3 0.440 0.200 '5' 0.124 'verdana' Font.BOLD} {"6" 3 0.440 0.200 '6' 0.124 'verdana' Font.BOLD} {"7" 3 0.440 0.200 '7' 0.124 'verdana' Font.BOLD} {"8" 3 0.440 0.200 '8' 0.124 'verdana' Font.BOLD} {"9" 3 0.440 0.200 '9' 0.124 'verdana' Font.BOLD} {"10" 3 0.405 0.200 '10' 0.124 'verdana' Font.BOLD}} HM-Sen-Wa-Od {} HM-RC-Key3-B {{"1" 4 0.252 0.2 0.16 0.18} {"2" 4 0.492 0.2 0.16 0.18} {"3" 4 0.34 0.484 0.228 0.252} {"1+2" 5   '1'  '2' }} DEVICE {{"Icon" 3 0.092 0.6 'Icon_folgt' 0.14 'verdana' Font.BOLD} {"1_channel" 3 0.44 0.232 '1' 0.18 'verdana' Font.BOLD} {"1" 5 '1_channel' 'Icon'} {"2_channel" 3 0.44 0.232 '2' 0.18 'verdana' Font.BOLD} {"2" 5 '2_channel' 'Icon'}} HM-WDS30-OT2-SM {} HM-PB-2-FM {{"2" 2 0.244 0.312 0.428 0.168} {"1" 2 0.244 0.56 0.428 0.168} {"1+2" 2 0.244 0.308 0.428 0.416}} HM-LC-Bl1PBU-FM {{"1a" 2 0.244 0.312 0.428 0.168} {"1b" 2 0.244 0.56 0.428 0.168} {"1" 5 '1a' '1b'}} HM-LC-Sw1-DR {} HMIP-eTRV {} HMIP-WTH {} HM-RC-2-PBU-FM {{"2" 2 0.244 0.312 0.428 0.168} {"1" 2 0.244 0.56 0.428 0.168} {"1+2" 2 0.244 0.308 0.428 0.416}} HM-LC-Sw1-Pl-OM54 {{"1_part1" 2 0.548 0.468 0.072 0.052} {"1_part2" 2 0.612 0.452 0.028 0.056} {"1" 5   '1_part1'  '1_part2'  }} HM-LC-Sw4-WM-2 {{"Channel1" 2 0.208 0.766 0.065 0.060} {"Channel2" 2 0.276 0.766 0.065 0.060} {"Channel3" 2 0.344 0.766 0.065 0.060} {"Channel4" 2 0.412 0.766 0.065 0.060} {"1_val" 3 0.372 0.288 '1' 0.14 'verdana' Font.BOLD} {"2_val" 3 0.372 0.288 '2' 0.14 'verdana' Font.BOLD} {"3_val" 3 0.372 0.288 '3' 0.14 'verdana' Font.BOLD} {"4_val" 3 0.372 0.288 '4' 0.14 'verdana' Font.BOLD} {"Circle1" 4 0.534 0.762 0.044 0.044} {"Circle2" 4 0.583 0.762 0.044 0.044} {"Circle3" 4 0.637 0.762 0.044 0.044} {"Circle4" 4 0.693 0.762 0.044 0.044} {"1" 5   'Channel1'  '1_val' 'Circle1'} {"2" 5   'Channel2'  '2_val' 'Circle2'} {"3" 5   'Channel3'  '3_val' 'Circle3'} {"4" 5   'Channel4'  '4_val' 'Circle4'}} HM-Sec-MDIR-2 {} HM-Sec-MDIR-3 {} HMW-Sec-TR-FM {} HM-WDC7000 {{"1" 3 0.440 0.200 '1' 0.124 'verdana' Font.BOLD} {"2" 3 0.440 0.200 '2' 0.124 'verdana' Font.BOLD} {"3" 3 0.440 0.200 '3' 0.124 'verdana' Font.BOLD} {"4" 3 0.440 0.200 '4' 0.124 'verdana' Font.BOLD} {"5" 3 0.440 0.200 '5' 0.124 'verdana' Font.BOLD} {"6" 3 0.440 0.200 '6' 0.124 'verdana' Font.BOLD} {"7" 3 0.440 0.200 '7' 0.124 'verdana' Font.BOLD} {"8" 3 0.440 0.200 '8' 0.124 'verdana' Font.BOLD} {"9" 3 0.440 0.200 '9' 0.124 'verdana' Font.BOLD} {"10" 3 0.405 0.200 '10' 0.124 'verdana' Font.BOLD}} HM-OU-LED16 {{"1" 2 0.152 0.218 0.064 0.056} {"2" 2 0.152 0.277 0.064 0.056} {"3" 2 0.152 0.336 0.064 0.056} {"4" 2 0.152 0.395 0.064 0.056} {"5" 2 0.152 0.454 0.064 0.056} {"6" 2 0.152 0.513 0.064 0.056} {"7" 2 0.152 0.572 0.064 0.056} {"8" 2 0.152 0.631 0.064 0.056} {"9" 2 0.728 0.218 0.064 0.056} {"10" 2 0.728 0.277 0.064 0.056} {"11" 2 0.728 0.336 0.064 0.056} {"12" 2 0.728 0.395 0.064 0.056} {"13" 2 0.728 0.454 0.064 0.056} {"14" 2 0.728 0.513 0.064 0.056} {"15" 2 0.728 0.572 0.064 0.056} {"16" 2 0.728 0.631 0.064 0.056}} HM-LC-Sw4-SM {{"1_Part1" 6 0.136 0.896 0.136 0.98 0.012} {"1_Part2" 6 0.136 0.98 0.096 0.916 0.012} {"1_Part3" 6 0.136 0.98 0.176 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.164 0} {"3_Arrow" 7 '1_Arrow' 0.328 0} {"4_Arrow" 7 '1_Arrow' 0.492 0} {"1_Key" 4 0.244 0.372 0.04 0.044} {"2_Key" 4 0.328 0.372 0.04 0.044} {"3_Key" 4 0.404 0.372 0.04 0.044} {"4_Key" 4 0.484 0.372 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  } {"3" 5   '3_Arrow'  '3_Key'  } {"4" 5   '4_Arrow'  '4_Key'  }} HM-LC-Sw1-FM {{"1_AUS" 2 0.288 0.66 0.068 0.152} {"1_EIN" 2 0.548 0.66 0.068 0.152} {"1" 5   '1_AUS'  '1_EIN'  }} HM-LC-Sw2-PB-FM {{"1" 2 0.24 0.312 0.204 0.412} {"2" 2 0.46 0.312 0.204 0.412}} WS888 {{"1" 3 0.440 0.200 '1' 0.124 'verdana' Font.BOLD} {"2" 3 0.440 0.200 '2' 0.124 'verdana' Font.BOLD} {"3" 3 0.440 0.200 '3' 0.124 'verdana' Font.BOLD} {"4" 3 0.440 0.200 '4' 0.124 'verdana' Font.BOLD} {"5" 3 0.440 0.200 '5' 0.124 'verdana' Font.BOLD} {"6" 3 0.440 0.200 '6' 0.124 'verdana' Font.BOLD} {"7" 3 0.440 0.200 '7' 0.124 'verdana' Font.BOLD} {"8" 3 0.440 0.200 '8' 0.124 'verdana' Font.BOLD} {"9" 3 0.440 0.200 '9' 0.124 'verdana' Font.BOLD} {"10" 3 0.405 0.200 '10' 0.124 'verdana' Font.BOLD}} HM-WS550-US {{"1" 3 0.440 0.200 '1' 0.124 'verdana' Font.BOLD} {"2" 3 0.440 0.200 '2' 0.124 'verdana' Font.BOLD} {"3" 3 0.440 0.200 '3' 0.124 'verdana' Font.BOLD} {"4" 3 0.440 0.200 '4' 0.124 'verdana' Font.BOLD} {"5" 3 0.440 0.200 '5' 0.124 'verdana' Font.BOLD} {"6" 3 0.440 0.200 '6' 0.124 'verdana' Font.BOLD} {"7" 3 0.440 0.200 '7' 0.124 'verdana' Font.BOLD} {"8" 3 0.440 0.200 '8' 0.124 'verdana' Font.BOLD} {"9" 3 0.440 0.200 '9' 0.124 'verdana' Font.BOLD} {"10" 3 0.405 0.200 '10' 0.124 'verdana' Font.BOLD}} HM-LC-Dim1PWM-CV {} HM-LC-Sw4-SM-ATmega168 {{"1_Part1" 6 0.136 0.896 0.136 0.98 0.012} {"1_Part2" 6 0.136 0.98 0.096 0.916 0.012} {"1_Part3" 6 0.136 0.98 0.176 0.916 0.012} {"1_Arrow" 5 '1_Part1'  '1_Part2'  '1_Part3' } {"2_Arrow" 7 '1_Arrow' 0.164 0} {"3_Arrow" 7 '1_Arrow' 0.328 0} {"4_Arrow" 7 '1_Arrow' 0.492 0} {"1_Key" 4 0.244 0.372 0.04 0.044} {"2_Key" 4 0.328 0.372 0.04 0.044} {"3_Key" 4 0.404 0.372 0.04 0.044} {"4_Key" 4 0.484 0.372 0.04 0.044} {"1" 5   '1_Arrow'  '1_Key'  } {"2" 5   '2_Arrow'  '2_Key'  } {"3" 5   '3_Arrow'  '3_Key'  } {"4" 5   '4_Arrow'  '4_Key'  }}}
 
 	proc DEV_getImagePath {key size} {
 		global DEV_PATHS DEV_LIST
diff --git a/WebUI/www/config/easymodes/ACTOR_SECURITY/WEATHER.tcl b/WebUI/www/config/easymodes/ACTOR_SECURITY/WEATHER.tcl
index dc880556..51a20e72 100755
--- a/WebUI/www/config/easymodes/ACTOR_SECURITY/WEATHER.tcl
+++ b/WebUI/www/config/easymodes/ACTOR_SECURITY/WEATHER.tcl
@@ -4,69 +4,69 @@ source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
 
-set PROFILES_MAP(0)	"\${expert}"
-set PROFILES_MAP(1)	"\${security_on}"
-set PROFILES_MAP(2)	"\${security_off}"
-set PROFILES_MAP(3)	"\${security_toggle}"
-set PROFILES_MAP(4)	"\${no_action}"
+set PROFILES_MAP(0)  "\${expert}"
+set PROFILES_MAP(1)  "\${security_on}"
+set PROFILES_MAP(2)  "\${security_off}"
+set PROFILES_MAP(3)  "\${security_toggle}"
+set PROFILES_MAP(4)  "\${no_action}"
 
-set PROFILE_0(UI_HINT)	0
-set PROFILE_0(UI_DESCRIPTION)		"Expertenprofil"
-set PROFILE_0(UI_TEMPLATE)			"Expertenprofil"
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
 
 set PROFILE_1(SHORT_CT_OFF)       0
 set PROFILE_1(SHORT_CT_ON)        0
-set PROFILE_1(SHORT_JT_OFF)			  1
-set PROFILE_1(SHORT_JT_ON)			  1
-set PROFILE_1(UI_DESCRIPTION)	""
-set PROFILE_1(UI_TEMPLATE)		$PROFILE_1(UI_DESCRIPTION)
-set PROFILE_1(UI_HINT)	1
+set PROFILE_1(SHORT_JT_OFF)        1
+set PROFILE_1(SHORT_JT_ON)        1
+set PROFILE_1(UI_DESCRIPTION)  ""
+set PROFILE_1(UI_TEMPLATE)    $PROFILE_1(UI_DESCRIPTION)
+set PROFILE_1(UI_HINT)  1
 
 set PROFILE_2(SHORT_CT_OFF)       0
 set PROFILE_2(SHORT_CT_ON)        0
-set PROFILE_2(SHORT_JT_OFF)			  2
-set PROFILE_2(SHORT_JT_ON)			  2
-set PROFILE_2(UI_DESCRIPTION)	""
-set PROFILE_2(UI_TEMPLATE)		$PROFILE_2(UI_DESCRIPTION)
-set PROFILE_2(UI_HINT)	2
+set PROFILE_2(SHORT_JT_OFF)        2
+set PROFILE_2(SHORT_JT_ON)        2
+set PROFILE_2(UI_DESCRIPTION)  ""
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION)
+set PROFILE_2(UI_HINT)  2
 
 set PROFILE_3(SHORT_CT_OFF)       0
 set PROFILE_3(SHORT_CT_ON)        0
-set PROFILE_3(SHORT_JT_OFF)			  1
-set PROFILE_3(SHORT_JT_ON)			  2
-set PROFILE_3(UI_DESCRIPTION)	""
-set PROFILE_3(UI_TEMPLATE)		$PROFILE_3(UI_DESCRIPTION)
-set PROFILE_3(UI_HINT)	3
+set PROFILE_3(SHORT_JT_OFF)        1
+set PROFILE_3(SHORT_JT_ON)        2
+set PROFILE_3(UI_DESCRIPTION)  ""
+set PROFILE_3(UI_TEMPLATE)    $PROFILE_3(UI_DESCRIPTION)
+set PROFILE_3(UI_HINT)  3
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
-	global dev_descr_sender dev_descr_receiver  
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps      
-	upvar $pps_descr    ps_descr
-	
-	foreach pro [array names PROFILES_MAP] {
-		upvar PROFILE_$pro PROFILE_$pro
-	}
-	 		
-	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
-	
-	#global SUBSETS
+  global dev_descr_sender dev_descr_receiver  
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+  
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+       
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+  
+  #global SUBSETS
 
-#	die Texte der Platzhalter einlesen
-	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
-	set prn 0	
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
 #1
-	incr prn
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\" >"
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+  incr prn
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\" >"
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 
 #2
   incr prn
@@ -83,10 +83,10 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 
 #4
-	incr prn
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+  incr prn
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
 
 }
 
diff --git a/WebUI/www/config/easymodes/ACTOR_WINDOW/SMOKE_DETECTOR_TEAM_V2.tcl b/WebUI/www/config/easymodes/ACTOR_WINDOW/SMOKE_DETECTOR_TEAM_V2.tcl
index d4d2f093..8fd4d3cb 100755
--- a/WebUI/www/config/easymodes/ACTOR_WINDOW/SMOKE_DETECTOR_TEAM_V2.tcl
+++ b/WebUI/www/config/easymodes/ACTOR_WINDOW/SMOKE_DETECTOR_TEAM_V2.tcl
@@ -69,13 +69,13 @@ set PROFILE_2(UI_HINT)	2
 #set SUBSET_1(NAME)					"nur auslösender Rauchmelder"
 set SUBSET_1(NAME)					"\${subset_1}"
 set SUBSET_1(SUBSET_OPTION_VALUE)	1
-set SUBSET_1(SHORT_COND_VALUE_LO)	1
+set SUBSET_1(SHORT_COND_VALUE_LO)	2
 set SUBSET_1(SHORT_COND_VALUE_HI)	180
 set SUBSET_1(SHORT_CT_ON)			2
 
 set SUBSET_2(NAME)					"\${subset_2}"
 set SUBSET_2(SUBSET_OPTION_VALUE)	2
-set SUBSET_2(SHORT_COND_VALUE_LO)	2
+set SUBSET_2(SHORT_COND_VALUE_LO)	4
 set SUBSET_2(SHORT_COND_VALUE_HI)	180
 set SUBSET_2(SHORT_CT_ON)	4
 
diff --git a/WebUI/www/config/easymodes/ALARMACTUATOR/KEY.tcl b/WebUI/www/config/easymodes/ALARMACTUATOR/KEY.tcl
index 5c896f40..eabf480c 100755
--- a/WebUI/www/config/easymodes/ALARMACTUATOR/KEY.tcl
+++ b/WebUI/www/config/easymodes/ALARMACTUATOR/KEY.tcl
@@ -5,162 +5,162 @@ source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options_alarmactuator.tcl]
 
 
-set PROFILES_MAP(0)	"\${expert}"
-set PROFILES_MAP(1)	"\${alarm_on}"
-set PROFILES_MAP(2)	"\${alarm_on_off}"
-set PROFILES_MAP(3)	"\${alarm_emergency_off}"
-
-
-set PROFILE_0(UI_HINT)	0
-set PROFILE_0(UI_DESCRIPTION)		"Expertenprofil"
-set PROFILE_0(UI_TEMPLATE)			"Expertenprofil"
-
-
-set PROFILE_1(SHORT_CT_OFFDELAY)	0
-set PROFILE_1(SHORT_CT_ONDELAY)		0
-set PROFILE_1(SHORT_CT_OFF)			0
-set PROFILE_1(SHORT_CT_ON)			0
-set PROFILE_1(SHORT_COND_VALUE_LO)	50
-set PROFILE_1(SHORT_COND_VALUE_HI)	100
-set PROFILE_1(SHORT_ON_TIME)		{120 300}
-set PROFILE_1(SHORT_ACTION_TYPE)	1
-set PROFILE_1(SHORT_JT_OFF)			1
-set PROFILE_1(SHORT_JT_ON)			0
-set PROFILE_1(SHORT_JT_OFFDELAY)	0
-set PROFILE_1(SHORT_JT_ONDELAY)		0
-set PROFILE_1(LONG_CT_OFFDELAY)		0
-set PROFILE_1(LONG_CT_ONDELAY)		0
-set PROFILE_1(LONG_CT_OFF)			0
-set PROFILE_1(LONG_CT_ON)			0
-set PROFILE_1(LONG_COND_VALUE_LO)	50
-set PROFILE_1(LONG_COND_VALUE_HI)	100
-set PROFILE_1(LONG_ON_TIME)			{120 300}
-set PROFILE_1(LONG_ACTION_TYPE)		1
-set PROFILE_1(LONG_JT_OFF)			1
-set PROFILE_1(LONG_JT_ON)			0
-set PROFILE_1(LONG_JT_OFFDELAY)		0
-set PROFILE_1(LONG_JT_ONDELAY)		0
-set PROFILE_1(UI_DESCRIPTION)	"Mit einem kurzen oder langen Tastendruck wird der Alarm f&uuml;r die gew&auml;hlte Zeit eingeschaltet.<br />"
-set PROFILE_1(UI_TEMPLATE)		$PROFILE_1(UI_DESCRIPTION)
-set PROFILE_1(UI_HINT)	1
-
-set PROFILE_2(SHORT_CT_OFFDELAY)	0
-set PROFILE_2(SHORT_CT_ONDELAY)		0
-set PROFILE_2(SHORT_CT_OFF)			0
-set PROFILE_2(SHORT_CT_ON)			0
-set PROFILE_2(SHORT_COND_VALUE_LO)	50
-set PROFILE_2(SHORT_COND_VALUE_HI)	100
-set PROFILE_2(SHORT_ON_TIME)		{120 300}
-set PROFILE_2(SHORT_ACTION_TYPE)	1
-set PROFILE_2(SHORT_JT_OFF)			1
-set PROFILE_2(SHORT_JT_ON)			{3 4}
-set PROFILE_2(SHORT_JT_OFFDELAY)	4
-set PROFILE_2(SHORT_JT_ONDELAY)		2 
-set PROFILE_2(LONG_CT_OFFDELAY)		0
-set PROFILE_2(LONG_CT_ONDELAY)		0
-set PROFILE_2(LONG_CT_OFF)			0
-set PROFILE_2(LONG_CT_ON)			0
-set PROFILE_2(LONG_COND_VALUE_LO)	50
-set PROFILE_2(LONG_COND_VALUE_HI)	100
-set PROFILE_2(LONG_ON_TIME)			{120 300}
-set PROFILE_2(LONG_ACTION_TYPE)		1
-set PROFILE_2(LONG_JT_OFF)			1
-set PROFILE_2(LONG_JT_ON)			{3 4}
-set PROFILE_2(LONG_JT_OFFDELAY)		4
-set PROFILE_2(LONG_JT_ONDELAY)		2
-set PROFILE_2(UI_DESCRIPTION)	"Mit einem kurzen oder langen Tastendruck wird der Alarm je nach aktuellem Zustand ein- oder ausgeschaltet (Togglefunktion)."
-set PROFILE_2(UI_TEMPLATE)		$PROFILE_2(UI_DESCRIPTION)	
-set PROFILE_2(UI_HINT)	2
-
-set PROFILE_3(SHORT_CT_OFFDELAY)	0
-set PROFILE_3(SHORT_CT_ONDELAY)		0
-set PROFILE_3(SHORT_CT_OFF)			0
-set PROFILE_3(SHORT_CT_ON)			0
-set PROFILE_3(SHORT_COND_VALUE_LO)	50
-set PROFILE_3(SHORT_COND_VALUE_HI)	100
-set PROFILE_3(SHORT_ON_TIME)		{120 300}
-set PROFILE_3(SHORT_ACTION_TYPE)	1
-set PROFILE_3(SHORT_JT_OFF)			4
-set PROFILE_3(SHORT_JT_ON)			3
-set PROFILE_3(SHORT_JT_OFFDELAY)	4
-set PROFILE_3(SHORT_JT_ONDELAY)		4
-set PROFILE_3(LONG_CT_OFFDELAY)		0
-set PROFILE_3(LONG_CT_ONDELAY)		0
-set PROFILE_3(LONG_CT_OFF)			0
-set PROFILE_3(LONG_CT_ON)			0
-set PROFILE_3(LONG_COND_VALUE_LO)	50
-set PROFILE_3(LONG_COND_VALUE_HI)	100
-set PROFILE_3(LONG_ON_TIME)			{120 300}
-set PROFILE_3(LONG_ACTION_TYPE)		1
-set PROFILE_3(LONG_JT_OFF)			4
-set PROFILE_3(LONG_JT_ON)			3
-set PROFILE_3(LONG_JT_OFFDELAY)		4
-set PROFILE_3(LONG_JT_ONDELAY)		4
-set PROFILE_3(UI_DESCRIPTION)	"Mit einem kurzen oder langen Tastendruck wird der Alarm sofort ausgeschaltet."
-set PROFILE_3(UI_TEMPLATE)		$PROFILE_3(UI_DESCRIPTION)	
-set PROFILE_3(UI_HINT)	3
+set PROFILES_MAP(0)  "\${expert}"
+set PROFILES_MAP(1)  "\${alarm_on}"
+set PROFILES_MAP(2)  "\${alarm_on_off}"
+set PROFILES_MAP(3)  "\${alarm_emergency_off}"
+
+
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
+
+
+set PROFILE_1(SHORT_CT_OFFDELAY)  0
+set PROFILE_1(SHORT_CT_ONDELAY)    0
+set PROFILE_1(SHORT_CT_OFF)      0
+set PROFILE_1(SHORT_CT_ON)      0
+set PROFILE_1(SHORT_COND_VALUE_LO)  50
+set PROFILE_1(SHORT_COND_VALUE_HI)  100
+set PROFILE_1(SHORT_ON_TIME)    {120 300}
+set PROFILE_1(SHORT_ACTION_TYPE)  1
+set PROFILE_1(SHORT_JT_OFF)      1
+set PROFILE_1(SHORT_JT_ON)      0
+set PROFILE_1(SHORT_JT_OFFDELAY)  0
+set PROFILE_1(SHORT_JT_ONDELAY)    0
+set PROFILE_1(LONG_CT_OFFDELAY)    0
+set PROFILE_1(LONG_CT_ONDELAY)    0
+set PROFILE_1(LONG_CT_OFF)      0
+set PROFILE_1(LONG_CT_ON)      0
+set PROFILE_1(LONG_COND_VALUE_LO)  50
+set PROFILE_1(LONG_COND_VALUE_HI)  100
+set PROFILE_1(LONG_ON_TIME)      {120 300}
+set PROFILE_1(LONG_ACTION_TYPE)    1
+set PROFILE_1(LONG_JT_OFF)      1
+set PROFILE_1(LONG_JT_ON)      0
+set PROFILE_1(LONG_JT_OFFDELAY)    0
+set PROFILE_1(LONG_JT_ONDELAY)    0
+set PROFILE_1(UI_DESCRIPTION)  "Mit einem kurzen oder langen Tastendruck wird der Alarm f&uuml;r die gew&auml;hlte Zeit eingeschaltet.<br />"
+set PROFILE_1(UI_TEMPLATE)    $PROFILE_1(UI_DESCRIPTION)
+set PROFILE_1(UI_HINT)  1
+
+set PROFILE_2(SHORT_CT_OFFDELAY)  0
+set PROFILE_2(SHORT_CT_ONDELAY)    0
+set PROFILE_2(SHORT_CT_OFF)      0
+set PROFILE_2(SHORT_CT_ON)      0
+set PROFILE_2(SHORT_COND_VALUE_LO)  50
+set PROFILE_2(SHORT_COND_VALUE_HI)  100
+set PROFILE_2(SHORT_ON_TIME)    {120 300}
+set PROFILE_2(SHORT_ACTION_TYPE)  1
+set PROFILE_2(SHORT_JT_OFF)      1
+set PROFILE_2(SHORT_JT_ON)      {3 4}
+set PROFILE_2(SHORT_JT_OFFDELAY)  4
+set PROFILE_2(SHORT_JT_ONDELAY)    2 
+set PROFILE_2(LONG_CT_OFFDELAY)    0
+set PROFILE_2(LONG_CT_ONDELAY)    0
+set PROFILE_2(LONG_CT_OFF)      0
+set PROFILE_2(LONG_CT_ON)      0
+set PROFILE_2(LONG_COND_VALUE_LO)  50
+set PROFILE_2(LONG_COND_VALUE_HI)  100
+set PROFILE_2(LONG_ON_TIME)      {120 300}
+set PROFILE_2(LONG_ACTION_TYPE)    1
+set PROFILE_2(LONG_JT_OFF)      1
+set PROFILE_2(LONG_JT_ON)      {3 4}
+set PROFILE_2(LONG_JT_OFFDELAY)    4
+set PROFILE_2(LONG_JT_ONDELAY)    2
+set PROFILE_2(UI_DESCRIPTION)  "Mit einem kurzen oder langen Tastendruck wird der Alarm je nach aktuellem Zustand ein- oder ausgeschaltet (Togglefunktion)."
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION)  
+set PROFILE_2(UI_HINT)  2
+
+set PROFILE_3(SHORT_CT_OFFDELAY)  0
+set PROFILE_3(SHORT_CT_ONDELAY)    0
+set PROFILE_3(SHORT_CT_OFF)      0
+set PROFILE_3(SHORT_CT_ON)      0
+set PROFILE_3(SHORT_COND_VALUE_LO)  50
+set PROFILE_3(SHORT_COND_VALUE_HI)  100
+set PROFILE_3(SHORT_ON_TIME)    {120 300}
+set PROFILE_3(SHORT_ACTION_TYPE)  1
+set PROFILE_3(SHORT_JT_OFF)      4
+set PROFILE_3(SHORT_JT_ON)      3
+set PROFILE_3(SHORT_JT_OFFDELAY)  4
+set PROFILE_3(SHORT_JT_ONDELAY)    4
+set PROFILE_3(LONG_CT_OFFDELAY)    0
+set PROFILE_3(LONG_CT_ONDELAY)    0
+set PROFILE_3(LONG_CT_OFF)      0
+set PROFILE_3(LONG_CT_ON)      0
+set PROFILE_3(LONG_COND_VALUE_LO)  50
+set PROFILE_3(LONG_COND_VALUE_HI)  100
+set PROFILE_3(LONG_ON_TIME)      {120 300}
+set PROFILE_3(LONG_ACTION_TYPE)    1
+set PROFILE_3(LONG_JT_OFF)      4
+set PROFILE_3(LONG_JT_ON)      3
+set PROFILE_3(LONG_JT_OFFDELAY)    4
+set PROFILE_3(LONG_JT_ONDELAY)    4
+set PROFILE_3(UI_DESCRIPTION)  "Mit einem kurzen oder langen Tastendruck wird der Alarm sofort ausgeschaltet."
+set PROFILE_3(UI_TEMPLATE)    $PROFILE_3(UI_DESCRIPTION)  
+set PROFILE_3(UI_HINT)  3
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
-	
-
-	global dev_descr_sender dev_descr_receiver receiver_address
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps      
-	upvar $pps_descr    ps_descr
-
-	# hier wird der gewaehlte Kancal der ASA ermittelt, Kanal 1 = Sirene - Kanal 2 = Blitzlicht
-	set ch [string range $receiver_address [expr [string first ":" $receiver_address] +1] [string length $receiver_address]]  
-	set manner(1) "siren"
-	set manner(2) "flashlight"
-	
-	foreach pro [array names PROFILES_MAP] {
-		upvar PROFILE_$pro PROFILE_$pro
-	}
- 		
-	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
-
-#	die Texte der Platzhalter einlesen
-	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
-	set prn 0	
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
-
-#1 	Alarm Ein	
-	incr prn
-	set pref 1
-	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
-
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-	option $manner($ch)
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME|LONG_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME ]
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-	
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
-#2	Alarm Ein/Aus
-	incr prn 
-	set pref 1
-	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
-
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-	option $manner($ch)
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME|LONG_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME ]
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-	
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
-#3	Alarm NOT-AUS 
-	incr prn 
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+  
+
+  global dev_descr_sender dev_descr_receiver receiver_address
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+
+  # hier wird der gewaehlte Kancal der ASA ermittelt, Kanal 1 = Sirene - Kanal 2 = Blitzlicht
+  set ch [string range $receiver_address [expr [string first ":" $receiver_address] +1] [string length $receiver_address]]  
+  set manner(1) "siren"
+  set manner(2) "flashlight"
+  
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+     
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
+
+#1   Alarm Ein  
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option $manner($ch)
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME|LONG_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME ]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+  
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+#2  Alarm Ein/Aus
+  incr prn 
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option $manner($ch)
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME|LONG_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME ]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+  
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+#3  Alarm NOT-AUS 
+  incr prn 
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
 }
 
 constructor
diff --git a/WebUI/www/config/easymodes/ALARMACTUATOR/SMOKE_DETECTOR_TEAM_V2.tcl b/WebUI/www/config/easymodes/ALARMACTUATOR/SMOKE_DETECTOR_TEAM_V2.tcl
index 0bf88fea..a3a6d2da 100755
--- a/WebUI/www/config/easymodes/ALARMACTUATOR/SMOKE_DETECTOR_TEAM_V2.tcl
+++ b/WebUI/www/config/easymodes/ALARMACTUATOR/SMOKE_DETECTOR_TEAM_V2.tcl
@@ -33,14 +33,14 @@ set PROFILE_1(UI_HINT)	1
 #set SUBSET_1(NAME)					"nur auslösender Rauchmelder"
 set SUBSET_1(NAME)					"\${subset_1}"
 set SUBSET_1(SUBSET_OPTION_VALUE)	1
-set SUBSET_1(SHORT_COND_VALUE_LO)	1
+set SUBSET_1(SHORT_COND_VALUE_LO)	2
 set SUBSET_1(SHORT_COND_VALUE_HI)	180
 set SUBSET_1(SHORT_CT_ON)			2
 
 #set SUBSET_2(NAME)					"Rauchmelder der gleichen Gruppe"
 set SUBSET_2(NAME)					"\${subset_2}"
 set SUBSET_2(SUBSET_OPTION_VALUE)	2
-set SUBSET_2(SHORT_COND_VALUE_LO)	2
+set SUBSET_2(SHORT_COND_VALUE_LO)	4
 set SUBSET_2(SHORT_COND_VALUE_HI)	180
 set SUBSET_2(SHORT_CT_ON)	4
 
diff --git a/WebUI/www/config/easymodes/ALARMACTUATOR/WEATHER.tcl b/WebUI/www/config/easymodes/ALARMACTUATOR/WEATHER.tcl
index 473e0fc4..330dbe6f 100755
--- a/WebUI/www/config/easymodes/ALARMACTUATOR/WEATHER.tcl
+++ b/WebUI/www/config/easymodes/ALARMACTUATOR/WEATHER.tcl
@@ -4,104 +4,110 @@ source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options_alarmactuator.tcl]
 
-set PROFILES_MAP(0)	"\${expert}"
-set PROFILES_MAP(1)	"\${alarm_on}"  
-
-
-set PROFILE_0(UI_HINT)	0
-set PROFILE_0(UI_DESCRIPTION)		"Expertenprofil"
-set PROFILE_0(UI_TEMPLATE)			"Expertenprofil"
-
-set PROFILE_1(SHORT_CT_OFFDELAY)	0
-set PROFILE_1(SHORT_CT_ONDELAY)		0 
-set PROFILE_1(SHORT_CT_OFF)			0
-set PROFILE_1(SHORT_CT_ON)			0
-set PROFILE_1(SHORT_COND_VALUE_LO)	{50 200}
-set PROFILE_1(SHORT_COND_VALUE_HI)	{0 100}
-set PROFILE_1(SHORT_ONDELAY_TIME)	0
-set PROFILE_1(SHORT_ON_TIME)		{120 300}	
-set PROFILE_1(SHORT_OFFDELAY_TIME)	0
-set PROFILE_1(SHORT_OFF_TIME)		111600
-set PROFILE_1(SHORT_ON_TIME_MODE)	0
-set PROFILE_1(SHORT_OFF_TIME_MODE)	0
-set PROFILE_1(SHORT_ACTION_TYPE)	1
-set PROFILE_1(SHORT_JT_OFF)			1
-set PROFILE_1(SHORT_JT_ON)			0
-set PROFILE_1(SHORT_JT_OFFDELAY)	0 
-set PROFILE_1(SHORT_JT_ONDELAY)		0  
-set PROFILE_1(UI_DESCRIPTION)	"Wenn die eingestellte Windgeschwindigkeit erreicht wird, schaltet der Alarm f&uuml;r die eingestellte Zeit ein."
-set PROFILE_1(UI_TEMPLATE)		$PROFILE_1(UI_DESCRIPTION)	
-set PROFILE_1(UI_HINT)	1
-
-#set SUBSET_1(NAME)					"Wind stark - Aus / Wind schwach - Ein"
-set SUBSET_1(NAME)					"\${subset_1}"
-set SUBSET_1(SUBSET_OPTION_VALUE)	1
-set SUBSET_1(SHORT_CT_OFF)			2
-set SUBSET_1(SHORT_CT_OFFDELAY)		2
-set SUBSET_1(SHORT_CT_ON)			0
-set SUBSET_1(SHORT_CT_ONDELAY)		0
-
-#set SUBSET_2(NAME)					"Wind stark - Ein / Wind schwach - Aus"
-set SUBSET_2(NAME)					"\${subset_2}"
-set SUBSET_2(SUBSET_OPTION_VALUE)	2
-set SUBSET_2(SHORT_CT_OFF)			0
-set SUBSET_2(SHORT_CT_OFFDELAY)		0
-set SUBSET_2(SHORT_CT_ON)			2
-set SUBSET_2(SHORT_CT_ONDELAY)		2
+set PROFILES_MAP(0)  "\${expert}"
+set PROFILES_MAP(1)  "\${alarm_on}"  
+
+
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
+
+set PROFILE_1(SHORT_CT_OFFDELAY)  {0 1}
+set PROFILE_1(SHORT_CT_ONDELAY)   {0 1}
+set PROFILE_1(SHORT_CT_OFF)      {0 1}
+set PROFILE_1(SHORT_CT_ON)      {0 1}
+set PROFILE_1(SHORT_COND_VALUE_LO)  {50 range 0 - 200}
+set PROFILE_1(SHORT_COND_VALUE_HI)  {0 range 0 - 100}
+set PROFILE_1(SHORT_ONDELAY_TIME)  0
+set PROFILE_1(SHORT_ON_TIME)    {120 300}  
+set PROFILE_1(SHORT_OFFDELAY_TIME)  0
+set PROFILE_1(SHORT_OFF_TIME)    111600
+set PROFILE_1(SHORT_ON_TIME_MODE)  0
+set PROFILE_1(SHORT_OFF_TIME_MODE)  0
+set PROFILE_1(SHORT_ACTION_TYPE)  1
+set PROFILE_1(SHORT_JT_OFF)      1
+set PROFILE_1(SHORT_JT_ON)      {0 2}
+set PROFILE_1(SHORT_JT_OFFDELAY)  {0 2}
+set PROFILE_1(SHORT_JT_ONDELAY)    {0 2}
+set PROFILE_1(UI_DESCRIPTION)  "Wenn die eingestellte Windgeschwindigkeit erreicht wird, schaltet der Alarm f&uuml;r die eingestellte Zeit ein."
+set PROFILE_1(UI_TEMPLATE)    $PROFILE_1(UI_DESCRIPTION)  
+set PROFILE_1(UI_HINT)  1
+
+
+set SUBSET_1(NAME)          "hidden element"
+set SUBSET_1(SUBSET_OPTION_VALUE)  1
+set SUBSET_1(SHORT_CT_OFFDELAY)    1
+set SUBSET_1(SHORT_CT_ONDELAY)    1
+set SUBSET_1(SHORT_CT_OFF)      1
+set SUBSET_1(SHORT_CT_ON)      1
+
+set SUBSET_1(SHORT_JT_OFF)       1
+set SUBSET_1(SHORT_JT_ON)        2
+set SUBSET_1(SHORT_JT_OFFDELAY)  2
+set SUBSET_1(SHORT_JT_ONDELAY)   2
+
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
-	global dev_descr_sender dev_descr_receiver receiver_address
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps      
-	upvar $pps_descr    ps_descr
-
-	# hier wird der gewaehlte Kancal der ASA ermittelt, Kanal 1 = Sirene - Kanal 2 = Blitzlicht
-	set ch [string range $receiver_address [expr [string first ":" $receiver_address] +1] [string length $receiver_address]]  
-	set manner(1) "siren"
-	set manner(2) "flashlight"
-
-	foreach pro [array names PROFILES_MAP] {
-		upvar PROFILE_$pro PROFILE_$pro
-	}
-	 		
-	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
-	
-	#global SUBSETS
-	set name "x"
-	set i 1
-	while {$name != ""} {
-		upvar SUBSET_$i SUBSET_$i
-		array set subset [array get SUBSET_$i]
-		set name ""
-		catch {set name $subset(NAME)}
-		array_clear subset
-		incr i
-	}
-
-#	die Texte der Platzhalter einlesen
-	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
-	set prn 0	
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+  global dev_descr_sender dev_descr_receiver receiver_address
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+
+  # hier wird der gewaehlte Kancal der ASA ermittelt, Kanal 1 = Sirene - Kanal 2 = Blitzlicht
+  set ch [string range $receiver_address [expr [string first ":" $receiver_address] +1] [string length $receiver_address]]  
+  set manner(1) "siren"
+  set manner(2) "flashlight"
+
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+       
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+  
+  #global SUBSETS
+  set name "x"
+  set i 1
+  while {$name != ""} {
+    upvar SUBSET_$i SUBSET_$i
+    array set subset [array get SUBSET_$i]
+    set name ""
+    catch {set name $subset(NAME)}
+    array_clear subset
+    incr i
+  }
+
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
 
 #1
-	incr prn
-	set pref 1
-	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
-
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-	option $manner($ch) 
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME|LONG_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME ]
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+  incr prn
+  set pref 0
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn\_s}&nbsp;\${actor_$ch}&nbsp;\${description_$prn\_e}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  if {$dev_descr_sender(PARENT_TYPE) == "HM-WDS100-C6-O-2"} {
+    incr pref;
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td></td><td>"
+    append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn]
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+  }
+
+  incr pref;
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option $manner($ch) 
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME|LONG_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME ]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 }
 
 constructor
diff --git a/WebUI/www/config/easymodes/BLIND/WEATHER.tcl b/WebUI/www/config/easymodes/BLIND/WEATHER.tcl
index a3c2952f..4237ce4d 100755
--- a/WebUI/www/config/easymodes/BLIND/WEATHER.tcl
+++ b/WebUI/www/config/easymodes/BLIND/WEATHER.tcl
@@ -84,6 +84,18 @@ set PROFILE_2(UI_HINT)	2
 
 # hier folgen die eventuellen Subsets
 
+# This is for the new HM-WDS100-C6-O-2
+set SUBSET_1(SUBSET_OPTION_VALUE)  1
+set SUBSET_1(NAME)          "hidden parameter"
+set SUBSET_1(SHORT_CT_RAMPOFF)      1
+set SUBSET_1(SHORT_CT_RAMPON)      1
+set SUBSET_1(SHORT_CT_OFFDELAY)      1
+set SUBSET_1(SHORT_CT_ONDELAY)      1
+set SUBSET_1(SHORT_CT_OFF)      1
+set SUBSET_1(SHORT_CT_ON)      1
+set SUBSET_1(SHORT_CT_REFOFF)      1
+set SUBSET_1(SHORT_CT_REFON)      1
+
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
 	global receiver_address dev_descr_sender dev_descr_receiver
@@ -126,19 +138,35 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
 	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
 
+
+	# Hide this
+  if {$dev_descr_sender(PARENT_TYPE) == "HM-WDS100-C6-O-2"} {
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td>Hidden Parameter</td><td>"
+    append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn]
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+    incr pref ;
+  }
+
+
 	append HTML_PARAMS(separate_$prn) "<tr><td>\${UP_TIME}</td><td>"
 	option LENGTH_OF_STAY
 	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME|LONG_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
 	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
 	append HTML_PARAMS(separate_$prn) "</td></tr>"
 	
-	incr pref ;# 2
+	incr pref ;# 2 / 3
 	append HTML_PARAMS(separate_$prn) "<tr><td>\${UP_DELAY_TIME}</td><td>"
 	option DELAY
 	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
 	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
 	append HTML_PARAMS(separate_$prn) "</td></tr>"
-	
+
+  # Hide tr 3/4 and 4/5
+  incr pref ;# 3 / 4
+  append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_LO\"></td></tr>"
+  incr pref ;# 4 / 5
+  append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_HI\"></td></tr>"
+
 	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 #2
 	incr prn
@@ -148,19 +176,33 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
 	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
 
+  # Hide this
+  if {$dev_descr_sender(PARENT_TYPE) == "HM-WDS100-C6-O-2"} {
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td>Hidden Parameter</td><td>"
+    append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn]
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+    incr pref
+  }
+
 	append HTML_PARAMS(separate_$prn) "<tr><td>\${DOWN_TIME}</td><td>"
 	option LENGTH_OF_STAY
 	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME|LONG_OFF_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
 	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME
 	append HTML_PARAMS(separate_$prn) "</td></tr>"
 	
-	incr pref ;# 2
+	incr pref ;# 2 / 3
 	append HTML_PARAMS(separate_$prn) "<tr><td>\${DOWN_DELAY_TIME}</td><td>"
 	option DELAY
 	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
 	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME
 	append HTML_PARAMS(separate_$prn) "</td></tr>"
-	
+
+  # Hide tr 3/4 and 4/5
+  incr pref ;# 3 / 4
+  append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_LO\"></td></tr>"
+  incr pref ;# 4 /5
+  append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_HI\"></td></tr>"
+
 	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 }
 
diff --git a/WebUI/www/config/easymodes/DIMMER/DIMMER.tcl b/WebUI/www/config/easymodes/DIMMER/DIMMER.tcl
index bb723658..73754a9a 100755
--- a/WebUI/www/config/easymodes/DIMMER/DIMMER.tcl
+++ b/WebUI/www/config/easymodes/DIMMER/DIMMER.tcl
@@ -109,8 +109,8 @@ set PROFILE_2(LONG_CT_ON)     0
 set PROFILE_2(LONG_CT_ONDELAY)    0
 set PROFILE_2(LONG_CT_RAMPOFF)    0
 set PROFILE_2(LONG_CT_RAMPON)   0
-set PROFILE_2(LONG_DIM_MAX_LEVEL) 1.0
-set PROFILE_2(LONG_DIM_MIN_LEVEL) 0.0
+set PROFILE_2(LONG_DIM_MAX_LEVEL) {1.0 range 0.0 - 1.0}
+set PROFILE_2(LONG_DIM_MIN_LEVEL) {0.0 range 0.0 - 1.0}
 set PROFILE_2(LONG_DIM_STEP)    0.05
 set PROFILE_2(LONG_JT_OFF)      4
 set PROFILE_2(LONG_JT_OFFDELAY)   5
@@ -146,8 +146,8 @@ set PROFILE_2(SHORT_CT_ON)      0
 set PROFILE_2(SHORT_CT_ONDELAY)   0
 set PROFILE_2(SHORT_CT_RAMPOFF)   0
 set PROFILE_2(SHORT_CT_RAMPON)    0
-set PROFILE_2(SHORT_DIM_MAX_LEVEL)  1.0
-set PROFILE_2(SHORT_DIM_MIN_LEVEL)  0.0
+set PROFILE_2(SHORT_DIM_MAX_LEVEL)  {1.0 range 0.0 - 1.0}
+set PROFILE_2(SHORT_DIM_MIN_LEVEL)  {0.0 range 0.0 - 1.0}
 set PROFILE_2(SHORT_DIM_STEP)   0.05
 set PROFILE_2(SHORT_JT_OFF)     4
 set PROFILE_2(SHORT_JT_OFFDELAY)  5
diff --git a/WebUI/www/config/easymodes/DIMMER/SMOKE_DETECTOR_TEAM_V2.tcl b/WebUI/www/config/easymodes/DIMMER/SMOKE_DETECTOR_TEAM_V2.tcl
index 35fbe25b..ca701911 100755
--- a/WebUI/www/config/easymodes/DIMMER/SMOKE_DETECTOR_TEAM_V2.tcl
+++ b/WebUI/www/config/easymodes/DIMMER/SMOKE_DETECTOR_TEAM_V2.tcl
@@ -104,7 +104,7 @@ set SUBSET_1(SUBSET_OPTION_VALUE) 1
 set SUBSET_1SHORT_CT_RAMPON)    2
 set SUBSET_1(SHORT_CT_ONDELAY)    2
 set SUBSET_1(SHORT_CT_ON)     2
-set SUBSET_1(SHORT_COND_VALUE_LO) 1
+set SUBSET_1(SHORT_COND_VALUE_LO) 2
 set SUBSET_1(SHORT_COND_VALUE_HI) 180
 
 #set SUBSET_2(NAME)                     "Rauchmelder der gleichen Gruppe"
@@ -113,19 +113,19 @@ set SUBSET_2(SUBSET_OPTION_VALUE) 2
 set SUBSET_2(SHORT_CT_RAMPON)   3
 set SUBSET_2(SHORT_CT_ONDELAY)    3
 set SUBSET_2(SHORT_CT_ON)     3
-set SUBSET_2(SHORT_COND_VALUE_LO) 2
+set SUBSET_2(SHORT_COND_VALUE_LO) 4
 set SUBSET_2(SHORT_COND_VALUE_HI) 180
 
 #set SUBSET_3(NAME)                     "nur auslösender Rauchmelder" ;# Subset für Alarmblinken
 set SUBSET_3(NAME)                      "\${subset_3}"
 set SUBSET_3(SUBSET_OPTION_VALUE) 3
-set SUBSET_3(SHORT_COND_VALUE_LO) 1
+set SUBSET_3(SHORT_COND_VALUE_LO) 2
 set SUBSET_3(SHORT_COND_VALUE_HI) 180
 
 #set SUBSET_4(NAME)                     "Rauchmelder der gleichen Gruppe" ;# Subset für Alarmblinken
 set SUBSET_4(NAME)                      "\${subset_4}"
 set SUBSET_4(SUBSET_OPTION_VALUE) 4
-set SUBSET_4(SHORT_COND_VALUE_LO) 2
+set SUBSET_4(SHORT_COND_VALUE_LO) 4
 set SUBSET_4(SHORT_COND_VALUE_HI) 180
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
diff --git a/WebUI/www/config/easymodes/MASTER_LANG/HM_ES_TX_WM.js b/WebUI/www/config/easymodes/MASTER_LANG/HM_ES_TX_WM.js
index 9be93ec1..54c77ce9 100755
--- a/WebUI/www/config/easymodes/MASTER_LANG/HM_ES_TX_WM.js
+++ b/WebUI/www/config/easymodes/MASTER_LANG/HM_ES_TX_WM.js
@@ -8,7 +8,31 @@ jQuery.extend(true,langJSON, {
     "PowerMeterIGLSensorGAS" : "Gas",
     "PowerMeterIGLSensorIR" : "Infrarot",
     "PowerMeterIGLSensorLED" : "LED",
-    "PowerMeterIGLSensorUnknown" : "Unbekannt"
+    "PowerMeterIGLSensorUnknown" : "Unbekannt",
+
+    "****" : "****",
+    "PowerMeterIECSensor" : "IEC",
+    "PowerMeterPowerString" : "Identifikationskennzeichnung der Leistung",
+    "PowerMeterEnergyCounterString" : "Identifikationskennzeichnung des Z%E4hlerstandes",
+
+    "PowerMeterBaudRate" : "Baudrate",
+    "PowerMeterSerialFormat" : "Zeichenformat des Verbrauchsz%E4hlers",
+    "PowerMeterPowerMode" : "Energiemodus des Verbrauchsz%E4hlers",
+    "PowerMeterProtocolMode" : "Protokollmodus des Verbrauchsz%E4hlers",
+    "PowerMeterSamplesPerCycle" : "Anzahl der Datenabfragen pro Senderaster",
+
+    "PowerMeterSerialFormatOption0" : "1_7D_1P_E_1S",
+    "PowerMeterSerialFormatOption1" : "1_7D_1P_E_2S",
+    "PowerMeterSerialFormatOption2" : "1_8D_0P_N_1S",
+    "PowerMeterSerialFormatOption3" : "1_8D_1P_E_1S",
+
+    "PowerMeterPowerModeOptionMains" : "Netzspannung",
+    "PowerMeterPowerModeOptionBattery" : "Batteriebetrieb",
+
+    "PowerMeterProtocolModeModeOptionA" : "Modus A - bidirektionale Datenschnittstelle ohne Geschwindigkeitsumschaltung",
+    "PowerMeterProtocolModeModeOptionB" : "Modus B - bidirektionale Datenschnittstelle mit Geschwindigkeitsumschaltung",
+    "PowerMeterProtocolModeModeOptionC" : "Modus C - bidirektionale Datenschnittstelle mit Geschwindigkeitsumschaltung",
+    "PowerMeterProtocolModeModeOptionD" : "Modus D - unidirektionale Datenschnittstelle mit Sendeintervall (z. B. EasyMeter)"
   },
 
   "en" : {
@@ -20,18 +44,66 @@ jQuery.extend(true,langJSON, {
     "PowerMeterIGLSensorGAS" : "Gas",
     "PowerMeterIGLSensorIR" : "Infrared",
     "PowerMeterIGLSensorLED" : "LED",
-    "PowerMeterIGLSensorUnknown" : "Unknown"
+    "PowerMeterIGLSensorUnknown" : "Unknown",
+
+    "****" : "****",
+    "PowerMeterIECSensor" : "IEC",
+    "PowerMeterPowerString" : "Identification marking of power",
+    "PowerMeterEnergyCounterString" : "Identification marking of meter reading",
+
+    "PowerMeterBaudRate" : "Baud rate",
+    "PowerMeterSerialFormat" : "Character format of consumption meter",
+    "PowerMeterPowerMode" : "Energy mode of consumption meter",
+    "PowerMeterProtocolMode" : "Protocol mode of consumption meter",
+    "PowerMeterSamplesPerCycle" : "Number of data requests per transmission interval",
+
+    "PowerMeterSerialFormatOption0" : "1_7D_1P_E_1S",
+    "PowerMeterSerialFormatOption1" : "1_7D_1P_E_2S",
+    "PowerMeterSerialFormatOption2" : "1_8D_0P_N_1S",
+    "PowerMeterSerialFormatOption3" : "1_8D_1P_E_1S",
+
+    "PowerMeterPowerModeOptionMains" : "Mains voltage",
+    "PowerMeterPowerModeOptionBattery" : "Battery operation",
+
+    "PowerMeterProtocolModeModeOptionA" : "Mode A - bidirectional data interface without speed switching",
+    "PowerMeterProtocolModeModeOptionB" : "Mode B - bidirectional data interface with speed switching",
+    "PowerMeterProtocolModeModeOptionC" : "Mode C - bidirectional data interface with speed switching",
+    "PowerMeterProtocolModeModeOptionD" : "Mode D - unidirectional data interface with transmission interval (e.g. EasyMeter)"
   },
 
   "tr" : {
-    "PowerMeterIGLMeterType" : "Sens%F6r tipi",
-    "PowerMeterIGLConstantGas" : "Gaz sayac sabiti",
-    "PowerMeterIGLConstantIR" : "IR sayac sabiti",
-    "PowerMeterIGLSensibilityIR" : "IR hassasiyeti",
-    "PowerMeterIGLConstantLed" : "LED sayac sabiti",
-    "PowerMeterIGLSensorGAS" : "Gaz",
-    "PowerMeterIGLSensorIR" : "Kizil%F6tesi",
+    "PowerMeterIGLMeterType" : "Type of sensor",
+    "PowerMeterIGLConstantGas" : "Gas meter constant",
+    "PowerMeterIGLConstantIR" : "IR meter constant",
+    "PowerMeterIGLSensibilityIR" : "IR threshold sensibility",
+    "PowerMeterIGLConstantLed" : "LED meter constant",
+    "PowerMeterIGLSensorGAS" : "Gas",
+    "PowerMeterIGLSensorIR" : "Infrared",
     "PowerMeterIGLSensorLED" : "LED",
-    "PowerMeterIGLSensorUnknown" : "Bilinmiyor"
+    "PowerMeterIGLSensorUnknown" : "Unknown",
+
+    "****" : "****",
+    "PowerMeterIECSensor" : "IEC",
+    "PowerMeterPowerString" : "Identification marking of power",
+    "PowerMeterEnergyCounterString" : "Identification marking of meter reading",
+
+    "PowerMeterBaudRate" : "Baud rate",
+    "PowerMeterSerialFormat" : "Character format of consumption meter",
+    "PowerMeterPowerMode" : "Energy mode of consumption meter",
+    "PowerMeterProtocolMode" : "Protocol mode of consumption meter",
+    "PowerMeterSamplesPerCycle" : "Number of data requests per transmission interval",
+
+    "PowerMeterSerialFormatOption0" : "1_7D_1P_E_1S",
+    "PowerMeterSerialFormatOption1" : "1_7D_1P_E_2S",
+    "PowerMeterSerialFormatOption2" : "1_8D_0P_N_1S",
+    "PowerMeterSerialFormatOption3" : "1_8D_1P_E_1S",
+
+    "PowerMeterPowerModeOptionMains" : "Mains voltage",
+    "PowerMeterPowerModeOptionBattery" : "Battery operation",
+
+    "PowerMeterProtocolModeModeOptionA" : "Mode A - bidirectional data interface without speed switching",
+    "PowerMeterProtocolModeModeOptionB" : "Mode B - bidirectional data interface with speed switching",
+    "PowerMeterProtocolModeModeOptionC" : "Mode C - bidirectional data interface with speed switching",
+    "PowerMeterProtocolModeModeOptionD" : "Mode D - unidirectional data interface with transmission interval (e.g. EasyMeter)"
   }
 });
\ No newline at end of file
diff --git a/WebUI/www/config/easymodes/MASTER_LANG/HM_ES_TX_WM_HELP.js b/WebUI/www/config/easymodes/MASTER_LANG/HM_ES_TX_WM_HELP.js
new file mode 100755
index 00000000..d9af65a9
--- /dev/null
+++ b/WebUI/www/config/easymodes/MASTER_LANG/HM_ES_TX_WM_HELP.js
@@ -0,0 +1,171 @@
+jQuery.extend(true,langJSON, {
+
+  "de" : {
+    "HelpTitle" : "Hilfe",
+    "SERIAL_FORMAT" :
+      "Standardeinstellung nach Norm:<br /> "+
+      "1 Startbit, 7 Datenbits, 1 Parit&auml;tsbit (gerade Parit&auml;t), 1 Stoppbit<br /><br />"+
+
+      "Weitere Einstellungsm&ouml;glichkeiten:<br />"+
+      "1 Startbit, 7 Datenbits, 1 Parit&auml;tsbit (gerade Parit&auml;t), 2 Stoppbits<br />"+
+      "1 Startbit, 8 Datenbits, 0 Parit&auml;tsbit (keine Parit&auml;t), 1 Stoppbit<br />"+
+      "1 Startbit, 8 Datenbits, 1 Parit&auml;tsbit (gerade Parit&auml;t), 1 Stoppbit<br />",
+
+    "SAMPLES_PER_CYCLE":
+      "Das Ger&auml;t sendet die Daten zyklisch alle 2–3 Minuten. Falls das Senderaster zu langsam ist, weil z. B. ein Zentralenprogramm schneller reagieren soll, " +
+      "k&ouml;nnen zus&auml;tzliche Datenabfragen pro Senderaster in Zusammenhang mit Schwellwerte f&uuml;r die Abweichung der Leistung beider Kan&auml;le " +
+      "konfiguriert werden, die zus&auml;tzliche Sendungen ausl&ouml;sen.",
+
+    "POWER_STRING_CH1" :
+      "Standardeinstellung: 1-0:1.7<br />"+
+      "1 --> Summe Wirkleistung +<br />"+
+      "7 --> Momentanwert<br /><br />"+
+
+      "Hinweis: Wenn von dem Z&auml;hler die Wirkleistungen der einzelnen Phasen nicht zusammen in einer Kennzahl &uuml;bertragen werden, k&ouml;nnen hier die Messgr&ouml;&szlig;en von mehreren Phasen zusammengefasst werden.<br /><br />"+
+
+      "Beispieleinstellung: 1-0:21|41|61.7<br />"+
+      "21 --> L1 Wirkleistung +<br />"+
+      "41 --> L2 Wirkleistung +<br />"+
+      "61 --> L3 Wirkleistung +<br />"+
+      "7 --> Momentanwert",
+
+
+    "ENERGY_COUNTER_STRING_CH1" :
+      "Standardeinstellung: 1-0:1.8<br />"+
+      "1 --> Summe Wirkleistung +<br />"+
+      "8 --> Z&auml;hlerstand",
+
+    "POWER_STRING_CH2" :
+      "Standardeinstellung: 1-0:2.7<br />"+
+      "2 --> Summe Wirkleistung -<br />"+
+      "7 --> Momentanwert<br /><br />"+
+
+      "Hinweis: Wenn von dem Z&auml;hler die Wirkleistungen der einzelnen Phasen nicht zusammen in einer Kennzahl &uuml;bertragen werden, "+
+      "k&ouml;nnen hier die Messgr&ouml;&szlig;en von mehreren Phasen zusammengefasst werden.<br /><br />"+
+
+      "Beispieleinstellung: 1-0:22|42|62.7<br />"+
+      "22 --> L1 Wirkleistung -<br />"+
+      "42 --> L2 Wirkleistung -<br />"+
+      "62 --> L3 Wirkleistung -<br />"+
+      "7 --> Momentanwert",
+
+    "ENERGY_COUNTER_STRING_CH2" :
+      "Standardeinstellung: 1-0:2.8<br />"+
+      "2 --> Summe Wirkleistung -<br />"+
+      "8 --> Z&auml;hlerstand"
+
+  },
+  "en" :{
+    "HelpTitle" : "Help",
+
+    "SERIAL_FORMAT" :
+      "Default setting according to standard:<br / >"+
+      "1 start bit, 7 data bits, 1 parity bit (even parity), 1 stop bit<br /><br />"+
+
+      "Further setting options are:<br / >"+
+      "1 start bit, 7 data bits, 1 parity bit (even parity), 2 stop bits<br / >"+
+      "1 start bit, 8 data bits, 0 parity bit (no parity), 1 stop bit<br / >"+
+      "1 start bit, 8 data bits, 1 parity bit (even parity), 1 stop bit",
+
+    "SAMPLES_PER_CYCLE":
+      "The device cyclically transmits the data every 2-3 minutes. If the transmission interval is too slow because e.g. a central control unit program is supposed to "+
+      "react faster, you can configure additional data requests per transmission interval relating to threshold values for deviation of power of both channels that "+
+      "trigger additional transmissions.",
+
+    "POWER_STRING_CH1" :
+      "Default setting: 1-0:1.7<br />" +
+      "1 --> sum of effective power +<br />" +
+      "7 --> current value<br />" +
+
+      "Please note: If the meter does not transfer the effective power of the single phases in one key figure, "+
+      "the measured values of several phases can be summarised here.<br /><br />"+
+
+      "Example setting: 1-0:21|41|61.7<br />"+
+      "21 --> L1 effective power +<br />"+
+      "41 --> L2 effective power +<br />"+
+      "61 --> L3 effective power +<br />"+
+      "7 --> current value<br />",
+
+    "ENERGY_COUNTER_STRING_CH1" :
+      "Default setting: 1-0:1.8<br />"+
+      "1 --> sum of effective power +<br />"+
+      "8 --> meter reading<br />",
+
+    "POWER_STRING_CH2" :
+
+      "Default setting: 1-0:2.7<br />"+
+      "2 --> sum of effective power -<br />"+
+      "7 --> current value<br /><br />"+
+
+      "Please note: If the meter does not transfer the effective power of the single phases in one key figure, "+
+      "the measured values of several phases can be summarised here."+
+
+      "Example setting: 1-0:22|43|62.7<br />"+
+      "22 --> L1 effective power -<br />"+
+      "42 --> L2 effective power -<br />"+
+      "62 --> L3 effective power -<br />"+
+      "7 --> current value<br />",
+
+    "ENERGY_COUNTER_STRING_CH2" :
+      "Default setting: 1-0:2.8<br />"+
+      "2 --> sum of effective power -<br />"+
+      "8 --> meter reading<br />"
+
+  },
+  "tr" : {
+    "HelpTitle" : "Help",
+
+    "SERIAL_FORMAT" :
+      "Default setting according to standard:<br / >"+
+      "1 start bit, 7 data bits, 1 parity bit (even parity), 1 stop bit<br /><br />"+
+
+      "Further setting options are:<br / >"+
+      "1 start bit, 7 data bits, 1 parity bit (even parity), 2 stop bits<br / >"+
+      "1 start bit, 8 data bits, 0 parity bit (no parity), 1 stop bit<br / >"+
+      "1 start bit, 8 data bits, 1 parity bit (even parity), 1 stop bit",
+
+    "SAMPLES_PER_CYCLE":
+      "The device cyclically transmits the data every 2-3 minutes. If the transmission interval is too slow because e.g. a central control unit program is supposed to "+
+      "react faster, you can configure additional data requests per transmission interval relating to threshold values for deviation of power of both channels that "+
+      "trigger additional transmissions.",
+
+    "POWER_STRING_CH1" :
+      "Default setting: 1-0:1.7<br />" +
+      "1 --> sum of effective power +<br />" +
+      "7 --> current value<br />" +
+
+      "Please note: If the meter does not transfer the effective power of the single phases in one key figure, "+
+      "the measured values of several phases can be summarised here.<br /><br />"+
+
+      "Example setting: 1-0:21|41|61.7<br />"+
+      "21 --> L1 effective power +<br />"+
+      "41 --> L2 effective power +<br />"+
+      "61 --> L3 effective power +<br />"+
+      "7 --> current value<br />",
+
+    "ENERGY_COUNTER_STRING_CH1" :
+      "Default setting: 1-0:1.8<br />"+
+      "1 --> sum of effective power +<br />"+
+      "8 --> meter reading<br />",
+
+    "POWER_STRING_CH2" :
+      "Default setting: 1-0:2.7<br />"+
+      "2 --> sum of effective power -<br />"+
+      "7 --> current value<br /><br />"+
+
+      "Please note: If the meter does not transfer the effective power of the single phases in one key figure, "+
+      "the measured values of several phases can be summarised here."+
+
+      "Example setting: 1-0:22|43|62.7<br />"+
+      "22 --> L1 effective power -<br />"+
+      "42 --> L2 effective power -<br />"+
+      "62 --> L3 effective power -<br />"+
+      "7 --> current value<br />",
+
+    "ENERGY_COUNTER_STRING_CH2" :
+      "Default setting: 1-0:2.8<br />"+
+      "2 --> sum of effective power -<br />"+
+      "8 --> meter reading<br />"
+  }
+
+});
diff --git a/WebUI/www/config/easymodes/MASTER_LANG/HM_SEC_SIR_WM.js b/WebUI/www/config/easymodes/MASTER_LANG/HM_SEC_SIR_WM.js
new file mode 100755
index 00000000..96c52c31
--- /dev/null
+++ b/WebUI/www/config/easymodes/MASTER_LANG/HM_SEC_SIR_WM.js
@@ -0,0 +1,33 @@
+/**
+ * Created by grobelnik on 05.02.2016.
+ */
+jQuery.extend(true,langJSON, {
+  "de" : {
+    "soundID" : "Alarmsignal",
+    "pitch" : "Tonh%F6he",
+    "speed" : "Geschwindigkeit",
+    "signal" : "Signal",
+    "speedSlow" : "langsam",
+    "speedFast" : "schnell",
+
+    "" : ""
+  },
+  "en" : {
+    "soundID" : "en Alarmsignal",
+    "pitch" : "en Tonh%F6he",
+    "speed" : "en Geschwindigkeit",
+    "signal" : "en Signal",
+    "speedSlow" : "en langsam",
+    "speedFast" : "en schnell",
+    "" : ""
+  },
+  "tr" : {
+    "soundID" : "tr Alarmsignal",
+    "pitch" : "tr Tonh%F6he",
+    "speed" : "tr Geschwindigkeit",
+    "signal" : "tr Signal",
+    "speedSlow" : "tr langsam",
+    "speedFast" : "tr schnell",
+    "" : ""
+  }
+});
\ No newline at end of file
diff --git a/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/VIRTUAL_KEY.tcl b/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/VIRTUAL_KEY.tcl
new file mode 100755
index 00000000..fbaeec7f
--- /dev/null
+++ b/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/VIRTUAL_KEY.tcl
@@ -0,0 +1,124 @@
+#!/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
+
+
+set PROFILES_MAP(0) "\${expert}"
+set PROFILES_MAP(1) "\${mode}"
+
+set PROFILE_0(UI_HINT)	0
+set PROFILE_0(UI_DESCRIPTION)	"Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)	"Expertenprofil"
+
+# hier folgen die verschiedenen Profile
+set PROFILE_1(SHORT_CONTROL_RC)   {1 range 0 - 6}
+set PROFILE_1(SHORT_TEMPERATUR_RC)   {17.00 range 5.00 - 30.00}
+set PROFILE_1(LONG_CONTROL_RC)   {0 range 0 - 6}
+set PROFILE_1(LONG_TEMPERATUR_RC)   {17.00 range 5.00 - 30.00}
+set PROFILE_1(UI_DESCRIPTION)	"Expertenprofil"
+set PROFILE_1(UI_TEMPLATE)	"Expertenprofil"
+set PROFILE_1(UI_HINT)	1
+
+# hier folgen die eventuellen Subsets
+
+proc isLinkActive {manuMode partyMode} {
+  set active 1
+
+  if {$manuMode != 1 || $partyMode != 1} {
+    set active 0
+  }
+  return $active
+}
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+
+	global url dev_descr_sender dev_descr_receiver
+	upvar PROFILES_MAP  PROFILES_MAP
+	upvar HTML_PARAMS   HTML_PARAMS
+	upvar PROFILE_PNAME PROFILE_PNAME
+	upvar $pps          ps      
+	upvar $pps_descr    ps_descr
+
+	foreach pro [array names PROFILES_MAP] {
+		upvar PROFILE_$pro PROFILE_$pro
+	}
+	 		
+	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+	
+	#global SUBSETS
+	set name "x"
+	set i 1
+	while {$name != ""} {
+		upvar SUBSET_$i SUBSET_$i
+		array set subset [array get SUBSET_$i]
+		set name ""
+		catch {set name $subset(NAME)}
+		array_clear subset
+		incr i
+	}
+
+  array set dev_descr [xmlrpc $url getParamset [list string $dev_descr_receiver(PARENT)] MASTER]
+  set MANU_MODE_PRIO [lindex [array get dev_descr MANU_MODE_PRIORITIZATION] 1]
+  set PARTY_MODE_PRIO [lindex [array get dev_descr PARTY_MODE_PRIORITIZATION] 1]
+  set linkIsActive [isLinkActive $MANU_MODE_PRIO $PARTY_MODE_PRIO]
+
+
+  puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/CC.js');</script>"
+
+#	die Texte der Platzhalter einlesen
+	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+	set prn 0	
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+
+# hier folgt die Profildarstellung
+	incr prn
+	set pref 1
+	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+	append HTML_PARAMS(separate_$prn) "<tr><td>\${mode}</td><td>"
+	set options(0) "\${option0}"
+	set options(1) "\${option1}"
+	set options(2) "\${option2}"
+	set options(3) "\${option3}"
+	set options(4) "\${option4}"
+	set options(5) "\${option5}"
+	#set options(6) "\${option6}"
+	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_CONTROL_RC|LONG_CONTROL_RC separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_CONTROL_RC "onchange=\"setPointVisibility('${special_input_id}', $prn)\""]
+	append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref
+	append HTML_PARAMS(separate_$prn) "<tr id='setpoint_${special_input_id}' class='hidden'><td>\${SetPointTemperature}</td><td>"
+  array_clear options
+	for {set val 5} {$val <= 30 } {incr val} {
+	  set options($val) "$val &#176;C"
+	}
+	set options(99999997) "Wert eingeben"
+
+	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_TEMPERATUR_RC|LONG_TEMPERATUR_RC separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_TEMPERATUR_RC "onchange=\"CC_ActivateFreeTemp(\$('${special_input_id}_profiles'),$pref);\""]
+	EnterTemp $prn $pref ${special_input_id} ps_descr 0 SHORT_TEMPERATUR_RC
+
+	append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+	append HTML_PARAMS(separate_$prn) "</table>"
+
+  if {$linkIsActive != 1} {
+  	append HTML_PARAMS(separate_$prn) "<hr>"
+	  append HTML_PARAMS(separate_$prn) "<span class='attention'>\${hintKeyPressIgnored}</span>"
+  }
+	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+
+  # Depending of the current mode the setpoint input field is visible or not.
+  append HTML_PARAMS(separate_$prn) "<script type=\"text/javascript\">"
+    append HTML_PARAMS(separate_$prn) "setPointVisibility(\"${special_input_id}\", $prn);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+}
+
+constructor
diff --git a/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/localization/de/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/localization/de/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..1e28c756
--- /dev/null
+++ b/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/localization/de/VIRTUAL_KEY.txt
@@ -0,0 +1 @@
+"description_1" : "<span class=\"translated\">Mit einem kurzen oder langen Tastendruck wird der Heizungsregler in die gew&auml;hlte Betriebsart geschaltet.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/localization/en/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/localization/en/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..267b18e1
--- /dev/null
+++ b/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/localization/en/VIRTUAL_KEY.txt
@@ -0,0 +1 @@
+"description_1" : "<span class=\"translated\">With a short or long button press the heating thermostat will be switched to the selected operation mode </span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/localization/tr/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/localization/tr/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..4b5e468c
--- /dev/null
+++ b/WebUI/www/config/easymodes/REMOTECONTROL_RECEIVER/localization/tr/VIRTUAL_KEY.txt
@@ -0,0 +1 @@
+"description_1" : "<span class=\"translated\">Tusa kisa veya uzun s&uuml;re basildiginda kalorifer reg&uuml;lat&ouml;r&uuml; istenen isletim moduna alinir.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/RGBW_AUTOMATIC/VIRTUAL_KEY.tcl b/WebUI/www/config/easymodes/RGBW_AUTOMATIC/VIRTUAL_KEY.tcl
new file mode 100755
index 00000000..4ba1f700
--- /dev/null
+++ b/WebUI/www/config/easymodes/RGBW_AUTOMATIC/VIRTUAL_KEY.tcl
@@ -0,0 +1,235 @@
+#!/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
+
+set PROFILES_MAP(0)	"\${expert}"
+set PROFILES_MAP(1)	"\${dec_Program}"
+set PROFILES_MAP(2)	"\${inc_Program}"
+set PROFILES_MAP(3)	"\${set_Program}"
+
+set PROFILE_0(UI_HINT)	0
+set PROFILE_0(UI_DESCRIPTION)		"Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)			"Expertenprofil"
+
+set PROFILE_1(SHORT_ACT_COLOR_PROGRAM)	0
+set PROFILE_1(SHORT_ACT_MIN_BOARDER)		{0 range 0 - 255}
+set PROFILE_1(SHORT_ACT_MAX_BOARDER)		{0 range 0 - 255}
+set PROFILE_1(LONG_ACT_COLOR_PROGRAM)		254
+set PROFILE_1(LONG_ACT_MIN_BOARDER)	  	{0 range 0 - 255}
+set PROFILE_1(LONG_ACT_MAX_BOARDER)	  	{0 range 0 - 255}
+set PROFILE_1(UI_DESCRIPTION)	"Mit einem kurzen oder langen Tastendruck wird ....."
+set PROFILE_1(UI_TEMPLATE)		$PROFILE_1(UI_DESCRIPTION)
+set PROFILE_1(UI_HINT)	1
+
+set PROFILE_2(SHORT_ACT_COLOR_PROGRAM)	2
+set PROFILE_2(SHORT_ACT_MIN_BOARDER)		{0 range 0 - 255}
+set PROFILE_2(SHORT_ACT_MAX_BOARDER)		{0 range 0 - 255}
+set PROFILE_2(LONG_ACT_COLOR_PROGRAM)		253
+set PROFILE_2(LONG_ACT_MIN_BOARDER)	  	{0 range 0 - 255}
+set PROFILE_2(LONG_ACT_MAX_BOARDER)	  	{0 range 0 - 255}
+set PROFILE_2(UI_DESCRIPTION)	"Mit einem kurzen oder langen Tastendruck wird ....."
+set PROFILE_2(UI_TEMPLATE)		$PROFILE_2(UI_DESCRIPTION)
+set PROFILE_2(UI_HINT)	2
+
+set PROFILE_3(SHORT_ACT_COLOR_PROGRAM)	{0 range 0 - 6}
+set PROFILE_3(SHORT_ACT_MIN_BOARDER)		{0 range 0 - 255}
+set PROFILE_3(SHORT_ACT_MAX_BOARDER)		{0 range 0 - 255}
+set PROFILE_3(LONG_ACT_COLOR_PROGRAM)		{0 range 0 - 6}
+set PROFILE_3(LONG_ACT_MIN_BOARDER)	  	{0 range 0 - 255}
+set PROFILE_3(LONG_ACT_MAX_BOARDER)	  	{0 range 0 - 255}
+set PROFILE_3(UI_DESCRIPTION)	"Mit einem kurzen oder langen Tastendruck wird ....."
+set PROFILE_3(UI_TEMPLATE)		$PROFILE_3(UI_DESCRIPTION)
+set PROFILE_3(UI_HINT)	3
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+	
+	global env receiver_address dev_descr_sender dev_descr_receiver
+	upvar PROFILES_MAP  PROFILES_MAP
+	upvar HTML_PARAMS   HTML_PARAMS
+	upvar PROFILE_PNAME PROFILE_PNAME
+	upvar $pps          ps      
+	upvar $pps_descr    ps_descr
+	
+	foreach pro [array names PROFILES_MAP] {
+		upvar PROFILE_$pro PROFILE_$pro
+	}
+
+	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+
+	#global SUBSETS
+	set name "x"
+	set i 1
+	while {$name != ""} {
+		upvar SUBSET_$i SUBSET_$i
+		array set subset [array get SUBSET_$i]
+		set name ""
+		catch {set name $subset(NAME)}
+		array_clear subset
+		incr i
+	}
+
+#	die Texte der Platzhalter einlesen
+	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+	puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/RGBW_Controller.js')</script>"
+
+	set prn 0
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+#1
+	incr prn
+	set pref 1
+	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+	append HTML_PARAMS(separate_$prn) "<tr><td>\${lblColorValueMin}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem SHORT_ACT_MIN_BOARDER separate_${special_input_id}_$prn\_$pref ps SHORT_ACT_MIN_BOARDER "onchange=\"setValueLONG('$special_input_id', $prn, $pref);\" " ]</td>"
+	append HTML_PARAMS(separate_$prn) "<td><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+	append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax($ps(SHORT_ACT_MIN_BOARDER), separate_${special_input_id}_$prn\_$pref);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${lblColorValueMax}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem SHORT_ACT_MAX_BOARDER separate_${special_input_id}_$prn\_$pref ps SHORT_ACT_MAX_BOARDER "onchange=\"setValueLONG('$special_input_id', $prn, $pref);\" "]</td>"
+	append HTML_PARAMS(separate_$prn) "<td><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+  append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax($ps(SHORT_ACT_MAX_BOARDER), separate_${special_input_id}_$prn\_$pref);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+  incr pref ;# 3
+  append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td>LONG Start</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem LONG_ACT_MIN_BOARDER separate_${special_input_id}_$prn\_$pref ps LONG_ACT_MIN_BOARDER]</td>"
+  append HTML_PARAMS(separate_$prn) "</tr>"
+
+  incr pref ;# 4
+  append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td>LONG END</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem LONG_ACT_MAX_BOARDER separate_${special_input_id}_$prn\_$pref ps LONG_ACT_MAX_BOARDER]</td>"
+  append HTML_PARAMS(separate_$prn) "</tr>"
+
+	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+
+#2
+	incr prn
+	set pref 1
+	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+	append HTML_PARAMS(separate_$prn) "<tr><td>\${lblColorValueMin}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem SHORT_ACT_MIN_BOARDER separate_${special_input_id}_$prn\_$pref ps SHORT_ACT_MIN_BOARDER "onchange=\"setValueLONG('$special_input_id', $prn, $pref);\" "]</td>"
+	append HTML_PARAMS(separate_$prn) "<td><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+	append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax($ps(SHORT_ACT_MIN_BOARDER), separate_${special_input_id}_$prn\_$pref);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${lblColorValueMax}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem SHORT_ACT_MAX_BOARDER separate_${special_input_id}_$prn\_$pref ps SHORT_ACT_MAX_BOARDER "onchange=\"setValueLONG('$special_input_id', $prn, $pref);\" "]</td>"
+	append HTML_PARAMS(separate_$prn) "<td><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+  append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax($ps(SHORT_ACT_MAX_BOARDER), separate_${special_input_id}_$prn\_$pref);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+    incr pref ;# 3
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td>LONG Start</td>"
+    append HTML_PARAMS(separate_$prn) "<td>[get_InputElem LONG_ACT_MIN_BOARDER separate_${special_input_id}_$prn\_$pref ps LONG_ACT_MIN_BOARDER]</td>"
+    append HTML_PARAMS(separate_$prn) "</tr>"
+
+    incr pref ;# 4
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td>LONG END</td>"
+    append HTML_PARAMS(separate_$prn) "<td>[get_InputElem LONG_ACT_MAX_BOARDER separate_${special_input_id}_$prn\_$pref ps LONG_ACT_MAX_BOARDER]</td>"
+    append HTML_PARAMS(separate_$prn) "</tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+
+#3
+	incr prn
+	set pref 1
+	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${lblShortKeyPress}</td><td>"
+
+  set options(0) "\${optionPrg0}"
+  set options(1) "\${optionPrg1}"
+  set options(2) "\${optionPrg2}"
+  set options(3) "\${optionPrg3}"
+  set options(4) "\${optionPrg4}"
+  set options(5) "\${optionPrg5}"
+  set options(6) "\${optionPrg6}"
+
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ACT_COLOR_PROGRAM separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ACT_COLOR_PROGRAM]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref; #2
+	append HTML_PARAMS(separate_$prn) "<tr><td>\${lblColorValueMin}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem SHORT_ACT_MIN_BOARDER separate_${special_input_id}_$prn\_$pref ps SHORT_ACT_MIN_BOARDER "_onchange=\"setValueLONG('$special_input_id', $prn, $pref);\" "]</td>"
+	append HTML_PARAMS(separate_$prn) "<td><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+	append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax($ps(SHORT_ACT_MIN_BOARDER), separate_${special_input_id}_$prn\_$pref);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+  incr pref ;# 3
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${lblColorValueMax}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem SHORT_ACT_MAX_BOARDER separate_${special_input_id}_$prn\_$pref ps SHORT_ACT_MAX_BOARDER "_onchange=\"setValueLONG('$special_input_id', $prn, $pref);\" "]</td>"
+	append HTML_PARAMS(separate_$prn) "<td><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+  append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax($ps(SHORT_ACT_MAX_BOARDER), separate_${special_input_id}_$prn\_$pref);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td><hr></td></tr>"
+
+  incr pref ;# 4
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${lblLongKeyPress}</td><td>"
+
+  set options(0) "\${optionPrg0}"
+  set options(1) "\${optionPrg1}"
+  set options(2) "\${optionPrg2}"
+  set options(3) "\${optionPrg3}"
+  set options(4) "\${optionPrg4}"
+  set options(5) "\${optionPrg5}"
+  set options(6) "\${optionPrg6}"
+
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options LONG_ACT_COLOR_PROGRAM separate_${special_input_id}_$prn\_$pref PROFILE_$prn LONG_ACT_COLOR_PROGRAM]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref; #5
+	append HTML_PARAMS(separate_$prn) "<tr><td>\${lblColorValueMin}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem LONG_ACT_MIN_BOARDER separate_${special_input_id}_$prn\_$pref ps LONG_ACT_MIN_BOARDER "_onchange=\"setValueLONG('$special_input_id', $prn, $pref);\" "]</td>"
+	append HTML_PARAMS(separate_$prn) "<td><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+	append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax($ps(LONG_ACT_MIN_BOARDER), separate_${special_input_id}_$prn\_$pref);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+  incr pref ;# 6
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${lblColorValueMax}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem LONG_ACT_MAX_BOARDER separate_${special_input_id}_$prn\_$pref ps LONG_ACT_MAX_BOARDER "_onchange=\"setValueLONG('$special_input_id', $prn, $pref);\" "]</td>"
+	append HTML_PARAMS(separate_$prn) "<td><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+  append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax($ps(LONG_ACT_MAX_BOARDER), separate_${special_input_id}_$prn\_$pref);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+}
+
+constructor
+
diff --git a/WebUI/www/config/easymodes/RGBW_AUTOMATIC/localization/de/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/RGBW_AUTOMATIC/localization/de/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..0c242557
--- /dev/null
+++ b/WebUI/www/config/easymodes/RGBW_AUTOMATIC/localization/de/VIRTUAL_KEY.txt
@@ -0,0 +1,3 @@
+"description_1" : "<span class=\"translated\">Mit einem langen Tastendruck k&ouml;nnen Sie die Nummer des Farbwechselprogramms verringern. Ein kurzer Tastendruck schaltet die Programmfunktion aus.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">Mit einem langen Tastendruck k&ouml;nnen Sie die Nummer des Farbwechselprogramms  erh&ouml;hen. Ein kurzer Tastendruck w&auml;hlt das Program 'Normaler Durchlauf'</span><br/><br/>",
+"description_3" : "<span class=\"translated\">Hier k&ouml;nnen Sie ein Programm festlegen, welches bei kurzen und langem Tastendruck aktiviert wird.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/RGBW_AUTOMATIC/localization/en/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/RGBW_AUTOMATIC/localization/en/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..db692977
--- /dev/null
+++ b/WebUI/www/config/easymodes/RGBW_AUTOMATIC/localization/en/VIRTUAL_KEY.txt
@@ -0,0 +1,3 @@
+"description_1" : "<span class=\"translated\">A long button press will decrease the number of the colour program. A brief button press will stop the program.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">A long button press will increase the number of the colour program. A brief button press will select the program 'Normal cycle'</span><br/><br/>",
+"description_3" : "<span class=\"translated\">You can set the program for the brief and long button press here.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/RGBW_AUTOMATIC/localization/tr/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/RGBW_AUTOMATIC/localization/tr/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..5b4d5123
--- /dev/null
+++ b/WebUI/www/config/easymodes/RGBW_AUTOMATIC/localization/tr/VIRTUAL_KEY.txt
@@ -0,0 +1,3 @@
+"description_1" : "<span class=\"translated\">Tusa uzun bir basisla renk degisim programi numarasini azaltabilirsiniz. Kisa bir basis program fonksiyonunu kapatir.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">Tusa uzun bir basisla renk degisim programinin numarasini artirabilirsiniz. Kisa bir basis "Normal Akis" programini secer.</span><br/><br/>",
+"description_3" : "<span class=\"translated\">Burada kisa ve uzun tus basiminda aktif hale gelen bir program belirleyebilirsiniz.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/RGBW_COLOR/VIRTUAL_KEY.tcl b/WebUI/www/config/easymodes/RGBW_COLOR/VIRTUAL_KEY.tcl
new file mode 100755
index 00000000..e73e6d00
--- /dev/null
+++ b/WebUI/www/config/easymodes/RGBW_COLOR/VIRTUAL_KEY.tcl
@@ -0,0 +1,110 @@
+#!/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
+
+set PROFILES_MAP(0)	"\${expert}"
+set PROFILES_MAP(1)	"\${choose_Mode}"
+set PROFILES_MAP(2)	"\${jumpToColor}"
+
+set PROFILE_0(UI_HINT)	0
+set PROFILE_0(UI_DESCRIPTION)		"Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)			"Expertenprofil"
+
+set PROFILE_1(SHORT_ACT_HSV_COLOR_VALUE)	{253 254 255}
+set PROFILE_1(LONG_ACT_HSV_COLOR_VALUE)		{253 254 255}
+set PROFILE_1(UI_DESCRIPTION)	"Mit einem kurzen oder langen Tastendruck wird ....."
+set PROFILE_1(UI_TEMPLATE)		$PROFILE_1(UI_DESCRIPTION)	
+set PROFILE_1(UI_HINT)	1
+
+set PROFILE_2(SHORT_ACT_HSV_COLOR_VALUE)	{0 range 0 - 200}
+set PROFILE_2(LONG_ACT_HSV_COLOR_VALUE)		{0 range 0 - 200}
+set PROFILE_2(UI_DESCRIPTION)	"Mit einem kurzen oder langen Tastendruck wird ....."
+set PROFILE_2(UI_TEMPLATE)		$PROFILE_2(UI_DESCRIPTION)
+set PROFILE_2(UI_HINT)	2
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+	
+	global env receiver_address dev_descr_sender dev_descr_receiver
+	upvar PROFILES_MAP  PROFILES_MAP
+	upvar HTML_PARAMS   HTML_PARAMS
+	upvar PROFILE_PNAME PROFILE_PNAME
+	upvar $pps          ps      
+	upvar $pps_descr    ps_descr
+	
+	foreach pro [array names PROFILES_MAP] {
+		upvar PROFILE_$pro PROFILE_$pro
+	}
+ 		
+	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+
+	#global SUBSETS
+	set name "x"
+	set i 1
+	while {$name != ""} {
+		upvar SUBSET_$i SUBSET_$i
+		array set subset [array get SUBSET_$i]
+		set name ""
+		catch {set name $subset(NAME)}
+		array_clear subset
+		incr i
+	}
+
+	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+	puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/RGBW_Controller.js')</script>"
+
+	set prn 0
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+#1
+	incr prn
+	set pref 1
+	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+	append HTML_PARAMS(separate_$prn) "<tr><td class=\"attention\">\${lblMode}</td><td>"
+  set options(253)	"\${optionIncColor}"
+  set options(254)	"\${optionDecColor}"
+  set options(255)	"\${optionToggleColor}"
+	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ACT_HSV_COLOR_VALUE|LONG_ACT_HSV_COLOR_VALUE separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ACT_HSV_COLOR_VALUE "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+	append HTML_PARAMS(separate_$prn) "</td></tr>"
+	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+
+#2
+	incr prn
+	set pref 1
+	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+	append HTML_PARAMS(separate_$prn) "<tr><td>\${lblShortKeyPress}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem SHORT_ACT_HSV_COLOR_VALUE separate_${special_input_id}_$prn\_$pref ps SHORT_ACT_HSV_COLOR_VALUE]</td>"
+	append HTML_PARAMS(separate_$prn) "<td class='hidden'><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+	append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "var shortVal = ($ps(SHORT_ACT_HSV_COLOR_VALUE) <= 200) ? $ps(SHORT_ACT_HSV_COLOR_VALUE) : 0;"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax(shortVal, separate_${special_input_id}_$prn\_$pref, true);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${lblLongKeyPress}</td>"
+  append HTML_PARAMS(separate_$prn) "<td>[get_InputElem LONG_ACT_HSV_COLOR_VALUE separate_${special_input_id}_$prn\_$pref ps LONG_ACT_HSV_COLOR_VALUE]</td>"
+	append HTML_PARAMS(separate_$prn) "<td class='hidden'><input id=\"borderColorActive_${special_input_id}_$prn\_$pref\" type=\"checkbox\"><label for=\"borderColorActive_${special_input_id}_$prn\_$pref\">\${active_1}</label></td>"
+  append HTML_PARAMS(separate_$prn) "</tr>"
+  append HTML_PARAMS(separate_$prn) "<script type=\"javascript\">"
+  append HTML_PARAMS(separate_$prn) "var longVal = ($ps(LONG_ACT_HSV_COLOR_VALUE) <= 200) ? $ps(LONG_ACT_HSV_COLOR_VALUE) : 0;"
+  append HTML_PARAMS(separate_$prn) "window.setTimeout(function() {activateColorPickerMinMax(longVal, separate_${special_input_id}_$prn\_$pref, true);}, 200);"
+  append HTML_PARAMS(separate_$prn) "</script>"
+
+	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+
+}
+
+constructor
diff --git a/WebUI/www/config/easymodes/RGBW_COLOR/localization/de/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/RGBW_COLOR/localization/de/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..74aafe07
--- /dev/null
+++ b/WebUI/www/config/easymodes/RGBW_COLOR/localization/de/VIRTUAL_KEY.txt
@@ -0,0 +1,3 @@
+"description_1" : "<span class=\"translated\">Hier k&ouml;nnen Sie den Modus der Taste einstellen. Es gibt folgende M&ouml;glichkeiten: Farbwert erh&ouml;hen, Farbwert verringern und Farbwert abwechselnd erh&ouml;hen oder verringern, abh&auml;ngig vom Tastendruckz&auml;hler.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">Hier k&ouml;nnen Sie eine Taste mit einer Farbe f&uuml;r den kurzen und langen Tastendruck belegen</span><br/><br/>",
+
diff --git a/WebUI/www/config/easymodes/RGBW_COLOR/localization/en/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/RGBW_COLOR/localization/en/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..3486cb60
--- /dev/null
+++ b/WebUI/www/config/easymodes/RGBW_COLOR/localization/en/VIRTUAL_KEY.txt
@@ -0,0 +1,2 @@
+"description_1" : "<span class=\"translated\">You can define the mode of the button here. There are the following options: increase the color value, decrease the color value and - depending on the button press counter -  alternate between increasing and decreasing of the color value.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">You can set the button for activating a particular color value here. You can set a color value for the short and for the long button press separately. </span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/RGBW_COLOR/localization/tr/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/RGBW_COLOR/localization/tr/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..8d3d2614
--- /dev/null
+++ b/WebUI/www/config/easymodes/RGBW_COLOR/localization/tr/VIRTUAL_KEY.txt
@@ -0,0 +1,2 @@
+"description_1" : "<span class=\"translated\">Burada tusun modunu ayarlayabilirsiniz. Asagidaki secenekler mevcut: Renk degerini y%FCkselt, renk degerini azalt ve renk degerini degisimli olarak y%FCkselt veya azalt, tus basimi sayacina bagli.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">Burada kisa ve uzun tus basimi icin bir tusu bir renkle atayabilirsiniz.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/STATUS_INDICATOR/SMOKE_DETECTOR_TEAM_V2.tcl b/WebUI/www/config/easymodes/STATUS_INDICATOR/SMOKE_DETECTOR_TEAM_V2.tcl
index 5f254e38..3d6bc65b 100755
--- a/WebUI/www/config/easymodes/STATUS_INDICATOR/SMOKE_DETECTOR_TEAM_V2.tcl
+++ b/WebUI/www/config/easymodes/STATUS_INDICATOR/SMOKE_DETECTOR_TEAM_V2.tcl
@@ -37,13 +37,13 @@ set PROFILE_1(UI_HINT)	1
 #set SUBSET_1(NAME)					"nur auslösender Rauchmelder"
 set SUBSET_1(NAME)					"\${subset_1}"
 set SUBSET_1(SUBSET_OPTION_VALUE)	1
-set SUBSET_1(SHORT_COND_VALUE_LO)	1
+set SUBSET_1(SHORT_COND_VALUE_LO)	2
 set SUBSET_1(SHORT_COND_VALUE_HI)	180
 set SUBSET_1(SHORT_CT_ON)			2
 
 set SUBSET_2(NAME)					"\${subset_2}"
 set SUBSET_2(SUBSET_OPTION_VALUE)	2
-set SUBSET_2(SHORT_COND_VALUE_LO)	2
+set SUBSET_2(SHORT_COND_VALUE_LO)	4
 set SUBSET_2(SHORT_COND_VALUE_HI)	180
 set SUBSET_2(SHORT_CT_ON)	4
 
diff --git a/WebUI/www/config/easymodes/STATUS_INDICATOR/WEATHER.tcl b/WebUI/www/config/easymodes/STATUS_INDICATOR/WEATHER.tcl
index 31d1a166..13d06e86 100755
--- a/WebUI/www/config/easymodes/STATUS_INDICATOR/WEATHER.tcl
+++ b/WebUI/www/config/easymodes/STATUS_INDICATOR/WEATHER.tcl
@@ -4,173 +4,215 @@ source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
 
-set PROFILES_MAP(0)	"\${expert}"
-set PROFILES_MAP(1)	"\${switch_on_off}"
-set PROFILES_MAP(2)	"\${switch_on}"
-
-set PROFILE_0(UI_HINT)	0
-set PROFILE_0(UI_DESCRIPTION)		"Expertenprofil"
-set PROFILE_0(UI_TEMPLATE)			"Expertenprofil"
-
-
-set PROFILE_1(SHORT_CT_OFFDELAY)	0
-set PROFILE_1(SHORT_CT_ONDELAY)		2 
-set PROFILE_1(SHORT_CT_OFF)			0
-set PROFILE_1(SHORT_CT_ON)			2
-set PROFILE_1(SHORT_COND_VALUE_LO)	200
-set PROFILE_1(SHORT_COND_VALUE_HI)	{100 0}
-set PROFILE_1(SHORT_ONDELAY_TIME)	0
-set PROFILE_1(SHORT_ON_TIME)		111600
-set PROFILE_1(SHORT_OFFDELAY_TIME)	0
-set PROFILE_1(SHORT_OFF_TIME)		111600
-set PROFILE_1(SHORT_ON_TIME_MODE)	0
-set PROFILE_1(SHORT_OFF_TIME_MODE)	0
-set PROFILE_1(SHORT_ACTION_TYPE)	1
-set PROFILE_1(SHORT_JT_OFF)			1
-set PROFILE_1(SHORT_JT_ON)			3 
-set PROFILE_1(SHORT_JT_OFFDELAY)	2 
-set PROFILE_1(SHORT_JT_ONDELAY)		4  
-set PROFILE_1(UI_DESCRIPTION)	"Bei starkem Wind wird die Anzeige ein- und bei schwachem Wind ausgeschaltet. Die Schaltzuordnung l&auml;sst sich auch umkehren."
-set PROFILE_1(UI_TEMPLATE)		$PROFILE_1(UI_DESCRIPTION)
-set PROFILE_1(UI_HINT)	1
-
-set PROFILE_2(SHORT_CT_OFFDELAY)	0
-set PROFILE_2(SHORT_CT_ONDELAY)		0 
-set PROFILE_2(SHORT_CT_OFF)			0
-set PROFILE_2(SHORT_CT_ON)			0
-set PROFILE_2(SHORT_COND_VALUE_LO)	200
-set PROFILE_2(SHORT_COND_VALUE_HI)	{100 0}
-set PROFILE_2(SHORT_ONDELAY_TIME)	0
-set PROFILE_2(SHORT_ON_TIME)		111600
-set PROFILE_2(SHORT_OFFDELAY_TIME)	0
-set PROFILE_2(SHORT_OFF_TIME)		111600
-set PROFILE_2(SHORT_ON_TIME_MODE)	0
-set PROFILE_2(SHORT_OFF_TIME_MODE)	0
-set PROFILE_2(SHORT_ACTION_TYPE)	1
-set PROFILE_2(SHORT_JT_OFF)			1
-set PROFILE_2(SHORT_JT_ON)			2
-set PROFILE_2(SHORT_JT_OFFDELAY)	2 
-set PROFILE_2(SHORT_JT_ONDELAY)		2  
-set PROFILE_2(UI_DESCRIPTION)	"Wenn die eingestellte Windgeschwindigkeit erreicht wird, schaltet die Anzeige f&uuml;r die eingestellte Zeit ein."
-set PROFILE_2(UI_TEMPLATE)		$PROFILE_2(UI_DESCRIPTION)	
-set PROFILE_2(UI_HINT)	2
-
-#set SUBSET_1(NAME)					"Wind stark - Aus / Wind schwach - Ein"
-set SUBSET_1(NAME)					"\${subset_1}"
-set SUBSET_1(SUBSET_OPTION_VALUE)	1
-set SUBSET_1(SHORT_CT_OFF)			2
-set SUBSET_1(SHORT_CT_OFFDELAY)		2
-set SUBSET_1(SHORT_CT_ON)			0
-set SUBSET_1(SHORT_CT_ONDELAY)		0
-
-#set SUBSET_2(NAME)					"Wind stark - Ein / Wind schwach - Aus"
-set SUBSET_2(SUBSET_OPTION_VALUE)	2
-set SUBSET_2(NAME)					"\${subset_2}"
-set SUBSET_2(SHORT_CT_OFF)			0
-set SUBSET_2(SHORT_CT_OFFDELAY)		0
-set SUBSET_2(SHORT_CT_ON)			2
-set SUBSET_2(SHORT_CT_ONDELAY)		2
+set PROFILES_MAP(0)  "\${expert}"
+set PROFILES_MAP(1)  "\${switch_on_off}"
+set PROFILES_MAP(2)  "\${switch_on}"
+
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
+
+
+set PROFILE_1(SHORT_CT_OFFDELAY)  0
+set PROFILE_1(SHORT_CT_ONDELAY)    2 
+set PROFILE_1(SHORT_CT_OFF)      0
+set PROFILE_1(SHORT_CT_ON)      2
+set PROFILE_1(SHORT_COND_VALUE_LO)  200
+set PROFILE_1(SHORT_COND_VALUE_HI)  {100 0}
+set PROFILE_1(SHORT_ONDELAY_TIME)  0
+set PROFILE_1(SHORT_ON_TIME)    111600
+set PROFILE_1(SHORT_OFFDELAY_TIME)  0
+set PROFILE_1(SHORT_OFF_TIME)    111600
+set PROFILE_1(SHORT_ON_TIME_MODE)  0
+set PROFILE_1(SHORT_OFF_TIME_MODE)  0
+set PROFILE_1(SHORT_ACTION_TYPE)  1
+set PROFILE_1(SHORT_JT_OFF)      1
+set PROFILE_1(SHORT_JT_ON)      3 
+set PROFILE_1(SHORT_JT_OFFDELAY)  2 
+set PROFILE_1(SHORT_JT_ONDELAY)    4  
+set PROFILE_1(UI_DESCRIPTION)  "Bei starkem Wind wird die Anzeige ein- und bei schwachem Wind ausgeschaltet. Die Schaltzuordnung l&auml;sst sich auch umkehren."
+set PROFILE_1(UI_TEMPLATE)    $PROFILE_1(UI_DESCRIPTION)
+set PROFILE_1(UI_HINT)  1
+
+set PROFILE_2(SHORT_CT_OFFDELAY)  0
+set PROFILE_2(SHORT_CT_ONDELAY)    0 
+set PROFILE_2(SHORT_CT_OFF)      0
+set PROFILE_2(SHORT_CT_ON)      0
+set PROFILE_2(SHORT_COND_VALUE_LO)  200
+set PROFILE_2(SHORT_COND_VALUE_HI)  {100 0}
+set PROFILE_2(SHORT_ONDELAY_TIME)  0
+set PROFILE_2(SHORT_ON_TIME)    111600
+set PROFILE_2(SHORT_OFFDELAY_TIME)  0
+set PROFILE_2(SHORT_OFF_TIME)    111600
+set PROFILE_2(SHORT_ON_TIME_MODE)  0
+set PROFILE_2(SHORT_OFF_TIME_MODE)  0
+set PROFILE_2(SHORT_ACTION_TYPE)  1
+set PROFILE_2(SHORT_JT_OFF)      1
+set PROFILE_2(SHORT_JT_ON)      2
+set PROFILE_2(SHORT_JT_OFFDELAY)  2 
+set PROFILE_2(SHORT_JT_ONDELAY)    2  
+set PROFILE_2(UI_DESCRIPTION)  "Wenn die eingestellte Windgeschwindigkeit erreicht wird, schaltet die Anzeige f&uuml;r die eingestellte Zeit ein."
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION)  
+set PROFILE_2(UI_HINT)  2
+
+#set SUBSET_1(NAME)          "Wind stark - Aus / Wind schwach - Ein"
+set SUBSET_1(NAME)          "\${subset_1}"
+set SUBSET_1(SUBSET_OPTION_VALUE)  1
+set SUBSET_1(SHORT_CT_OFF)      2
+set SUBSET_1(SHORT_CT_OFFDELAY)    2
+set SUBSET_1(SHORT_CT_ON)      0
+set SUBSET_1(SHORT_CT_ONDELAY)    0
+
+#set SUBSET_2(NAME)          "Wind stark - Ein / Wind schwach - Aus"
+set SUBSET_2(SUBSET_OPTION_VALUE)  2
+set SUBSET_2(NAME)          "\${subset_2}"
+set SUBSET_2(SHORT_CT_OFF)      0
+set SUBSET_2(SHORT_CT_OFFDELAY)    0
+set SUBSET_2(SHORT_CT_ON)      2
+set SUBSET_2(SHORT_CT_ONDELAY)    2
+
+# This is for the new HM-WDS100-C6-O-2
+set SUBSET_3(NAME)          "\${subset_1}"
+set SUBSET_3(SUBSET_OPTION_VALUE)  3
+set SUBSET_3(SHORT_CT_OFF)      3
+set SUBSET_3(SHORT_CT_OFFDELAY)    3
+set SUBSET_3(SHORT_CT_ON)      1
+set SUBSET_3(SHORT_CT_ONDELAY)    1
+
+# This is for the new HM-WDS100-C6-O-2
+set SUBSET_4(SUBSET_OPTION_VALUE)  4
+set SUBSET_4(NAME)          "\${subset_2}"
+set SUBSET_4(SHORT_CT_OFF)      1
+set SUBSET_4(SHORT_CT_OFFDELAY)    1
+set SUBSET_4(SHORT_CT_ON)      3
+set SUBSET_4(SHORT_CT_ONDELAY)    3
+
+# This is for the new HM-WDS100-C6-O-2
+# This device is using other conditions than the old device
+set SUBSET_5(SUBSET_OPTION_VALUE)  5
+set SUBSET_5(NAME)          "hidden element"
+set SUBSET_5(SHORT_CT_OFF)      1
+set SUBSET_5(SHORT_CT_OFFDELAY)    1
+set SUBSET_5(SHORT_CT_ON)      1
+set SUBSET_5(SHORT_CT_ONDELAY)    1
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
-	global dev_descr_sender dev_descr_receiver  
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps      
-	upvar $pps_descr    ps_descr
-	
-	foreach pro [array names PROFILES_MAP] {
-		upvar PROFILE_$pro PROFILE_$pro
-	}
-	 		
-	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
-	
-	#global SUBSETS
-	set name "x"
-	set i 1
-	while {$name != ""} {
-		upvar SUBSET_$i SUBSET_$i
-		array set subset [array get SUBSET_$i]
-		set name ""
-		catch {set name $subset(NAME)}
-		array_clear subset
-		incr i
-	}
-
-#	die Texte der Platzhalter einlesen
-	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
-	set prn 0	
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+  global dev_descr_sender dev_descr_receiver  
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+  
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+       
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+  
+  #global SUBSETS
+  set name "x"
+  set i 1
+  while {$name != ""} {
+    upvar SUBSET_$i SUBSET_$i
+    array set subset [array get SUBSET_$i]
+    set name ""
+    catch {set name $subset(NAME)}
+    array_clear subset
+    incr i
+  }
+
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
 #1
-	incr prn
-	if {$cur_profile == $prn} then {
-		# ermittelt die Schaltrichtung und setzt entsprechend die Beschriftung im Sender 		
-		append HTML_PARAMS(separate_$prn) "<script type=\"text/javascript\">WEATHER_change_thres('$prn\_1');</script>"
-		array set PROFILE_$prn [array get ps]
-	}
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\" >"
-
-	set pref 1
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
-	append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1 SUBSET_2} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn "onchange=\"WEATHER_change_thres('$prn\_1')\""]
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 2
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 3
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 4
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 5
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
-#2	
-	incr prn
-	set pref 1
-	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
-
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 2
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+  incr prn
+  if {$cur_profile == $prn} then {
+    # ermittelt die Schaltrichtung und setzt entsprechend die Beschriftung im Sender     
+    append HTML_PARAMS(separate_$prn) "<script type=\"text/javascript\">WEATHER_change_thres('$prn\_1');</script>"
+    array set PROFILE_$prn [array get ps]
+  }
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\" >"
+
+  set pref 1
+
+  if {$dev_descr_sender(PARENT_TYPE) != "HM-WDS100-C6-O-2"} {
+    append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
+    append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1 SUBSET_2} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn "onchange=\"WEATHER_change_thres('$prn\_1')\""]
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+  } else {
+    append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
+    append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_3 SUBSET_4} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn "onchange=\"WEATHER_change_thres('$prn\_1')\""]
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+  }
+
+
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 3
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 4
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 5
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+#2  
+  incr prn
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  set pref 0
+  if {$dev_descr_sender(PARENT_TYPE) == "HM-WDS100-C6-O-2"} {
+    incr pref;
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td></td><td>"
+    append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_5} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn]
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+  }
+
+  incr pref;
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 }
 
 constructor
diff --git a/WebUI/www/config/easymodes/SWITCH/SHUTTER_CONTACT.tcl b/WebUI/www/config/easymodes/SWITCH/SHUTTER_CONTACT.tcl
index c7fc54f7..9030c206 100755
--- a/WebUI/www/config/easymodes/SWITCH/SHUTTER_CONTACT.tcl
+++ b/WebUI/www/config/easymodes/SWITCH/SHUTTER_CONTACT.tcl
@@ -9,211 +9,211 @@ set PROFILES_MAP(0) "\${expert}"
 set PROFILES_MAP(1) "\${switch_on_off}"
 set PROFILES_MAP(2) "\${change_signal}"
 
-set PROFILE_0(UI_HINT)	0
-set PROFILE_0(UI_DESCRIPTION)		"Expertenprofil"
-set PROFILE_0(UI_TEMPLATE)			"Expertenprofil"
-
-set PROFILE_1(SHORT_CT_OFFDELAY)	0
-set PROFILE_1(SHORT_CT_ONDELAY)		2 
-set PROFILE_1(SHORT_CT_OFF)			0
-set PROFILE_1(SHORT_CT_ON)			2
-set PROFILE_1(SHORT_COND_VALUE_LO)	50
-set PROFILE_1(SHORT_COND_VALUE_HI)	180
-set PROFILE_1(SHORT_ONDELAY_TIME)	0
-set PROFILE_1(SHORT_ON_TIME)		{111600 range 0.0 - 111600.0}
-set PROFILE_1(SHORT_OFFDELAY_TIME)	0
-set PROFILE_1(SHORT_OFF_TIME)		111600
-set PROFILE_1(SHORT_ON_TIME_MODE)	0
-set PROFILE_1(SHORT_OFF_TIME_MODE)	0
-set PROFILE_1(SHORT_ACTION_TYPE)	1
-set PROFILE_1(SHORT_JT_OFF)			1
-set PROFILE_1(SHORT_JT_ON)			{3 4} 
-set PROFILE_1(SHORT_JT_OFFDELAY)	2 
-set PROFILE_1(SHORT_JT_ONDELAY)		{3 4}  
-set PROFILE_1(LONG_ACTION_TYPE)		0
-set PROFILE_1(UI_DESCRIPTION)	"Beim &Ouml;ffnen des Schaltkontaktes wird der Schalter ein- und beim Schlie&szlig;en ausgeschaltet. Die Schaltzuordnung l&auml;sst sich auch umkehren."
-set PROFILE_1(UI_TEMPLATE)	$PROFILE_1(UI_DESCRIPTION)	
-set PROFILE_1(UI_HINT)	1
-
-set PROFILE_2(LONG_ACTION_TYPE)		0
-set PROFILE_2(SHORT_ACTION_TYPE)	1
-set PROFILE_2(SHORT_COND_VALUE_HI)	180
-set PROFILE_2(SHORT_COND_VALUE_LO)	50
-set PROFILE_2(SHORT_CT_OFF)			0
-set PROFILE_2(SHORT_CT_OFFDELAY)	0
-set PROFILE_2(SHORT_CT_ON)			2
-set PROFILE_2(SHORT_CT_ONDELAY)		2
-set PROFILE_2(SHORT_JT_OFF)			1
-set PROFILE_2(SHORT_JT_OFFDELAY)	2
-set PROFILE_2(SHORT_JT_ON)			2
-set PROFILE_2(SHORT_JT_ONDELAY)		0
-set PROFILE_2(SHORT_OFFDELAY_TIME)	0
-set PROFILE_2(SHORT_OFF_TIME)		111600
-set PROFILE_2(SHORT_OFF_TIME_MODE)	0
-set PROFILE_2(SHORT_ONDELAY_TIME)	0
-set PROFILE_2(SHORT_ON_TIME)		111600
-set PROFILE_2(SHORT_ON_TIME_MODE)	0
-set PROFILE_2(UI_DESCRIPTION)	"Bei Erkennung des &Auml;nderungssignals wird der Schalter f&uuml;r eine bestimmte Zeit eingeschaltet."
-set PROFILE_2(UI_TEMPLATE)		$PROFILE_2(UI_DESCRIPTION)
-set PROFILE_2(UI_HINT)	2
-
-
-#set SUBSET_1(NAME)					"Offen-Ein/Zu-Aus"
-set SUBSET_1(NAME)					"\${subset_1}"
-set SUBSET_1(SUBSET_OPTION_VALUE)	1
-set SUBSET_1(SHORT_CT_OFF)			0
-set SUBSET_1(SHORT_CT_OFFDELAY)		0
-set SUBSET_1(SHORT_CT_ON)			2
-set SUBSET_1(SHORT_CT_ONDELAY)		2
-
-#set SUBSET_2(NAME)					"Offen-Aus/Zu-Ein"
-set SUBSET_2(NAME)					"\${subset_2}"
-set SUBSET_2(SUBSET_OPTION_VALUE)	2
-set SUBSET_2(SHORT_CT_OFF)			2
-set SUBSET_2(SHORT_CT_OFFDELAY)		2
-set SUBSET_2(SHORT_CT_ON)			0
-set SUBSET_2(SHORT_CT_ONDELAY)		0
-
-#set SUBSET_3(NAME)					"Oeffnen"
-set SUBSET_3(NAME)					"\${subset_3}"
-set SUBSET_3(SUBSET_OPTION_VALUE)	3
-set SUBSET_3(SHORT_CT_OFF)			0
-set SUBSET_3(SHORT_CT_OFFDELAY)		0
-set SUBSET_3(SHORT_CT_ON)			0
-set SUBSET_3(SHORT_CT_ONDELAY)		0
-
-#set SUBSET_4(NAME)					"Schliessen"
-set SUBSET_4(NAME)					"\${subset_4}"
-set SUBSET_4(SUBSET_OPTION_VALUE)	4
-set SUBSET_4(SHORT_CT_OFF)			2
-set SUBSET_4(SHORT_CT_OFFDELAY)		2
-set SUBSET_4(SHORT_CT_ON)			2
-set SUBSET_4(SHORT_CT_ONDELAY)		2
-
-
-#set SUBSET_5(NAME)					"Aendern"
-set SUBSET_5(NAME)					"\${subset_5}"
-set SUBSET_5(SUBSET_OPTION_VALUE)	5
-set SUBSET_5(SHORT_CT_OFF)			5
-set SUBSET_5(SHORT_CT_OFFDELAY)		5
-set SUBSET_5(SHORT_CT_ON)			5
-set SUBSET_5(SHORT_CT_ONDELAY)		5
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
+
+set PROFILE_1(SHORT_CT_OFFDELAY)  0
+set PROFILE_1(SHORT_CT_ONDELAY)    2 
+set PROFILE_1(SHORT_CT_OFF)      0
+set PROFILE_1(SHORT_CT_ON)      2
+set PROFILE_1(SHORT_COND_VALUE_LO)  50
+set PROFILE_1(SHORT_COND_VALUE_HI)  180
+set PROFILE_1(SHORT_ONDELAY_TIME)  0
+set PROFILE_1(SHORT_ON_TIME)    {111600 range 0.0 - 111600.0}
+set PROFILE_1(SHORT_OFFDELAY_TIME)  0
+set PROFILE_1(SHORT_OFF_TIME)    111600
+set PROFILE_1(SHORT_ON_TIME_MODE)  0
+set PROFILE_1(SHORT_OFF_TIME_MODE)  0
+set PROFILE_1(SHORT_ACTION_TYPE)  1
+set PROFILE_1(SHORT_JT_OFF)      1
+set PROFILE_1(SHORT_JT_ON)      {3 4} 
+set PROFILE_1(SHORT_JT_OFFDELAY)  2 
+set PROFILE_1(SHORT_JT_ONDELAY)    {3 4}  
+set PROFILE_1(LONG_ACTION_TYPE)    0
+set PROFILE_1(UI_DESCRIPTION)  "Beim &Ouml;ffnen des Schaltkontaktes wird der Schalter ein- und beim Schlie&szlig;en ausgeschaltet. Die Schaltzuordnung l&auml;sst sich auch umkehren."
+set PROFILE_1(UI_TEMPLATE)  $PROFILE_1(UI_DESCRIPTION)  
+set PROFILE_1(UI_HINT)  1
+
+set PROFILE_2(LONG_ACTION_TYPE)    0
+set PROFILE_2(SHORT_ACTION_TYPE)  1
+set PROFILE_2(SHORT_COND_VALUE_HI)  180
+set PROFILE_2(SHORT_COND_VALUE_LO)  50
+set PROFILE_2(SHORT_CT_OFF)      0
+set PROFILE_2(SHORT_CT_OFFDELAY)  0
+set PROFILE_2(SHORT_CT_ON)      2
+set PROFILE_2(SHORT_CT_ONDELAY)    2
+set PROFILE_2(SHORT_JT_OFF)      1
+set PROFILE_2(SHORT_JT_OFFDELAY)  2
+set PROFILE_2(SHORT_JT_ON)      2
+set PROFILE_2(SHORT_JT_ONDELAY)    0
+set PROFILE_2(SHORT_OFFDELAY_TIME)  0
+set PROFILE_2(SHORT_OFF_TIME)    111600
+set PROFILE_2(SHORT_OFF_TIME_MODE)  0
+set PROFILE_2(SHORT_ONDELAY_TIME)  0
+set PROFILE_2(SHORT_ON_TIME)    111600
+set PROFILE_2(SHORT_ON_TIME_MODE)  0
+set PROFILE_2(UI_DESCRIPTION)  "Bei Erkennung des &Auml;nderungssignals wird der Schalter f&uuml;r eine bestimmte Zeit eingeschaltet."
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION)
+set PROFILE_2(UI_HINT)  2
+
+
+#set SUBSET_1(NAME)          "Offen-Ein/Zu-Aus"
+set SUBSET_1(NAME)          "\${subset_1}"
+set SUBSET_1(SUBSET_OPTION_VALUE)  1
+set SUBSET_1(SHORT_CT_OFF)      0
+set SUBSET_1(SHORT_CT_OFFDELAY)    0
+set SUBSET_1(SHORT_CT_ON)      2
+set SUBSET_1(SHORT_CT_ONDELAY)    2
+
+#set SUBSET_2(NAME)          "Offen-Aus/Zu-Ein"
+set SUBSET_2(NAME)          "\${subset_2}"
+set SUBSET_2(SUBSET_OPTION_VALUE)  2
+set SUBSET_2(SHORT_CT_OFF)      2
+set SUBSET_2(SHORT_CT_OFFDELAY)    2
+set SUBSET_2(SHORT_CT_ON)      0
+set SUBSET_2(SHORT_CT_ONDELAY)    0
+
+#set SUBSET_3(NAME)          "Oeffnen"
+set SUBSET_3(NAME)          "\${subset_3}"
+set SUBSET_3(SUBSET_OPTION_VALUE)  3
+set SUBSET_3(SHORT_CT_OFF)      0
+set SUBSET_3(SHORT_CT_OFFDELAY)    0
+set SUBSET_3(SHORT_CT_ON)      0
+set SUBSET_3(SHORT_CT_ONDELAY)    0
+
+#set SUBSET_4(NAME)          "Schliessen"
+set SUBSET_4(NAME)          "\${subset_4}"
+set SUBSET_4(SUBSET_OPTION_VALUE)  4
+set SUBSET_4(SHORT_CT_OFF)      2
+set SUBSET_4(SHORT_CT_OFFDELAY)    2
+set SUBSET_4(SHORT_CT_ON)      2
+set SUBSET_4(SHORT_CT_ONDELAY)    2
+
+
+#set SUBSET_5(NAME)          "Aendern"
+set SUBSET_5(NAME)          "\${subset_5}"
+set SUBSET_5(SUBSET_OPTION_VALUE)  5
+set SUBSET_5(SHORT_CT_OFF)      5
+set SUBSET_5(SHORT_CT_OFFDELAY)    5
+set SUBSET_5(SHORT_CT_ON)      5
+set SUBSET_5(SHORT_CT_ONDELAY)    5
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
-	
-	global dev_descr_sender dev_descr_receiver  
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps      
-	upvar $pps_descr    ps_descr
-
-	foreach pro [array names PROFILES_MAP] {
-		upvar PROFILE_$pro PROFILE_$pro
-	}
-	 		
-	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
-
-	#global SUBSETS
-	set name "x"
-	set i 1
-	while {$name != ""} {
-		upvar SUBSET_$i SUBSET_$i
-		array set subset [array get SUBSET_$i]
-		set name ""
-		catch {set name $subset(NAME)}
-		array_clear subset
-		incr i
-	}
-
-#	die Texte der Platzhalter einlesen
-	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
-	set prn 0	
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+  
+  global dev_descr_sender dev_descr_receiver  
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+       
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+
+  #global SUBSETS
+  set name "x"
+  set i 1
+  while {$name != ""} {
+    upvar SUBSET_$i SUBSET_$i
+    array set subset [array get SUBSET_$i]
+    set name ""
+    catch {set name $subset(NAME)}
+    array_clear subset
+    incr i
+  }
+
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
 
 #1
-	incr prn
-	set pref 1
-	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
-
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
-	append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1 SUBSET_2} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn ]
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 2
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 3
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 4
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 5
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
+  append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1 SUBSET_2} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn ]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 3
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 4
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 5
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 #2
-	incr prn
-	set pref 1
-	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
-
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${CHANGE_SIGNAL}&nbsp;\${at}</td><td>"
-	append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_3 SUBSET_4 SUBSET_5} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn ]
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-	
-	incr pref ;# 2
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 3
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 4
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 5
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${CHANGE_SIGNAL}&nbsp;\${at}</td><td>"
+  append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_3 SUBSET_4 SUBSET_5} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn ]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+  
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 3
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 4
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 5
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 }
 constructor
diff --git a/WebUI/www/config/easymodes/SWITCH/SMOKE_DETECTOR_TEAM_V2.tcl b/WebUI/www/config/easymodes/SWITCH/SMOKE_DETECTOR_TEAM_V2.tcl
index 44a88712..65811c9b 100755
--- a/WebUI/www/config/easymodes/SWITCH/SMOKE_DETECTOR_TEAM_V2.tcl
+++ b/WebUI/www/config/easymodes/SWITCH/SMOKE_DETECTOR_TEAM_V2.tcl
@@ -38,13 +38,13 @@ set PROFILE_1(UI_HINT)	1
 #set SUBSET_1(NAME)					"nur auslösender Rauchmelder"
 set SUBSET_1(NAME)					"\${subset_1}"
 set SUBSET_1(SUBSET_OPTION_VALUE)	1
-set SUBSET_1(SHORT_COND_VALUE_LO)	1
+set SUBSET_1(SHORT_COND_VALUE_LO)	2
 set SUBSET_1(SHORT_COND_VALUE_HI)	180
 set SUBSET_1(SHORT_CT_ON)			2
 
 set SUBSET_2(NAME)					"\${subset_2}"
 set SUBSET_2(SUBSET_OPTION_VALUE)	2
-set SUBSET_2(SHORT_COND_VALUE_LO)	2
+set SUBSET_2(SHORT_COND_VALUE_LO)	4
 set SUBSET_2(SHORT_COND_VALUE_HI)	180
 set SUBSET_2(SHORT_CT_ON)	4
 
diff --git a/WebUI/www/config/easymodes/SWITCH/WEATHER.tcl b/WebUI/www/config/easymodes/SWITCH/WEATHER.tcl
index bc83d2d0..9005f8b9 100755
--- a/WebUI/www/config/easymodes/SWITCH/WEATHER.tcl
+++ b/WebUI/www/config/easymodes/SWITCH/WEATHER.tcl
@@ -5,173 +5,254 @@ source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
 source [file join $env(DOCUMENT_ROOT) config/easymodes/SWITCH/mapping/WEATHER_map.tcl]
 
-set PROFILES_MAP(0)	"\${expert}"
-set PROFILES_MAP(1)	"\${switch_on_off}"
-set PROFILES_MAP(2)	"\${switch_on}"
-
-set PROFILE_0(UI_HINT)	0
-set PROFILE_0(UI_DESCRIPTION)		"Expertenprofil"
-set PROFILE_0(UI_TEMPLATE)			"Expertenprofil"
-
-
-set PROFILE_1(SHORT_CT_OFFDELAY)	0
-set PROFILE_1(SHORT_CT_ONDELAY)		2 
-set PROFILE_1(SHORT_CT_OFF)			0
-set PROFILE_1(SHORT_CT_ON)			2
-set PROFILE_1(SHORT_COND_VALUE_LO)	200
-set PROFILE_1(SHORT_COND_VALUE_HI)	{100 0}
-set PROFILE_1(SHORT_ONDELAY_TIME)	0
-set PROFILE_1(SHORT_ON_TIME)		{111600 range 0.0 - 111600.0}
-set PROFILE_1(SHORT_OFFDELAY_TIME)	0
-set PROFILE_1(SHORT_OFF_TIME)		111600
-set PROFILE_1(SHORT_ON_TIME_MODE)	0
-set PROFILE_1(SHORT_OFF_TIME_MODE)	0
-set PROFILE_1(SHORT_ACTION_TYPE)	1
-set PROFILE_1(SHORT_JT_OFF)			1
-set PROFILE_1(SHORT_JT_ON)			3 
-set PROFILE_1(SHORT_JT_OFFDELAY)	2 
-set PROFILE_1(SHORT_JT_ONDELAY)		4  
-set PROFILE_1(UI_DESCRIPTION)	"Bei starkem Wind wird der Schalter ein- und bei schwachem Wind ausgeschaltet. Die Schaltzuordnung l&auml;sst sich auch umkehren."
-set PROFILE_1(UI_TEMPLATE)		$PROFILE_1(UI_DESCRIPTION)
-set PROFILE_1(UI_HINT)	1
-
-set PROFILE_2(SHORT_CT_OFFDELAY)	0
-set PROFILE_2(SHORT_CT_ONDELAY)		0 
-set PROFILE_2(SHORT_CT_OFF)			0
-set PROFILE_2(SHORT_CT_ON)			0
-set PROFILE_2(SHORT_COND_VALUE_LO)	200
-set PROFILE_2(SHORT_COND_VALUE_HI)	{100 0}
-set PROFILE_2(SHORT_ONDELAY_TIME)	0
-set PROFILE_2(SHORT_ON_TIME)		{111600 range 0.0 - 111600.0}
-set PROFILE_2(SHORT_OFFDELAY_TIME)	0
-set PROFILE_2(SHORT_OFF_TIME)		111600
-set PROFILE_2(SHORT_ON_TIME_MODE)	0
-set PROFILE_2(SHORT_OFF_TIME_MODE)	0
-set PROFILE_2(SHORT_ACTION_TYPE)	1
-set PROFILE_2(SHORT_JT_OFF)			1
-set PROFILE_2(SHORT_JT_ON)			2
-set PROFILE_2(SHORT_JT_OFFDELAY)	2 
-set PROFILE_2(SHORT_JT_ONDELAY)		2  
-set PROFILE_2(UI_DESCRIPTION)	"Wenn die eingestellte Windgeschwindigkeit erreicht wird, schaltet der Schalter f&uuml;r die eingestellte Zeit ein."
-set PROFILE_2(UI_TEMPLATE)		$PROFILE_2(UI_DESCRIPTION)	
-set PROFILE_2(UI_HINT)	2
-
-#set SUBSET_1(NAME)					"Wind stark - Aus / Wind schwach - Ein"
-set SUBSET_1(NAME)					"\${subset_1}"
-set SUBSET_1(SUBSET_OPTION_VALUE)	1
-set SUBSET_1(SHORT_CT_OFF)			2
-set SUBSET_1(SHORT_CT_OFFDELAY)		2
-set SUBSET_1(SHORT_CT_ON)			0
-set SUBSET_1(SHORT_CT_ONDELAY)		0
-
-#set SUBSET_2(NAME)					"Wind stark - Ein / Wind schwach - Aus"
-set SUBSET_2(SUBSET_OPTION_VALUE)	2
-set SUBSET_2(NAME)					"\${subset_2}"
-set SUBSET_2(SHORT_CT_OFF)			0
-set SUBSET_2(SHORT_CT_OFFDELAY)		0
-set SUBSET_2(SHORT_CT_ON)			2
-set SUBSET_2(SHORT_CT_ONDELAY)		2
+set PROFILES_MAP(0)  "\${expert}"
+set PROFILES_MAP(1)  "\${switch_on_off}"
+set PROFILES_MAP(2)  "\${switch_on}"
+
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
+
+set PROFILE_1(SHORT_CT_OFFDELAY)  0
+set PROFILE_1(SHORT_CT_ONDELAY)    2 
+set PROFILE_1(SHORT_CT_OFF)      0
+set PROFILE_1(SHORT_CT_ON)      2
+set PROFILE_1(SHORT_COND_VALUE_LO)  200
+set PROFILE_1(SHORT_COND_VALUE_HI)  {100 0}
+set PROFILE_1(SHORT_ONDELAY_TIME)  0
+set PROFILE_1(SHORT_ON_TIME)    {111600 range 0.0 - 111600.0}
+set PROFILE_1(SHORT_OFFDELAY_TIME)  0
+set PROFILE_1(SHORT_OFF_TIME)    111600
+set PROFILE_1(SHORT_ON_TIME_MODE)  0
+set PROFILE_1(SHORT_OFF_TIME_MODE)  0
+set PROFILE_1(SHORT_ACTION_TYPE)  1
+set PROFILE_1(SHORT_JT_OFF)      1
+set PROFILE_1(SHORT_JT_ON)      3 
+set PROFILE_1(SHORT_JT_OFFDELAY)  2 
+set PROFILE_1(SHORT_JT_ONDELAY)    4  
+set PROFILE_1(UI_DESCRIPTION)  "Bei starkem Wind wird der Schalter ein- und bei schwachem Wind ausgeschaltet. Die Schaltzuordnung l&auml;sst sich auch umkehren."
+set PROFILE_1(UI_TEMPLATE)    $PROFILE_1(UI_DESCRIPTION)
+set PROFILE_1(UI_HINT)  1
+
+set PROFILE_2(SHORT_CT_OFFDELAY)  {0 1}
+set PROFILE_2(SHORT_CT_ONDELAY)   {0 1}
+set PROFILE_2(SHORT_CT_OFF)       {0 1}
+set PROFILE_2(SHORT_CT_ON)        {0 1}
+set PROFILE_2(SHORT_COND_VALUE_LO)  {200 range 0 - 255}
+set PROFILE_2(SHORT_COND_VALUE_HI)  {100 range 0 - 255}
+set PROFILE_2(SHORT_ONDELAY_TIME)  0
+set PROFILE_2(SHORT_ON_TIME)    {111600 range 0.0 - 111600.0}
+set PROFILE_2(SHORT_OFFDELAY_TIME)  0
+set PROFILE_2(SHORT_OFF_TIME)    111600
+set PROFILE_2(SHORT_ON_TIME_MODE)  0
+set PROFILE_2(SHORT_OFF_TIME_MODE)  0
+set PROFILE_2(SHORT_ACTION_TYPE)  1
+set PROFILE_2(SHORT_JT_OFF)      1
+set PROFILE_2(SHORT_JT_ON)      2
+set PROFILE_2(SHORT_JT_OFFDELAY)  2
+set PROFILE_2(SHORT_JT_ONDELAY)    2
+set PROFILE_2(UI_DESCRIPTION)  "Wenn die eingestellte Windgeschwindigkeit erreicht wird, schaltet der Schalter f&uuml;r die eingestellte Zeit ein."
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION)
+set PROFILE_2(UI_HINT)  2
+
+
+#set SUBSET_1(NAME)          "Wind stark - Aus / Wind schwach - Ein"
+set SUBSET_1(NAME)          "\${subset_1}"
+set SUBSET_1(SUBSET_OPTION_VALUE)  1
+set SUBSET_1(SHORT_CT_OFF)      2
+set SUBSET_1(SHORT_CT_OFFDELAY)    2
+set SUBSET_1(SHORT_CT_ON)      0
+set SUBSET_1(SHORT_CT_ONDELAY)    0
+
+#set SUBSET_2(NAME)          "Wind stark - Ein / Wind schwach - Aus"
+set SUBSET_2(SUBSET_OPTION_VALUE)  2
+set SUBSET_2(NAME)          "\${subset_2}"
+set SUBSET_2(SHORT_CT_OFF)      1
+set SUBSET_2(SHORT_CT_OFFDELAY)    1
+set SUBSET_2(SHORT_CT_ON)      3
+set SUBSET_2(SHORT_CT_ONDELAY)    3
+
+# This is for the new HM-WDS100-C6-O-2
+#set SUBSET_3(NAME)          "Wind stark - Aus / Wind schwach - Ein"
+set SUBSET_3(NAME)          "\${subset_1}"
+set SUBSET_3(SUBSET_OPTION_VALUE)  3
+set SUBSET_3(SHORT_CT_OFF)      2
+set SUBSET_3(SHORT_CT_OFFDELAY)    2
+set SUBSET_3(SHORT_CT_ON)      1
+set SUBSET_3(SHORT_CT_ONDELAY)    1
+
+# This is for the new HM-WDS100-C6-O-2
+#set SUBSET_4(NAME)          "Wind stark - Ein / Wind schwach - Aus"
+set SUBSET_4(SUBSET_OPTION_VALUE)  4
+set SUBSET_4(NAME)          "\${subset_2}"
+set SUBSET_4(SHORT_CT_OFF)      1
+set SUBSET_4(SHORT_CT_OFFDELAY)    1
+set SUBSET_4(SHORT_CT_ON)      2
+set SUBSET_4(SHORT_CT_ONDELAY)    2
+
+# This is for the new HM-WDS100-C6-O-2
+# This device is using other conditions than the old device
+
+set SUBSET_5(SUBSET_OPTION_VALUE)  5
+set SUBSET_5(NAME)          "hidden element"
+set SUBSET_5(SHORT_CT_OFF)      1
+set SUBSET_5(SHORT_CT_OFFDELAY)    1
+set SUBSET_5(SHORT_CT_ON)      1
+set SUBSET_5(SHORT_CT_ONDELAY)    1
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
-	global dev_descr_sender dev_descr_receiver  
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps      
-	upvar $pps_descr    ps_descr
-	
-	foreach pro [array names PROFILES_MAP] {
-		upvar PROFILE_$pro PROFILE_$pro
-	}
-	 		
-	set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
-	
-	#global SUBSETS
-	set name "x"
-	set i 1
-	while {$name != ""} {
-		upvar SUBSET_$i SUBSET_$i
-		array set subset [array get SUBSET_$i]
-		set name ""
-		catch {set name $subset(NAME)}
-		array_clear subset
-		incr i
-	}
-
-#	die Texte der Platzhalter einlesen
-	puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
-	set prn 0	
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
-	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+  global dev_descr_sender dev_descr_receiver  
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps
+  upvar $pps_descr    ps_descr
+
+  set newSensor "HM-WDS100-C6-O-2"
+  
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+       
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+  
+  #global SUBSETS
+  set name "x"
+  set i 1
+  while {$name != ""} {
+    upvar SUBSET_$i SUBSET_$i
+    array set subset [array get SUBSET_$i]
+    set name ""
+    catch {set name $subset(NAME)}
+    array_clear subset
+    incr i
+  }
+
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
 #1
-	incr prn
-	if {$cur_profile == $prn} then {
-		# ermittelt die Schaltrichtung und setzt entsprechend die Beschriftung im Sender 		
-		append HTML_PARAMS(separate_$prn) "<script type=\"text/javascript\">WEATHER_change_thres('$prn\_1');</script>"
-		array set PROFILE_$prn [array get ps]
-	}
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\" >"
-
-	set pref 1
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
-	append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1 SUBSET_2} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn "onchange=\"WEATHER_change_thres('$prn\_1')\""]
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 2
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 3
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 4
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 5
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
-#2	
-	incr prn
-	set pref 1
-	if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
-	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
-	append HTML_PARAMS(separate_$prn) "\${description_$prn}"
-	append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
-
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
-	option DELAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	incr pref ;# 2
-	append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
-	option LENGTH_OF_STAY
-	append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
-	EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
-	append HTML_PARAMS(separate_$prn) "</td></tr>"
-
-	append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+  incr prn
+  if {$cur_profile == $prn} then {
+    # ermittelt die Schaltrichtung und setzt entsprechend die Beschriftung im Sender     
+    append HTML_PARAMS(separate_$prn) "<script type=\"text/javascript\">WEATHER_change_thres('$prn\_1');</script>"
+    array set PROFILE_$prn [array get ps]
+  }
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\" >"
+
+
+  set pref 1
+
+  if {$dev_descr_sender(PARENT_TYPE) != $newSensor} {
+    append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
+    append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1 SUBSET_2} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn "onchange=\"WEATHER_change_thres('$prn\_1')\""]
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+  } else {
+    append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
+    append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_3 SUBSET_4} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn "onchange=\"WEATHER_change_thres('$prn\_1')\""]
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+  }
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 3
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 4
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 5
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  if {$dev_descr_sender(PARENT_TYPE) == $newSensor} {
+    incr pref ;# 6
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_LO\"></td></tr>"
+    incr pref ;# 7
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_HI\"></td></tr>"
+  }
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+#2  
+  incr prn
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  set pref 0
+  if {$dev_descr_sender(PARENT_TYPE) == $newSensor} {
+    incr pref;
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td></td><td>"
+    append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_5} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn]
+    append HTML_PARAMS(separate_$prn) "</td></tr>"
+  }
+
+  incr pref; #1 / 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 2 / 3
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  if {$dev_descr_sender(PARENT_TYPE) == $newSensor} {
+    incr pref ;# 3 / 4
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_LO\"></td></tr>"
+    incr pref ;# 4 / 5
+    append HTML_PARAMS(separate_$prn) "<tr class=\"hidden\"><td><input type=\"text\" id=\"separate_receiver_$prn\_$pref\" name=\"SHORT_COND_VALUE_HI\"></td></tr>"
+  }
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+
+    if {$dev_descr_sender(PARENT_TYPE) == $newSensor} {
+      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
+        append HTML_PARAMS(separate_1) "var stormLowerThresholdElm = jQuery(\"\[name='__STORM_LOWER_THRESHOLD'\]\").first();"
+        append HTML_PARAMS(separate_1) "var stormUpperThresholdElm = jQuery(\"\[name='__STORM_UPPER_THRESHOLD'\]\").first();"
+        append HTML_PARAMS(separate_1) "var condValLoElm1 = jQuery(\"#separate_receiver_1_6\");"
+        append HTML_PARAMS(separate_1) "var condValHiElm1 = jQuery(\"#separate_receiver_1_7\");"
+        append HTML_PARAMS(separate_1) "condValLoElm1.val(stormLowerThresholdElm.val());"
+        append HTML_PARAMS(separate_1) "condValHiElm1.val(stormUpperThresholdElm.val());"
+      append HTML_PARAMS(separate_1) "</script>"
+
+      append HTML_PARAMS(separate_2) "<script type=\"text/javascript\">"
+        append HTML_PARAMS(separate_2) "var stormLowerThresholdElm = jQuery(\"\[name='__STORM_LOWER_THRESHOLD'\]\").first();"
+        append HTML_PARAMS(separate_2) "var stormUpperThresholdElm = jQuery(\"\[name='__STORM_UPPER_THRESHOLD'\]\").first();"
+        append HTML_PARAMS(separate_2) "var condValLoElm2 = jQuery(\"#separate_receiver_2_4\");"
+        append HTML_PARAMS(separate_2) "var condValHiElm2 = jQuery(\"#separate_receiver_2_5\");"
+        append HTML_PARAMS(separate_2) "condValLoElm2.val(stormLowerThresholdElm.val());"
+        append HTML_PARAMS(separate_2) "condValHiElm2.val(stormUpperThresholdElm.val());"
+      append HTML_PARAMS(separate_2) "</script>"
+  }
 }
 
 constructor
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/KEY.tcl b/WebUI/www/config/easymodes/SWITCH_SENSOR/KEY.tcl
new file mode 100755
index 00000000..19bcc966
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/KEY.tcl
@@ -0,0 +1,247 @@
+#!/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
+
+set PROFILES_MAP(0)  "\${expert}"
+set PROFILES_MAP(1)  "\${switch_on}"
+set PROFILES_MAP(2)  "\${switch_off}"
+set PROFILES_MAP(3)  "\${switch_on_off}"
+
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
+
+set PROFILE_1(LONG_ACTION_TYPE_SIRSEN)  1
+set PROFILE_1(LONG_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_1(LONG_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_1(LONG_CT_OFF_SIRSEN)  0
+set PROFILE_1(LONG_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_1(LONG_CT_ON_SIRSEN)  0
+set PROFILE_1(LONG_CT_ONDELAY_SIRSEN)  0
+set PROFILE_1(LONG_JT_OFF_SIRSEN)  1
+set PROFILE_1(LONG_JT_OFFDELAY_SIRSEN)  2
+set PROFILE_1(LONG_JT_ON_SIRSEN)  2
+set PROFILE_1(LONG_JT_ONDELAY_SIRSEN)  2
+set PROFILE_1(LONG_OFF_TIME_SIRSEN)  111600
+set PROFILE_1(LONG_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_1(LONG_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_1(LONG_ON_TIME_SIRSEN)  120
+set PROFILE_1(LONG_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_1(LONG_ON_LEVEL_SIRSEN)  50
+set PROFILE_1(LONG_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_1(LONG_MULTIEXECUTE_SIRSEN)  1
+
+set PROFILE_1(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_1(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_1(SHORT_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_1(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_1(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_1(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_1(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_1(SHORT_JT_OFF_SIRSEN)  1
+set PROFILE_1(SHORT_JT_OFFDELAY_SIRSEN)  2
+set PROFILE_1(SHORT_JT_ON_SIRSEN)  2
+set PROFILE_1(SHORT_JT_ONDELAY_SIRSEN)  2
+set PROFILE_1(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_1(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_1(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_1(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_1(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_1(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_1(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_1(UI_DESCRIPTION)  "Mit einem kurzen oder langen Tastendruck wird der Schalter f&uuml;r die eingestellte Zeit eingeschaltet. Ist eine Einschaltverz&ouml;gerungszeit eingestellt, so wird der Schalter erst nach Ablauf dieser Zeit eingeschaltet."
+set PROFILE_1(UI_TEMPLATE)    $PROFILE_1(UI_DESCRIPTION)  
+set PROFILE_1(UI_HINT)  1
+
+set PROFILE_2(LONG_ACTION_TYPE_SIRSEN)  1
+set PROFILE_2(LONG_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_2(LONG_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_2(LONG_CT_OFF_SIRSEN)  0
+set PROFILE_2(LONG_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_2(LONG_CT_ON_SIRSEN)  0
+set PROFILE_2(LONG_CT_ONDELAY_SIRSEN)  0
+set PROFILE_2(LONG_JT_OFF_SIRSEN)  4
+set PROFILE_2(LONG_JT_OFFDELAY_SIRSEN)  4
+set PROFILE_2(LONG_JT_ON_SIRSEN)  3
+set PROFILE_2(LONG_JT_ONDELAY_SIRSEN)  4
+set PROFILE_2(LONG_OFF_TIME_SIRSEN)  111600
+set PROFILE_2(LONG_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_2(LONG_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_2(LONG_ON_TIME_SIRSEN)  120
+set PROFILE_2(LONG_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_2(LONG_ON_LEVEL_SIRSEN)  50
+set PROFILE_2(LONG_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_2(LONG_MULTIEXECUTE_SIRSEN)  1
+
+set PROFILE_2(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_2(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_2(SHORT_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_2(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_2(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_2(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_JT_OFF_SIRSEN)  4
+set PROFILE_2(SHORT_JT_OFFDELAY_SIRSEN)  4
+set PROFILE_2(SHORT_JT_ON_SIRSEN)  3
+set PROFILE_2(SHORT_JT_ONDELAY_SIRSEN)  4
+set PROFILE_2(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_2(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_2(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_2(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_2(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_2(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_2(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_2(UI_DESCRIPTION)  "Mit einem kurzen oder langen Tastendruck wird der Schalter f&uuml;r die eingestellte Zeit ausgeschaltet. Ist eine Ausschaltverz&ouml;gerungszeit eingestellt, so wird der Schalter erst nach Ablauf dieser Zeit ausgeschaltet."
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION) 
+set PROFILE_2(UI_HINT)  2
+
+set PROFILE_3(LONG_ACTION_TYPE_SIRSEN)  1
+set PROFILE_3(LONG_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_3(LONG_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_3(LONG_CT_OFF_SIRSEN)  0
+set PROFILE_3(LONG_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_3(LONG_CT_ON_SIRSEN)  0
+set PROFILE_3(LONG_CT_ONDELAY_SIRSEN)  0
+set PROFILE_3(LONG_JT_OFF_SIRSEN)  1
+set PROFILE_3(LONG_JT_OFFDELAY_SIRSEN)  4
+set PROFILE_3(LONG_JT_ON_SIRSEN)  3
+set PROFILE_3(LONG_JT_ONDELAY_SIRSEN)  2
+set PROFILE_3(LONG_OFF_TIME_SIRSEN)  111600
+set PROFILE_3(LONG_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_3(LONG_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_3(LONG_ON_TIME_SIRSEN)  120
+set PROFILE_3(LONG_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_3(LONG_ON_LEVEL_SIRSEN)  50
+set PROFILE_3(LONG_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_3(LONG_MULTIEXECUTE_SIRSEN)  1
+  
+set PROFILE_3(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_3(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_3(SHORT_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_3(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_3(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_3(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_3(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_3(SHORT_JT_OFF_SIRSEN)  1
+set PROFILE_3(SHORT_JT_OFFDELAY_SIRSEN)  4
+set PROFILE_3(SHORT_JT_ON_SIRSEN)  3
+set PROFILE_3(SHORT_JT_ONDELAY_SIRSEN)  2
+set PROFILE_3(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_3(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_3(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_3(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_3(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_3(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_3(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_3(UI_DESCRIPTION)  "Mit einem kurzen oder langen Tastendruck wird der Schalter f&uuml;r die eingestellte Zeit je nach aktuellem Zustand ein- oder ausgeschaltet (Togglefunktion). Ist eine Ein- oder Ausschaltverz&ouml;gerungszeit eingestellt, so wird der Schalter erst nach Ablauf dieser Zeit ein- bzw. ausgeschaltet."
+set PROFILE_3(UI_TEMPLATE)    $PROFILE_3(UI_DESCRIPTION)
+set PROFILE_3(UI_HINT)  3
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+  
+  global receiver_address dev_descr_sender dev_descr_receiver
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+  
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+     
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+  
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
+#1
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME_SIRSEN|LONG_ONDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME_SIRSEN|LONG_ON_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+#2
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME_SIRSEN|LONG_OFFDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME_SIRSEN|LONG_OFF_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+#3
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME_SIRSEN|LONG_ONDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+  
+  
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME_SIRSEN|LONG_ON_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+  
+  incr pref ;# 3
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME_SIRSEN|LONG_OFFDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 4
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME_SIRSEN|LONG_OFF_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+
+}
+
+constructor
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/ROTARY_HANDLE_SENSOR.tcl b/WebUI/www/config/easymodes/SWITCH_SENSOR/ROTARY_HANDLE_SENSOR.tcl
new file mode 100755
index 00000000..f8683ed5
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/ROTARY_HANDLE_SENSOR.tcl
@@ -0,0 +1,195 @@
+#/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
+
+set PROFILES_MAP(0) "\${expert}"
+set PROFILES_MAP(1) "\${switch_on}"
+set PROFILES_MAP(2) "\${change_signal}"
+
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
+
+set PROFILE_1(LONG_ACTION_TYPE_SIRSEN)  {0 1}
+set PROFILE_1(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_1(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_1(SHORT_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_1(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_1(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_1(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_1(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_1(SHORT_JT_OFF_SIRSEN)  1
+set PROFILE_1(SHORT_JT_OFFDELAY_SIRSEN)  2
+set PROFILE_1(SHORT_JT_ON_SIRSEN)  2
+set PROFILE_1(SHORT_JT_ONDELAY_SIRSEN)  2
+set PROFILE_1(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_1(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_1(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_1(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_1(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_1(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_1(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_1(UI_DESCRIPTION)  "Beim &Ouml;ffnen des Schaltkontaktes wird der Alarm ein- und beim Schlie&szlig;en ausgeschaltet. Die Schaltzuordnung l&auml;sst sich auch umkehren."
+set PROFILE_1(UI_TEMPLATE)  $PROFILE_1(UI_DESCRIPTION)  
+set PROFILE_1(UI_HINT)  1
+
+set PROFILE_2(LONG_ACTION_TYPE_SIRSEN)  0
+set PROFILE_2(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_2(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_2(SHORT_COND_VALUE_LO_SIRSEN)  0
+set PROFILE_2(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_2(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_2(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_JT_OFF_SIRSEN)  1
+set PROFILE_2(SHORT_JT_OFFDELAY_SIRSEN)  2
+set PROFILE_2(SHORT_JT_ON_SIRSEN)  2
+set PROFILE_2(SHORT_JT_ONDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_2(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_2(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_2(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_2(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_2(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_2(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_2(UI_DESCRIPTION)  "Bei Erkennung des &Auml;nderungssignals wird der Alarm f&uuml;r eine bestimmte Zeit eingeschaltet."
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION)
+set PROFILE_2(UI_HINT)  2
+
+
+#set SUBSET_1(NAME)          "Offen-Ein"
+set SUBSET_1(NAME)          "\${subset_1}"
+set SUBSET_1(SUBSET_OPTION_VALUE)  1
+set SUBSET_1(SHORT_CT_OFF_SIRSEN)      0
+set SUBSET_1(SHORT_CT_OFFDELAY_SIRSEN)    0
+set SUBSET_1(SHORT_CT_ON_SIRSEN)      0
+set SUBSET_1(SHORT_CT_ONDELAY_SIRSEN)    0
+
+#set SUBSET_2(NAME)          "Zu-Ein"
+set SUBSET_2(NAME)          "\${subset_2}"
+set SUBSET_2(SUBSET_OPTION_VALUE)  2
+set SUBSET_2(SHORT_CT_OFF_SIRSEN)      2
+set SUBSET_2(SHORT_CT_OFFDELAY_SIRSEN)    2
+set SUBSET_2(SHORT_CT_ON_SIRSEN)      2
+set SUBSET_2(SHORT_CT_ONDELAY_SIRSEN)    2
+
+#set SUBSET_3(NAME)          "Oeffnen"
+set SUBSET_3(NAME)          "\${subset_3}"
+set SUBSET_3(SUBSET_OPTION_VALUE)  3
+set SUBSET_3(SHORT_CT_OFF_SIRSEN)      0
+set SUBSET_3(SHORT_CT_OFFDELAY_SIRSEN)    0
+set SUBSET_3(SHORT_CT_ON_SIRSEN)      0
+set SUBSET_3(SHORT_CT_ONDELAY_SIRSEN)    0
+
+#set SUBSET_4(NAME)          "Schliessen"
+set SUBSET_4(NAME)          "\${subset_4}"
+set SUBSET_4(SUBSET_OPTION_VALUE)  4
+set SUBSET_4(SHORT_CT_OFF_SIRSEN)      3
+set SUBSET_4(SHORT_CT_OFFDELAY_SIRSEN)    3
+set SUBSET_4(SHORT_CT_ON_SIRSEN)      3
+set SUBSET_4(SHORT_CT_ONDELAY_SIRSEN)    3
+
+
+#set SUBSET_5(NAME)          "Aendern"
+set SUBSET_5(NAME)          "\${subset_5}"
+set SUBSET_5(SUBSET_OPTION_VALUE)  5
+set SUBSET_5(SHORT_CT_OFF_SIRSEN)      0
+set SUBSET_5(SHORT_CT_OFFDELAY_SIRSEN)    0
+set SUBSET_5(SHORT_CT_ON_SIRSEN)      0
+set SUBSET_5(SHORT_CT_ONDELAY_SIRSEN)    0
+set SUBSET_5(SHORT_COND_VALUE_LO_SIRSEN)    0
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+  
+  global dev_descr_sender dev_descr_receiver  
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+       
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+
+  #global SUBSETS
+  set name "x"
+  set i 1
+  while {$name != ""} {
+    upvar SUBSET_$i SUBSET_$i
+    array set subset [array get SUBSET_$i]
+    set name ""
+    catch {set name $subset(NAME)}
+    array_clear subset
+    incr i
+  }
+
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
+
+#1
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
+  append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1 SUBSET_2} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn ]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 3
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+
+
+#2
+  incr prn
+# set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+set comment {
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${CHANGE_SIGNAL}&nbsp;\${at}</td><td>"
+  append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_3 SUBSET_4 SUBSET_5} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn ]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+}
+  set pref 1
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+}
+constructor
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/SHUTTER_CONTACT.tcl b/WebUI/www/config/easymodes/SWITCH_SENSOR/SHUTTER_CONTACT.tcl
new file mode 100755
index 00000000..bb715910
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/SHUTTER_CONTACT.tcl
@@ -0,0 +1,197 @@
+#/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
+
+set PROFILES_MAP(0) "\${expert}"
+set PROFILES_MAP(1) "\${switch_on}"
+set PROFILES_MAP(2) "\${change_signal}"
+
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
+
+set PROFILE_1(LONG_ACTION_TYPE_SIRSEN)  {0 1}
+set PROFILE_1(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_1(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_1(SHORT_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_1(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_1(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_1(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_1(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_1(SHORT_JT_OFF_SIRSEN)  1
+set PROFILE_1(SHORT_JT_OFFDELAY_SIRSEN)  2
+set PROFILE_1(SHORT_JT_ON_SIRSEN)  2
+set PROFILE_1(SHORT_JT_ONDELAY_SIRSEN)  2
+set PROFILE_1(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_1(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_1(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_1(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_1(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_1(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_1(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_1(UI_DESCRIPTION)  "Beim &Ouml;ffnen des Schaltkontaktes wird der Alarm ein- und beim Schlie&szlig;en ausgeschaltet. Die Schaltzuordnung l&auml;sst sich auch umkehren."
+set PROFILE_1(UI_TEMPLATE)  $PROFILE_1(UI_DESCRIPTION)  
+set PROFILE_1(UI_HINT)  1
+
+set PROFILE_2(LONG_ACTION_TYPE_SIRSEN)  0
+set PROFILE_2(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_2(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_2(SHORT_COND_VALUE_LO_SIRSEN)  0
+set PROFILE_2(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_2(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_2(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_JT_OFF_SIRSEN)  1
+set PROFILE_2(SHORT_JT_OFFDELAY_SIRSEN)  2
+set PROFILE_2(SHORT_JT_ON_SIRSEN)  2
+set PROFILE_2(SHORT_JT_ONDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_2(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_2(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_2(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_2(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_2(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_2(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_2(UI_DESCRIPTION)  "Bei Erkennung des &Auml;nderungssignals wird der Alarm f&uuml;r eine bestimmte Zeit eingeschaltet."
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION)
+set PROFILE_2(UI_HINT)  2
+
+
+#set SUBSET_1(NAME)          "Offen-Ein"
+set SUBSET_1(NAME)          "\${subset_1}"
+set SUBSET_1(SUBSET_OPTION_VALUE)  1
+set SUBSET_1(SHORT_CT_OFF_SIRSEN)      0
+set SUBSET_1(SHORT_CT_OFFDELAY_SIRSEN)    0
+set SUBSET_1(SHORT_CT_ON_SIRSEN)      0
+set SUBSET_1(SHORT_CT_ONDELAY_SIRSEN)    0
+
+#set SUBSET_2(NAME)          "Zu-Ein"
+set SUBSET_2(NAME)          "\${subset_2}"
+set SUBSET_2(SUBSET_OPTION_VALUE)  2
+set SUBSET_2(SHORT_CT_OFF_SIRSEN)      2
+set SUBSET_2(SHORT_CT_OFFDELAY_SIRSEN)    2
+set SUBSET_2(SHORT_CT_ON_SIRSEN)      2
+set SUBSET_2(SHORT_CT_ONDELAY_SIRSEN)    2
+
+#set SUBSET_3(NAME)          "Oeffnen"
+set SUBSET_3(NAME)          "\${subset_3}"
+set SUBSET_3(SUBSET_OPTION_VALUE)  3
+set SUBSET_3(SHORT_CT_OFF_SIRSEN)      0
+set SUBSET_3(SHORT_CT_OFFDELAY_SIRSEN)    0
+set SUBSET_3(SHORT_CT_ON_SIRSEN)      0
+set SUBSET_3(SHORT_CT_ONDELAY_SIRSEN)    0
+
+#set SUBSET_4(NAME)          "Schliessen"
+set SUBSET_4(NAME)          "\${subset_4}"
+set SUBSET_4(SUBSET_OPTION_VALUE)  4
+set SUBSET_4(SHORT_CT_OFF_SIRSEN)      3
+set SUBSET_4(SHORT_CT_OFFDELAY_SIRSEN)    3
+set SUBSET_4(SHORT_CT_ON_SIRSEN)      3
+set SUBSET_4(SHORT_CT_ONDELAY_SIRSEN)    3
+
+
+#set SUBSET_5(NAME)          "Aendern"
+set SUBSET_5(NAME)          "\${subset_5}"
+set SUBSET_5(SUBSET_OPTION_VALUE)  5
+set SUBSET_5(SHORT_CT_OFF_SIRSEN)      0
+set SUBSET_5(SHORT_CT_OFFDELAY_SIRSEN)    0
+set SUBSET_5(SHORT_CT_ON_SIRSEN)      0
+set SUBSET_5(SHORT_CT_ONDELAY_SIRSEN)    0
+set SUBSET_5(SHORT_COND_VALUE_LO_SIRSEN)    0
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+  
+  global dev_descr_sender dev_descr_receiver  
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+       
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+
+  #global SUBSETS
+  set name "x"
+  set i 1
+  while {$name != ""} {
+    upvar SUBSET_$i SUBSET_$i
+    array set subset [array get SUBSET_$i]
+    set name ""
+    catch {set name $subset(NAME)}
+    array_clear subset
+    incr i
+  }
+
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
+
+#1
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${SWITCH_DIR}</td><td>"
+  append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_1 SUBSET_2} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn ]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+
+
+#2
+  incr prn
+  #set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+set comment {
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${CHANGE_SIGNAL}&nbsp;\${at}</td><td>"
+  append HTML_PARAMS(separate_$prn) [subset2combobox {SUBSET_3 SUBSET_4 SUBSET_5} subset_$prn\_$pref separate_${special_input_id}_$prn\_$pref PROFILE_$prn ]
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+}
+
+  set pref 1
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+}
+constructor
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/VIRTUAL_KEY.tcl b/WebUI/www/config/easymodes/SWITCH_SENSOR/VIRTUAL_KEY.tcl
new file mode 100755
index 00000000..19bcc966
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/VIRTUAL_KEY.tcl
@@ -0,0 +1,247 @@
+#!/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
+source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/options.tcl]
+
+set PROFILES_MAP(0)  "\${expert}"
+set PROFILES_MAP(1)  "\${switch_on}"
+set PROFILES_MAP(2)  "\${switch_off}"
+set PROFILES_MAP(3)  "\${switch_on_off}"
+
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE)      "Expertenprofil"
+
+set PROFILE_1(LONG_ACTION_TYPE_SIRSEN)  1
+set PROFILE_1(LONG_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_1(LONG_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_1(LONG_CT_OFF_SIRSEN)  0
+set PROFILE_1(LONG_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_1(LONG_CT_ON_SIRSEN)  0
+set PROFILE_1(LONG_CT_ONDELAY_SIRSEN)  0
+set PROFILE_1(LONG_JT_OFF_SIRSEN)  1
+set PROFILE_1(LONG_JT_OFFDELAY_SIRSEN)  2
+set PROFILE_1(LONG_JT_ON_SIRSEN)  2
+set PROFILE_1(LONG_JT_ONDELAY_SIRSEN)  2
+set PROFILE_1(LONG_OFF_TIME_SIRSEN)  111600
+set PROFILE_1(LONG_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_1(LONG_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_1(LONG_ON_TIME_SIRSEN)  120
+set PROFILE_1(LONG_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_1(LONG_ON_LEVEL_SIRSEN)  50
+set PROFILE_1(LONG_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_1(LONG_MULTIEXECUTE_SIRSEN)  1
+
+set PROFILE_1(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_1(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_1(SHORT_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_1(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_1(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_1(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_1(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_1(SHORT_JT_OFF_SIRSEN)  1
+set PROFILE_1(SHORT_JT_OFFDELAY_SIRSEN)  2
+set PROFILE_1(SHORT_JT_ON_SIRSEN)  2
+set PROFILE_1(SHORT_JT_ONDELAY_SIRSEN)  2
+set PROFILE_1(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_1(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_1(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_1(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_1(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_1(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_1(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_1(UI_DESCRIPTION)  "Mit einem kurzen oder langen Tastendruck wird der Schalter f&uuml;r die eingestellte Zeit eingeschaltet. Ist eine Einschaltverz&ouml;gerungszeit eingestellt, so wird der Schalter erst nach Ablauf dieser Zeit eingeschaltet."
+set PROFILE_1(UI_TEMPLATE)    $PROFILE_1(UI_DESCRIPTION)  
+set PROFILE_1(UI_HINT)  1
+
+set PROFILE_2(LONG_ACTION_TYPE_SIRSEN)  1
+set PROFILE_2(LONG_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_2(LONG_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_2(LONG_CT_OFF_SIRSEN)  0
+set PROFILE_2(LONG_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_2(LONG_CT_ON_SIRSEN)  0
+set PROFILE_2(LONG_CT_ONDELAY_SIRSEN)  0
+set PROFILE_2(LONG_JT_OFF_SIRSEN)  4
+set PROFILE_2(LONG_JT_OFFDELAY_SIRSEN)  4
+set PROFILE_2(LONG_JT_ON_SIRSEN)  3
+set PROFILE_2(LONG_JT_ONDELAY_SIRSEN)  4
+set PROFILE_2(LONG_OFF_TIME_SIRSEN)  111600
+set PROFILE_2(LONG_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_2(LONG_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_2(LONG_ON_TIME_SIRSEN)  120
+set PROFILE_2(LONG_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_2(LONG_ON_LEVEL_SIRSEN)  50
+set PROFILE_2(LONG_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_2(LONG_MULTIEXECUTE_SIRSEN)  1
+
+set PROFILE_2(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_2(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_2(SHORT_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_2(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_2(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_2(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_2(SHORT_JT_OFF_SIRSEN)  4
+set PROFILE_2(SHORT_JT_OFFDELAY_SIRSEN)  4
+set PROFILE_2(SHORT_JT_ON_SIRSEN)  3
+set PROFILE_2(SHORT_JT_ONDELAY_SIRSEN)  4
+set PROFILE_2(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_2(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_2(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_2(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_2(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_2(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_2(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_2(UI_DESCRIPTION)  "Mit einem kurzen oder langen Tastendruck wird der Schalter f&uuml;r die eingestellte Zeit ausgeschaltet. Ist eine Ausschaltverz&ouml;gerungszeit eingestellt, so wird der Schalter erst nach Ablauf dieser Zeit ausgeschaltet."
+set PROFILE_2(UI_TEMPLATE)    $PROFILE_2(UI_DESCRIPTION) 
+set PROFILE_2(UI_HINT)  2
+
+set PROFILE_3(LONG_ACTION_TYPE_SIRSEN)  1
+set PROFILE_3(LONG_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_3(LONG_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_3(LONG_CT_OFF_SIRSEN)  0
+set PROFILE_3(LONG_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_3(LONG_CT_ON_SIRSEN)  0
+set PROFILE_3(LONG_CT_ONDELAY_SIRSEN)  0
+set PROFILE_3(LONG_JT_OFF_SIRSEN)  1
+set PROFILE_3(LONG_JT_OFFDELAY_SIRSEN)  4
+set PROFILE_3(LONG_JT_ON_SIRSEN)  3
+set PROFILE_3(LONG_JT_ONDELAY_SIRSEN)  2
+set PROFILE_3(LONG_OFF_TIME_SIRSEN)  111600
+set PROFILE_3(LONG_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_3(LONG_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_3(LONG_ON_TIME_SIRSEN)  120
+set PROFILE_3(LONG_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_3(LONG_ON_LEVEL_SIRSEN)  50
+set PROFILE_3(LONG_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_3(LONG_MULTIEXECUTE_SIRSEN)  1
+  
+set PROFILE_3(SHORT_ACTION_TYPE_SIRSEN)  1
+set PROFILE_3(SHORT_COND_VALUE_HI_SIRSEN)  180
+set PROFILE_3(SHORT_COND_VALUE_LO_SIRSEN)  1
+set PROFILE_3(SHORT_CT_OFF_SIRSEN)  0
+set PROFILE_3(SHORT_CT_OFFDELAY_SIRSEN)  0
+set PROFILE_3(SHORT_CT_ON_SIRSEN)  0
+set PROFILE_3(SHORT_CT_ONDELAY_SIRSEN)  0
+set PROFILE_3(SHORT_JT_OFF_SIRSEN)  1
+set PROFILE_3(SHORT_JT_OFFDELAY_SIRSEN)  4
+set PROFILE_3(SHORT_JT_ON_SIRSEN)  3
+set PROFILE_3(SHORT_JT_ONDELAY_SIRSEN)  2
+set PROFILE_3(SHORT_OFF_TIME_SIRSEN)  111600
+set PROFILE_3(SHORT_OFF_TIME_MODE_SIRSEN)  0
+set PROFILE_3(SHORT_OFFDELAY_TIME_SIRSEN)  0
+set PROFILE_3(SHORT_ON_TIME_SIRSEN)  120
+set PROFILE_3(SHORT_ON_TIME_MODE_SIRSEN)  0
+set PROFILE_3(SHORT_ON_LEVEL_SIRSEN)  200
+set PROFILE_3(SHORT_ONDELAY_TIME_SIRSEN)  0
+set PROFILE_3(UI_DESCRIPTION)  "Mit einem kurzen oder langen Tastendruck wird der Schalter f&uuml;r die eingestellte Zeit je nach aktuellem Zustand ein- oder ausgeschaltet (Togglefunktion). Ist eine Ein- oder Ausschaltverz&ouml;gerungszeit eingestellt, so wird der Schalter erst nach Ablauf dieser Zeit ein- bzw. ausgeschaltet."
+set PROFILE_3(UI_TEMPLATE)    $PROFILE_3(UI_DESCRIPTION)
+set PROFILE_3(UI_HINT)  3
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+  
+  global receiver_address dev_descr_sender dev_descr_receiver
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps      
+  upvar $pps_descr    ps_descr
+  
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
+     
+  set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+  
+#  die Texte der Platzhalter einlesen
+  puts "<script type=\"text/javascript\">getLangInfo('$dev_descr_sender(TYPE)', '$dev_descr_receiver(TYPE)');</script>"
+  set prn 0  
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_$prn]
+  append HTML_PARAMS(separate_$prn) "</textarea></div>"
+#1
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME_SIRSEN|LONG_ONDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME_SIRSEN|LONG_ON_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+#2
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME_SIRSEN|LONG_OFFDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME_SIRSEN|LONG_OFF_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+#3
+  incr prn
+  set pref 1
+  if {$cur_profile == $prn} then {array set PROFILE_$prn [array get ps]}
+  append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+  append HTML_PARAMS(separate_$prn) "\${description_$prn}"
+  append HTML_PARAMS(separate_$prn) "<table class=\"ProfileTbl\">"
+
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ONDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ONDELAY_TIME_SIRSEN|LONG_ONDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ONDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ONDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+  
+  
+  incr pref ;# 2
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${ON_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_ON_TIME_SIRSEN|LONG_ON_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_ON_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_ON_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+  
+  incr pref ;# 3
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFFDELAY_TIME}</td><td>"
+  option DELAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFFDELAY_TIME_SIRSEN|LONG_OFFDELAY_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFFDELAY_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFFDELAY_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  incr pref ;# 4
+  append HTML_PARAMS(separate_$prn) "<tr><td>\${OFF_TIME}</td><td>"
+  option LENGTH_OF_STAY
+  append HTML_PARAMS(separate_$prn) [get_ComboBox options SHORT_OFF_TIME_SIRSEN|LONG_OFF_TIME_SIRSEN separate_${special_input_id}_$prn\_$pref PROFILE_$prn SHORT_OFF_TIME_SIRSEN "onchange=\"ActivateFreeTime(\$('${special_input_id}_profiles'),$pref);\""]
+  EnterTime_h_m_s $prn $pref ${special_input_id} ps_descr SHORT_OFF_TIME_SIRSEN
+  append HTML_PARAMS(separate_$prn) "</td></tr>"
+
+  append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
+
+}
+
+constructor
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/GENERIC.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/GENERIC.txt
new file mode 100755
index 00000000..990e1555
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/GENERIC.txt
@@ -0,0 +1,3 @@
+"switch_off" : "Alarm aus",
+"switch_on" : "Alarm ein",
+"switch_on_off" : "Alarm ein / aus",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/KEY.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/KEY.txt
new file mode 100755
index 00000000..d2dde8d3
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/KEY.txt
@@ -0,0 +1,4 @@
+"description_1" : "<span class=\"translated\">Mit einem kurzen oder langen Tastendruck wird der Alarm f&uuml;r die eingestellte Zeit eingeschaltet. Ist eine Einschaltverz&ouml;gerungszeit eingestellt, so wird der Alarm erst nach Ablauf dieser Zeit eingeschaltet.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">Mit einem kurzen oder langen Tastendruck wird der Alarm ausgeschaltet. Ist eine Ausschaltverz&ouml;gerungszeit eingestellt, so wird der Alarm erst nach Ablauf dieser Zeit ausgeschaltet</span><br/><br/>",
+"description_3" : "<span class=\"translated\">Mit einem kurzen oder langen Tastendruck wird der Alarm je nach aktuellem Zustand f&uuml;r die eingestellte Zeit ein- oder ausgeschaltet (Togglefunktion). Ist eine Einschaltverz&ouml;gerungszeit eingestellt, so wird der Alarm erst nach Ablauf dieser Zeit eingeschaltet.</span><br/><br/>",
+
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/ROTARY_HANDLE_SENSOR.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/ROTARY_HANDLE_SENSOR.txt
new file mode 100755
index 00000000..dc4ef563
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/ROTARY_HANDLE_SENSOR.txt
@@ -0,0 +1,10 @@
+"description_1" : "<span class=\"translated\">Beim &Ouml;ffnen des Fensters wird der Alarm f&uuml;r die eingestellte Zeit eingeschaltet.  Ist eine Einschaltverz&ouml;gerungszeit eingestellt, so wird der Alarm erst nach Ablauf dieser Zeit eingeschaltet Diese Funktion l&auml;sst sich auch umkehren.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">Bei Wechseln des Fensterzustands wird der Alarm f&uuml;r die eingestellte Zeit eingeschaltet.  Ist eine Einschaltverz&ouml;gerungszeit eingestellt, so wird der Alarm erst nach Ablauf dieser Zeit eingeschaltet.</span><br/><br/>",
+
+"subset_1" : "Offen - ein",
+"subset_2" : "Zu - ein",
+"subset_3" : "&Ouml;ffnen",
+"subset_4" : "Schlie&szlig;en",
+"subset_5" : "&Auml;ndern",
+
+"at" : "<span class=\"translated\">beim</span>",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/SHUTTER_CONTACT.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/SHUTTER_CONTACT.txt
new file mode 100755
index 00000000..75f10948
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/SHUTTER_CONTACT.txt
@@ -0,0 +1,9 @@
+"description_1" : "<span class=\"translated\">Beim &Ouml;ffnen des Kontakts wird der Alarm  f&uuml;r die festgelegte Zeit eingeschaltet. Diese Funktion l&auml;sst sich auch umkehren.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">Beim Erkennen des &Auml;nderungssignals wird der Schalter f&uuml;r eine festgelegte Zeit eingeschaltet.</span><br/><br/>",
+
+"subset_1" : "Offen - ein",
+"subset_2" : "Zu - ein",
+"subset_3" : "&Ouml;ffnen",
+"subset_4" : "Schlie&szlig;en",
+"subset_5" : "&Auml;ndern",
+"at" : "<span class=\"translated\">beim</span>",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..d2dde8d3
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/de/VIRTUAL_KEY.txt
@@ -0,0 +1,4 @@
+"description_1" : "<span class=\"translated\">Mit einem kurzen oder langen Tastendruck wird der Alarm f&uuml;r die eingestellte Zeit eingeschaltet. Ist eine Einschaltverz&ouml;gerungszeit eingestellt, so wird der Alarm erst nach Ablauf dieser Zeit eingeschaltet.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">Mit einem kurzen oder langen Tastendruck wird der Alarm ausgeschaltet. Ist eine Ausschaltverz&ouml;gerungszeit eingestellt, so wird der Alarm erst nach Ablauf dieser Zeit ausgeschaltet</span><br/><br/>",
+"description_3" : "<span class=\"translated\">Mit einem kurzen oder langen Tastendruck wird der Alarm je nach aktuellem Zustand f&uuml;r die eingestellte Zeit ein- oder ausgeschaltet (Togglefunktion). Ist eine Einschaltverz&ouml;gerungszeit eingestellt, so wird der Alarm erst nach Ablauf dieser Zeit eingeschaltet.</span><br/><br/>",
+
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/GENERIC.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/GENERIC.txt
new file mode 100755
index 00000000..546a797a
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/GENERIC.txt
@@ -0,0 +1,3 @@
+"switch_off" : "Switch - off",
+"switch_on" : "Switch - on",
+"switch_on_off" : "Switch - on/off",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/KEY.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/KEY.txt
new file mode 100755
index 00000000..825d098b
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/KEY.txt
@@ -0,0 +1,3 @@
+"description_1" : "<span class=\"translated\">With a short or long button press the alarm will be toggled on for the set time. If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">With a short or long button press the alarm will be toggled off for the set time. If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
+"description_3" : "<span class=\"translated\">With a short or long button press the alarm will be toggled on or off for the set time (toggle function). If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/ROTARY_HANDLE_SENSOR.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/ROTARY_HANDLE_SENSOR.txt
new file mode 100755
index 00000000..3e379fa6
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/ROTARY_HANDLE_SENSOR.txt
@@ -0,0 +1,10 @@
+"description_1" : "<span class=\"translated\">When the window is opened the alarm will be switched on for the time set. This function can be reversed.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">The alarm will be switched on for the time set if a change of the window state is recognized.</span><br/><br/>",
+
+"subset_1" : "Open - on",
+"subset_2" : "Closed - on",
+"subset_3" : "Open",
+"subset_4" : "Close",
+"subset_5" : "Change",
+
+"at" : "<span class=\"translated\">on</span>",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/SHUTTER_CONTACT.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/SHUTTER_CONTACT.txt
new file mode 100755
index 00000000..94a1548e
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/SHUTTER_CONTACT.txt
@@ -0,0 +1,9 @@
+"description_1" : "<span class=\"translated\">When the contact is opened the alarm will be switched on for the time set. This function can be reversed.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">The alarm will be switched on for the time set if the change signal is recognized.</span><br/><br/>",
+
+"subset_1" : "Open - on",
+"subset_2" : "Closed - on",
+"subset_3" : "Open",
+"subset_4" : "Close",
+"subset_5" : "Change",
+"at" : "<span class=\"translated\">on</span>",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..825d098b
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/en/VIRTUAL_KEY.txt
@@ -0,0 +1,3 @@
+"description_1" : "<span class=\"translated\">With a short or long button press the alarm will be toggled on for the set time. If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">With a short or long button press the alarm will be toggled off for the set time. If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
+"description_3" : "<span class=\"translated\">With a short or long button press the alarm will be toggled on or off for the set time (toggle function). If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/GENERIC.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/GENERIC.txt
new file mode 100755
index 00000000..546a797a
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/GENERIC.txt
@@ -0,0 +1,3 @@
+"switch_off" : "Switch - off",
+"switch_on" : "Switch - on",
+"switch_on_off" : "Switch - on/off",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/KEY.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/KEY.txt
new file mode 100755
index 00000000..825d098b
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/KEY.txt
@@ -0,0 +1,3 @@
+"description_1" : "<span class=\"translated\">With a short or long button press the alarm will be toggled on for the set time. If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">With a short or long button press the alarm will be toggled off for the set time. If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
+"description_3" : "<span class=\"translated\">With a short or long button press the alarm will be toggled on or off for the set time (toggle function). If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/ROTARY_HANDLE_SENSOR.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/ROTARY_HANDLE_SENSOR.txt
new file mode 100755
index 00000000..3e379fa6
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/ROTARY_HANDLE_SENSOR.txt
@@ -0,0 +1,10 @@
+"description_1" : "<span class=\"translated\">When the window is opened the alarm will be switched on for the time set. This function can be reversed.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">The alarm will be switched on for the time set if a change of the window state is recognized.</span><br/><br/>",
+
+"subset_1" : "Open - on",
+"subset_2" : "Closed - on",
+"subset_3" : "Open",
+"subset_4" : "Close",
+"subset_5" : "Change",
+
+"at" : "<span class=\"translated\">on</span>",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/SHUTTER_CONTACT.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/SHUTTER_CONTACT.txt
new file mode 100755
index 00000000..c7487960
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/SHUTTER_CONTACT.txt
@@ -0,0 +1,9 @@
+"description_1" : "<span class=\"translated\">When the contact is opened the alarm will be switched on for the time set. This function can be reversed.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">The switch will be switched on for the time set if the change signal is recognized.</span><br/><br/>",
+
+"subset_1" : "Open - on",
+"subset_2" : "Closed - on",
+"subset_3" : "Open",
+"subset_4" : "Close",
+"subset_5" : "Change",
+"at" : "<span class=\"translated\">on</span>",
diff --git a/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..825d098b
--- /dev/null
+++ b/WebUI/www/config/easymodes/SWITCH_SENSOR/localization/tr/VIRTUAL_KEY.txt
@@ -0,0 +1,3 @@
+"description_1" : "<span class=\"translated\">With a short or long button press the alarm will be toggled on for the set time. If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
+"description_2" : "<span class=\"translated\">With a short or long button press the alarm will be toggled off for the set time. If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
+"description_3" : "<span class=\"translated\">With a short or long button press the alarm will be toggled on or off for the set time (toggle function). If a delay is set switching will be performed after the delay time has expired.</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/KEY_TRANSCEIVER.tcl b/WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/KEY_TRANSCEIVER.tcl
index 201d7114..48dbaf72 100755
--- a/WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/KEY_TRANSCEIVER.tcl
+++ b/WebUI/www/config/easymodes/SWITCH_VIRTUAL_RECEIVER/KEY_TRANSCEIVER.tcl
@@ -10,8 +10,8 @@ set PROFILES_MAP(0)  "\${expert}"
 set PROFILES_MAP(1)  "\${switch_on}"
 set PROFILES_MAP(2)  "\${switch_off}"
 set PROFILES_MAP(3)  "\${switch_on_off}"
-set PROFILES_MAP(4)  "\${switch_shortOn_longOff}"
-set PROFILES_MAP(5)  "\${switch_shortOff_longOn}"
+#set PROFILES_MAP(4)  "\${switch_shortOn_longOff}"
+#set PROFILES_MAP(5)  "\${switch_shortOff_longOn}"
 
 set PROFILE_0(UI_HINT)  0
 set PROFILE_0(UI_DESCRIPTION)    "Expertenprofil"
@@ -611,6 +611,7 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
   append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 
+set comment {
 #4
   incr prn
   set pref 1
@@ -772,7 +773,7 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   append HTML_PARAMS(separate_$prn) "<tr id=\"timeFactor\_$prn\_$pref\" class=\"hidden\"><td>\${ON_TIME_FACTOR}</td>"
   append HTML_PARAMS(separate_$prn) "<td>[get_InputElem LONG_ON_TIME_FACTOR separate_${special_input_id}_$prn\_$pref ps LONG_ON_TIME_FACTOR ]</td>"
   append HTML_PARAMS(separate_$prn) "</tr>"
-
+}
   append HTML_PARAMS(separate_$prn) "</table></textarea></div>"
 }
 
diff --git a/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/VIRTUAL_KEY.tcl b/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/VIRTUAL_KEY.tcl
new file mode 100755
index 00000000..86fe0516
--- /dev/null
+++ b/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/VIRTUAL_KEY.tcl
@@ -0,0 +1,35 @@
+#!/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+
+
+set PROFILES_MAP(0)	"\${no_profile}"
+
+set PROFILE_0(UI_HINT)	0
+set PROFILE_0(UI_DESCRIPTION)	"no"
+set PROFILE_0(UI_TEMPLATE)	"no"
+
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+	
+	global dev_descr_sender dev_descr_receiver  
+	upvar PROFILES_MAP  PROFILES_MAP
+	upvar HTML_PARAMS   HTML_PARAMS
+	upvar $pps          ps      
+	upvar $pps_descr    ps_descr
+	upvar prn prn
+	
+	foreach pro [array names PROFILES_MAP] {
+		upvar PROFILE_$pro PROFILE_$pro
+	}
+
+#	die Texte der Platzhalter einlesen
+	puts "<script type=\"text/javascript\">getLangInfo_Special('SPECIAL.txt');</script>"
+	set prn 0	
+	append HTML_PARAMS(separate_$prn) "<div id=\"param_$prn\"><textarea id=\"profile_$prn\" style=\"display:none\">"
+	append HTML_PARAMS(separate_$prn)	"\${hint_no_expert}<br/><br/>"
+	append HTML_PARAMS(separate_$prn) "</textarea></div>"
+	
+}
+
+constructor
diff --git a/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/localization/de/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/localization/de/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..b6a75ce8
--- /dev/null
+++ b/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/localization/de/VIRTUAL_KEY.txt
@@ -0,0 +1 @@
+"description_1" : "<span class=\"translated\">NIL</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/localization/en/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/localization/en/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..b6a75ce8
--- /dev/null
+++ b/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/localization/en/VIRTUAL_KEY.txt
@@ -0,0 +1 @@
+"description_1" : "<span class=\"translated\">NIL</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/localization/tr/VIRTUAL_KEY.txt b/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/localization/tr/VIRTUAL_KEY.txt
new file mode 100755
index 00000000..b6a75ce8
--- /dev/null
+++ b/WebUI/www/config/easymodes/WINDOW_SWITCH_RECEIVER/localization/tr/VIRTUAL_KEY.txt
@@ -0,0 +1 @@
+"description_1" : "<span class=\"translated\">NIL</span><br/><br/>",
diff --git a/WebUI/www/config/easymodes/dimmer_virt_ch_masterParams.tcl b/WebUI/www/config/easymodes/dimmer_virt_ch_masterParams.tcl
index 598941ee..b2dd4ac8 100755
--- a/WebUI/www/config/easymodes/dimmer_virt_ch_masterParams.tcl
+++ b/WebUI/www/config/easymodes/dimmer_virt_ch_masterParams.tcl
@@ -11,43 +11,43 @@ set PROFILE_PNAME(STATUSINFO_MINDELAY) "\${stringTableDimmerStatusInfoMinDelay}"
 set PROFILE_PNAME(STATUSINFO_RANDOM) "\${stringTableDimmerStatusInfoRandom}"
 set PROFILE_PNAME(TRANSMIT_TRY_MAX) "\${stringTableTransmitTryMax}"
 
-set PROFILES_MAP(0)	"Experte"
-set PROFILES_MAP(1)	"TheOneAndOnlyEasyMode"
+set PROFILES_MAP(0)  "Experte"
+set PROFILES_MAP(1)  "TheOneAndOnlyEasyMode"
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
-	global env
+  global env
 
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps
-	upvar $pps_descr    ps_descr
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps
+  upvar $pps_descr    ps_descr
 
-	foreach pro [array names PROFILES_MAP] {
-		upvar PROFILE_$pro PROFILE_$pro
-	}
+  foreach pro [array names PROFILES_MAP] {
+    upvar PROFILE_$pro PROFILE_$pro
+  }
 
   array_clear param_descr
-	array set param_descr $ps_descr(STATUSINFO_MINDELAY)
-	set minDelay_min [format {%1.2f} $param_descr(MIN)]
-	set minDelay_max [format {%1.2f} $param_descr(MAX)]
+  array set param_descr $ps_descr(STATUSINFO_MINDELAY)
+  set minDelay_min [format {%1.2f} $param_descr(MIN)]
+  set minDelay_max [format {%1.2f} $param_descr(MAX)]
 
   array_clear param_descr
-	array set param_descr $ps_descr(STATUSINFO_RANDOM)
-	set random_min [format {%1.2f} $param_descr(MIN)]
-	set random_max [format {%1.2f} $param_descr(MAX)]
+  array set param_descr $ps_descr(STATUSINFO_RANDOM)
+  set random_min [format {%1.2f} $param_descr(MIN)]
+  set random_max [format {%1.2f} $param_descr(MAX)]
 
-	array_clear param_descr
-	array set param_descr $ps_descr(TRANSMIT_TRY_MAX)
-	set tryMax_min $param_descr(MIN)
-	set tryMax_max $param_descr(MAX)
+  array_clear param_descr
+  array set param_descr $ps_descr(TRANSMIT_TRY_MAX)
+  set tryMax_min $param_descr(MIN)
+  set tryMax_max $param_descr(MAX)
 
-	set ch [lindex [split $address ":"] 1]
+  set ch [lindex [split $address ":"] 1]
 
-	puts "<script type=\"text/javascript\">getLangInfo_Special('VIRTUAL_HELP.txt');</script>"
+  puts "<script type=\"text/javascript\">getLangInfo_Special('VIRTUAL_HELP.txt');</script>"
 
-	append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\"><tr><td>"
+  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\"><tr><td>"
 
     catch {
       array set loadAppearBehaviour "$ps_descr(LOAD_APPEAR_BEHAVIOUR)"
@@ -61,86 +61,86 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
         append HTML_PARAMS(separate_1) [get_ComboBox options LOAD_APPEAR_BEHAVIOUR separate_${special_input_id}_7 ps LOAD_APPEAR_BEHAVIOUR]
       append HTML_PARAMS(separate_1) "</td></tr>"
     }
-		append HTML_PARAMS(separate_1) "<tr><td>"
-			append HTML_PARAMS(separate_1) "<tr><td>$PROFILE_PNAME(LOGIC_COMBINATION)</td><td>"
-			array_clear options
-		  set options(0) "\${stringTableLogicInactive}"
-			set options(1) "\${stringTableLogicOR}"
-			set options(2) "\${stringTableLogicAND}"
-			set options(3) "\${stringTableLogicXOR}"
-			set options(4) "\${stringTableLogicNOR}"
-			set options(5) "\${stringTableLogicNAND}"
-			set options(6) "\${stringTableLogicORINVERS}"
-			set options(7) \${stringTableLogicANDINVERS}"
-			set options(8) "\${stringTableLogicPLUS}"
-			set options(9) "\${stringTableLogicMINUS}"
-			set options(10) "\${stringTableLogicMUL}"
-			set options(11) "\${stringTableLogicPLUSINVERS}"
-			set options(12) "\${stringTableLogicMINUSINVERS}"
+    append HTML_PARAMS(separate_1) "<tr><td>"
+      append HTML_PARAMS(separate_1) "<tr><td>$PROFILE_PNAME(LOGIC_COMBINATION)</td><td>"
+      array_clear options
+      set options(0) "\${stringTableLogicInactive}"
+      set options(1) "\${stringTableLogicOR}"
+      set options(2) "\${stringTableLogicAND}"
+      set options(3) "\${stringTableLogicXOR}"
+      set options(4) "\${stringTableLogicNOR}"
+      set options(5) "\${stringTableLogicNAND}"
+      set options(6) "\${stringTableLogicORINVERS}"
+      set options(7) \${stringTableLogicANDINVERS}"
+      set options(8) "\${stringTableLogicPLUS}"
+      set options(9) "\${stringTableLogicMINUS}"
+      set options(10) "\${stringTableLogicMUL}"
+      set options(11) "\${stringTableLogicPLUSINVERS}"
+      set options(12) "\${stringTableLogicMINUSINVERS}"
       set options(13) "\${stringTableLogicMULINVERS}"
-			set options(14) "\${stringTableLogicINVERSPLUS}"
-			set options(15) "\${stringTableLogicINVERSMINUS}"
-			set options(16) "\${stringTableLogicINVERSMUL}"
-			append HTML_PARAMS(separate_1) [get_ComboBox options LOGIC_COMBINATION separate_${special_input_id}_6 ps LOGIC_COMBINATION]
-
-			append HTML_PARAMS(separate_1) "&nbsp<input class=\"j_helpBtn\" id=\"virtual_help_button_$ch\" type=\"button\" value=\"Hilfe\" onclick=\"Virtual_DimmerChannel_help($ch);\">"
-		append HTML_PARAMS(separate_1) "</td></tr>"
-
-
-		append HTML_PARAMS(separate_1) "<tr><td>"
-			append HTML_PARAMS(separate_1) "<tr><td>$PROFILE_PNAME(POWERUP_ACTION)</td><td>"
-			array_clear options
-			set options(0) "\${stringTablePowerUpOFF}"
-			set options(1) "\${stringTablePowerUpON}"
-			append HTML_PARAMS(separate_1) [get_ComboBox options POWERUP_ACTION separate_${special_input_id}_2 ps POWERUP_ACTION]
-			append HTML_PARAMS(separate_1) "</td></tr>"
-		append HTML_PARAMS(separate_1) "</td></tr>"
-
-		append HTML_PARAMS(separate_1) "<tr><td>"
-
-		append HTML_PARAMS(separate_1) "<tr><td>$PROFILE_PNAME(STATUSINFO_MINDELAY)</td><td>"
-			set options(0) "\${stringTableNotUsed}"
-			set options(1) "\${stringTableEnterValue}"
-
-			append HTML_PARAMS(separate_1) [get_ComboBox options STATUSINFO_MINDELAY separate_${special_input_id}_3 ps STATUSINFO_MINDELAY "onchange=\"setMinDelayVisibility($ch, $ps(STATUSINFO_MINDELAY));\""]
-			append HTML_PARAMS(separate_1) "<input type=\"text\" id= separate_${special_input_id}_4 name=\"STATUSINFO_MINDELAY\" value=[format {%1.2f} $ps(STATUSINFO_MINDELAY)]></td>"
-			append HTML_PARAMS(separate_1) "<td> s ($minDelay_min - $minDelay_max)</td>"
-
-			puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/DIMMER/dimmer_virt.js');</script>"
-			append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-			append HTML_PARAMS(separate_1) "var freeValue = document.getElementById('separate_CHANNEL_$ch\_4');"
-			append HTML_PARAMS(separate_1) "var option = document.getElementById('separate_CHANNEL_$ch\_3');"
-			append HTML_PARAMS(separate_1) "if(freeValue.value > 0) {option.selectedIndex = 1;}"
-		  append HTML_PARAMS(separate_1) " else {option.selectedIndex = 0;freeValue.style.display = \"none\"}"
-			append HTML_PARAMS(separate_1) "setMinDelayVisibility($ch, $ps(STATUSINFO_MINDELAY));"
-			append HTML_PARAMS(separate_1) "</script>"
-		append HTML_PARAMS(separate_1) "</td></tr>"
-
-	 	append HTML_PARAMS(separate_1) "<tr id=\"stateInfoRandom_$ch\"><td>$PROFILE_PNAME(STATUSINFO_RANDOM)</td>"
-			append HTML_PARAMS(separate_1) "<td>[get_InputElem STATUSINFO_RANDOM  separate_${special_input_id}_5 ps tmp_STATUSINFO_RANDOM]</td>"
-			append HTML_PARAMS(separate_1) "<td>s ($random_min - $random_max)</td>"
-		append HTML_PARAMS(separate_1) "</tr>"
-
-		append HTML_PARAMS(separate_1) "</td></tr>"
-
-		append HTML_PARAMS(separate_1) "<tr><td>$PROFILE_PNAME(TRANSMIT_TRY_MAX)</td><td>"
-			append HTML_PARAMS(separate_1) "[get_InputElem TRANSMIT_TRY_MAX  separate_${special_input_id}_1 ps TRANSMIT_TRY_MAX]</td>"
-			append HTML_PARAMS(separate_1) "<td> ($tryMax_min - $tryMax_max)</td>"
-		append HTML_PARAMS(separate_1) "</td></tr>"
-	append HTML_PARAMS(separate_1) "</td></tr></table>"
-
-	append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\" id=\"virtual_ch_help_$ch\" style=\"display:none\">"
-	#set help_txt "<span class=\"CLASS22015\"><b>Die Hilfe steht leider nicht zur Verf&uuml;gung!<b></span>"
-	#catch {source [file join $env(DOCUMENT_ROOT) config/virtualHelp.tcl]}
-	#append HTML_PARAMS(separate_1) "<tr><td>$help_txt</td></tr>"
-
-	append HTML_PARAMS(separate_1) "<tr><td>\${virtualHelpTxt}</td></tr>"
-
-	append HTML_PARAMS(separate_1) "</table>"
-
-	puts "<script type=\"text/javascript\">"
-	  puts "jQuery(\".j_helpBtn\").val(translateKey(\"helpBtnTxt\"));"
-	puts "</script>"
+      set options(14) "\${stringTableLogicINVERSPLUS}"
+      set options(15) "\${stringTableLogicINVERSMINUS}"
+      set options(16) "\${stringTableLogicINVERSMUL}"
+      append HTML_PARAMS(separate_1) [get_ComboBox options LOGIC_COMBINATION separate_${special_input_id}_6 ps LOGIC_COMBINATION]
+
+      append HTML_PARAMS(separate_1) "&nbsp<input class=\"j_helpBtn\" id=\"virtual_help_button_$ch\" type=\"button\" value=\"Hilfe\" onclick=\"Virtual_DimmerChannel_help($ch);\">"
+    append HTML_PARAMS(separate_1) "</td></tr>"
+
+
+    append HTML_PARAMS(separate_1) "<tr><td>"
+      append HTML_PARAMS(separate_1) "<tr><td>$PROFILE_PNAME(POWERUP_ACTION)</td><td>"
+      array_clear options
+      set options(0) "\${stringTablePowerUpOFF}"
+      set options(1) "\${stringTablePowerUpON}"
+      append HTML_PARAMS(separate_1) [get_ComboBox options POWERUP_ACTION separate_${special_input_id}_2 ps POWERUP_ACTION]
+      append HTML_PARAMS(separate_1) "</td></tr>"
+    append HTML_PARAMS(separate_1) "</td></tr>"
+
+    append HTML_PARAMS(separate_1) "<tr><td>"
+
+    append HTML_PARAMS(separate_1) "<tr><td>$PROFILE_PNAME(STATUSINFO_MINDELAY)</td><td>"
+      set options(0) "\${stringTableNotUsed}"
+      set options(1) "\${stringTableEnterValue}"
+
+      append HTML_PARAMS(separate_1) [get_ComboBox options STATUSINFO_MINDELAY separate_${special_input_id}_3 ps STATUSINFO_MINDELAY "onchange=\"setMinDelayVisibility($ch, $ps(STATUSINFO_MINDELAY));\""]
+      append HTML_PARAMS(separate_1) "<input type=\"text\" id= separate_${special_input_id}_4 name=\"STATUSINFO_MINDELAY\" value=[format {%1.2f} $ps(STATUSINFO_MINDELAY)]></td>"
+      append HTML_PARAMS(separate_1) "<td> s ($minDelay_min - $minDelay_max)</td>"
+
+      puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/DIMMER/dimmer_virt.js');</script>"
+      append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
+      append HTML_PARAMS(separate_1) "var freeValue = document.getElementById('separate_CHANNEL_$ch\_4');"
+      append HTML_PARAMS(separate_1) "var option = document.getElementById('separate_CHANNEL_$ch\_3');"
+      append HTML_PARAMS(separate_1) "if(freeValue.value > 0) {option.selectedIndex = 1;}"
+      append HTML_PARAMS(separate_1) " else {option.selectedIndex = 0;freeValue.style.display = \"none\"}"
+      append HTML_PARAMS(separate_1) "setMinDelayVisibility($ch, $ps(STATUSINFO_MINDELAY));"
+      append HTML_PARAMS(separate_1) "</script>"
+    append HTML_PARAMS(separate_1) "</td></tr>"
+
+     append HTML_PARAMS(separate_1) "<tr id=\"stateInfoRandom_$ch\"><td>$PROFILE_PNAME(STATUSINFO_RANDOM)</td>"
+      append HTML_PARAMS(separate_1) "<td>[get_InputElem STATUSINFO_RANDOM  separate_${special_input_id}_5 ps tmp_STATUSINFO_RANDOM]</td>"
+      append HTML_PARAMS(separate_1) "<td>s ($random_min - $random_max)</td>"
+    append HTML_PARAMS(separate_1) "</tr>"
+
+    append HTML_PARAMS(separate_1) "</td></tr>"
+
+    append HTML_PARAMS(separate_1) "<tr><td>$PROFILE_PNAME(TRANSMIT_TRY_MAX)</td><td>"
+      append HTML_PARAMS(separate_1) "[get_InputElem TRANSMIT_TRY_MAX  separate_${special_input_id}_1 ps TRANSMIT_TRY_MAX]</td>"
+      append HTML_PARAMS(separate_1) "<td> ($tryMax_min - $tryMax_max)</td>"
+    append HTML_PARAMS(separate_1) "</td></tr>"
+  append HTML_PARAMS(separate_1) "</td></tr></table>"
+
+  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\" id=\"virtual_ch_help_$ch\" style=\"display:none\">"
+  #set help_txt "<span class=\"CLASS22015\"><b>Die Hilfe steht leider nicht zur Verf&uuml;gung!<b></span>"
+  #catch {source [file join $env(DOCUMENT_ROOT) config/virtualHelp.tcl]}
+  #append HTML_PARAMS(separate_1) "<tr><td>$help_txt</td></tr>"
+
+  append HTML_PARAMS(separate_1) "<tr><td>\${virtualHelpTxt}</td></tr>"
+
+  append HTML_PARAMS(separate_1) "</table>"
+
+  puts "<script type=\"text/javascript\">"
+    puts "jQuery(\".j_helpBtn\").val(translateKey(\"helpBtnTxt\"));"
+  puts "</script>"
 }
 
 constructor
diff --git a/WebUI/www/config/easymodes/etc/localization/de/PNAME.txt b/WebUI/www/config/easymodes/etc/localization/de/PNAME.txt
index 0a00cc8d..ce5a1a91 100755
--- a/WebUI/www/config/easymodes/etc/localization/de/PNAME.txt
+++ b/WebUI/www/config/easymodes/etc/localization/de/PNAME.txt
@@ -28,7 +28,7 @@
 "ON_AIRING" : "<span class=\"translated\">L&uuml;ften bei</span>",
 "ON_LEVEL" : "<span class=\"translated\">Pegel im Zustand \"ein\"</span>",
 "ON_THRESHOLD" : "<span class=\"translated\">Einschalten bei</span>",
-"ON_TIME" : "<span class=\"translated\">Einschaltdauer (Verweildauer im Zustand \"ein\")</span>",
+"ON_TIME" : "<span class=\"translated\">Verweildauer im Zustand \"ein\"</span>",
 "ON_TIME_MODE" : "<span class=\"translated\">Art der Verweildauer</span>",
 "OPEN_WHEN" : "<span class=\"translated\">&Ouml;ffnen bei&nbsp;</span>",
 "RAMPOFF_TIME" : "<span class=\"translated\">Rampenzeit beim Ausschalten</span>",
diff --git a/WebUI/www/config/easymodes/etc/uiElements.tcl b/WebUI/www/config/easymodes/etc/uiElements.tcl
index 39265299..d8f3c47f 100755
--- a/WebUI/www/config/easymodes/etc/uiElements.tcl
+++ b/WebUI/www/config/easymodes/etc/uiElements.tcl
@@ -1,10 +1,3 @@
-proc getCheckBox {param value prn} {
-  set checked ""
-  if { $value } then { set checked "checked=\"checked\"" }
-  set s "<input id='separate_CHANNEL_0\_$prn' type='checkbox' $checked value='dummy' name=$param/>"
-  return $s
-}
-
 proc getMinValue {param} {
   global psDescr
   upvar psDescr descr
@@ -23,15 +16,20 @@ proc getMaxValue {param} {
   return "$max"
 }
 
-proc getTextField {param value prn} {
-  set elemId 'separate_CHANNEL_0\_$prn'
+proc getMinMaxValueDescr {param} {
+  global psDescr
+  upvar psDescr descr
+  array_clear param_descr
+  array set param_descr $descr($param)
+  set min $param_descr(MIN)
+  set max $param_descr(MAX)
+
   # Limit float to 2 decimal places
-  if {[llength [split $value "."]] == 2} {
-    set value [format {%1.2f} $value]
+  if {[llength [split $min "."]] == 2} {
+    set min [format {%1.2f} $min]
+    set max [format {%1.2f} $max]
   }
-
-  set s "<input id=$elemId type=\"text\" size=\"5\" value=$value name=$param>"
-  return $s
+  return "($min - $max)"
 }
 
 proc getUnit {param} {
@@ -52,20 +50,29 @@ proc getUnit {param} {
   return "$unit"
 }
 
-proc getMinMaxValueDescr {param} {
+proc getTextField {param value chn prn} {
   global psDescr
   upvar psDescr descr
   array_clear param_descr
   array set param_descr $descr($param)
-  set min $param_descr(MIN)
-  set max $param_descr(MAX)
+  set minValue [format {%1.1f} $param_descr(MIN)]
+  set maxValue [format {%1.1f} $param_descr(MAX)]
 
+  set elemId 'separate_CHANNEL\_$chn\_$prn'
   # Limit float to 2 decimal places
-  if {[llength [split $min "."]] == 2} {
-    set min [format {%1.2f} $min]
-    set max [format {%1.2f} $max]
+  if {[llength [split $value "."]] == 2} {
+    set value [format {%1.2f} $value]
   }
-  return "($min - $max)"
+
+  set s "<input id=$elemId type=\"text\" size=\"5\" value=$value name=$param onblur=\"ProofAndSetValue(this.id, this.id, $minValue, $maxValue, 1)\">"
+  return $s
+}
+
+proc getCheckBox {param value chn prn} {
+  set checked ""
+  if { $value } then { set checked "checked=\"checked\"" }
+  set s "<input id='separate_CHANNEL\_$chn\_$prn' type='checkbox' $checked value='dummy' name=$param/>"
+  return $s
 }
 
 proc getHelpIcon {topic x y} {
diff --git a/WebUI/www/config/easymodes/hmip-etrv_0_master.tcl b/WebUI/www/config/easymodes/hmip-etrv_0_master.tcl
index 6e28c4f8..6de023e8 100755
--- a/WebUI/www/config/easymodes/hmip-etrv_0_master.tcl
+++ b/WebUI/www/config/easymodes/hmip-etrv_0_master.tcl
@@ -27,39 +27,40 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   }
 
   append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+    set chn 0
     set prn 1
     set param CYCLIC_INFO_MSG
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsg}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param CYCLIC_INFO_MSG_DIS
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsgDis}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param DAYLIGHT_SAVINGS_TIME
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableDST}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param GLOBAL_BUTTON_LOCK
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableGlobalButtonLock}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param LOCAL_RESET_DISABLED
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableLocalResetDisable}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
   append HTML_PARAMS(separate_1) "</table>"
diff --git a/WebUI/www/config/easymodes/hmip-krc4_0_master.tcl b/WebUI/www/config/easymodes/hmip-krc4_0_master.tcl
index 3da671bb..19a7177b 100755
--- a/WebUI/www/config/easymodes/hmip-krc4_0_master.tcl
+++ b/WebUI/www/config/easymodes/hmip-krc4_0_master.tcl
@@ -28,11 +28,12 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   }
 
   append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+    set chn 0
     set prn 1
     set param LOCAL_RESET_DISABLED
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableLocalResetDisable}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
   append HTML_PARAMS(separate_1) "</table>"
diff --git a/WebUI/www/config/easymodes/hmip-ps_0_master.tcl b/WebUI/www/config/easymodes/hmip-ps_0_master.tcl
index ed71f160..c219cccc 100755
--- a/WebUI/www/config/easymodes/hmip-ps_0_master.tcl
+++ b/WebUI/www/config/easymodes/hmip-ps_0_master.tcl
@@ -28,25 +28,26 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   }
 
   append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+    set chn 0
     set prn 1
     set param CYCLIC_INFO_MSG
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsg}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param CYCLIC_INFO_MSG_DIS
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsgDis}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param LOCAL_RESET_DISABLED
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableLocalResetDisable}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
   append HTML_PARAMS(separate_1) "</table>"
diff --git a/WebUI/www/config/easymodes/hmip-psm_0_master.tcl b/WebUI/www/config/easymodes/hmip-psm_0_master.tcl
index ed71f160..c219cccc 100755
--- a/WebUI/www/config/easymodes/hmip-psm_0_master.tcl
+++ b/WebUI/www/config/easymodes/hmip-psm_0_master.tcl
@@ -28,25 +28,26 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   }
 
   append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+    set chn 0
     set prn 1
     set param CYCLIC_INFO_MSG
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsg}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param CYCLIC_INFO_MSG_DIS
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsgDis}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param LOCAL_RESET_DISABLED
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableLocalResetDisable}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
   append HTML_PARAMS(separate_1) "</table>"
diff --git a/WebUI/www/config/easymodes/hmip-swdo_0_master.tcl b/WebUI/www/config/easymodes/hmip-swdo_0_master.tcl
index ed71f160..c219cccc 100755
--- a/WebUI/www/config/easymodes/hmip-swdo_0_master.tcl
+++ b/WebUI/www/config/easymodes/hmip-swdo_0_master.tcl
@@ -28,25 +28,26 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   }
 
   append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+    set chn 0
     set prn 1
     set param CYCLIC_INFO_MSG
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsg}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param CYCLIC_INFO_MSG_DIS
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsgDis}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param LOCAL_RESET_DISABLED
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableLocalResetDisable}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
   append HTML_PARAMS(separate_1) "</table>"
diff --git a/WebUI/www/config/easymodes/hmip-wrc2_0_master.tcl b/WebUI/www/config/easymodes/hmip-wrc2_0_master.tcl
index 3da671bb..19a7177b 100755
--- a/WebUI/www/config/easymodes/hmip-wrc2_0_master.tcl
+++ b/WebUI/www/config/easymodes/hmip-wrc2_0_master.tcl
@@ -28,11 +28,12 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   }
 
   append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+    set chn 0
     set prn 1
     set param LOCAL_RESET_DISABLED
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableLocalResetDisable}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
   append HTML_PARAMS(separate_1) "</table>"
diff --git a/WebUI/www/config/easymodes/hmip-wth_0_master.tcl b/WebUI/www/config/easymodes/hmip-wth_0_master.tcl
index f7499fda..e22c74c3 100755
--- a/WebUI/www/config/easymodes/hmip-wth_0_master.tcl
+++ b/WebUI/www/config/easymodes/hmip-wth_0_master.tcl
@@ -29,39 +29,40 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
 
   append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+    set chn 0
     set prn 1
     set param CYCLIC_INFO_MSG
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsg}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param CYCLIC_INFO_MSG_DIS
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableCyclicInfoMsgDis}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param DAYLIGHT_SAVINGS_TIME
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableDST}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param GLOBAL_BUTTON_LOCK
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableGlobalButtonLock}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
     incr prn
     set param LOCAL_RESET_DISABLED
     append HTML_PARAMS(separate_1) "<tr>"
       append HTML_PARAMS(separate_1) "<td>\${stringTableLocalResetDisable}</td>"
-      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $prn]</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getCheckBox '$param' $ps($param) $chn $prn]</td>"
     append HTML_PARAMS(separate_1) "</tr>"
 
   append HTML_PARAMS(separate_1) "</table>"
diff --git a/WebUI/www/config/easymodes/js/CC.js b/WebUI/www/config/easymodes/js/CC.js
index a3ce31d6..f3d19695 100755
--- a/WebUI/www/config/easymodes/js/CC.js
+++ b/WebUI/www/config/easymodes/js/CC.js
@@ -307,7 +307,7 @@ self.isEcoLTComfort = function(elmName) {
   errorMsg = translateKey("errorComfortLTEco"),
   fadeOutTime = 3500;
 
-  console.log("comfValIsValid: " + comfValIsValid + " - ecoValIsValid: " + ecoValIsValid);
+  //console.log("comfValIsValid: " + comfValIsValid + " - ecoValIsValid: " + ecoValIsValid);
 
   switch (elmType) {
     case "COMFORT":
diff --git a/WebUI/www/config/easymodes/js/HmIP.js b/WebUI/www/config/easymodes/js/HmIP.js
index df8cc200..184439dd 100755
--- a/WebUI/www/config/easymodes/js/HmIP.js
+++ b/WebUI/www/config/easymodes/js/HmIP.js
@@ -16,7 +16,7 @@ HmIpTest = function(sTime) {
       result = parseInt(tmpVal),
       remainder = (tmpVal * 100) % 100; // Nachkommastellen
 
-    console.log("val: " + val + " - result: " + result + " - remainder: " + remainder);
+    //console.log("val: " + val + " - result: " + result + " - remainder: " + remainder);
 
   });
 };
diff --git a/WebUI/www/config/easymodes/js/ic_functions.js b/WebUI/www/config/easymodes/js/ic_functions.js
index b95d00a1..f508902a 100755
--- a/WebUI/www/config/easymodes/js/ic_functions.js
+++ b/WebUI/www/config/easymodes/js/ic_functions.js
@@ -1180,26 +1180,77 @@ WEATHER_change_thres = function(id)
 
 WEATHER_check_dir = function()
 {
+  var newSensor = "HM-WDS100-C6-O-2";
+  var sensorTypeDesc = jQuery("#weatherSensor").val();
+  var selectedWindDirection = jQuery("[name=\"subset_1_1\"]").prop("selectedIndex");
+
   var ein;
   var aus;
   //1 
-  
-  if (switch_dir) 
-  {  
-    //ein = document.createTextNode("Einschaltschwelle");
-    ein = document.createTextNode(translateKey("upperStormThreshold"));
-    //aus = document.createTextNode("Ausschaltschwelle");
-    aus = document.createTextNode(translateKey("lowerStormThreshold"));
+
+  if (sensorTypeDesc != newSensor) {
+    if (switch_dir) {
+      //ein = document.createTextNode("Einschaltschwelle");
+      ein = document.createTextNode(translateKey("upperStormThreshold"));
+      //aus = document.createTextNode("Ausschaltschwelle");
+      aus = document.createTextNode(translateKey("lowerStormThreshold"));
+    }
+    else {
+      //ein = document.createTextNode("Ausschaltschwelle");
+      ein = document.createTextNode(translateKey("lowerStormThreshold"));
+      //aus = document.createTextNode("Einschaltschwelle");
+      aus = document.createTextNode(translateKey("upperStormThreshold"));
+    }
+  } else {
+    // new Sensor
+    var ctON = jQuery("[name=\"SHORT_CT_ON\"]").prop("selectedIndex");
+    var ctOFF = jQuery("[name=\"SHORT_CT_OFF\"]").prop("selectedIndex");
+
+    if (switch_dir == 1) {
+      //ein = document.createTextNode("Einschaltschwelle");
+      ein = document.createTextNode(translateKey("upperStormThreshold"));
+      //aus = document.createTextNode("Ausschaltschwelle");
+      aus = document.createTextNode(translateKey("lowerStormThreshold"));
+      $('ein').replaceChild(ein, $('ein').firstChild);
+      $('aus').replaceChild(aus, $('aus').firstChild);
+      return;
+    }
+    else if (switch_dir == 0) {
+      //ein = document.createTextNode("Ausschaltschwelle");
+      ein = document.createTextNode(translateKey("lowerStormThreshold"));
+      //aus = document.createTextNode("Einschaltschwelle");
+      aus = document.createTextNode(translateKey("upperStormThreshold"));
+      $('ein').replaceChild(ein, $('ein').firstChild);
+      $('aus').replaceChild(aus, $('aus').firstChild);
+      return;
+    }
+
+    // X GE LO = 0
+    // X GE HI = 1
+    // X LT LO = 2
+    // X LT HI = 3
+    // Starker Wind EIN, schwacher Wind AUS / oder EIN nur bei starkem Wind, nicht aus (2. Profil)
+    if ((ctON == 2 && ctOFF == 1) || (ctON == 1 && ctOFF == 1)) {
+      //ein = document.createTextNode("Einschaltschwelle");
+      ein = document.createTextNode(translateKey("upperStormThreshold"));
+      //aus = document.createTextNode("Ausschaltschwelle");
+      aus = document.createTextNode(translateKey("lowerStormThreshold"));
+    }
+    // Starker Wind AUS, schwacher Wind EIN
+    if (ctON == 1 && ctOFF == 2) {
+      //ein = document.createTextNode("Ausschaltschwelle");
+      ein = document.createTextNode(translateKey("lowerStormThreshold"));
+      //aus = document.createTextNode("Einschaltschwelle");
+      aus = document.createTextNode(translateKey("upperStormThreshold"));
+    }
+
+
+
   }
-  else 
-  {
-    //ein = document.createTextNode("Ausschaltschwelle");
-    ein = document.createTextNode(translateKey("lowerStormThreshold"));
-    //aus = document.createTextNode("Einschaltschwelle");
-    aus = document.createTextNode(translateKey("upperStormThreshold"));
-  }  
-  $('ein').replaceChild(ein, $('ein').firstChild);
-  $('aus').replaceChild(aus, $('aus').firstChild);
+  try {
+    $('ein').replaceChild(ein, $('ein').firstChild);
+    $('aus').replaceChild(aus, $('aus').firstChild);
+  } catch (e) {}
 };
 
 WEATHER_check_expert = function()
diff --git a/WebUI/www/config/easymodes/ks550_ch_link.tcl b/WebUI/www/config/easymodes/ks550_ch_link.tcl
index 94af394e..6e3d31b1 100755
--- a/WebUI/www/config/easymodes/ks550_ch_link.tcl
+++ b/WebUI/www/config/easymodes/ks550_ch_link.tcl
@@ -1,11 +1,11 @@
 #!/bin/tclsh
 source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
 
-set PROFILES_MAP(0)	"Experte"
-#set PROFILES_MAP(1)	"Sturmschwelle"
-set PROFILES_MAP(1)	"\${weatherProfile1}"
+set PROFILES_MAP(0)  "Experte"
+#set PROFILES_MAP(1)  "Sturmschwelle"
+set PROFILES_MAP(1)  "\${weatherProfile1}"
 
-set PROFILE_0(UI_HINT)	0
+set PROFILE_0(UI_HINT)  0
 set PROFILE_0(UI_DESCRIPTION) "Expertenprofil"
 set PROFILE_0(UI_TEMPLATE) "Expertenprofil"
 
@@ -13,104 +13,104 @@ set range {1 2 5 12 15 25 29 39 50 62 75 89 103 118}
 set PROFILE_1(STORM_UPPER_THRESHOLD) $range
 set PROFILE_1(STORM_LOWER_THRESHOLD) $range
 set PROFILE_1(UI_DESCRIPTION) "<br>\${windInBeaufort}"
-set PROFILE_1(UI_TEMPLATE)	"Windst&auml;rke in Beaufort"
-set PROFILE_1(UI_HINT)	1
+set PROFILE_1(UI_TEMPLATE)  "Windst&auml;rke in Beaufort"
+set PROFILE_1(UI_HINT)  1
 
 set multilingual 1
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
-	global dev_descr_sender dev_descr_receiver sender_address
-	set ACTOR $dev_descr_receiver(TYPE) 
-	# Kanal aus der Senderaddresse entfernen, aus EDD00001234:1 wird EDD00001234
-	set sender_addr [string toupper [string range $sender_address 0 [expr [string first ":" $sender_address] -1] ]] 
-	catch {puts "<input type=\"hidden\" id=\"dev_descr_sender_tmp\" value=\"$dev_descr_sender(TYPE)-$sender_addr\">"}
-	catch {puts "<input type=\"hidden\" id=\"dev_descr_receiver_tmp\" value=\"$ACTOR\">"}
+  global dev_descr_sender dev_descr_receiver sender_address
+  set ACTOR $dev_descr_receiver(TYPE) 
+  # Kanal aus der Senderaddresse entfernen, aus EDD00001234:1 wird EDD00001234
+  set sender_addr [string toupper [string range $sender_address 0 [expr [string first ":" $sender_address] -1] ]] 
+  catch {puts "<input type=\"hidden\" id=\"dev_descr_sender_tmp\" value=\"$dev_descr_sender(TYPE)-$sender_addr\">"}
+  catch {puts "<input type=\"hidden\" id=\"dev_descr_receiver_tmp\" value=\"$ACTOR\">"}
 
-	# bei Verknuepfung Wetterstation - Kombisensor sinnlos	
-	if {$ACTOR != "WS_CS"} {
-		
-		upvar PROFILES_MAP  PROFILES_MAP
-		upvar HTML_PARAMS   HTML_PARAMS
-		upvar PROFILE_PNAME PROFILE_PNAME
-		upvar $pps          ps      
-		upvar $pps_descr    ps_descr
+  # bei Verknuepfung Wetterstation - Kombisensor sinnlos  
+  if {$ACTOR != "WS_CS"} {
+    
+    upvar PROFILES_MAP  PROFILES_MAP
+    upvar HTML_PARAMS   HTML_PARAMS
+    upvar PROFILE_PNAME PROFILE_PNAME
+    upvar $pps          ps      
+    upvar $pps_descr    ps_descr
 
-		
-		foreach pro [array names PROFILES_MAP] {
-			upvar PROFILE_$pro PROFILE_$pro
-		}
-		
-		set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+    
+    foreach pro [array names PROFILES_MAP] {
+      upvar PROFILE_$pro PROFILE_$pro
+    }
+    
+    set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
 
-		append HTML_PARAMS(separate_0) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_0]
-		
-		array_clear options
-		set options(1)		"\${windForce0}"
-		set options(2)		"\${windForce1}"
-		set options(5)		"\${windForce2}"
-		set options(12)		"\${windForce3}"
-		set options(25)		"\${windForce4}"
-		set options(29)		"\${windForce5}"
-		set options(39)		"\${windForce6}"
-		set options(50)		"\${windForce7}"
-		set options(62)		"\${windForce8}"
-		set options(75)		"\${windForce9}"
-		set options(89)		"\${windForce10}"
-		set options(103)	"\${windForce11}"
-		set options(118)	"\${windForce12}"
+    append HTML_PARAMS(separate_0) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_0]
+    
+    array_clear options
+    set options(1)    "\${windForce0}"
+    set options(2)    "\${windForce1}"
+    set options(5)    "\${windForce2}"
+    set options(12)    "\${windForce3}"
+    set options(25)    "\${windForce4}"
+    set options(29)    "\${windForce5}"
+    set options(39)    "\${windForce6}"
+    set options(50)    "\${windForce7}"
+    set options(62)    "\${windForce8}"
+    set options(75)    "\${windForce9}"
+    set options(89)    "\${windForce10}"
+    set options(103)  "\${windForce11}"
+    set options(118)  "\${windForce12}"
 
-		# obere Sturmschwelle
-		
-		append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\"><tr><td></td><td>"
-		append HTML_PARAMS(separate_1) $PROFILE_1(UI_DESCRIPTION)
-		append HTML_PARAMS(separate_1) "</td></tr><tr><td>"
-		#append HTML_PARAMS(separate_1) "<span id=\"ein\">Einschaltschwelle</span>"
-		append HTML_PARAMS(separate_1) "<span id=\"ein\">\${upperStormThreshold}</span>"
-		append HTML_PARAMS(separate_1) "</td><td>"
+    # obere Sturmschwelle
+    
+    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\"><tr><td></td><td>"
+    append HTML_PARAMS(separate_1) $PROFILE_1(UI_DESCRIPTION)
+    append HTML_PARAMS(separate_1) "</td></tr><tr><td>"
+    #append HTML_PARAMS(separate_1) "<span id=\"ein\">Einschaltschwelle</span>"
+    append HTML_PARAMS(separate_1) "<span id=\"ein\">\${upperStormThreshold}</span>"
+    append HTML_PARAMS(separate_1) "</td><td>"
 
-		if {$cur_profile == 1} then {
-			append HTML_PARAMS(separate_1) "<div id=\"title0\" title=\"Schaltbefehl bei &uuml;berschreiten der eingestellten Schaltschwelle\">"
-			append HTML_PARAMS(separate_1) [get_ComboBox options STORM_UPPER_THRESHOLD separate_${special_input_id}_1_1 ps        STORM_UPPER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_1',1);\""]
-			append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_1',0); </script></div>"
-		} else {
-			append HTML_PARAMS(separate_1) [get_ComboBox options STORM_UPPER_THRESHOLD separate_${special_input_id}_1_1 PROFILE_1 STORM_UPPER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_1',1);\""]
-			append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_1',0); </script>"
-		}
-		append HTML_PARAMS(separate_1)	"</td></tr><tr><td></td><td><span id=\"upper_desc\">&nbsp;</span><br><br>"
-		append HTML_PARAMS(separate_1) "</td></tr>"
-		append HTML_PARAMS(separate_1) "</table>"
-		
-		# untere Sturmschwelle
-		append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\" id=\"lower_tab\" style=\"display:block\">"
-		append HTML_PARAMS(separate_1) "<tr><td>"
-		#append HTML_PARAMS(separate_1) "<span id=\"aus\">Ausschaltschwelle</span>"
-		append HTML_PARAMS(separate_1) "<span id=\"aus\">\${lowerStormThreshold}</span>"
-		append HTML_PARAMS(separate_1)  
-		append HTML_PARAMS(separate_1) "</td><td>"
-		
-		if {$cur_profile == 1} then {
-			append HTML_PARAMS(separate_1) "<div id=\"title1\" title=\"Schaltbefehl bei unterschreiten der eingestellten Schaltschwelle\">"
-			append HTML_PARAMS(separate_1) [get_ComboBox options STORM_LOWER_THRESHOLD separate_${special_input_id}_1_2 ps        STORM_LOWER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_2',1);\""]
-			append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_2',0); </script></div>"
-		} else {
-			append HTML_PARAMS(separate_1) [get_ComboBox options STORM_LOWER_THRESHOLD separate_${special_input_id}_1_2 PROFILE_1 STORM_LOWER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_2',1);\""]
-			append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_2',0); </script>"
-		}
-		append HTML_PARAMS(separate_1)	"</td></tr><tr><td></td><td><span id=\"lower_desc\">&nbsp;</span>"
-		append HTML_PARAMS(separate_1) "</td></tr></table>"
-	} else {
-		puts "<script type=\"text/javascript\">document.getElementById('sender_profiles').style.visibility = \"hidden\"</script>"
-	}
+    if {$cur_profile == 1} then {
+      append HTML_PARAMS(separate_1) "<div id=\"title0\" title=\"Schaltbefehl bei &uuml;berschreiten der eingestellten Schaltschwelle\">"
+      append HTML_PARAMS(separate_1) [get_ComboBox options STORM_UPPER_THRESHOLD separate_${special_input_id}_1_1 ps        STORM_UPPER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_1',1);\""]
+      append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_1',0); </script></div>"
+    } else {
+      append HTML_PARAMS(separate_1) [get_ComboBox options STORM_UPPER_THRESHOLD separate_${special_input_id}_1_1 PROFILE_1 STORM_UPPER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_1',1);\""]
+      append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_1',0); </script>"
+    }
+    append HTML_PARAMS(separate_1)  "</td></tr><tr><td></td><td><span id=\"upper_desc\">&nbsp;</span><br><br>"
+    append HTML_PARAMS(separate_1) "</td></tr>"
+    append HTML_PARAMS(separate_1) "</table>"
+    
+    # untere Sturmschwelle
+    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\" id=\"lower_tab\" style=\"display:block\">"
+    append HTML_PARAMS(separate_1) "<tr><td>"
+    #append HTML_PARAMS(separate_1) "<span id=\"aus\">Ausschaltschwelle</span>"
+    append HTML_PARAMS(separate_1) "<span id=\"aus\">\${lowerStormThreshold}</span>"
+    append HTML_PARAMS(separate_1)  
+    append HTML_PARAMS(separate_1) "</td><td>"
+    
+    if {$cur_profile == 1} then {
+      append HTML_PARAMS(separate_1) "<div id=\"title1\" title=\"Schaltbefehl bei unterschreiten der eingestellten Schaltschwelle\">"
+      append HTML_PARAMS(separate_1) [get_ComboBox options STORM_LOWER_THRESHOLD separate_${special_input_id}_1_2 ps        STORM_LOWER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_2',1);\""]
+      append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_2',0); </script></div>"
+    } else {
+      append HTML_PARAMS(separate_1) [get_ComboBox options STORM_LOWER_THRESHOLD separate_${special_input_id}_1_2 PROFILE_1 STORM_LOWER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_2',1);\""]
+      append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_2',0); </script>"
+    }
+    append HTML_PARAMS(separate_1)  "</td></tr><tr><td></td><td><span id=\"lower_desc\">&nbsp;</span>"
+    append HTML_PARAMS(separate_1) "</td></tr></table>"
+  } else {
+    puts "<script type=\"text/javascript\">document.getElementById('sender_profiles').style.visibility = \"hidden\"</script>"
+  }
   
-    #	die Texte der Platzhalter einlesen
-	  puts "<script type=\"text/javascript\">"
-	  puts "jQuery.getScript('/config/easymodes/WEATHER/localization/lang.js', function() {"
-	  puts "translateAttribute(\"#title0\",\"title\",\"toolTip0\");"
-	  puts "translateAttribute(\"#title1\",\"title\",\"toolTip1\");"
-	  puts "translatePage('.easymode_wrapper');"
-	  puts "});</script>"
-		
+    #  die Texte der Platzhalter einlesen
+    puts "<script type=\"text/javascript\">"
+    puts "jQuery.getScript('/config/easymodes/WEATHER/localization/lang.js', function() {"
+    puts "translateAttribute(\"#title0\",\"title\",\"toolTip0\");"
+    puts "translateAttribute(\"#title1\",\"title\",\"toolTip1\");"
+    puts "translatePage('.easymode_wrapper');"
+    puts "});</script>"
+    
     #puts "<script type=\"text/javascript\">window.setTimeout(\"translatePage(\'#body_wrapper\')\",500);</script>"
 }
 
diff --git a/WebUI/www/config/easymodes/md_ch_master.tcl b/WebUI/www/config/easymodes/md_ch_master.tcl
index 4bd41ff7..fd80418c 100755
--- a/WebUI/www/config/easymodes/md_ch_master.tcl
+++ b/WebUI/www/config/easymodes/md_ch_master.tcl
@@ -10,116 +10,116 @@ set PROFILE_PNAME(D) "MOTION_DETECTOR|BRIGHTNESS_FILTER"
 set PROFILE_PNAME(E) "MOTION_DETECTOR|LED_ONTIME"
 set PROFILE_PNAME(F) "\${motionDetectorSendMotionWithinDetectionSpan}"
 
-set PROFILES_MAP(0)	"Experte"
-set PROFILES_MAP(1)	"TheOneAndOnlyEasyMode"
+set PROFILES_MAP(0)  "Experte"
+set PROFILES_MAP(1)  "TheOneAndOnlyEasyMode"
 
 
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
-	puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/ic_effects.js');</script>"
-	puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/MASTER_LANG/MOTION_DETECTOR.js');</script>"
-	
-	global iface_url 
-
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps
-   	upvar $pps_descr	ps_descr
-	
-	set url $iface_url($iface)
-	array set dev_descr [xmlrpc $url getParamset [list string $address] MASTER]
-	set capture_within_interval  $dev_descr(CAPTURE_WITHIN_INTERVAL)	
+  puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/ic_effects.js');</script>"
+  puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/MASTER_LANG/MOTION_DETECTOR.js');</script>"
+  
+  global iface_url 
+
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps
+     upvar $pps_descr  ps_descr
+  
+  set url $iface_url($iface)
+  array set dev_descr [xmlrpc $url getParamset [list string $address] MASTER]
+  set capture_within_interval  $dev_descr(CAPTURE_WITHIN_INTERVAL)  
 
   set help_txt "\${motionDetectorHelp}"
 
 ###
 
-	append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-	append HTML_PARAMS(separate_1) "<tr><td><span class=\"stringtable_value\">$PROFILE_PNAME(A)</span></td><td id=\"Hm\">\${mdTrigger}"
-	array_clear options
-	set options(1) "1"
-	set options(2) "2"
-	set options(3) "3"
-	set options(4) "4"
-	set options(5) "5"
-	set options(6) "6"
-	set options(7) "7"
-	set options(8) "8"
-	set options(9) "9"
-	set options(10) "10"
-	set options(11) "11"
-	set options(12) "12"
-	set options(13) "13"
-	set options(14) "14"
-	set options(15) "15"
-	append HTML_PARAMS(separate_1) [get_ComboBox options EVENT_FILTER_NUMBER separate_${special_input_id}_1 ps EVENT_FILTER_NUMBER "onchange=\"MD_init(\'separate_${special_input_id}_1\', 1, 15)\"" ] 
-	append HTML_PARAMS(separate_1) "<span class=\"event_filter_number\"> Sensor-Impulsen innerhalb <span>"
-	append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">MD_init(\'separate_${special_input_id}_1\', 1, 15)</script>"		
-
-	array_clear options
-	set options(0.5) "0.5"
-	set options(1.0) "1.0"
-	set options(1.5) "1.5"
-	set options(2.0) "2.0"
-	set options(2.5) "2.5"
-	set options(3.0) "3.0"
-	set options(3.5) "3.5"
-	set options(4.0) "4.0"
-	set options(4.5) "4.5"
-	set options(5.0) "5.0"
-	set options(5.5) "5.5"
-	set options(6.0) "6.0"
-	set options(6.5) "6.5"
-	set options(7.0) "7.0"
-	set options(7.5) "7.5"
-	append HTML_PARAMS(separate_1) [get_ComboBox options EVENT_FILTER_PERIOD separate_${special_input_id}_2 ps EVENT_FILTER_PERIOD] 
-	append HTML_PARAMS(separate_1) "<span class=\"event_filter_number\">&nbsp;Sekunden</span></td></tr>"
-	
-	append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">MD_proofClassic(\'separate_${special_input_id}_3\');</script>"
-
-	append HTML_PARAMS(separate_1) "<tr><td>\${motionDetectorOnAirIntervalMode}</td><td>"
-	append HTML_PARAMS(separate_1) "<select id=\"separate_${special_input_id}_3\" name=\"MD_sendmode\"onchange=\"MD_minInterval(\'separate_${special_input_id}_3\');\"><option>\${motionDetectorOnAirIntervalModeClassic}</option><option>\${motionDetectorOnAirIntervalModeDynamic}</option></select>"
-	append HTML_PARAMS(separate_1) "&nbsp<input id=\"md_help_button\" type=\"button\" value=\"Hilfe\" onclick=\"MD_channel_help();\">"
-	append HTML_PARAMS(separate_1) "</td></tr>"
-
-	append HTML_PARAMS(separate_1) "<tr><td><span id=\"min_interval\"class=\"stringtable_value\">$PROFILE_PNAME(C)</span></td><td>"
-	array_clear options
-	set options(0)  "15s"
-	set options(1)	"30s"
-	set options(2)	"60s"
-	set options(3)	"120s"
-	set options(4)	"240s"
-	append HTML_PARAMS(separate_1) [get_ComboBox options MIN_INTERVAL separate_${special_input_id}_4 ps        MIN_INTERVAL ]
-	append HTML_PARAMS(separate_1) "</td></tr>"
-	
-	append HTML_PARAMS(separate_1) "<tr><td colspan=\"2\"><span>$PROFILE_PNAME(F)</span>"
-	if {$capture_within_interval == 1} {
-		append HTML_PARAMS(separate_1) "<input type=\"checkbox\" id=\"separate\_${special_input_id}_5\" name=\"CAPTURE_WITHIN_INTERVAL\" checked=\"checked\"></td>"
-	} else {
-		append HTML_PARAMS(separate_1) "<input type=\"checkbox\" id=\"separate\_${special_input_id}_5\" name=\"CAPTURE_WITHIN_INTERVAL\"></td>"
-	}	
-
-	
-	append HTML_PARAMS(separate_1) "<tr><td><span class=\"stringtable_value\">$PROFILE_PNAME(D)</span></td><td>"
-	array_clear  options
-	set options(0) "1"
-	set options(1) "2"
-	set options(2) "3"
-	set options(3) "4"
-	set options(4) "5"
-	set options(5) "6"
-	set options(6) "7"
-	set options(7) "8"
-	append HTML_PARAMS(separate_1) [get_ComboBox options BRIGHTNESS_FILTER separate_${special_input_id}_6 ps BRIGHTNESS_FILTER "onchange=\"MD_init(\'separate_${special_input_id}_6\', 0, 7)\""]
-	append HTML_PARAMS(separate_1) " \${motionDetectorMinumumOfLastValuesA} <span class=\"brightness\">\${motionDetectorMinumumOfLastValuesB1} [expr $ps(BRIGHTNESS_FILTER) + 1] \${motionDetectorMinumumOfLastValuesC}</span> \${motionDetectorMinumumOfLastValuesD}</td></tr>"
-	append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">MD_init(\'separate_${special_input_id}_6\', 0, 7)</script>"	
-
-#	append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
-	append HTML_PARAMS(separate_1) "<tr><td><span class=\"stringtable_value\">$PROFILE_PNAME(E)</span></td><td>"
-	append HTML_PARAMS(separate_1) "<input type=\"text\" id=\"separate_${special_input_id}_7\" name=\"LED_ONTIME\" size=\"5\" value=\"[format %.2f $ps(LED_ONTIME)]\">"
-	append HTML_PARAMS(separate_1) " s (0 - 1.27)</td><td><p id=\"slider_1_7\" style=\"display:none\"></p></td></tr>"
+  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+  append HTML_PARAMS(separate_1) "<tr><td><span class=\"stringtable_value\">$PROFILE_PNAME(A)</span></td><td id=\"Hm\">\${mdTrigger}"
+  array_clear options
+  set options(1) "1"
+  set options(2) "2"
+  set options(3) "3"
+  set options(4) "4"
+  set options(5) "5"
+  set options(6) "6"
+  set options(7) "7"
+  set options(8) "8"
+  set options(9) "9"
+  set options(10) "10"
+  set options(11) "11"
+  set options(12) "12"
+  set options(13) "13"
+  set options(14) "14"
+  set options(15) "15"
+  append HTML_PARAMS(separate_1) [get_ComboBox options EVENT_FILTER_NUMBER separate_${special_input_id}_1 ps EVENT_FILTER_NUMBER "onchange=\"MD_init(\'separate_${special_input_id}_1\', 1, 15)\"" ] 
+  append HTML_PARAMS(separate_1) "<span class=\"event_filter_number\"> Sensor-Impulsen innerhalb <span>"
+  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">MD_init(\'separate_${special_input_id}_1\', 1, 15)</script>"    
+
+  array_clear options
+  set options(0.5) "0.5"
+  set options(1.0) "1.0"
+  set options(1.5) "1.5"
+  set options(2.0) "2.0"
+  set options(2.5) "2.5"
+  set options(3.0) "3.0"
+  set options(3.5) "3.5"
+  set options(4.0) "4.0"
+  set options(4.5) "4.5"
+  set options(5.0) "5.0"
+  set options(5.5) "5.5"
+  set options(6.0) "6.0"
+  set options(6.5) "6.5"
+  set options(7.0) "7.0"
+  set options(7.5) "7.5"
+  append HTML_PARAMS(separate_1) [get_ComboBox options EVENT_FILTER_PERIOD separate_${special_input_id}_2 ps EVENT_FILTER_PERIOD] 
+  append HTML_PARAMS(separate_1) "<span class=\"event_filter_number\">&nbsp;Sekunden</span></td></tr>"
+  
+  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">MD_proofClassic(\'separate_${special_input_id}_3\');</script>"
+
+  append HTML_PARAMS(separate_1) "<tr><td>\${motionDetectorOnAirIntervalMode}</td><td>"
+  append HTML_PARAMS(separate_1) "<select id=\"separate_${special_input_id}_3\" name=\"MD_sendmode\"onchange=\"MD_minInterval(\'separate_${special_input_id}_3\');\"><option>\${motionDetectorOnAirIntervalModeClassic}</option><option>\${motionDetectorOnAirIntervalModeDynamic}</option></select>"
+  append HTML_PARAMS(separate_1) "&nbsp<input id=\"md_help_button\" type=\"button\" value=\"Hilfe\" onclick=\"MD_channel_help();\">"
+  append HTML_PARAMS(separate_1) "</td></tr>"
+
+  append HTML_PARAMS(separate_1) "<tr><td><span id=\"min_interval\"class=\"stringtable_value\">$PROFILE_PNAME(C)</span></td><td>"
+  array_clear options
+  set options(0)  "15s"
+  set options(1)  "30s"
+  set options(2)  "60s"
+  set options(3)  "120s"
+  set options(4)  "240s"
+  append HTML_PARAMS(separate_1) [get_ComboBox options MIN_INTERVAL separate_${special_input_id}_4 ps        MIN_INTERVAL ]
+  append HTML_PARAMS(separate_1) "</td></tr>"
+  
+  append HTML_PARAMS(separate_1) "<tr><td colspan=\"2\"><span>$PROFILE_PNAME(F)</span>"
+  if {$capture_within_interval == 1} {
+    append HTML_PARAMS(separate_1) "<input type=\"checkbox\" id=\"separate\_${special_input_id}_5\" name=\"CAPTURE_WITHIN_INTERVAL\" checked=\"checked\"></td>"
+  } else {
+    append HTML_PARAMS(separate_1) "<input type=\"checkbox\" id=\"separate\_${special_input_id}_5\" name=\"CAPTURE_WITHIN_INTERVAL\"></td>"
+  }  
+
+  
+  append HTML_PARAMS(separate_1) "<tr><td><span class=\"stringtable_value\">$PROFILE_PNAME(D)</span></td><td>"
+  array_clear  options
+  set options(0) "1"
+  set options(1) "2"
+  set options(2) "3"
+  set options(3) "4"
+  set options(4) "5"
+  set options(5) "6"
+  set options(6) "7"
+  set options(7) "8"
+  append HTML_PARAMS(separate_1) [get_ComboBox options BRIGHTNESS_FILTER separate_${special_input_id}_6 ps BRIGHTNESS_FILTER "onchange=\"MD_init(\'separate_${special_input_id}_6\', 0, 7)\""]
+  append HTML_PARAMS(separate_1) " \${motionDetectorMinumumOfLastValuesA} <span class=\"brightness\">\${motionDetectorMinumumOfLastValuesB1} [expr $ps(BRIGHTNESS_FILTER) + 1] \${motionDetectorMinumumOfLastValuesC}</span> \${motionDetectorMinumumOfLastValuesD}</td></tr>"
+  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">MD_init(\'separate_${special_input_id}_6\', 0, 7)</script>"  
+
+#  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+  append HTML_PARAMS(separate_1) "<tr><td><span class=\"stringtable_value\">$PROFILE_PNAME(E)</span></td><td>"
+  append HTML_PARAMS(separate_1) "<input type=\"text\" id=\"separate_${special_input_id}_7\" name=\"LED_ONTIME\" size=\"5\" value=\"[format %.2f $ps(LED_ONTIME)]\">"
+  append HTML_PARAMS(separate_1) " s (0 - 1.27)</td><td><p id=\"slider_1_7\" style=\"display:none\"></p></td></tr>"
 
   set param TRANSMIT_TRY_MAX
   if {[catch {set tmp $ps($param)}] == 0} {
@@ -129,16 +129,16 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
     append HTML_PARAMS(separate_1) "</tr>"
   }
 
-	append HTML_PARAMS(separate_1) "</table>"
+  append HTML_PARAMS(separate_1) "</table>"
 
-	append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\" id=\"md_ch_help\" style=\"display:none\">"
-	append HTML_PARAMS(separate_1) "<tr><td id=\"helpText\">$help_txt</td></tr>"
-	append HTML_PARAMS(separate_1) "</table>"	
+  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\" id=\"md_ch_help\" style=\"display:none\">"
+  append HTML_PARAMS(separate_1) "<tr><td id=\"helpText\">$help_txt</td></tr>"
+  append HTML_PARAMS(separate_1) "</table>"  
 
-	append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
-	  append HTML_PARAMS(separate_1) "st_setStringTableValues();"
-	  append HTML_PARAMS(separate_1) "jQuery(\"#md_help_button\").val(translateKey(\"genericBtnTxtHelp\"));"
-	append HTML_PARAMS(separate_1) "</script>"
+  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
+    append HTML_PARAMS(separate_1) "st_setStringTableValues();"
+    append HTML_PARAMS(separate_1) "jQuery(\"#md_help_button\").val(translateKey(\"genericBtnTxtHelp\"));"
+  append HTML_PARAMS(separate_1) "</script>"
 }
 
 constructor
diff --git a/WebUI/www/config/easymodes/powermeter_iec_ch1_master.tcl b/WebUI/www/config/easymodes/powermeter_iec_ch1_master.tcl
new file mode 100755
index 00000000..4afbc4d7
--- /dev/null
+++ b/WebUI/www/config/easymodes/powermeter_iec_ch1_master.tcl
@@ -0,0 +1,217 @@
+#!/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+
+proc getDefaultValue {psDescr param} {
+  upvar psDescr descr
+  array_clear param_descr
+  array set param_descr $descr($param)
+  set default $param_descr(DEFAULT)
+  return "$default"
+}
+
+proc getUnit {psDescr param} {
+  upvar psDescr descr
+  array_clear param_descr
+  array set param_descr $descr($param)
+  set unit $param_descr(UNIT)
+  return "$unit"
+}
+
+proc getMinMaxValueDescr {psDescr param} {
+	upvar psDescr descr
+  array_clear param_descr
+	array set param_descr $descr($param)
+  set min $param_descr(MIN)
+  set max $param_descr(MAX)
+
+  # Limit float to 2 decimal places
+  if {[llength [split $min "."]] == 2} {
+    set min [format {%1.2f} $min]
+    set max [format {%1.2f} $max]
+  }
+  return "($min - $max)"
+}
+
+proc getTextField {psDescr type param value inputId} {
+  upvar psDescr descr
+  array_clear param_descr
+  array set param_descr $descr($param)
+
+  set elemId '$inputId'
+
+  set s "<input id=$elemId type=\"text\" size=\"5\" value=$value name=$param onblur=\"ProofAndSetValue($elemId, $elemId,$param_descr(MIN), $param_descr(MAX), parseFloat(1))\"/>"
+  return $s
+}
+
+proc getComboBox {param prn special_input_id} {
+	  global psDescr
+	  upvar ps ps
+	  set CHANNEL "CHANNEL"
+
+	  array_clear options
+    set options(0) "\${PowerMeterIGLSensorGAS}"
+    set options(1) "\${PowerMeterIGLSensorIR}"
+    set options(2) "\${PowerMeterIGLSensorLED}"
+    set options(3) "\${PowerMeterIECSensor}"
+    set options(4) "\${PowerMeterIGLSensorUnknown}"
+
+    append s "<td>"
+    append s "[get_ComboBox options $param separate_${special_input_id}_$prn ps $param]"
+    append s "</td>"
+    return $s
+}
+
+catch {unset internalKey}
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+
+	global env iface_url psDescr
+
+	#upvar PROFILES_MAP  PROFILES_MAP
+	upvar HTML_PARAMS   HTML_PARAMS
+	#upvar PROFILE_PNAME PROFILE_PNAME
+	upvar $pps          ps
+	upvar $pps_descr    ps_descr
+
+	puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/MASTER_LANG/HM_ES_TX_WM.js')</script>"
+  set chn [lindex [split $special_input_id _] 1]
+  set CHANNEL "CHANNEL"
+
+  set hlpBoxWidth 450
+  set hlpBoxHeight 160
+
+  array set psDescr [xmlrpc $iface_url($iface) getParamsetDescription [list string $address] [list string MASTER]]
+
+	append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+
+      set comment {
+        set prn 1
+        # This parameter will be removed
+        set param TX_MINDELAY
+        append HTML_PARAMS(separate_1) "<tr>"
+          append HTML_PARAMS(separate_1) "<td>\${stringTableTxMinDelay}</td>"
+          append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param $ps($param) separate_${special_input_id}_$prn]&nbsp;[getUnit psDescr $param]&nbsp;[getMinMaxValueDescr psDescr $param]</td>"
+        append HTML_PARAMS(separate_1) "</tr>"
+      }
+
+      set prn 1
+      set param TX_THRESHOLD_POWER
+
+      append HTML_PARAMS(separate_1) "<tr name='sensor_3' class='hidden'>"
+        append HTML_PARAMS(separate_1) "<td>\${stringTablePowerMeterTxThresholdPower}</td>"
+        append HTML_PARAMS(separate_1) "<td>"
+          if {$ps($param) != "0.00"} {
+            set thresholdVal [format %.2f $ps($param)]
+            set notUsed ""
+            set used "selected=\"selected\""
+          } else {
+            set thresholdVal "0.00"
+            set notUsed "selected=\"selected\""
+            set used ""
+          }
+          append HTML_PARAMS(separate_1) "<select onchange=\"var showThres = (this.selectedIndex < 1)?false:true;if(showThres) {jQuery(this).next().show();} else {jQuery(this).next().hide();} jQuery('#separate_CHANNEL_$chn\_$prn').val(this.options\[this.selectedIndex\].value);setDefaultThresholdPowerReceiver($ps($param), this.selectedIndex, $prn, [getDefaultValue psDescr $param]);\">"
+            append HTML_PARAMS(separate_1) "<option value=\"0\" $notUsed>\${stringTableNotUsed}</option>"
+            append HTML_PARAMS(separate_1) "<option value=\"$thresholdVal\" $used>\${optionEnterValue}</option>"
+          append HTML_PARAMS(separate_1) "</select>"
+          append HTML_PARAMS(separate_1) "<span id=\"spanPowerThreshold_$chn\">[getTextField psDescr $CHANNEL $param [format "%.2f" $ps($param)] separate_${special_input_id}_$prn]&nbsp;[getUnit psDescr $param]&nbsp;[getMinMaxValueDescr psDescr $param]</span>"
+        append HTML_PARAMS(separate_1) "</td>"
+      append HTML_PARAMS(separate_1) "</tr>"
+      if {$ps($param) == "0.00"} {
+        append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
+          append HTML_PARAMS(separate_1) jQuery(\"#spanPowerThreshold_$chn\").hide();
+        append HTML_PARAMS(separate_1) "</script>"
+      }
+
+      incr prn
+      set param METER_TYPE
+      append HTML_PARAMS(separate_1) "<tr>"
+      append HTML_PARAMS(separate_1)  "<td id=\"selectMeterType_$chn\">\${PowerMeterIGLMeterType}</td>"
+      append HTML_PARAMS(separate_1) [getComboBox $param $prn $special_input_id]
+      append HTML_PARAMS(separate_1) "</tr>"
+
+      incr prn
+      set param METER_CONSTANT_GAS
+      append HTML_PARAMS(separate_1) "<tr name='sensor_0' class='hidden'>"
+        append HTML_PARAMS(separate_1) "<td>\${PowerMeterIGLConstantGas}</td>"
+        append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param [format "%.3f" $ps($param)] separate_${special_input_id}_$prn]&nbsp;[getUnit psDescr $param]&nbsp;[getMinMaxValueDescr psDescr $param]</td>"
+      append HTML_PARAMS(separate_1) "</tr>"
+
+      incr prn
+      set param METER_CONSTANT_IR
+    	append HTML_PARAMS(separate_1) "<tr name='sensor_1' class='hidden'>"
+    	  append HTML_PARAMS(separate_1) "<td>\${PowerMeterIGLConstantIR}</td>"
+	      append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param $ps($param) separate_${special_input_id}_$prn]&nbsp;[getUnit psDescr $param]&nbsp;[getMinMaxValueDescr psDescr $param]</td>"
+	    append HTML_PARAMS(separate_1) "</tr>"
+
+      incr prn
+      set param METER_SENSIBILITY_IR
+    	append HTML_PARAMS(separate_1) "<tr name='sensor_1' class='hidden'>"
+    	  append HTML_PARAMS(separate_1) "<td>\${PowerMeterIGLSensibilityIR}</td>"
+	      append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param $ps($param) separate_${special_input_id}_$prn]&nbsp;[getUnit psDescr $param]&nbsp;[getMinMaxValueDescr psDescr $param]</td>"
+	    append HTML_PARAMS(separate_1) "</tr>"
+
+      incr prn
+      set param METER_CONSTANT_LED
+      append HTML_PARAMS(separate_1) "<tr name='sensor_2' class='hidden'>"
+        append HTML_PARAMS(separate_1) "<td>\${PowerMeterIGLConstantLed}</td>"
+        append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param $ps($param) separate_${special_input_id}_$prn]&nbsp;[getUnit psDescr $param]&nbsp;[getMinMaxValueDescr psDescr $param]</td>"
+      append HTML_PARAMS(separate_1) "</tr>"
+
+      incr prn
+      set param POWER_STRING
+      append HTML_PARAMS(separate_1) "<tr name='sensor_3' class='hidden'>"
+        append HTML_PARAMS(separate_1) "<td>\${PowerMeterPowerString}</td>"
+        append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param $ps($param) separate_${special_input_id}_$prn][getHelpIcon "POWER_STRING_CH1" $hlpBoxWidth [expr $hlpBoxHeight * 1.6]]</td>"
+      append HTML_PARAMS(separate_1) "</tr>"
+
+      incr prn
+      set param ENERGY_COUNTER_STRING
+      append HTML_PARAMS(separate_1) "<tr name='sensor_3' class='hidden'>"
+        append HTML_PARAMS(separate_1) "<td>\${PowerMeterEnergyCounterString}</td>"
+        append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param $ps($param) separate_${special_input_id}_$prn][getHelpIcon ENERGY_COUNTER_STRING_CH1 $hlpBoxWidth $hlpBoxHeight]</td>"
+      append HTML_PARAMS(separate_1) "</tr>"
+
+  append HTML_PARAMS(separate_1) "</table>"
+
+  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
+    append HTML_PARAMS(separate_1) "setDefaultThresholdPowerReceiver = function(curValue, selectedIndex, prn, defaultVal) \{"
+      append HTML_PARAMS(separate_1) "if ((selectedIndex == 1) && (curValue == \"0.00\")) \{"
+        append HTML_PARAMS(separate_1) "jQuery('#separate_${special_input_id}_' +prn).val(defaultVal);"
+      append HTML_PARAMS(separate_1) "\}"
+    append HTML_PARAMS(separate_1) "\};"
+
+    append HTML_PARAMS(separate_1) "function showParameter() \{"
+      append HTML_PARAMS(separate_1) "var meterType = jQuery(jQuery('#selectMeterType_$chn').next().children(0)).val();"
+
+      append HTML_PARAMS(separate_1) "jQuery('tr.hidden').hide();"
+      append HTML_PARAMS(separate_1) "jQuery(\"\[name='sensor_\" + meterType+ \"'\]\").show();"
+      append HTML_PARAMS(separate_1) "if (meterType < 3) \{"
+        append HTML_PARAMS(separate_1) "jQuery(\"#ch2ParamTbl\").hide();"
+      append HTML_PARAMS(separate_1) "\}"
+
+      append HTML_PARAMS(separate_1) "if (meterType == 3) \{"
+        append HTML_PARAMS(separate_1) "jQuery(\".j_IECSensor\").show(); "
+        append HTML_PARAMS(separate_1) "jQuery(\"#ch2ParamTbl\").show();"
+      append HTML_PARAMS(separate_1) "\}"
+
+      append HTML_PARAMS(separate_1) "if(meterType == 4) \{"
+        append HTML_PARAMS(separate_1) " jQuery('tr.hidden').show();"
+        append HTML_PARAMS(separate_1) "jQuery(\"#ch2ParamTbl\").show();"
+      append HTML_PARAMS(separate_1) "\}"
+    append HTML_PARAMS(separate_1) "\};"
+
+    append HTML_PARAMS(separate_1) "showParameter();"
+    append HTML_PARAMS(separate_1) "jQuery(jQuery('#selectMeterType_$chn').next().children(0)).bind('change',function() \{"
+
+      append HTML_PARAMS(separate_1) "var meterTypeCH2 = jQuery(jQuery('#selectMeterType_2').next().children(0));"
+      append HTML_PARAMS(separate_1) "jQuery(meterTypeCH2).val(jQuery(this).val());"
+      append HTML_PARAMS(separate_1) "showParameter();"
+
+    append HTML_PARAMS(separate_1) "\});"
+  append HTML_PARAMS(separate_1) "</script>"
+}
+
+constructor
+
+
diff --git a/WebUI/www/config/easymodes/powermeter_iec_ch2_master.tcl b/WebUI/www/config/easymodes/powermeter_iec_ch2_master.tcl
new file mode 100755
index 00000000..b7a2f85e
--- /dev/null
+++ b/WebUI/www/config/easymodes/powermeter_iec_ch2_master.tcl
@@ -0,0 +1,186 @@
+#!/bin/tclsh
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+
+proc getDefaultValue {psDescr param} {
+  upvar psDescr descr
+  array_clear param_descr
+  array set param_descr $descr($param)
+  set default $param_descr(DEFAULT)
+  return "$default"
+}
+
+proc getUnit {psDescr param} {
+  upvar psDescr descr
+  array_clear param_descr
+  array set param_descr $descr($param)
+  set unit $param_descr(UNIT)
+  return "$unit"
+}
+
+proc getMinMaxValueDescr {psDescr param} {
+	upvar psDescr descr
+  array_clear param_descr
+	array set param_descr $descr($param)
+  set min $param_descr(MIN)
+  set max $param_descr(MAX)
+
+  # Limit float to 2 decimal places
+  if {[llength [split $min "."]] == 2} {
+    set min [format {%1.2f} $min]
+    set max [format {%1.2f} $max]
+  }
+  return "($min - $max)"
+}
+
+proc getTextField {psDescr type param value inputId} {
+  upvar psDescr descr
+  array_clear param_descr
+  array set param_descr $descr($param)
+
+  set elemId '$inputId'
+
+  set s "<input id=$elemId type=\"text\" size=\"5\" value=$value name=$param onblur=\"ProofAndSetValue($elemId, $elemId,$param_descr(MIN), $param_descr(MAX), parseFloat(1))\"/>"
+  return $s
+}
+
+proc getComboBox {param prn special_input_id} {
+	  global psDescr
+	  upvar ps ps
+	  set CHANNEL "CHANNEL"
+
+	  array_clear options
+    set options(0) "\${PowerMeterIGLSensorGAS}"
+    set options(1) "\${PowerMeterIGLSensorIR}"
+    set options(2) "\${PowerMeterIGLSensorLED}"
+    set options(3) "\${PowerMeterIECSensor}"
+    set options(4) "\${PowerMeterIGLSensorUnknown}"
+
+    append s "<td>"
+    append s "[get_ComboBox options $param separate_${special_input_id}_$prn ps $param]"
+    append s "</td>"
+    return $s
+}
+
+catch {unset internalKey}
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+
+	global env iface_url psDescr
+
+	#upvar PROFILES_MAP  PROFILES_MAP
+	upvar HTML_PARAMS   HTML_PARAMS
+	#upvar PROFILE_PNAME PROFILE_PNAME
+	upvar $pps          ps
+	upvar $pps_descr    ps_descr
+
+	puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/MASTER_LANG/HM_ES_TX_WM.js')</script>"
+  set chn [lindex [split $special_input_id _] 1]
+  set CHANNEL "CHANNEL"
+
+  set hlpBoxWidth 450
+  set hlpBoxHeight 160
+
+  array set psDescr [xmlrpc $iface_url($iface) getParamsetDescription [list string $address] [list string MASTER]]
+
+  append HTML_PARAMS(separate_1) "<div id=\"ch2ParamTbl\" class=\"hidden\">"
+    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+
+      set comment {
+        # This parameter will be removed
+        set prn 1
+        set param TX_MINDELAY
+        append HTML_PARAMS(separate_1) "<tr>"
+          append HTML_PARAMS(separate_1) "<td>\${stringTableTxMinDelay}</td>"
+          append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param $ps($param) separate_${special_input_id}_$prn]&nbsp;[getUnit psDescr $param]&nbsp;[getMinMaxValueDescr psDescr $param]</td>"
+        append HTML_PARAMS(separate_1) "</tr>"
+      }
+
+      set prn 1
+      set param TX_THRESHOLD_POWER
+
+      append HTML_PARAMS(separate_1) "<tr'>"
+        append HTML_PARAMS(separate_1) "<td>\${stringTablePowerMeterTxThresholdPower}</td>"
+        append HTML_PARAMS(separate_1) "<td>"
+          if {$ps($param) != "0.00"} {
+            set thresholdVal [format %.2f $ps($param)]
+            set notUsed ""
+            set used "selected=\"selected\""
+          } else {
+            set thresholdVal "0.00"
+            set notUsed "selected=\"selected\""
+            set used ""
+          }
+          append HTML_PARAMS(separate_1) "<select onchange=\"var showThres = (this.selectedIndex < 1)?false:true;if(showThres) {jQuery(this).next().show();} else {jQuery(this).next().hide();} jQuery('#separate_CHANNEL_$chn\_$prn').val(this.options\[this.selectedIndex\].value);setDefaultThresholdPowerSender($ps($param), this.selectedIndex, $prn, [getDefaultValue psDescr $param]);\">"
+            append HTML_PARAMS(separate_1) "<option value=\"0\" $notUsed>\${stringTableNotUsed}</option>"
+            append HTML_PARAMS(separate_1) "<option value=\"$thresholdVal\" $used>\${optionEnterValue}</option>"
+          append HTML_PARAMS(separate_1) "</select>"
+          append HTML_PARAMS(separate_1) "<span id=\"spanPowerThreshold_$chn\">[getTextField psDescr $CHANNEL $param [format "%.2f" $ps($param)] separate_${special_input_id}_$prn]&nbsp;[getUnit psDescr $param]&nbsp;[getMinMaxValueDescr psDescr $param]</span>"
+        append HTML_PARAMS(separate_1) "</td>"
+      append HTML_PARAMS(separate_1) "</tr>"
+      if {$ps($param) == "0.00"} {
+        append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
+          append HTML_PARAMS(separate_1) jQuery(\"#spanPowerThreshold_$chn\").hide();
+        append HTML_PARAMS(separate_1) "</script>"
+      }
+
+      incr prn
+      set param METER_TYPE
+      append HTML_PARAMS(separate_1) "<tr>"
+      append HTML_PARAMS(separate_1)  "<td id=\"selectMeterType_$chn\">\${PowerMeterIGLMeterType}</td>"
+      append HTML_PARAMS(separate_1) [getComboBox $param $prn $special_input_id]
+      append HTML_PARAMS(separate_1) "</tr>"
+
+      incr prn
+      set param POWER_STRING
+      append HTML_PARAMS(separate_1) "<tr name='sensor_3' class='hidden'>"
+        append HTML_PARAMS(separate_1) "<td>\${PowerMeterPowerString}</td>"
+        append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param $ps($param) separate_${special_input_id}_$prn][getHelpIcon "POWER_STRING_CH2" $hlpBoxWidth [expr $hlpBoxHeight * 1.6]]</td>"
+      append HTML_PARAMS(separate_1) "</tr>"
+
+      incr prn
+      set param ENERGY_COUNTER_STRING
+      append HTML_PARAMS(separate_1) "<tr name='sensor_3' class='hidden'>"
+        append HTML_PARAMS(separate_1) "<td>\${PowerMeterEnergyCounterString}</td>"
+        append HTML_PARAMS(separate_1) "<td>[getTextField psDescr $CHANNEL $param $ps($param) separate_${special_input_id}_$prn][getHelpIcon "ENERGY_COUNTER_STRING_CH2" $hlpBoxWidth $hlpBoxHeight]</td>"
+      append HTML_PARAMS(separate_1) "</tr>"
+    append HTML_PARAMS(separate_1) "</table>"
+  append HTML_PARAMS(separate_1) "</div>"
+
+  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
+    append HTML_PARAMS(separate_1) "setDefaultThresholdPowerSender = function(curValue, selectedIndex, prn, defaultVal) \{"
+      append HTML_PARAMS(separate_1) "if ((selectedIndex == 1) && (curValue == \"0.00\")) \{"
+        append HTML_PARAMS(separate_1) "jQuery('#separate_${special_input_id}_' +prn).val(defaultVal);"
+      append HTML_PARAMS(separate_1) "\}"
+    append HTML_PARAMS(separate_1) "\};"
+
+    append HTML_PARAMS(separate_1) "function showParameter() \{"
+      append HTML_PARAMS(separate_1) "var meterType = jQuery(jQuery('#selectMeterType_$chn').next().children(0)).val();"
+
+      append HTML_PARAMS(separate_1) "jQuery('tr.hidden').hide();"
+      append HTML_PARAMS(separate_1) "jQuery(\"\[name='sensor_\" + meterType+ \"'\]\").show();"
+      append HTML_PARAMS(separate_1) "if (meterType == 3) \{"
+        append HTML_PARAMS(separate_1) "jQuery(\".j_IECSensor\").show(); "
+        append HTML_PARAMS(separate_1) "jQuery(\"#paramTbl\").show(); "
+      append HTML_PARAMS(separate_1) "\}"
+
+      append HTML_PARAMS(separate_1) "if(meterType == 4) \{"
+        append HTML_PARAMS(separate_1) " jQuery('tr.hidden').show();"
+        # TODO check if channel 2 should be visible when an unknown sensor is attached
+        # append HTML_PARAMS(separate_1) "jQuery(\"#ch2ParamTbl\").show(); "
+      append HTML_PARAMS(separate_1) "\}"
+    append HTML_PARAMS(separate_1) "\};"
+    append HTML_PARAMS(separate_1) "showParameter();"
+    append HTML_PARAMS(separate_1) "jQuery(jQuery('#selectMeterType_$chn').next().children(0)).bind('change',function() \{"
+
+      append HTML_PARAMS(separate_1) "var meterTypeCH1 = jQuery(jQuery('#selectMeterType_1').next().children(0));"
+      append HTML_PARAMS(separate_1) "jQuery(meterTypeCH1).val(jQuery(this).val()).change();"
+      append HTML_PARAMS(separate_1) "showParameter();"
+
+    append HTML_PARAMS(separate_1) "\});"
+  append HTML_PARAMS(separate_1) "</script>"
+}
+
+constructor
+
+
diff --git a/WebUI/www/config/easymodes/powermeter_iec_dev_master.tcl b/WebUI/www/config/easymodes/powermeter_iec_dev_master.tcl
new file mode 100755
index 00000000..53e2f631
--- /dev/null
+++ b/WebUI/www/config/easymodes/powermeter_iec_dev_master.tcl
@@ -0,0 +1,159 @@
+#!/bin/tclsh
+#Kanal-EasyMode!
+source [file join /www/config/easymodes/em_common.tcl]
+
+set PROFILES_MAP(0)  "Experte"
+set PROFILES_MAP(1)  "TheOneAndOnlyEasyMode"
+
+proc getHelpIcon {topic x y} {
+  set ret "<img src=\"/ise/img/help.png\" style=\"cursor: pointer; width:18px; height:18px; position:relative; top:2px\" onclick=\"showParamHelp('$topic', '$x', '$y')\">"
+  return $ret
+}
+
+proc getCheckBox {param value prn} {
+  set checked ""
+  if { $value } then { set checked "checked=\"checked\"" }
+  set s "<input id='separate_DEVICE_$prn' type='checkbox' $checked value='dummy' name=$param/>"
+  return $s
+}
+
+proc getComboBox {arOptions prn param val} {
+  upvar $arOptions options
+
+  set s "<select id=\"separate_DEVICE\_$prn\" name=$param>"
+  foreach value [lsort -real [array names options]] {
+    set selected ""
+    if {$value == $val} {set selected "selected=\"selected\""}
+    append s "<option value=$value $selected>$options($value)</option>"
+  }
+  append s "</select>"
+  return $s
+}
+
+proc getMinMaxValueDescr {param} {
+  global psDescr
+  upvar psDescr descr
+  array_clear param_descr
+  array set param_descr $descr($param)
+  set min $param_descr(MIN)
+  set max $param_descr(MAX)
+
+  # Limit float to 2 decimal places
+  if {[llength [split $min "."]] == 2} {
+    set min [format {%1.2f} $min]
+    set max [format {%1.2f} $max]
+  }
+  return "($min - $max)"
+}
+
+proc getTextField {prn param val} {
+  global psDescr
+  upvar psDescr descr
+  array_clear param_descr
+  array set param_descr $descr($param)
+  set minValue [format {%1.1f} $param_descr(MIN)]
+  set maxValue [format {%1.1f} $param_descr(MAX)]
+
+  set elemId 'separate_DEVICE\_$prn'
+  # Limit float to 2 decimal places
+  if {[llength [split $val "."]] == 2} {
+    set val [format {%1.2f} $val]
+  }
+
+  set s "<input id=$elemId type=\"text\" size=\"5\" value=$val name=$param onblur=\"ProofAndSetValue(this.id, this.id, $minValue, $maxValue, 1)\">"
+  return $s
+}
+
+puts "<script type=\"text/javascript\">"
+  puts "showParamHelp = function(topic, x , y) {"
+    puts "var width = (! isNaN(x)) ? x : 450;"
+    puts "var height = (! isNaN(y)) ? y : 260;"
+    puts "MessageBox.show(translateKey(\"HelpTitle\"), translateKey(topic) ,\"\" ,width , height);"
+  puts "}"
+puts "</script>"
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+  global iface_url psDescr
+
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps
+
+  set hlpBoxWidth 450
+  set hlpBoxHeight 160
+
+  puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/MASTER_LANG/HM_ES_TX_WM.js');load_JSFunc('/config/easymodes/MASTER_LANG/HM_ES_TX_WM_HELP.js')</script>"
+
+  array set psDescr [xmlrpc $iface_url($iface) getParamsetDescription [list string $address] [list string MASTER]]
+
+  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\">"
+  set prn 1
+  set param LOCAL_RESET_DISABLE
+  append HTML_PARAMS(separate_1) "<tr>"
+    append HTML_PARAMS(separate_1) "<td>\${stringTableLocalResetDisable}</td>"
+    append HTML_PARAMS(separate_1) "<td>"
+     append HTML_PARAMS(separate_1) "[getCheckBox '$param' $ps($param) $prn]"
+    append HTML_PARAMS(separate_1) "</td>"
+  append HTML_PARAMS(separate_1) "</tr>"
+
+  incr prn
+  set param BAUDRATE
+  append HTML_PARAMS(separate_1) "<tr class=\"j_IECSensor hidden\">"
+    array_clear options
+    set options(0) "\${optionBaud300}"
+    set options(1) "\${optionBaud600}"
+    set options(2) "\${optionBaud1200}"
+    set options(3) "\${optionBaud2400}"
+    set options(4) "\${optionBaud4800}"
+    set options(5) "\${optionBaud9600}"
+    set options(6) "\${optionBaud19200}"
+    append HTML_PARAMS(separate_1) "<td>\${PowerMeterBaudRate}</td>"
+    append HTML_PARAMS(separate_1) "<td>[getComboBox options $prn '$param' $ps($param)]</td>"
+  append HTML_PARAMS(separate_1) "</tr>"
+
+  incr prn
+  set param SERIAL_FORMAT
+  append HTML_PARAMS(separate_1) "<tr class=\"j_IECSensor hidden\">"
+    array_clear options
+    set options(0) "\${PowerMeterSerialFormatOption0}"
+    set options(1) "\${PowerMeterSerialFormatOption1}"
+    set options(2) "\${PowerMeterSerialFormatOption2}"
+    set options(3) "\${PowerMeterSerialFormatOption3}"
+    append HTML_PARAMS(separate_1) "<td>\${PowerMeterSerialFormat}</td>"
+    append HTML_PARAMS(separate_1) "<td>[getComboBox options $prn '$param' $ps($param)][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
+  append HTML_PARAMS(separate_1) "</tr>"
+
+  incr prn
+  set param METER_POWERMODE
+  append HTML_PARAMS(separate_1) "<tr class=\"j_IECSensor hidden\">"
+    array_clear options
+    set options(0) "\${PowerMeterPowerModeOptionMains}"
+    set options(1) "\${PowerMeterPowerModeOptionBattery}"
+    append HTML_PARAMS(separate_1) "<td>\${PowerMeterPowerMode}</td>"
+    append HTML_PARAMS(separate_1) "<td>[getComboBox options $prn '$param' $ps($param)]</td>"
+  append HTML_PARAMS(separate_1) "</tr>"
+
+  incr prn
+  set param METER_PROTOCOLMODE
+  append HTML_PARAMS(separate_1) "<tr class=\"j_IECSensor hidden\">"
+    array_clear options
+    set options(0) "\${PowerMeterProtocolModeModeOptionA}"
+    set options(1) "\${PowerMeterProtocolModeModeOptionB}"
+    set options(2) "\${PowerMeterProtocolModeModeOptionC}"
+    set options(3) "\${PowerMeterProtocolModeModeOptionD}"
+    append HTML_PARAMS(separate_1) "<td>\${PowerMeterProtocolMode}</td>"
+    append HTML_PARAMS(separate_1) "<td>[getComboBox options $prn '$param' $ps($param)]</td>"
+  append HTML_PARAMS(separate_1) "</tr>"
+
+  incr prn
+  set param SAMPLES_PER_CYCLE
+  append HTML_PARAMS(separate_1) "<tr class=\"j_IECSensor hidden\">"
+    append HTML_PARAMS(separate_1) "<td>\${PowerMeterSamplesPerCycle}</td>"
+    append HTML_PARAMS(separate_1) "<td>[getTextField $prn $param $ps($param)]&nbsp;[getMinMaxValueDescr $param][getHelpIcon $param $hlpBoxWidth $hlpBoxHeight]</td>"
+  append HTML_PARAMS(separate_1) "</tr>"
+
+  append HTML_PARAMS(separate_1) "</table>"
+
+}
+constructor
diff --git a/WebUI/www/config/easymodes/sensor_ch_master.tcl b/WebUI/www/config/easymodes/sensor_ch_master.tcl
index c355c912..001a8904 100755
--- a/WebUI/www/config/easymodes/sensor_ch_master.tcl
+++ b/WebUI/www/config/easymodes/sensor_ch_master.tcl
@@ -6,37 +6,37 @@ source [file join $env(DOCUMENT_ROOT) config/easymodes/EnterFreeValue.tcl]
 # set PROFILE_PNAME(Lichthupe) "Wie oft soll die Lichthupe zum Ausl&ouml;sen des Aktors bet&auml;tigt werden? "
 set PROFILE_PNAME(Lichthupe) "\${triggerNecessary}"
 
-set PROFILES_MAP(0)	"Experte"
-set PROFILES_MAP(1)	"TheOneAndOnlyEasyMode"
+set PROFILES_MAP(0)  "Experte"
+set PROFILES_MAP(1)  "TheOneAndOnlyEasyMode"
 
 proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
 
-	puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/SenEP.js');</script>"
-	
-	upvar PROFILES_MAP  PROFILES_MAP
-	upvar HTML_PARAMS   HTML_PARAMS
-	upvar PROFILE_PNAME PROFILE_PNAME
-	upvar $pps          ps
-   	upvar $pps_descr	ps_descr
+  puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/js/SenEP.js');</script>"
+  
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps
+     upvar $pps_descr  ps_descr
    
-   	array set arr_pulse ""
+     array set arr_pulse ""
 
   puts "<script type=\"text/javascript\">getLangInfo_Special('PULSE_SENSOR.txt');</script>"
-	
-	append HTML_PARAMS(separate_1) "<div id=\"param_1\"><textarea id=\"profile_1\" style=\"display:non_\">"
-	append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\"><tr><td>"
-	append HTML_PARAMS(separate_1) $PROFILE_PNAME(Lichthupe)
-	append HTML_PARAMS(separate_1) "</td><td>"
+  
+  append HTML_PARAMS(separate_1) "<div id=\"param_1\"><textarea id=\"profile_1\" style=\"display:non_\">"
+  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\"><tr><td>"
+  append HTML_PARAMS(separate_1) $PROFILE_PNAME(Lichthupe)
+  append HTML_PARAMS(separate_1) "</td><td>"
 
-	array_clear options
+  array_clear options
 
-	set comment {
+  set comment {
     set options(99999992) "nicht aktiv "
     set options(99999993) "einmal"
     set options(99999994) "zweimal"
     set options(99999995) "dreimal"
     set options(99999996) "Experte"
-	}
+  }
 
   set options(99999992) "\${notActive}"
   set options(99999993) "\${one}"
@@ -44,22 +44,22 @@ proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
   set options(99999995) "\${three}"
   set options(99999996) "\${expert}"
 
-	append HTML_PARAMS(separate_1) [get_Pulse options separate_${special_input_id}_1 ps SEQUENCE_PULSE_5 $address arr_pulse "onchange=\"SenEP_activateEnterPulse('$special_input_id');\""]
-	
-	for {set loop 1} {$loop <= 6} {incr loop} {
-		set pulse_values [lappend pulse_values $arr_pulse($loop)] 
-		
-	}
-	
-	append HTML_PARAMS(separate_1) "<script type=\"text/javascript\"> 
-									SenEP_activateEnterPulse('$special_input_id');
-									SenEP_setPulseActorValue('$special_input_id', '$pulse_values'); 
-									</script>"
+  append HTML_PARAMS(separate_1) [get_Pulse options separate_${special_input_id}_1 ps SEQUENCE_PULSE_5 $address arr_pulse "onchange=\"SenEP_activateEnterPulse('$special_input_id');\""]
+  
+  for {set loop 1} {$loop <= 6} {incr loop} {
+    set pulse_values [lappend pulse_values $arr_pulse($loop)] 
+    
+  }
+  
+  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\"> 
+    SenEP_activateEnterPulse('$special_input_id');
+    SenEP_setPulseActorValue('$special_input_id', '$pulse_values');
+  </script>"
 
-	append HTML_PARAMS(separate_1) "</td></tr></table></textarea></div>"
-	
+  append HTML_PARAMS(separate_1) "</td></tr></table></textarea></div>"
+  
 
-	EnterPulse ${special_input_id} ps_descr $pulse_values
+  EnterPulse ${special_input_id} ps_descr $pulse_values
 
   puts "<script type=\"text/javascript\">translate(\"1\", \"$special_input_id\");</script>"
 
diff --git a/WebUI/www/config/easymodes/switch_ch_link.tcl b/WebUI/www/config/easymodes/switch_ch_link.tcl
index 642fa22b..7fdec39d 100755
--- a/WebUI/www/config/easymodes/switch_ch_link.tcl
+++ b/WebUI/www/config/easymodes/switch_ch_link.tcl
@@ -11,16 +11,16 @@ catch {puts "<input type=\"hidden\" id=\"dev_descr_sender_tmp\" value=\"$dev_des
 catch {puts "<input type=\"hidden\" id=\"dev_descr_receiver_tmp\" value=\"$ACTOR\">"} 
 
 if {[catch {set x $dev_descr_sender(TYPE)}] == 0} {
-	
-	if {[catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/$ACTOR/$x.tcl]}] != 0} {
-		catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/NO_PROFILE.tcl]}
-	}
+  
+  if {[catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/$ACTOR/$x.tcl]}] != 0} {
+    catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/NO_PROFILE.tcl]}
+  }
 
 } else {
-	
-	if {[catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/$ACTOR/$dev_descr_sender_tmp.tcl]}] != 0} {
-		catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/NO_PROFILE.tcl]}
-	}
+  
+  if {[catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/$ACTOR/$dev_descr_sender_tmp.tcl]}] != 0} {
+    catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/NO_PROFILE.tcl]}
+  }
 }
 
 
diff --git a/WebUI/www/config/easymodes/switch_panic_ch_link.tcl b/WebUI/www/config/easymodes/switch_panic_ch_link.tcl
new file mode 100755
index 00000000..642fa22b
--- /dev/null
+++ b/WebUI/www/config/easymodes/switch_panic_ch_link.tcl
@@ -0,0 +1,26 @@
+#!/bin/tclsh
+
+# dev_descr_sender(TYPE) enthaelt den Sendertype (KEY, WATERDETECTIONSENSOR usw.)
+
+global dev_descr_receiver dev_descr_sender 
+
+set multilingual 1
+set ACTOR $dev_descr_receiver(TYPE) 
+
+catch {puts "<input type=\"hidden\" id=\"dev_descr_sender_tmp\" value=\"$dev_descr_sender(TYPE)-$dev_descr_sender(PARENT)\">"} 
+catch {puts "<input type=\"hidden\" id=\"dev_descr_receiver_tmp\" value=\"$ACTOR\">"} 
+
+if {[catch {set x $dev_descr_sender(TYPE)}] == 0} {
+	
+	if {[catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/$ACTOR/$x.tcl]}] != 0} {
+		catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/NO_PROFILE.tcl]}
+	}
+
+} else {
+	
+	if {[catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/$ACTOR/$dev_descr_sender_tmp.tcl]}] != 0} {
+		catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/NO_PROFILE.tcl]}
+	}
+}
+
+
diff --git a/WebUI/www/config/easymodes/switch_sensor_ch_link.tcl b/WebUI/www/config/easymodes/switch_sensor_ch_link.tcl
new file mode 100755
index 00000000..642fa22b
--- /dev/null
+++ b/WebUI/www/config/easymodes/switch_sensor_ch_link.tcl
@@ -0,0 +1,26 @@
+#!/bin/tclsh
+
+# dev_descr_sender(TYPE) enthaelt den Sendertype (KEY, WATERDETECTIONSENSOR usw.)
+
+global dev_descr_receiver dev_descr_sender 
+
+set multilingual 1
+set ACTOR $dev_descr_receiver(TYPE) 
+
+catch {puts "<input type=\"hidden\" id=\"dev_descr_sender_tmp\" value=\"$dev_descr_sender(TYPE)-$dev_descr_sender(PARENT)\">"} 
+catch {puts "<input type=\"hidden\" id=\"dev_descr_receiver_tmp\" value=\"$ACTOR\">"} 
+
+if {[catch {set x $dev_descr_sender(TYPE)}] == 0} {
+	
+	if {[catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/$ACTOR/$x.tcl]}] != 0} {
+		catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/NO_PROFILE.tcl]}
+	}
+
+} else {
+	
+	if {[catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/$ACTOR/$dev_descr_sender_tmp.tcl]}] != 0} {
+		catch {source [file join $env(DOCUMENT_ROOT) config/easymodes/NO_PROFILE.tcl]}
+	}
+}
+
+
diff --git a/WebUI/www/config/easymodes/switch_senspan_ch_master.tcl b/WebUI/www/config/easymodes/switch_senspan_ch_master.tcl
new file mode 100755
index 00000000..eb80e884
--- /dev/null
+++ b/WebUI/www/config/easymodes/switch_senspan_ch_master.tcl
@@ -0,0 +1,172 @@
+#!/bin/tclsh
+
+#Kanal-EasyMode!
+
+source [file join $env(DOCUMENT_ROOT) config/easymodes/etc/uiElements.tcl]
+source [file join /www/config/easymodes/em_common.tcl]
+
+proc getComboBox {arOptions chn prn attrID} {
+  upvar $arOptions options
+
+  set s "<select id=$attrID onchange=\"calculateSoundID($chn);\">"
+  foreach value [lsort -real [array names options]] {
+    append s "<option value=$value>$options($value)</option>"
+  }
+  append s "</select>"
+  return $s
+}
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+
+  global env iface_url psDescr
+
+  upvar PROFILES_MAP  PROFILES_MAP
+  upvar HTML_PARAMS   HTML_PARAMS
+  upvar PROFILE_PNAME PROFILE_PNAME
+  upvar $pps          ps
+  upvar $pps_descr    psDescr
+
+  upvar PROFILE_1     PROFILE_1
+  set chn [lindex [split $special_input_id _] 1]
+
+	puts "<script type=\"text/javascript\">load_JSFunc('/config/easymodes/MASTER_LANG/HM_SEC_SIR_WM.js');</script>"
+
+
+  # Available parameters
+  #TRANSMIT_TRY_MAX
+  #STATUSINFO_MINDELAY
+  #STATUSINFO_RANDOM
+  #SOUND_ID
+
+
+  append HTML_PARAMS(separate_1) "<table id=\"table\_$chn\" class=\"ProfileTbl\">"
+
+    set prn 1
+    set param TRANSMIT_TRY_MAX
+    append HTML_PARAMS(separate_1) "<tr>"
+      append HTML_PARAMS(separate_1) "<td>\${stringTableTransmitTryMax}</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+    append HTML_PARAMS(separate_1) "</tr>"
+
+    incr prn
+    set param STATUSINFO_MINDELAY
+    append HTML_PARAMS(separate_1) "<tr>"
+      append HTML_PARAMS(separate_1) "<td>\${stringTableStatusInfoMinDelay}</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+    append HTML_PARAMS(separate_1) "</tr>"
+
+    incr prn
+    set param STATUSINFO_RANDOM
+    append HTML_PARAMS(separate_1) "<tr>"
+      append HTML_PARAMS(separate_1) "<td>\${stringTableStatusInfoRandom}</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+    append HTML_PARAMS(separate_1) "</tr>"
+
+    incr prn
+    set param SOUND_ID
+    append HTML_PARAMS(separate_1) "<tr class=\"hidden\">"
+      append HTML_PARAMS(separate_1) "<td>\${stringTableSoundID}</td>"
+      append HTML_PARAMS(separate_1)  "<td>[getTextField $param $ps($param) $chn $prn]&nbsp;[getMinMaxValueDescr $param]</td>"
+    append HTML_PARAMS(separate_1) "</tr>"
+
+    append HTML_PARAMS(separate_1) "<tr>"
+      array_clear options
+      for {set i 1} {$i <= 9} {incr i} {
+        set options($i) "\${signal} $i"
+      }
+      append HTML_PARAMS(separate_1) "<td>\${soundID}</td>"
+      append HTML_PARAMS(separate_1) "<td>[getComboBox options $chn $prn 'sound\_$chn']&nbsp<input id=\"btnHelp\_$chn\" type=\"button\" onclick=\"showHelp($chn);\"></td>"
+    append HTML_PARAMS(separate_1) "</tr>"
+
+    append HTML_PARAMS(separate_1) "<tr>"
+      array_clear options
+      set options(0) "\${stringTableSignalToneLow}"
+      set options(1) "\${stringTableSignalToneMid}"
+      set options(2) "\${stringTableSignalToneHigh}"
+      set options(3) "\${stringTableSignalToneVeryHigh}"
+
+      append HTML_PARAMS(separate_1) "<td>\${pitch}</td>"
+      append HTML_PARAMS(separate_1) "<td>[getComboBox options $chn $prn 'pitch\_$chn']</td>"
+    append HTML_PARAMS(separate_1) "</tr>"
+
+    append HTML_PARAMS(separate_1) "<tr>"
+      array_clear options
+      set options(0) "\${speedSlow}"
+      set options(1) "\${speedFast}"
+      append HTML_PARAMS(separate_1) "<td>\${speed}</td>"
+      append HTML_PARAMS(separate_1) "<td>[getComboBox options $chn $prn 'speed\_$chn']</td>"
+    append HTML_PARAMS(separate_1) "</tr>"
+  append HTML_PARAMS(separate_1) "</table>"
+
+  append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl hidden j_help\" id=\"alarmHelp\_$chn\">"
+  append HTML_PARAMS(separate_1) "<tr><td><img src='/ise/img/lang/de/hm-sen-sir-wm_800.png'></td></tr>"
+  append HTML_PARAMS(separate_1) "</table>"
+
+  append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
+
+    append HTML_PARAMS(separate_1) "jQuery(\"#alarmHelp\_$chn img\").attr(\"src\",\"/ise/img/lang/\"+getLang()+\"/hm-sen-sir-wm_800.png\");"
+
+    append HTML_PARAMS(separate_1) "showHelp = function(chn) {"
+      append HTML_PARAMS(separate_1) "var tmpCounter = 0;"
+      # $chn is a tcl value and contains the number of channels
+      append HTML_PARAMS(separate_1) "var numberOfChannels = $chn;"
+      append HTML_PARAMS(separate_1) "var contentElm = jQuery(\"#content\");"
+      append HTML_PARAMS(separate_1) "var tableElm = jQuery(\"#table_\"+chn);"
+      append HTML_PARAMS(separate_1) "var tableAlarmElm = jQuery(\"#alarmHelp_\"+chn);"
+
+      append HTML_PARAMS(separate_1) "if (tableAlarmElm.is( \":visible\" )) {"
+          append HTML_PARAMS(separate_1) "contentElm.animate({scrollTop: (parseInt(chn) * parseInt(tableElm.height()))},1000, function() {"
+          append HTML_PARAMS(separate_1)  "tableAlarmElm.fadeOut();"
+        append HTML_PARAMS(separate_1) "});"
+      append HTML_PARAMS(separate_1) "} else {"
+
+       append HTML_PARAMS(separate_1) "jQuery(\".j_help\").fadeOut(400, function() \{"
+        append HTML_PARAMS(separate_1) "tmpCounter++;"
+        append HTML_PARAMS(separate_1) "if (tmpCounter == numberOfChannels) \{"
+          append HTML_PARAMS(separate_1) "tableAlarmElm.fadeIn();"
+          append HTML_PARAMS(separate_1) "contentElm.animate({scrollTop: ((parseInt(chn)) * parseInt(tableElm.height())) + parseInt(tableAlarmElm.height())},1000);"
+        append HTML_PARAMS(separate_1) "\}"
+       append HTML_PARAMS(separate_1) "\});"
+
+      append HTML_PARAMS(separate_1) "}"
+    append HTML_PARAMS(separate_1) "};"
+
+    append HTML_PARAMS(separate_1) "calculateSoundID = function(ch) {"
+      append HTML_PARAMS(separate_1) "var soundIDElm = jQuery(\"\[name='SOUND_ID'\]\")\[parseInt(ch) - 1\];"
+      append HTML_PARAMS(separate_1) "var selectedSound = parseInt(jQuery(\"#sound_\" + ch).val());"
+      append HTML_PARAMS(separate_1) "var selectedPitch = parseInt(jQuery(\"#pitch_\" + ch).val());"
+      append HTML_PARAMS(separate_1) "var selectedSpeed = parseInt(jQuery(\"#speed_\" + ch).val());"
+      append HTML_PARAMS(separate_1) "var valSoundID = selectedSound + (9 * selectedPitch) + (36 * selectedSpeed);"
+      append HTML_PARAMS(separate_1) "jQuery(soundIDElm).val(valSoundID);"
+    append HTML_PARAMS(separate_1) "};"
+
+    append HTML_PARAMS(separate_1) "initSoundIDElements = function() {"
+      append HTML_PARAMS(separate_1) "var soundIDElm,selectedSound,selectedPitch,selectedSpeed,valSoundID,currentSound,ch;"
+
+      append HTML_PARAMS(separate_1) "for (var i = 0; i < 3; i++) {"
+
+        append HTML_PARAMS(separate_1) "ch = parseInt(i) + 1;"
+        append HTML_PARAMS(separate_1) "jQuery(\"#btnHelp_\" + ch).val(translateKey(\"genericBtnTxtHelp\"));"
+
+        append HTML_PARAMS(separate_1) "soundIDElm = jQuery(\"\[name='SOUND_ID'\]\")\[i\];"
+        append HTML_PARAMS(separate_1) "currentSound = jQuery(soundIDElm).val();"
+        append HTML_PARAMS(separate_1) "selectedSoundElm = jQuery(\"#sound_\" + ch);"
+        append HTML_PARAMS(separate_1) "selectedPitchElm = jQuery(\"#pitch_\" + ch);"
+        append HTML_PARAMS(separate_1) "selectedSpeedElm = jQuery(\"#speed_\" + ch);"
+
+        append HTML_PARAMS(separate_1) "selectedSoundElm.val(parseInt( ((currentSound - 1)%9) + 1 ));"
+        append HTML_PARAMS(separate_1) "selectedPitchElm.val(parseInt( ((currentSound - 1)%36) / 9));"
+        append HTML_PARAMS(separate_1) "selectedSpeedElm.val(parseInt( ((currentSound - 1) / 36 )));"
+
+      append HTML_PARAMS(separate_1) "}"
+
+    append HTML_PARAMS(separate_1) "};"
+
+    append HTML_PARAMS(separate_1) "initSoundIDElements();"
+
+   append HTML_PARAMS(separate_1) "</script>"
+
+}
+
+constructor
+
diff --git a/WebUI/www/config/easymodes/wds100_ch_link.tcl b/WebUI/www/config/easymodes/wds100_ch_link.tcl
new file mode 100755
index 00000000..b480056f
--- /dev/null
+++ b/WebUI/www/config/easymodes/wds100_ch_link.tcl
@@ -0,0 +1,171 @@
+#!/bin/tclsh
+source [file join $env(DOCUMENT_ROOT) config/easymodes/em_common.tcl]
+
+set PROFILES_MAP(0)  "Experte"
+#set PROFILES_MAP(1)  "Sturmschwelle"
+set PROFILES_MAP(1)  "\${weatherProfile1}"
+
+set PROFILE_0(UI_HINT)  0
+set PROFILE_0(UI_DESCRIPTION) "Expertenprofil"
+set PROFILE_0(UI_TEMPLATE) "Expertenprofil"
+
+set range {1 2 5 12 15 25 29 39 50 62 75 89 103 118}
+set PROFILE_1(STORM_UPPER_THRESHOLD) $range
+set PROFILE_1(STORM_LOWER_THRESHOLD) $range
+set PROFILE_1(UI_DESCRIPTION) "<br>\${windInBeaufort}"
+set PROFILE_1(UI_TEMPLATE)  "Windst&auml;rke in Beaufort"
+set PROFILE_1(UI_HINT)  1
+
+set multilingual 1
+
+proc set_htmlParams {iface address pps pps_descr special_input_id peer_type} {
+
+  global dev_descr_sender dev_descr_receiver sender_address
+  set ACTOR $dev_descr_receiver(TYPE)
+  set sender_addr $dev_descr_sender(PARENT)
+  catch {puts "<input type=\"hidden\" id=\"dev_descr_sender_tmp\" value=\"$dev_descr_sender(TYPE)-$sender_addr\">"}
+  catch {puts "<input type=\"hidden\" id=\"dev_descr_receiver_tmp\" value=\"$ACTOR\">"}
+
+  # bei Verknuepfung Wetterstation - Kombisensor sinnlos  
+  if {$ACTOR != "WS_CS"} {
+    
+    upvar PROFILES_MAP  PROFILES_MAP
+    upvar HTML_PARAMS   HTML_PARAMS
+    upvar PROFILE_PNAME PROFILE_PNAME
+    upvar $pps          ps      
+    upvar $pps_descr    ps_descr
+
+    
+    foreach pro [array names PROFILES_MAP] {
+      upvar PROFILE_$pro PROFILE_$pro
+    }
+    
+    set cur_profile [get_cur_profile2 ps PROFILES_MAP PROFILE_TMP $peer_type]
+
+    append HTML_PARAMS(separate_0) [cmd_link_paramset2 $iface $address ps_descr ps "LINK" ${special_input_id}_0]
+    
+    array_clear options
+    set options(1)    "\${windForce0}"
+    set options(2)    "\${windForce1}"
+    set options(5)    "\${windForce2}"
+    set options(12)    "\${windForce3}"
+    set options(25)    "\${windForce4}"
+    set options(29)    "\${windForce5}"
+    set options(39)    "\${windForce6}"
+    set options(50)    "\${windForce7}"
+    set options(62)    "\${windForce8}"
+    set options(75)    "\${windForce9}"
+    set options(89)    "\${windForce10}"
+    set options(103)  "\${windForce11}"
+    set options(118)  "\${windForce12}"
+
+    # obere Sturmschwelle
+    
+    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\"><tr><td></td><td>"
+    append HTML_PARAMS(separate_1) $PROFILE_1(UI_DESCRIPTION)
+    append HTML_PARAMS(separate_1) "</td></tr><tr><td>"
+    #append HTML_PARAMS(separate_1) "<span id=\"ein\">Einschaltschwelle</span>"
+    append HTML_PARAMS(separate_1) "<span id=\"ein\">\${upperStormThreshold}</span>"
+    append HTML_PARAMS(separate_1) "</td><td>"
+
+    if {$cur_profile == 1} then {
+      append HTML_PARAMS(separate_1) "<div id=\"title0\" title=\"Schaltbefehl bei &uuml;berschreiten der eingestellten Schaltschwelle\">"
+      append HTML_PARAMS(separate_1) [get_ComboBox options STORM_UPPER_THRESHOLD separate_${special_input_id}_1_1 ps        STORM_UPPER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_1',1);setActorConditions();\""]
+      append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_1',0); </script></div>"
+    } else {
+      append HTML_PARAMS(separate_1) [get_ComboBox options STORM_UPPER_THRESHOLD separate_${special_input_id}_1_1 PROFILE_1 STORM_UPPER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_1',1);setActorConditions();\""]
+      append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_1',0); </script>"
+    }
+    append HTML_PARAMS(separate_1)  "</td></tr><tr><td></td><td><span id=\"upper_desc\">&nbsp;</span><br><br>"
+    append HTML_PARAMS(separate_1) "</td></tr>"
+    append HTML_PARAMS(separate_1) "</table>"
+    
+    # untere Sturmschwelle
+    append HTML_PARAMS(separate_1) "<table class=\"ProfileTbl\" id=\"lower_tab\" style=\"display:block\">"
+    append HTML_PARAMS(separate_1) "<tr><td>"
+    #append HTML_PARAMS(separate_1) "<span id=\"aus\">Ausschaltschwelle</span>"
+    append HTML_PARAMS(separate_1) "<span id=\"aus\">\${lowerStormThreshold}</span>"
+    append HTML_PARAMS(separate_1)  
+    append HTML_PARAMS(separate_1) "</td><td>"
+    
+    if {$cur_profile == 1} then {
+      append HTML_PARAMS(separate_1) "<div id=\"title1\" title=\"Schaltbefehl bei unterschreiten der eingestellten Schaltschwelle\">"
+      append HTML_PARAMS(separate_1) [get_ComboBox options STORM_LOWER_THRESHOLD separate_${special_input_id}_1_2 ps STORM_LOWER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_2',1);setActorConditions();\""]
+      append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_2',0); </script></div>"
+    } else {
+      append HTML_PARAMS(separate_1) [get_ComboBox options STORM_LOWER_THRESHOLD separate_${special_input_id}_1_2 PROFILE_1 STORM_LOWER_THRESHOLD "onchange=\"WEATHER_put_desc('separate_${special_input_id}_1_2',1);setActorConditions();\""]
+      append HTML_PARAMS(separate_1) "<script type=\"javascript\"> WEATHER_put_desc('separate_${special_input_id}_1_2',0); </script>"
+    }
+    append HTML_PARAMS(separate_1)  "</td></tr><tr><td></td><td><span id=\"lower_desc\">&nbsp;</span>"
+    append HTML_PARAMS(separate_1) "</td></tr></table>"
+  } else {
+    puts "<script type=\"text/javascript\">document.getElementById('sender_profiles').style.visibility = \"hidden\"</script>"
+  }
+  
+    #  die Texte der Platzhalter einlesen
+    puts "<script type=\"text/javascript\">"
+    puts "jQuery.getScript('/config/easymodes/WEATHER/localization/lang.js', function() {"
+    puts "translateAttribute(\"#title0\",\"title\",\"toolTip0\");"
+    puts "translateAttribute(\"#title1\",\"title\",\"toolTip1\");"
+    puts "translatePage('.easymode_wrapper');"
+
+    puts "});</script>"
+    
+    #puts "<script type=\"text/javascript\">window.setTimeout(\"translatePage(\'#body_wrapper\')\",500);</script>"
+
+    # TODO /*Das funktioniert für eine Verknüpfung WEATHER - SWITCH
+    if {$dev_descr_sender(PARENT_TYPE) == "HM-WDS100-C6-O-2"} {
+        append HTML_PARAMS(separate_1) "<input id=\"weatherSensor\" type=\"text\" class=\"hidden\" value=\"$dev_descr_sender(PARENT_TYPE)\">"
+        append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">"
+
+          append HTML_PARAMS(separate_1) "setActorConditions = function() {"
+
+            # Die Werte dieser Elemente auf Senderseite (Wettersender) müssen auf die unten stehenden Elemente auf Aktorseite übertragen werden
+            append HTML_PARAMS(separate_1) "var stormUpperThresholdElm = jQuery(\"\[name='__STORM_UPPER_THRESHOLD'\]\").first();"
+            append HTML_PARAMS(separate_1) "var stormLowerThresholdElm = jQuery(\"\[name='__STORM_LOWER_THRESHOLD'\]\").first();"
+
+            # Expertenparameter auf Aktorseite
+            append HTML_PARAMS(separate_1) "var expertCondLowElm = jQuery(\"\[name='SHORT_COND_VALUE_LO'\]\").first();"
+            append HTML_PARAMS(separate_1) "var _expertCondLowElm = jQuery(\"\[name='__SHORT_COND_VALUE_LO'\]\").first();"
+            append HTML_PARAMS(separate_1) "var expertCondHiElm = jQuery(\"\[name='SHORT_COND_VALUE_HI'\]\").first();"
+            append HTML_PARAMS(separate_1) "var _expertCondHiElm = jQuery(\"\[name='__SHORT_COND_VALUE_HI'\]\").first();"
+
+            # Get selected profile
+            append HTML_PARAMS(separate_1) "var selectedProfile = jQuery(\"#receiver_profiles\").val();"
+
+            # Get SHORT_COND_VALUE_LO Element of the profile
+            append HTML_PARAMS(separate_1) "var profileCondLowElem = jQuery(\"#receiver_param_\"+selectedProfile+\" \[name='SHORT_COND_VALUE_LO'\]\");"
+
+            # Get SHORT_COND_VALUE_HI Element of the profile
+            append HTML_PARAMS(separate_1) "var profileCondHiElem = jQuery(\"#receiver_param_\"+selectedProfile+\" \[name='SHORT_COND_VALUE_HI'\]\");"
+
+            # Set values of the expert page of the actor
+            append HTML_PARAMS(separate_1) "expertCondLowElm.val(stormLowerThresholdElm.val());"
+            append HTML_PARAMS(separate_1) "_expertCondLowElm.val(stormLowerThresholdElm.val());"
+            append HTML_PARAMS(separate_1) "expertCondHiElm.val(stormUpperThresholdElm.val());"
+            append HTML_PARAMS(separate_1) "_expertCondHiElm.val(stormUpperThresholdElm.val());"
+
+            # Set values of the hidden condition elements of the actor
+            append HTML_PARAMS(separate_1) "profileCondLowElem.val(stormLowerThresholdElm.val());"
+            append HTML_PARAMS(separate_1) "profileCondHiElem.val(stormUpperThresholdElm.val());"
+
+          append HTML_PARAMS(separate_1) "};"
+
+       append HTML_PARAMS(separate_1) "</script>"
+
+       append HTML_PARAMS(separate_1) "<script type=\"text/javascript\">window.setTimeout(function() {"
+        append HTML_PARAMS(separate_1) "setActorConditions();"
+        append HTML_PARAMS(separate_1) "jQuery(\"#receiver_profiles\").change(function() \{setActorConditions();\});"
+        append HTML_PARAMS(separate_1) "jQuery(\"\[name='__STORM_UPPER_THRESHOLD'\]\").first().change(function() \{setActorConditions()\});"
+        append HTML_PARAMS(separate_1) "jQuery(\"\[name='__STORM_LOWER_THRESHOLD'\]\").first().change(function() \{setActorConditions()\});"
+        append HTML_PARAMS(separate_1) "jQuery(\"#sender_profiles\").change(function() \{"
+          append HTML_PARAMS(separate_1) "if(parseInt(jQuery(this).val()) > 0) \{"
+            append HTML_PARAMS(separate_1) "jQuery(\"\[name='STORM_UPPER_THRESHOLD'\]\").change();"
+          append HTML_PARAMS(separate_1) "\}"
+        append HTML_PARAMS(separate_1) "\});"
+
+       append HTML_PARAMS(separate_1) "},750);</script>"
+    }
+}
+
+constructor
diff --git a/WebUI/www/config/ic_common.tcl b/WebUI/www/config/ic_common.tcl
index 59e53cbd..15f671a6 100755
--- a/WebUI/www/config/ic_common.tcl
+++ b/WebUI/www/config/ic_common.tcl
@@ -23,10 +23,10 @@ set GL_FLAG_SENDER_UNKNOWN       0x4
 set GL_FLAG_RECEIVER_UNKNOWN     0x8
 
 set HTMLTITLE "HomeMatic Interne Konfiguration"
-set INTERFACES_FILE "/etc/config/InterfacesList.xml"
+set INTERFACES_FILE "/opt/hm/etc/config/InterfacesList.xml"
 
 if { ![info exists env(CONFIG_ROOT)] } {
-    set env(CONFIG_ROOT) "/etc/config"
+    set env(CONFIG_ROOT) "/opt/hm/etc/config"
 }
 
 set USERPROFILESPATH "$env(CONFIG_ROOT)/userprofiles"
@@ -1210,15 +1210,15 @@ proc cmd_link_paramset2 {iface address pps_descr pps ps_type {pnr 0}} {
                 array set sv $_sv
                 set sv_value [expr $sv(VALUE) * $factor]
 
-                                if {$ps_type == "MASTER" && $parent_type == "" } then {
-                                    set v "<span class=\"stringtable_value\">${param_id}=$sv(ID)</span>"
-                                } elseif {$ps_type == "MASTER" || $ps_type == "VALUES"} then {
-                                    set v "<span class=\"stringtable_value\">$channel_type|${param_id}=$sv(ID)</span>"
-                                } else {
-                                    set v $sv(ID)
-                                }
+                if {$ps_type == "MASTER" && $parent_type == "" } then {
+                    set v "<span class=\"stringtable_value\">${param_id}=$sv(ID)</span>"
+                } elseif {$ps_type == "MASTER" || $ps_type == "VALUES"} then {
+                    set v "<span class=\"stringtable_value\">$channel_type|${param_id}=$sv(ID)</span>"
+                } else {
+                    set v $sv(ID)
+                }
 
-                                if { $sv_value == $value } then {
+                if { $sv_value == $value } then {
                   set selected selected=\"selected\"
                 } else  {
                   set selected ""
diff --git a/WebUI/www/config/ic_seldevice.cgi b/WebUI/www/config/ic_seldevice.cgi
index 152d81c7..1257269f 100755
--- a/WebUI/www/config/ic_seldevice.cgi
+++ b/WebUI/www/config/ic_seldevice.cgi
@@ -23,598 +23,607 @@ ise_getChannelRooms ise_ROOMS
 
 proc put_page {} {
 
-	global iface_url HTMLTITLE sidname sid
-	global step dev_descr_sender dev_descr_receiver iface sender_address receiver_address name description group_name group_description sender_group
+  global iface_url HTMLTITLE sidname sid
+  global step dev_descr_sender dev_descr_receiver iface sender_address receiver_address name description group_name group_description sender_group
 
 #cgi_debug -on
 
-	puts "<div id=\"ic_selchannel\">"
-			
-		puts "<div id=\"id_body\">"
-			
-			puts "<div id=\"id_subOffsetDivPopup\" class=\"subOffsetDivPopup CLASS21900\" >"
-			
-			puts "<div id=\"body_wrapper\">"
-
-			if {$step > 1} then {
-				put_PreviousStep
-			}
-
-			set realchannels    0
-			set virtualchannels 0
-				
-			if {$step < 3} then {
-				# wegen dem IE muss das Style overflow:visible eingestellt sein
-				puts "<div id=\"ChnTblContentDiv\" class=\"CLASS21908\" style=\"overflow:visible\" >"
-				puts "<table border=\"1\" id=\"ChnListTbl\" class=\"ChnListTbl\" width=\"100%\" cellspacing=\"0\">"
-				put_colgroup
-				put_tableheader
-
-				put_tablebody realchannels virtualchannels
-				puts "</table>"
-				puts "</div>"
-
-				put_js_SizeTable
-				#put_js_sortby 0
-				
-				#if {$realchannels == 0 && $virtualchannels > 0} then {
-				# Funktioniert an dieser Stelle noch nicht, da der Button noch gar nicht vorhanden ist.
-				#	put_js_ShowVirtualChannels
-				#}
-			}
-			
-			#body_wrapper
-			puts "</div>"
-
- 			puts "<div id=\"global_values\" style=\"display: none; visibility: hidden;\">"
-			puts "<form action=\"#\">"
-			puts "<input id=\"global_sid\" type=\"hidden\" name=\"$sidname\"          value=\"$sid\"/>"
-			puts "<input id=\"global_iface\" type=\"hidden\" name=\"iface\"             value=\"$iface\"/>"
-			puts "<input id=\"global_sender_address\" type=\"hidden\" name=\"sender_address\"    value=\"$sender_address\"/>"
-			puts "<input id=\"global_sender_group\" type=\"hidden\" name=\"sender_group\"    value=\"$sender_group\"/>"
-			puts "<input id=\"global_receiver_address\" type=\"hidden\" name=\"receiver_address\"  value=\"$receiver_address\"/>"
-			puts "<input id=\"global_realchannels\"    type=\"hidden\" name=\"realchannels\"          value=\"$realchannels\"/>"
-			puts "<input id=\"global_virtualchannels\" type=\"hidden\" name=\"virtualchannels\"          value=\"$virtualchannels\"/>"
-			puts "</form>"
-			puts "</div>"
-
-			#subOffsetDivPopup
-			puts "</div>"
-
-			puts "<script type=\"text/javascript\">"
-			#puts "	setPath(\"<span onclick='WebUI.enter(LinksAndProgramsPage);'>Programme &amp; Verkn&uuml;pfungen</span> &gt; <span onclick='WebUI.enter(LinkListPage);'>Direkte Verkn&uuml;pfungen</span> &gt; Neue Verkn&uuml;pfung anlegen - Schritt $step/3\");"
-			#puts "	setPath(\"<span onclick='WebUI.enter(LinksAndProgramsPage);'>\"+translateKey('menuProgramsLinksPage')+\"</span> &gt; <span onclick='WebUI.enter(LinkListPage);'>\"+translateKey('submenuDirectLinks')+\"</span> &gt; \"+translateKey('lblPathCreateNewLink')+\" - \"+translateKey('lblPathStepX')+\" $step/3\");"
-			puts "	setPath(\"<span onclick='WebUI.enter(SystemConfigPage);'>\"+translateKey('menuSettingsPage')+\" &gt; \" +translateKey('submenuDeviceInbox')+\"</span> &gt; <span onclick='WebUI.enter(NewDeviceListPage);'>\"+translateKey('replaceDevicePathAction')+\"</span>\");"
-
-			puts "	var s = \"\";"
-			puts "	s += \"<table cellspacing='8'>\";"
-			puts "	s += \"<tr>\";"
-			if {$step < 3} then {
-				puts "	s += \"<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.enter(NewDeviceListPage);'>\${btnCancel}</div></td>\";"
-				puts "	s += \"<td align='center' valign='middle'><div class='FooterButton CLASS21901' onclick='ResetFilterAndTable();'>\${footerBtnResetFilter}</div></td>\";"
-
-				if {$virtualchannels > 0} then {
-					puts "	s += \"<td align='center' valign='middle'><div class='FooterButton CLASS21909' onclick='ToggleVirtualKeys();' id='ToggleVirtualKeys'>\${footerBtnVirtualChannelsShow}</div></td>\";"
-				}
-			} else {
-				puts "	s += \"<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.enter(NewDeviceListPage);'>\${btnCancel}</div></td>\";"
-				puts "	s += \"<td align='center' valign='middle'><div class='FooterButton CLASS21901' onclick='CollectData_AddLink(1);'>\${footerBtnCreateEdit}</div></td>\";"
-				puts "	s += \"<td align='center' valign='middle'><div class='FooterButton' onclick='CollectData_AddLink(0);'>\${footerBtnCreate}</div></td>\";"
-			}
-			puts "	s += \"</tr>\";"
-			puts "	s += \"</table>\";"
-			puts "	setFooter(s);"
+  puts "<div id=\"ic_selchannel\">"
+      
+    puts "<div id=\"id_body\">"
+      
+      puts "<div id=\"id_subOffsetDivPopup\" class=\"subOffsetDivPopup CLASS21900\" >"
+      
+      puts "<div id=\"body_wrapper\">"
+
+      if {$step > 1} then {
+        put_PreviousStep
+      }
+
+      set realchannels    0
+      set virtualchannels 0
+        
+      if {$step < 3} then {
+        # wegen dem IE muss das Style overflow:visible eingestellt sein
+        puts "<div id=\"ChnTblContentDiv\" class=\"CLASS21908\" style=\"overflow:visible\" >"
+        puts "<table border=\"1\" id=\"ChnListTbl\" class=\"ChnListTbl\" width=\"100%\" cellspacing=\"0\">"
+        put_colgroup
+        put_tableheader
+
+        put_tablebody realchannels virtualchannels
+        puts "</table>"
+        puts "</div>"
+
+        put_js_SizeTable
+        #put_js_sortby 0
+        
+        #if {$realchannels == 0 && $virtualchannels > 0} then {
+        # Funktioniert an dieser Stelle noch nicht, da der Button noch gar nicht vorhanden ist.
+        #  put_js_ShowVirtualChannels
+        #}
+      }
+      
+      #body_wrapper
+      puts "</div>"
+
+       puts "<div id=\"global_values\" style=\"display: none; visibility: hidden;\">"
+      puts "<form action=\"#\">"
+      puts "<input id=\"global_sid\" type=\"hidden\" name=\"$sidname\"          value=\"$sid\"/>"
+      puts "<input id=\"global_iface\" type=\"hidden\" name=\"iface\"             value=\"$iface\"/>"
+      puts "<input id=\"global_sender_address\" type=\"hidden\" name=\"sender_address\"    value=\"$sender_address\"/>"
+      puts "<input id=\"global_sender_group\" type=\"hidden\" name=\"sender_group\"    value=\"$sender_group\"/>"
+      puts "<input id=\"global_receiver_address\" type=\"hidden\" name=\"receiver_address\"  value=\"$receiver_address\"/>"
+      puts "<input id=\"global_realchannels\"    type=\"hidden\" name=\"realchannels\"          value=\"$realchannels\"/>"
+      puts "<input id=\"global_virtualchannels\" type=\"hidden\" name=\"virtualchannels\"          value=\"$virtualchannels\"/>"
+      puts "</form>"
+      puts "</div>"
+
+      #subOffsetDivPopup
+      puts "</div>"
+
+      puts "<script type=\"text/javascript\">"
+      #puts "  setPath(\"<span onclick='WebUI.enter(LinksAndProgramsPage);'>Programme &amp; Verkn&uuml;pfungen</span> &gt; <span onclick='WebUI.enter(LinkListPage);'>Direkte Verkn&uuml;pfungen</span> &gt; Neue Verkn&uuml;pfung anlegen - Schritt $step/3\");"
+      #puts "  setPath(\"<span onclick='WebUI.enter(LinksAndProgramsPage);'>\"+translateKey('menuProgramsLinksPage')+\"</span> &gt; <span onclick='WebUI.enter(LinkListPage);'>\"+translateKey('submenuDirectLinks')+\"</span> &gt; \"+translateKey('lblPathCreateNewLink')+\" - \"+translateKey('lblPathStepX')+\" $step/3\");"
+      puts "  setPath(\"<span onclick='WebUI.enter(SystemConfigPage);'>\"+translateKey('menuSettingsPage')+\" &gt; \" +translateKey('submenuDeviceInbox')+\"</span> &gt; <span onclick='WebUI.enter(NewDeviceListPage);'>\"+translateKey('replaceDevicePathAction')+\"</span>\");"
+
+      puts "  var s = \"\";"
+      puts "  s += \"<table cellspacing='8'>\";"
+      puts "  s += \"<tr>\";"
+      if {$step < 3} then {
+        puts "  s += \"<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.enter(NewDeviceListPage);'>\${btnCancel}</div></td>\";"
+        puts "  s += \"<td align='center' valign='middle'><div class='FooterButton CLASS21901' onclick='ResetFilterAndTable();'>\${footerBtnResetFilter}</div></td>\";"
+
+        if {$virtualchannels > 0} then {
+          puts "  s += \"<td align='center' valign='middle'><div class='FooterButton CLASS21909' onclick='ToggleVirtualKeys();' id='ToggleVirtualKeys'>\${footerBtnVirtualChannelsShow}</div></td>\";"
+        }
+      } else {
+        puts "  s += \"<td align='center' valign='middle'><div class='FooterButton' onclick='WebUI.enter(NewDeviceListPage);'>\${btnCancel}</div></td>\";"
+        puts "  s += \"<td align='center' valign='middle'><div class='FooterButton CLASS21901' onclick='CollectData_AddLink(1);'>\${footerBtnCreateEdit}</div></td>\";"
+        puts "  s += \"<td align='center' valign='middle'><div class='FooterButton' onclick='CollectData_AddLink(0);'>\${footerBtnCreate}</div></td>\";"
+      }
+      puts "  s += \"</tr>\";"
+      puts "  s += \"</table>\";"
+      puts "  setFooter(s);"
       
       # Tabelle sortieren
       if {$step < 3} then  {
         puts "  SORTED_COL = -1;"
         puts "  Sort('ChnListTbl', 0);"
       }
-			puts "</script>"
-			
-		#id_body
-		puts "</div>"
-			
-	#ic_selchannel
-	puts "</div>"
+      puts "</script>"
+      
+    #id_body
+    puts "</div>"
+      
+  #ic_selchannel
+  puts "</div>"
 }
 
 proc put_colgroup {} {
-	puts "<colgroup>"
+  puts "<colgroup>"
 #Name
-	puts "	<col width=\"39%\" />"
+  puts "  <col width=\"39%\" />"
 #Typenbezeichnung
-	puts "	<col width=\"10%\" />"
+  puts "  <col width=\"10%\" />"
 #Bild
-	puts "	<col width=\"4%\" />"
+  puts "  <col width=\"4%\" />"
 #Bezeichnung
-	puts "	<col width=\"30%\" />"
+  puts "  <col width=\"30%\" />"
 #Seriennummer
-	puts "	<col width=\"10%\" />"
+  puts "  <col width=\"10%\" />"
 
 
 
 #Kategorie
-	#puts "	<col width=\"5%\" />"
+  #puts "  <col width=\"5%\" />"
 #Übertragungsmodus
-	#puts "	<col width=\"5%\" />"
+  #puts "  <col width=\"5%\" />"
 #Gewerk
-	#puts "	<col width=\"10%\" />"
+  #puts "  <col width=\"10%\" />"
 #Raum
-	#puts "	<col width=\"10%\" />"
+  #puts "  <col width=\"10%\" />"
 #Aktion
-	puts "	<col width=\"7%\" />"
+  puts "  <col width=\"7%\" />"
 
-	puts "</colgroup>"
+  puts "</colgroup>"
 }
 
 proc put_NaviButtons {} {
 
-	global step
+  global step
 
 #cgi_debug -on
 
-	puts "<div class=\"popupControls\">"
-	puts "<table class=\"CLASS21902\">"
-	puts "<tbody>"
-	
-	puts "<TR>"
-
-	if {$step < 3} then {
-		puts "<td class=\"ActiveButton CLASS21903\" onclick=\"CloseSelChannel();\" ><div>\${btnCancel}</div></td>"
-		puts "<TD class=\"ActiveButton CLASS21903\" onclick=\"ResetFilterAndTable();\"><div>\${footerBtnResetFilter}</div></TD>"
-		puts "<TD class=\"ActiveButton CLASS21903\" onclick=\"ToggleVirtualKeys();\"><div id=\"ToggleVirtualKeys\">\${footerBtnVirtualChannelsShow}</div></TD>"
-		puts "<td class=\"CLASS21911\">&nbsp;</td>"
-	} else {
-		puts "<td class=\"ActiveButton CLASS21903\" onclick=\"CloseSelChannel();\"><div>\${btnCancel}</div></td>"
-		puts "<td class=\"ActiveButton CLASS21903\" onclick=\"AddLink(\$F('global_iface'), \$F('global_sender_address'), \$F('global_sender_group'), \$F('global_receiver_address'), \$F('input_name'), \$F('input_description'), \$F('input_group_name'), \$F('input_group_description'), 'IC_SETPROFILES'    );\"><div>\${footerBtnCreateEdit}</div></td>"
-		puts "<td class=\"ActiveButton CLASS21903\" onclick=\"AddLink(\$F('global_iface'), \$F('global_sender_address'), \$F('global_sender_group'), \$F('global_receiver_address'), \$F('input_name'), \$F('input_description'), \$F('input_group_name'), \$F('input_group_description'), 'IC_LINKPEERLIST');\"><div>\${footerBtnCreate}</div></td>"
-		puts "<td class=\"CLASS21911\">&nbsp;</td>"
-	}
-
-	puts "</TR>"
-	puts "</tbody>"
-
-	puts "</table>"
-	puts "</div>"
+  puts "<div class=\"popupControls\">"
+  puts "<table class=\"CLASS21902\">"
+  puts "<tbody>"
+  
+  puts "<TR>"
+
+  if {$step < 3} then {
+    puts "<td class=\"ActiveButton CLASS21903\" onclick=\"CloseSelChannel();\" ><div>\${btnCancel}</div></td>"
+    puts "<TD class=\"ActiveButton CLASS21903\" onclick=\"ResetFilterAndTable();\"><div>\${footerBtnResetFilter}</div></TD>"
+    puts "<TD class=\"ActiveButton CLASS21903\" onclick=\"ToggleVirtualKeys();\"><div id=\"ToggleVirtualKeys\">\${footerBtnVirtualChannelsShow}</div></TD>"
+    puts "<td class=\"CLASS21911\">&nbsp;</td>"
+  } else {
+    puts "<td class=\"ActiveButton CLASS21903\" onclick=\"CloseSelChannel();\"><div>\${btnCancel}</div></td>"
+    puts "<td class=\"ActiveButton CLASS21903\" onclick=\"AddLink(\$F('global_iface'), \$F('global_sender_address'), \$F('global_sender_group'), \$F('global_receiver_address'), \$F('input_name'), \$F('input_description'), \$F('input_group_name'), \$F('input_group_description'), 'IC_SETPROFILES'    );\"><div>\${footerBtnCreateEdit}</div></td>"
+    puts "<td class=\"ActiveButton CLASS21903\" onclick=\"AddLink(\$F('global_iface'), \$F('global_sender_address'), \$F('global_sender_group'), \$F('global_receiver_address'), \$F('input_name'), \$F('input_description'), \$F('input_group_name'), \$F('input_group_description'), 'IC_LINKPEERLIST');\"><div>\${footerBtnCreate}</div></td>"
+    puts "<td class=\"CLASS21911\">&nbsp;</td>"
+  }
+
+  puts "</TR>"
+  puts "</tbody>"
+
+  puts "</table>"
+  puts "</div>"
 }
 
 # AG test_space
 
 proc test_space {pruefling} {
-	
+  
 # wenn &nbsp; vorhanden, dann 1, sonst 0
 
-	if {$pruefling == "&nbsp;"} {
-		return 1
-		} else {
-		return 0
-		}
+  if {$pruefling == "&nbsp;"} {
+    return 1
+    } else {
+    return 0
+    }
 }
 
 proc put_PreviousStep {} {
 
 #cgi_debug -on
-	global ise_CHANNELNAMES step receiver_links
-	global dev_descr_sender dev_descr_receiver iface sender_address receiver_address name description group_name group_description sender_group dev_descr_sender_group
+  global ise_CHANNELNAMES step receiver_links
+  global dev_descr_sender dev_descr_receiver iface sender_address receiver_address name description group_name group_description sender_group dev_descr_sender_group
 
 #cgi_debug -on
-	
-	array set SENTRY ""
-	set SENTRY(RECEIVERADDR) "&nbsp;"
-	set SENTRY(RECEIVERNAME) "&nbsp;"
-	set SENTRY(RECEIVERNAME_DISPLAY) "&nbsp;"
-	set SENTRY(SENDERADDR)   "&nbsp;"
-	set SENTRY(SENDERNAME)   "&nbsp;"
-	set SENTRY(SENDERNAME_DISPLAY) "&nbsp;"
-	set SENTRY(SENDERGROUPADDR)   "&nbsp;"
-	set SENTRY(SENDERGROUPNAME)   "&nbsp;"
-	set SENTRY(SENDERGROUPNAME_DISPLAY) "&nbsp;"
-	set SENTRY(LINKNAME)     "&nbsp;"
-	set SENTRY(LINKDESC)     "&nbsp;"
-	set SENTRY(WARNINGS)     ""
-
-
-	if {$receiver_address != ""} then {
-		set SENTRY(RECEIVERADDR) $receiver_address
-		if { [catch { set SENTRY(RECEIVERNAME) $ise_CHANNELNAMES($iface;$receiver_address)} ] } then {
-   			set SENTRY(RECEIVERNAME) "$iface"
-   			append SENTRY(RECEIVERNAME) ".$receiver_address"
-		}
-
-		if {[test_space $SENTRY(RECEIVERNAME)] == 1} {
-		set SENTRY(RECEIVERNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_receiver(PARENT_TYPE)', 250, $dev_descr_receiver(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">$SENTRY(RECEIVERNAME)</div>"
-		} else {
-		set SENTRY(RECEIVERNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_receiver(PARENT_TYPE)', 250, $dev_descr_receiver(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">[cgi_quote_html $SENTRY(RECEIVERNAME)]</div>"
-	}
-		
-	}
-
-		
-	if {$sender_address != ""} then {
-		set SENTRY(SENDERADDR) $sender_address
-		if { [catch { set SENTRY(SENDERNAME) $ise_CHANNELNAMES($iface;$sender_address)} ] } then {
-   			set SENTRY(SENDERNAME) "$iface"
-   			append SENTRY(SENDERNAME) ".$sender_address"
-		}
-		
-		if {[test_space $SENTRY(SENDERNAME)] == 1 } {
-		set SENTRY(SENDERNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_sender(PARENT_TYPE)', 250, $dev_descr_sender(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">$SENTRY(SENDERNAME)</div>"
-		} else {
-		set SENTRY(SENDERNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_sender(PARENT_TYPE)', 250, $dev_descr_sender(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">[cgi_quote_html $SENTRY(SENDERNAME)]</div>"
-	}
-	}
-
-	if {$sender_group != ""} then {
-		set SENTRY(SENDERGROUPADDR) $sender_group
-		if { [catch { set SENTRY(SENDERGROUPNAME) $ise_CHANNELNAMES($iface;$sender_group)} ] } then {
-   			set SENTRY(SENDERGROUPNAME) "$iface"
-   			append SENTRY(SENDERGROUPNAME) ".$sender_group"
-		}
-		
-		if {[test_space $SENTRY(SENDERGROUPNAME)] == 1} {
-		set SENTRY(SENDERGROUPNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_sender_group(PARENT_TYPE)', 250, $dev_descr_sender_group(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">$SENTRY(SENDERGROUPNAME)</div>"
-		} else {
-		set SENTRY(SENDERGROUPNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_sender_group(PARENT_TYPE)', 250, $dev_descr_sender_group(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">[cgi_quote_html $SENTRY(SENDERGROUPNAME)]</div>"
-	}
-
-		}
-
-	if {$step < 3} then {
-		set SENTRY(LINKNAME)      "<input id=\"input_name\"              name=\"name\"              type=\"hidden\" value=\"\"/>&nbsp;"
-		set SENTRY(LINKDESC)      "<input id=\"input_description\"       name=\"description\"       type=\"hidden\" value=\"\"/>&nbsp;"
-		set SENTRY(LINKGROUPNAME) "<input id=\"input_group_name\"        name=\"group_name\"        type=\"hidden\" value=\"\"/>&nbsp;"
-		set SENTRY(LINKGROUPDESC) "<input id=\"input_group_description\" name=\"group_description\" type=\"hidden\" value=\"\"/>&nbsp;"
-	} else {
-		if {$name       == ""                       } then {set name       "[cgi_quote_html $SENTRY(SENDERNAME)] \${lblLinkNameWith} [cgi_quote_html $SENTRY(RECEIVERNAME)]"}
-		if {$group_name == "" && $sender_group != ""} then {set group_name "[cgi_quote_html $SENTRY(SENDERGROUPNAME)] \${lblLinkNameWith} [cgi_quote_html $SENTRY(RECEIVERNAME)]"}
-
-		set description1 ""
-		set description2 ""
-		
-		catch {set description1 "\${lblStandardLink} $dev_descr_sender(TYPE) - $dev_descr_receiver(TYPE)"}
-		catch {set description2 "Standardverknüpfung $dev_descr_sender(TYPE) - $dev_descr_receiver(TYPE)"}
-		#catch {set description2 "\${lblStandardLink} $dev_descr_sender(TYPE) - $dev_descr_receiver(TYPE)"}
-
-		set SENTRY(LINKNAME)      "<input id=\"input_name\"              name=\"name\"              type=\"text\" value=\"$name\"/>"
-		set SENTRY(LINKDESC)      "<input id=\"input_description\"       name=\"description\"  class=\"stringtable_input\"     type=\"text\" value=\"$description1\"/>"
-		puts "<script type=\"text/javascript\">st_setStringTableValues();</script>"
-		set SENTRY(LINKGROUPNAME) "<input id=\"input_group_name\"        name=\"group_name\"        type=\"text\" value=\"$group_name\"/>"
-		set SENTRY(LINKGROUPDESC) "<input id=\"input_group_description\" name=\"group_description\" class=\"stringtable_input\"  type=\"text\" value=\"$description2\"/>"
-		puts "<script type=\"text/javascript\">st_setStringTableValues();</script>"
-		puts "<script type=\"text/javascript\">"
-		  puts "jQuery(\"#input_name\").attr(\"value\",translateString(\"$name\"));"
-		  puts "jQuery(\"#input_group_name\").attr(\"value\",translateString(\"$group_name\"));"
-		  puts "jQuery(\"#input_description\").attr(\"value\",translateString(\"$description1\"));"
-		  puts "jQuery(\"#input_group_description\").attr(\"value\",translateString(\"$description2\"));"
-		puts "</script>"
-
-		#Warnung vor dem Überschreiben von Verknüpfungen----------------------------------
-		set i 0
-		
-		if { [LinkExists receiver_links $sender_address $receiver_address ] == 1 } then {
+  
+  array set SENTRY ""
+  set SENTRY(RECEIVERADDR) "&nbsp;"
+  set SENTRY(RECEIVERNAME) "&nbsp;"
+  set SENTRY(RECEIVERNAME_DISPLAY) "&nbsp;"
+  set SENTRY(SENDERADDR)   "&nbsp;"
+  set SENTRY(SENDERNAME)   "&nbsp;"
+  set SENTRY(SENDERNAME_DISPLAY) "&nbsp;"
+  set SENTRY(SENDERGROUPADDR)   "&nbsp;"
+  set SENTRY(SENDERGROUPNAME)   "&nbsp;"
+  set SENTRY(SENDERGROUPNAME_DISPLAY) "&nbsp;"
+  set SENTRY(LINKNAME)     "&nbsp;"
+  set SENTRY(LINKDESC)     "&nbsp;"
+  set SENTRY(WARNINGS)     ""
+
+
+  if {$receiver_address != ""} then {
+    set SENTRY(RECEIVERADDR) $receiver_address
+    if { [catch { set SENTRY(RECEIVERNAME) $ise_CHANNELNAMES($iface;$receiver_address)} ] } then {
+         set SENTRY(RECEIVERNAME) "$iface"
+         append SENTRY(RECEIVERNAME) ".$receiver_address"
+    }
+
+    if {[test_space $SENTRY(RECEIVERNAME)] == 1} {
+    set SENTRY(RECEIVERNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_receiver(PARENT_TYPE)', 250, $dev_descr_receiver(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">$SENTRY(RECEIVERNAME)</div>"
+    } else {
+    set SENTRY(RECEIVERNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_receiver(PARENT_TYPE)', 250, $dev_descr_receiver(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">[cgi_quote_html $SENTRY(RECEIVERNAME)]</div>"
+  }
+    
+  }
+
+    
+  if {$sender_address != ""} then {
+    set SENTRY(SENDERADDR) $sender_address
+    if { [catch { set SENTRY(SENDERNAME) $ise_CHANNELNAMES($iface;$sender_address)} ] } then {
+         set SENTRY(SENDERNAME) "$iface"
+         append SENTRY(SENDERNAME) ".$sender_address"
+    }
+    
+    if {[test_space $SENTRY(SENDERNAME)] == 1 } {
+    set SENTRY(SENDERNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_sender(PARENT_TYPE)', 250, $dev_descr_sender(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">$SENTRY(SENDERNAME)</div>"
+    } else {
+    set SENTRY(SENDERNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_sender(PARENT_TYPE)', 250, $dev_descr_sender(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">[cgi_quote_html $SENTRY(SENDERNAME)]</div>"
+  }
+  }
+
+  if {$sender_group != ""} then {
+    set SENTRY(SENDERGROUPADDR) $sender_group
+    if { [catch { set SENTRY(SENDERGROUPNAME) $ise_CHANNELNAMES($iface;$sender_group)} ] } then {
+         set SENTRY(SENDERGROUPNAME) "$iface"
+         append SENTRY(SENDERGROUPNAME) ".$sender_group"
+    }
+    
+    if {[test_space $SENTRY(SENDERGROUPNAME)] == 1} {
+    set SENTRY(SENDERGROUPNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_sender_group(PARENT_TYPE)', 250, $dev_descr_sender_group(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">$SENTRY(SENDERGROUPNAME)</div>"
+    } else {
+    set SENTRY(SENDERGROUPNAME_DISPLAY) "<div class=\"CLASS21912\" onmouseover=\"picDivShow(jg_250, '$dev_descr_sender_group(PARENT_TYPE)', 250, $dev_descr_sender_group(INDEX), this);\" onmouseout=\"picDivHide(jg_250);\">[cgi_quote_html $SENTRY(SENDERGROUPNAME)]</div>"
+  }
+
+    }
+
+  if {$step < 3} then {
+    set SENTRY(LINKNAME)      "<input id=\"input_name\"              name=\"name\"              type=\"hidden\" value=\"\"/>&nbsp;"
+    set SENTRY(LINKDESC)      "<input id=\"input_description\"       name=\"description\"       type=\"hidden\" value=\"\"/>&nbsp;"
+    set SENTRY(LINKGROUPNAME) "<input id=\"input_group_name\"        name=\"group_name\"        type=\"hidden\" value=\"\"/>&nbsp;"
+    set SENTRY(LINKGROUPDESC) "<input id=\"input_group_description\" name=\"group_description\" type=\"hidden\" value=\"\"/>&nbsp;"
+  } else {
+    if {$name       == ""                       } then {set name       "[cgi_quote_html $SENTRY(SENDERNAME)] \${lblLinkNameWith} [cgi_quote_html $SENTRY(RECEIVERNAME)]"}
+    if {$group_name == "" && $sender_group != ""} then {set group_name "[cgi_quote_html $SENTRY(SENDERGROUPNAME)] \${lblLinkNameWith} [cgi_quote_html $SENTRY(RECEIVERNAME)]"}
+
+    set description1 ""
+    set description2 ""
+    
+    catch {set description1 "\${lblStandardLink} $dev_descr_sender(TYPE) - $dev_descr_receiver(TYPE)"}
+    catch {set description2 "Standardverknüpfung $dev_descr_sender(TYPE) - $dev_descr_receiver(TYPE)"}
+    #catch {set description2 "\${lblStandardLink} $dev_descr_sender(TYPE) - $dev_descr_receiver(TYPE)"}
+
+    set SENTRY(LINKNAME)      "<input id=\"input_name\"              name=\"name\"              type=\"text\" value=\"$name\"/>"
+    set SENTRY(LINKDESC)      "<input id=\"input_description\"       name=\"description\"  class=\"stringtable_input\"     type=\"text\" value=\"$description1\"/>"
+    puts "<script type=\"text/javascript\">st_setStringTableValues();</script>"
+    set SENTRY(LINKGROUPNAME) "<input id=\"input_group_name\"        name=\"group_name\"        type=\"text\" value=\"$group_name\"/>"
+    set SENTRY(LINKGROUPDESC) "<input id=\"input_group_description\" name=\"group_description\" class=\"stringtable_input\"  type=\"text\" value=\"$description2\"/>"
+    puts "<script type=\"text/javascript\">st_setStringTableValues();</script>"
+    puts "<script type=\"text/javascript\">"
+      puts "jQuery(\"#input_name\").attr(\"value\",translateString(\"$name\"));"
+      puts "jQuery(\"#input_group_name\").attr(\"value\",translateString(\"$group_name\"));"
+      puts "jQuery(\"#input_description\").attr(\"value\",translateString(\"$description1\"));"
+      puts "jQuery(\"#input_group_description\").attr(\"value\",translateString(\"$description2\"));"
+    puts "</script>"
+
+    #Warnung vor dem Überschreiben von Verknüpfungen----------------------------------
+    set i 0
+    
+    if { [LinkExists receiver_links $sender_address $receiver_address ] == 1 } then {
       append SENTRY(LINKNAME) "<img src=\"/ise/img/dialog-warning.png\" alt=\"Warnung\" title=\"Verkn&uuml;pfung gibt es schon\"/>"
-			#append SENTRY(LINKNAME) "Achtung, die Verkn&uuml;pfung existiert bereits und wird &uuml;berschrieben."
-			append SENTRY(LINKNAME) "\${dialogCreateLinkHintLinkExists}"
-		  incr i
-		}
+      #append SENTRY(LINKNAME) "Achtung, die Verkn&uuml;pfung existiert bereits und wird &uuml;berschrieben."
+      append SENTRY(LINKNAME) "\${dialogCreateLinkHintLinkExists}"
+      incr i
+    }
 
-		if { [LinkExists receiver_links $sender_group $receiver_address ] == 1 } then {
+    if { [LinkExists receiver_links $sender_group $receiver_address ] == 1 } then {
       append SENTRY(LINKGROUPNAME) "<img src=\"/ise/img/dialog-warning.png\" alt=\"Warnung\" title=\"Verkn&uuml;pfung gibt es schon\"/>"
-			#append SENTRY(LINKGROUPNAME) "Achtung, die Verkn&uuml;pfung existiert bereits und wird &uuml;berschrieben."
-			append SENTRY(LINKNAME) "\${dialogCreateLinkHintLinkExists}"
-			incr i
-		}
-
-		if {$i > 0} then {
-			#append SENTRY(WARNINGS) "<script type=\"text/javascript\">ShowWarningMsg(\"Sie sind dabei $i bestehende Verknüpfungen zu überschreiben.\");</script>"
-			append SENTRY(WARNINGS) "<script type=\"text/javascript\">ShowWarningMsg(translateKey(\"dialogCreateLinkMsgLinkExistsA\") +\"$i\"+ translateKey(\"dialogCreateLinkMsgLinkExistsB\"));</script>"
-		}
-		#---------------------------------------------------------------------------------
-	}
-
-	puts "<div id=\"previous_step_wrapper\" >"
-	
-	puts "<table border=\"1\" id=\"createLinkStep1\" cellspacing=\"0\" class=\"j_translate\" >"
-
-	puts "<colgroup>"
-	puts "	<col width=\"10%\" />"
-	puts "	<col width=\"10%\" />"
-	puts "	<col width=\"25%\" />"
-	puts "	<col width=\"25%\" />"
-	puts "	<col width=\"10%\" />"
-	puts "	<col width=\"10%\" />"
-	puts "</colgroup>"
-	
-	puts "<THEAD>"
-
-	puts "<TR>"
-	puts "<TD COLSPAN=\"2\" align=\"center\">\${thSender}</TD>"
-	puts "<TD COLSPAN=\"2\" align=\"center\" class=\"BlueHeader\">\${thLink}</TD>"
-	puts "<TD COLSPAN=\"2\" align=\"center\">\${thReceiver}</TD>"
-	puts "</TR>"
-	puts "<TR class=\"CLASS21913\">"
-	puts "<TD align=\"center\">\${thName}</TD>"
-	puts "<TD align=\"center\">\${thSerialNumber}</TD>"
-	puts "<TD align=\"center\" class=\"BlueHeader\">\${thName}</TD>"
-	puts "<TD align=\"center\">\${thDescription}</TD>"
-	puts "<TD align=\"center\">\${thName}</TD>"
-	puts "<TD align=\"center\">\${thSerialNumber}</TD>"
-	puts "</TR>"
-	
-	puts "</THEAD>"
-
-	puts "<TBODY>"
-			
-	puts "<tr>"
-	puts "<td align=\"center\">$SENTRY(SENDERNAME_DISPLAY)</td>"
-	puts "<td align=\"center\">$SENTRY(SENDERADDR)</td>"
-	puts "<td style=\"vertical-align: top;\" align=\"center\" [expr {$step==3?"class=\"WhiteHeader\"":""}]>$SENTRY(LINKNAME)</td>"
-	puts "<td style=\"vertical-align: top;\" align=\"center\" [expr {$step==3?"class=\"WhiteHeader\"":""}]>$SENTRY(LINKDESC)</td>"
-	puts "<td align=\"center\">$SENTRY(RECEIVERNAME_DISPLAY)</td>"
-	puts "<td align=\"center\">$SENTRY(RECEIVERADDR)</td>"
-	puts "</tr>"
-
-	puts "<tr [expr {$sender_group != ""?"":"style=\"display:none;\""}]>"
-	puts "<td align=\"center\">$SENTRY(SENDERGROUPNAME_DISPLAY)</td>"
-	puts "<td align=\"center\">$SENTRY(SENDERGROUPADDR)</td>"
-	puts "<td style=\"vertical-align: top;\" align=\"center\" [expr {$step==3?"class=\"WhiteHeader\"":""}]>$SENTRY(LINKGROUPNAME)</td>"
-	puts "<td style=\"vertical-align: top;\" align=\"center\" [expr {$step==3?"class=\"WhiteHeader\"":""}]>$SENTRY(LINKGROUPDESC)</td>"
-	puts "<td align=\"center\">$SENTRY(RECEIVERNAME_DISPLAY)</td>"
-	puts "<td align=\"center\">$SENTRY(RECEIVERADDR)</td>"
-	puts "</tr>"
-
-	puts "</TBODY>"
-
-	puts "</table>"
-
-	puts "<script type=\"\">translatePage(\"#createLinkStep1\")</script>"
-
-	puts $SENTRY(WARNINGS)
-	
-	puts "</div>"
+      #append SENTRY(LINKGROUPNAME) "Achtung, die Verkn&uuml;pfung existiert bereits und wird &uuml;berschrieben."
+      append SENTRY(LINKNAME) "\${dialogCreateLinkHintLinkExists}"
+      incr i
+    }
+
+    if {$i > 0} then {
+      #append SENTRY(WARNINGS) "<script type=\"text/javascript\">ShowWarningMsg(\"Sie sind dabei $i bestehende Verknüpfungen zu überschreiben.\");</script>"
+      append SENTRY(WARNINGS) "<script type=\"text/javascript\">ShowWarningMsg(translateKey(\"dialogCreateLinkMsgLinkExistsA\") +\"$i\"+ translateKey(\"dialogCreateLinkMsgLinkExistsB\"));</script>"
+    }
+    #---------------------------------------------------------------------------------
+  }
+
+  puts "<div id=\"previous_step_wrapper\" >"
+  
+  puts "<table border=\"1\" id=\"createLinkStep1\" cellspacing=\"0\" class=\"j_translate\" >"
+
+  puts "<colgroup>"
+  puts "  <col width=\"10%\" />"
+  puts "  <col width=\"10%\" />"
+  puts "  <col width=\"25%\" />"
+  puts "  <col width=\"25%\" />"
+  puts "  <col width=\"10%\" />"
+  puts "  <col width=\"10%\" />"
+  puts "</colgroup>"
+  
+  puts "<THEAD>"
+
+  puts "<TR>"
+  puts "<TD COLSPAN=\"2\" align=\"center\">\${thSender}</TD>"
+  puts "<TD COLSPAN=\"2\" align=\"center\" class=\"BlueHeader\">\${thLink}</TD>"
+  puts "<TD COLSPAN=\"2\" align=\"center\">\${thReceiver}</TD>"
+  puts "</TR>"
+  puts "<TR class=\"CLASS21913\">"
+  puts "<TD align=\"center\">\${thName}</TD>"
+  puts "<TD align=\"center\">\${thSerialNumber}</TD>"
+  puts "<TD align=\"center\" class=\"BlueHeader\">\${thName}</TD>"
+  puts "<TD align=\"center\">\${thDescription}</TD>"
+  puts "<TD align=\"center\">\${thName}</TD>"
+  puts "<TD align=\"center\">\${thSerialNumber}</TD>"
+  puts "</TR>"
+  
+  puts "</THEAD>"
+
+  puts "<TBODY>"
+      
+  puts "<tr>"
+  puts "<td align=\"center\">$SENTRY(SENDERNAME_DISPLAY)</td>"
+  puts "<td align=\"center\">$SENTRY(SENDERADDR)</td>"
+  puts "<td style=\"vertical-align: top;\" align=\"center\" [expr {$step==3?"class=\"WhiteHeader\"":""}]>$SENTRY(LINKNAME)</td>"
+  puts "<td style=\"vertical-align: top;\" align=\"center\" [expr {$step==3?"class=\"WhiteHeader\"":""}]>$SENTRY(LINKDESC)</td>"
+  puts "<td align=\"center\">$SENTRY(RECEIVERNAME_DISPLAY)</td>"
+  puts "<td align=\"center\">$SENTRY(RECEIVERADDR)</td>"
+  puts "</tr>"
+
+  puts "<tr [expr {$sender_group != ""?"":"style=\"display:none;\""}]>"
+  puts "<td align=\"center\">$SENTRY(SENDERGROUPNAME_DISPLAY)</td>"
+  puts "<td align=\"center\">$SENTRY(SENDERGROUPADDR)</td>"
+  puts "<td style=\"vertical-align: top;\" align=\"center\" [expr {$step==3?"class=\"WhiteHeader\"":""}]>$SENTRY(LINKGROUPNAME)</td>"
+  puts "<td style=\"vertical-align: top;\" align=\"center\" [expr {$step==3?"class=\"WhiteHeader\"":""}]>$SENTRY(LINKGROUPDESC)</td>"
+  puts "<td align=\"center\">$SENTRY(RECEIVERNAME_DISPLAY)</td>"
+  puts "<td align=\"center\">$SENTRY(RECEIVERADDR)</td>"
+  puts "</tr>"
+
+  puts "</TBODY>"
+
+  puts "</table>"
+
+  puts "<script type=\"\">translatePage(\"#createLinkStep1\")</script>"
+
+  puts $SENTRY(WARNINGS)
+  
+  puts "</div>"
 }
 
 proc put_js_ShowVirtualChannels {} {
-	set msg [cgi_quote_html "Es stehen nur virtuelle Kanäle zur Verfügung."]
-	puts "<script type=\"text/javascript\">alert('$msg'.unescapeHTML()); ToggleVirtualKeys();</script>"
+  set msg [cgi_quote_html "Es stehen nur virtuelle Kanäle zur Verfügung."]
+  puts "<script type=\"text/javascript\">alert('$msg'.unescapeHTML()); ToggleVirtualKeys();</script>"
 }
 
 proc put_js_sortby {colNr} {
-	puts "<script type=\"text/javascript\">Sort('ChnListTbl', $colNr);</script>"
+  puts "<script type=\"text/javascript\">Sort('ChnListTbl', $colNr);</script>"
 }
 
 proc put_js_SizeTable {} {
-	puts "<script type=\"text/javascript\">SizeTable();</script>"
+  puts "<script type=\"text/javascript\">SizeTable();</script>"
 }
 
 proc put_tableheader {} {
 
-	global step
-
-	puts "<THEAD id=\"chnListHead\" class=\"j_translate\" >"
-	
-	puts "<TR>"
-	puts "<TD class=\"chnListTbl_Caption\" align=\"left\" colspan=\"10\">\${replaceDeviceTblHeader}</TD>"
-	puts "</TR>"
-	
-	puts "<TR id=\"tr_caption_colnames\" align=\"center\">"
-	puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 0);\">\${thName}<img src=\"/ise/img/arrow_up.gif\" alt=\"sorting\"/></TD>"
-	puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 1);\">\${thTypeDescriptor}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
-	puts "<TD class=\"nosort\">\${thPicture}</TD>"
-	puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 3);\">\${thDescriptor}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
-	puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 4);\">\${thSerialNumber}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
-	#puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 5);\">\${thCategorie}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
-	#puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 6);\">\${thTransmitMode}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
-	#puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 7);\">\${thFunction}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
-	#puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 8);\">\${thRoom}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
-	puts "<TD class=\"nosort\">\${thAction}</TD>"
-	puts "</TR>"
+  global step
+
+  puts "<THEAD id=\"chnListHead\" class=\"j_translate\" >"
+  
+  puts "<TR>"
+  puts "<TD class=\"chnListTbl_Caption\" align=\"left\" colspan=\"10\">\${replaceDeviceTblHeader}</TD>"
+  puts "</TR>"
+  
+  puts "<TR id=\"tr_caption_colnames\" align=\"center\">"
+  puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 0);\">\${thName}<img src=\"/ise/img/arrow_up.gif\" alt=\"sorting\"/></TD>"
+  puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 1);\">\${thTypeDescriptor}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
+  puts "<TD class=\"nosort\">\${thPicture}</TD>"
+  puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 3);\">\${thDescriptor}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
+  puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 4);\">\${thSerialNumber}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
+  #puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 5);\">\${thCategorie}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
+  #puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 6);\">\${thTransmitMode}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
+  #puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 7);\">\${thFunction}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
+  #puts "<TD class=\"unsorted\" onclick=\"Sort('ChnListTbl', 8);\">\${thRoom}<img src=\"/ise/img/arrow_down.gif\" alt=\"sorting\"/></TD>"
+  puts "<TD class=\"nosort\">\${thAction}</TD>"
+  puts "</TR>"
 
   puts "<script type=\"text/javascript\">translatePage(\"#chnListHead\")</script>"
 
-	puts "<TR align=\"center\" class='height20px'>"
+  puts "<TR align=\"center\" class='height20px'>"
 
-	#Name
-	put_FilterControl TEXTINPUT  0
+  #Name
+  put_FilterControl TEXTINPUT  0
 
-	#Typenbezeichnung
-	put_FilterControl TEXTINPUT  1 
+  #Typenbezeichnung
+  put_FilterControl TEXTINPUT  1 
 
-	#Bild
-	put_FilterControl NONE       2
-	#puts "<td class=\"unfiltered CLASS21914\" >&nbsp;</td>"
+  #Bild
+  put_FilterControl NONE       2
+  #puts "<td class=\"unfiltered CLASS21914\" >&nbsp;</td>"
 
-	#Bezeichnung
-	put_FilterControl TEXTINPUT  3
+  #Bezeichnung
+  put_FilterControl TEXTINPUT  3
 
-	#Seriennummer / Adresse
-	put_FilterControl TEXTINPUT  4
-	
-	#Kategorie
-	#put_FilterControl CHECKBOXES 5 [list "\${lblReceiver}" "\${lblSender}"]
+  #Seriennummer / Adresse
+  put_FilterControl TEXTINPUT  4
+  
+  #Kategorie
+  #put_FilterControl CHECKBOXES 5 [list "\${lblReceiver}" "\${lblSender}"]
 
-	#Übertragungsmodus
-	#put_FilterControl CHECKBOXES 6 [list "\${lblStandard}" "\${lblSecured}"]
+  #Übertragungsmodus
+  #put_FilterControl CHECKBOXES 6 [list "\${lblStandard}" "\${lblSecured}"]
 
-	#Gewerk
-	#set ise_FUNCTIONS ""
-	#ise_getFunctions ise_FUNCTIONS
-	#put_FilterControl CHECKBOXES 7 $ise_FUNCTIONS
-	
-	#Raum
-	#set ise_ROOMS ""
-	#ise_getRooms ise_ROOMS
-	#put_FilterControl CHECKBOXES 8 $ise_ROOMS
-	
-	#Aktion
-	put_FilterControl NONE       9
-	puts "<td class=\"chkCell CLASS21914 nofilter\" >&nbsp;</td>"
+  #Gewerk
+  #set ise_FUNCTIONS ""
+  #ise_getFunctions ise_FUNCTIONS
+  #put_FilterControl CHECKBOXES 7 $ise_FUNCTIONS
+  
+  #Raum
+  #set ise_ROOMS ""
+  #ise_getRooms ise_ROOMS
+  #put_FilterControl CHECKBOXES 8 $ise_ROOMS
+  
+  #Aktion
+  put_FilterControl NONE       9
+  puts "<td class=\"chkCell CLASS21914 nofilter\" >&nbsp;</td>"
 
-	puts "</TR>"
+  puts "</TR>"
 
-	puts "</THEAD>"
+  puts "</THEAD>"
 }
 
 #control: NONE|TEXTINPUT|CHECKBOXES|RADIOBOXES
 proc put_FilterControl {control colNr {entrylist ""} } {
 
-	#cgi_debug -on
-
-	if {$control == "NONE"} then {
-		puts "<td id=\"id_filtertd_$colNr\" class=\"nofilter\">"
-		puts "<div class=\"spacer\">&nbsp;</div>"
-		puts "<div class=\"CLASS21915\">&nbsp;"
-	} else {
-		puts "<td id=\"id_filtertd_$colNr\" class=\"unfiltered\">"
-		puts "<div class='FilterBtn' onclick=\"ShowFilterControl($colNr);\">Filter</div>"
-		puts "<div class=\"CLASS21915\">"
-	}
-	
-	puts "<div class=\"filterBox\" id=\"id_filtercontrol_$colNr\" style=\"display: none; visibility: hidden;\">"
-
-	if {$control == "TEXTINPUT"} then {
-		
-		puts "<input type=\"text\" name=\"input_filtercontrol_$colNr\" /><br/>"
-		
-	} elseif {$control == "CHECKBOXES"} then {
-		
-		if {[llength $entrylist] > 0} then {
-			
-			puts "<table>"
-			foreach entry $entrylist {
-				puts "<tr>"
-				puts "<td>[cgi_quote_html $entry]</td>"
-				puts "<td><input type=\"checkbox\" name=\"input_filtercontrol_$colNr\" value=\"[cgi_quote_html $entry]\"></td>"
-				puts "</tr>"
-			}
-			puts "</table>"
-		} else {
-			puts "Keine Eintr&auml;ge vorhanden."
-		}
-
-	} elseif {$control == "RADIOBOXES"} then {
-		
-		foreach entry $entrylist {
-			puts "[cgi_quote_html $entry] <input type=\"radio\" name=\"input_filtercontrol_$colNr\" value=\"[cgi_quote_html $entry]\"><br/>"
-		}
-
-		# TODO Übersetzung
-		puts "Keine Auswahl<input type=\"radio\" name=\"input_filtercontrol_$colNr\" value=\"\"><br/>"
-	}
-	
-	puts "<div class=\"CLASS21916\">"
-	puts "	<span onclick=\"filterTable();\" class=\"CLASS21917\">\${btnOk}</span>"
-	puts "</div>"
-	
-	puts "</div>"
-	
-	puts "</div>"
-	puts "</td>"
+  #cgi_debug -on
+
+  if {$control == "NONE"} then {
+    puts "<td id=\"id_filtertd_$colNr\" class=\"nofilter\">"
+    puts "<div class=\"spacer\">&nbsp;</div>"
+    puts "<div class=\"CLASS21915\">&nbsp;"
+  } else {
+    puts "<td id=\"id_filtertd_$colNr\" class=\"unfiltered\">"
+    puts "<div class='FilterBtn' onclick=\"ShowFilterControl($colNr);\">Filter</div>"
+    puts "<div class=\"CLASS21915\">"
+  }
+  
+  puts "<div class=\"filterBox\" id=\"id_filtercontrol_$colNr\" style=\"display: none; visibility: hidden;\">"
+
+  if {$control == "TEXTINPUT"} then {
+    
+    puts "<input type=\"text\" name=\"input_filtercontrol_$colNr\" /><br/>"
+    
+  } elseif {$control == "CHECKBOXES"} then {
+    
+    if {[llength $entrylist] > 0} then {
+      
+      puts "<table>"
+      foreach entry $entrylist {
+        puts "<tr>"
+        puts "<td>[cgi_quote_html $entry]</td>"
+        puts "<td><input type=\"checkbox\" name=\"input_filtercontrol_$colNr\" value=\"[cgi_quote_html $entry]\"></td>"
+        puts "</tr>"
+      }
+      puts "</table>"
+    } else {
+      puts "Keine Eintr&auml;ge vorhanden."
+    }
+
+  } elseif {$control == "RADIOBOXES"} then {
+    
+    foreach entry $entrylist {
+      puts "[cgi_quote_html $entry] <input type=\"radio\" name=\"input_filtercontrol_$colNr\" value=\"[cgi_quote_html $entry]\"><br/>"
+    }
+
+    # TODO Übersetzung
+    puts "Keine Auswahl<input type=\"radio\" name=\"input_filtercontrol_$colNr\" value=\"\"><br/>"
+  }
+  
+  puts "<div class=\"CLASS21916\">"
+  puts "  <span onclick=\"filterTable();\" class=\"CLASS21917\">\${btnOk}</span>"
+  puts "</div>"
+  
+  puts "</div>"
+  
+  puts "</div>"
+  puts "</td>"
 }
 
 proc put_tablefooter {} {
 
-	#cgi_debug -on
-
-	puts "<TFOOT id=\"chnListFoot\">"
-	
-	puts "<TR>"
-	puts "<td colspan=\"10\">"
-	puts "<table id=\"chnListFoot_NaviTbl\">"
-	puts "<tr>"
-	puts "<TD class=\"CLASS21903\"><div class=\"CLASS21904\" onclick=\"ResetFilterAndTable();\">\${footerBtnResetFilter}</div></TD>"
-	puts "<TD class=\"CLASS21903\"><div class=\"CLASS21904\" id=\"ToggleVirtualKeys\" onclick=\"ToggleVirtualKeys();\">\${footerBtnVirtualChannelsShow}</div></TD>"
-	puts "<TD class=\"CLASS21905\">&nbsp;</TD>"
-	puts "</tr>"
-	puts "</table>"
-	puts "</td>"
-	puts "</TR>"
-
-	puts "</TFOOT>"
+  #cgi_debug -on
+
+  puts "<TFOOT id=\"chnListFoot\">"
+  
+  puts "<TR>"
+  puts "<td colspan=\"10\">"
+  puts "<table id=\"chnListFoot_NaviTbl\">"
+  puts "<tr>"
+  puts "<TD class=\"CLASS21903\"><div class=\"CLASS21904\" onclick=\"ResetFilterAndTable();\">\${footerBtnResetFilter}</div></TD>"
+  puts "<TD class=\"CLASS21903\"><div class=\"CLASS21904\" id=\"ToggleVirtualKeys\" onclick=\"ToggleVirtualKeys();\">\${footerBtnVirtualChannelsShow}</div></TD>"
+  puts "<TD class=\"CLASS21905\">&nbsp;</TD>"
+  puts "</tr>"
+  puts "</table>"
+  puts "</td>"
+  puts "</TR>"
+
+  puts "</TFOOT>"
 }
 
 #proc trim_dev_descr {p_dev_descr} {
 #
-	#upvar $p_dev_descr dev_descr
-	#foreach d [array names dev_descr] {
-		#trimright dev_descr($d)
-	#}
+  #upvar $p_dev_descr dev_descr
+  #foreach d [array names dev_descr] {
+    #trimright dev_descr($d)
+  #}
 #}
 #
 #proc trimright {p_var} {
-	#upvar $p_var var
-	#set var [string trimright $var " "]
+  #upvar $p_var var
+  #set var [string trimright $var " "]
 #}
 
 proc LinkExists {p_LINKLIST sender_address receiver_address} {
 
-	upvar $p_LINKLIST linklist
-	set match 0
-	
-	foreach _link $linklist {
+  upvar $p_LINKLIST linklist
+  set match 0
+  
+  foreach _link $linklist {
 
-		array set link $_link
+    array set link $_link
 
-		if {$link(SENDER) == $sender_address && $link(RECEIVER) == $receiver_address} then {
-			set match 1
-			break
-		}
-	}
+    if {$link(SENDER) == $sender_address && $link(RECEIVER) == $receiver_address} then {
+      set match 1
+      break
+    }
+  }
 
-	return $match
+  return $match
 }
 
 proc put_tablebody {p_realchannels p_virtualchannels} {
 
-	global DEV_DESCRIPTION
-	global iface_url ise_CHANNELNAMES ise_FUNCTIONS ise_ROOMS
-	global step dev_descr_sender dev_descr_receiver iface sender_address receiver_address sender_group
-	global SNNewDev TypeNewDev IDNewDev
+  global DEV_DESCRIPTION
+  global iface_url ise_CHANNELNAMES ise_FUNCTIONS ise_ROOMS
+  global step dev_descr_sender dev_descr_receiver iface sender_address receiver_address sender_group
+  global SNNewDev TypeNewDev IDNewDev
 
 #cgi_debug -on
 
-	upvar $p_realchannels    realchannels
-	upvar $p_virtualchannels virtualchannels
-
-	#Step 2=====
- 	set ROLENAME2CHECK ""
-	set dev_roles ""
-	
-	if {$step == 2} then {
-		if {$receiver_address != ""} then {
-			set ROLENAME2CHECK LINK_SOURCE_ROLES
-			set dev_roles $dev_descr_receiver(LINK_TARGET_ROLES)
-		} else {
-			set ROLENAME2CHECK LINK_TARGET_ROLES
-			set dev_roles $dev_descr_sender(LINK_SOURCE_ROLES)
-		}
-	}
-	#==========
-
-	set rowcount 0
-	set virtualcount 0
-
-	puts "<TBODY id=\"chnListBody\" class=\"j_translate\">"
+  upvar $p_realchannels    realchannels
+  upvar $p_virtualchannels virtualchannels
 
-  foreach iface_loop [array names iface_url] {
+  set HmIPIdentifier "HmIP-RF"
 
-		#Liste nur Geräte desselben Interfaces auf (iface = in der URL übergebenes Interface, iface_loop = alle bekannten Interfaces)
-		if {$iface != "" && $iface_loop != $iface} then { continue }
+  #Step 2=====
+   set ROLENAME2CHECK ""
+  set dev_roles ""
+  
+  if {$step == 2} then {
+    if {$receiver_address != ""} then {
+      set ROLENAME2CHECK LINK_SOURCE_ROLES
+      set dev_roles $dev_descr_receiver(LINK_TARGET_ROLES)
+    } else {
+      set ROLENAME2CHECK LINK_TARGET_ROLES
+      set dev_roles $dev_descr_sender(LINK_SOURCE_ROLES)
+    }
+  }
+  #==========
 
-		#if { [catch { set devlist [xmlrpc $iface_url($iface_loop) listDevices [list bool 0]] } ] } then
-		if { [catch { set devlist [xmlrpc $iface_url($iface_loop) listReplaceableDevices [list string $SNNewDev]] } ] } then {
-			if { [string first "faultCode=-2" $::errorInfo] == -1 } then {
-				puts "<div class=\"CLASS21906\">Interface-Prozess '$iface_loop' communication error.</div>"
-			} 
-			continue
-		}
+  set rowcount 0
+  set virtualcount 0
 
-		set devcount [llength $devlist]
-		for {set i 0} {$i < $devcount} {incr i} {
+  puts "<TBODY id=\"chnListBody\" class=\"j_translate\">"
 
+  foreach iface_loop [array names iface_url] {
 
-			array set dev_descr [lindex $devlist $i]
+    #Liste nur Geräte desselben Interfaces auf (iface = in der URL übergebenes Interface, iface_loop = alle bekannten Interfaces)
+    if {$iface != "" && $iface_loop != $iface} then { continue }
+
+    # HmIP doesn't support device replacement
+    if {$iface_loop != $HmIPIdentifier } {
+      set error [catch { set devlist [xmlrpc $iface_url($iface_loop) listReplaceableDevices [list string $SNNewDev]] } ]
+      if { $error } then {
+        # Error code -2  happens when listReplaceableDevices tries to get a device with a serial number from another interface
+        # E. g. SN ABC0123456 belongs to a device of the interface BidCos-Wired and listReplaceDevices checks this SN for the interface BidCos-RF
+        if { ($error != -2) } {
+          puts "<div class=\"CLASS21906\">Interface-Prozess '$iface_loop' communication error.</div>"
+          continue
+        } else {
+          continue
+        }
+      }
+    }
+
+    set devcount [llength $devlist]
+    for {set i 0} {$i < $devcount} {incr i} {
+
+
+      array set dev_descr [lindex $devlist $i]
 
       #Nur Geräte, keine Kanäle
       if { $dev_descr(PARENT) != ""} then {
@@ -622,36 +631,36 @@ proc put_tablebody {p_realchannels p_virtualchannels} {
         continue
       }
 
-			#Nur Geräte anzeigen, die schon vom Posteingang in die Geräteliste übertragen wurden
-			if { ![ metadata_getReadyConfig $iface_loop $dev_descr(ADDRESS) ] } then {
-				continue
-			}
-
-			array set SENTRY ""
-			
-			if { [catch { set SENTRY(NAME) $ise_CHANNELNAMES($iface_loop;$dev_descr(ADDRESS))} ] } then {
-				set SENTRY(NAME) "$iface_loop"
-				append SENTRY(NAME) ".$dev_descr(ADDRESS)"
-			}
-      set SENTRY(TYPE)  "$dev_descr(TYPE)"
+      #Nur Geräte anzeigen, die schon vom Posteingang in die Geräteliste übertragen wurden
+      if { ![ metadata_getReadyConfig $iface_loop $dev_descr(ADDRESS) ] } then {
+        continue
+      }
 
-			#Image===
-			set senderimgpath_50  [DEV_getImagePath $dev_descr(TYPE)  50]
+      array set SENTRY ""
+      
+      if { [catch { set SENTRY(NAME) $ise_CHANNELNAMES($iface_loop;$dev_descr(ADDRESS))} ] } then {
+        set SENTRY(NAME) "$iface_loop"
+        append SENTRY(NAME) ".$dev_descr(ADDRESS)"
+      }
+      set SENTRY(TYPE)  "$dev_descr(TYPE)"
 
-			if {$senderimgpath_50 == ""} { set senderimgpath_50 "#" }
-			set SENTRY(IMAGE) "<div id=\"picDiv_$rowcount\" class=\"CLASS21907\" onmouseover=\"picDivShow(jg_250, '$dev_descr(TYPE)', 250, '', this);\" onmouseout=\"picDivHide(jg_250);\"></div>"
-			append SENTRY(IMAGE) "<script type=\"text/javascript\">"
-			append SENTRY(IMAGE) "var jg_$rowcount = new jsGraphics(\"picDiv_$rowcount\");"
-			append SENTRY(IMAGE) "InitGD(jg_$rowcount, 50);"
-			append SENTRY(IMAGE) "Draw(jg_$rowcount, '$dev_descr(TYPE)', 50, '');"
-			append SENTRY(IMAGE) "</script>"
-			#===
-			
-			if { [catch {set SENTRY(DESCRIPTION) "$DEV_DESCRIPTION($dev_descr(TYPE))" } ] } then {
-				set SENTRY(DESCRIPTION) "$dev_descr(TYPE)"
-			}
+      #Image===
+      set senderimgpath_50  [DEV_getImagePath $dev_descr(TYPE)  50]
+
+      if {$senderimgpath_50 == ""} { set senderimgpath_50 "#" }
+      set SENTRY(IMAGE) "<div id=\"picDiv_$rowcount\" class=\"CLASS21907\" onmouseover=\"picDivShow(jg_250, '$dev_descr(TYPE)', 250, '', this);\" onmouseout=\"picDivHide(jg_250);\"></div>"
+      append SENTRY(IMAGE) "<script type=\"text/javascript\">"
+      append SENTRY(IMAGE) "var jg_$rowcount = new jsGraphics(\"picDiv_$rowcount\");"
+      append SENTRY(IMAGE) "InitGD(jg_$rowcount, 50);"
+      append SENTRY(IMAGE) "Draw(jg_$rowcount, '$dev_descr(TYPE)', 50, '');"
+      append SENTRY(IMAGE) "</script>"
+      #===
+      
+      if { [catch {set SENTRY(DESCRIPTION) "$DEV_DESCRIPTION($dev_descr(TYPE))" } ] } then {
+        set SENTRY(DESCRIPTION) "$dev_descr(TYPE)"
+      }
 
-			set SENTRY(ADDRESS)  $dev_descr(ADDRESS)
+      set SENTRY(ADDRESS)  $dev_descr(ADDRESS)
 
       cgi_debug -on
 
@@ -664,122 +673,122 @@ proc put_tablebody {p_realchannels p_virtualchannels} {
       append args "}"
 
       set SENTRY(ACTION) "<div onclick=\"ReplaceDevice.perform('$iface_loop',$args);\" class=\"CLASS21904\">\${btnSelect}</div>"
-			puts "<tr>"
-
-			if { [test_space $SENTRY(NAME)] == 1 } then { puts "<td>$SENTRY(NAME)</td>" } else { puts "<td>[cgi_quote_html $SENTRY(NAME)]</td>" }
-			
-			puts "<td>$SENTRY(TYPE)</td>"
-
-			puts "<td class=\"chnListTbl_dev_img\">$SENTRY(IMAGE)</td>"
-
-			if { [test_space $SENTRY(DESCRIPTION)] == 1 } then { puts "<td>$SENTRY(DESCRIPTION)</td>" } else { puts "<td>[cgi_quote_html $SENTRY(DESCRIPTION)]</td>" }
+      puts "<tr>"
 
-			puts "<td>$SENTRY(ADDRESS)</td>"
-			puts "<td align=\"center\">$SENTRY(ACTION)</td>"
-			puts "</tr>"
+      if { [test_space $SENTRY(NAME)] == 1 } then { puts "<td>$SENTRY(NAME)</td>" } else { puts "<td>[cgi_quote_html $SENTRY(NAME)]</td>" }
+      
+      puts "<td>$SENTRY(TYPE)</td>"
 
-			incr rowcount
-			
-			if {$dev_descr(TYPE) == "VIRTUAL_KEY"} then { incr virtualcount }
-			
-			array_clear SENTRY
-			array_clear dev_descr
-		}
-	}
+      puts "<td class=\"chnListTbl_dev_img\">$SENTRY(IMAGE)</td>"
 
-	if {$rowcount == 0} then {
-		puts "<TR>"
-		puts "<TD height=\"100\" align=\"center\" COLSPAN=\"10\">\${replaceDeviceNoDevAvailable}</TD>"
-		puts "</TR>"
-	}
+      if { [test_space $SENTRY(DESCRIPTION)] == 1 } then { puts "<td>$SENTRY(DESCRIPTION)</td>" } else { puts "<td>[cgi_quote_html $SENTRY(DESCRIPTION)]</td>" }
 
-	puts "</TBODY>"
+      puts "<td>$SENTRY(ADDRESS)</td>"
+      puts "<td align=\"center\">$SENTRY(ACTION)</td>"
+      puts "</tr>"
 
-	set realchannels    [expr $rowcount - $virtualcount]
-	set virtualchannels $virtualcount
-	puts "<script type=\"text/javascript\">translatePage(\"#chnListBody\")</script>"
+      incr rowcount
+      
+      if {$dev_descr(TYPE) == "VIRTUAL_KEY"} then { incr virtualcount }
+      
+      array_clear SENTRY
+      array_clear dev_descr
+    }
+  }
+
+  if {$rowcount == 0} then {
+    puts "<TR>"
+    puts "<TD height=\"100\" align=\"center\" COLSPAN=\"10\">\${replaceDeviceNoDevAvailable}</TD>"
+    puts "</TR>"
+  }
+
+  puts "</TBODY>"
+
+  set realchannels    [expr $rowcount - $virtualcount]
+  set virtualchannels $virtualcount
+  puts "<script type=\"text/javascript\">translatePage(\"#chnListBody\")</script>"
 }
 
 # TODO Viel überflüssiger Ballast, der entfernt werden sollte.
 cgi_eval {
 
 #cgi_debug -on
-	cgi_input
-
-	if {[session_requestisvalid 0] > 0} then {
-
-		#-----------------------------------------
-		#allg. globale Parameter
-		set step 1
-		array set dev_descr_sender       ""
-	  array set dev_descr_receiver     ""
-	  array set dev_descr_sender_group ""
-		set sender_group                 ""
-   	set receiver_links               ""
-		
-		#URL-Parameter
-		set iface             ""
-		set sender_address    ""
-		set receiver_address  ""
-		set name              ""
-		set description       ""
-		set group_name        ""
-		set group_description ""
-		set SNNewDev ""
-		set TypeNewDev ""
-		set IDNewDev ""
-
-		catch {import iface}
-		catch {import sender_address}
-		catch {import receiver_address}
-		catch {import name}
-		catch {import description}
-		catch {import group_name}
-		catch {import group_description}
-		catch {import SNNewDev}
-		catch {import TypeNewDev}
-		catch {import IDNewDev}
-		#-----------------------------------------
+  cgi_input
+
+  if {[session_requestisvalid 0] > 0} then {
+
+    #-----------------------------------------
+    #allg. globale Parameter
+    set step 1
+    array set dev_descr_sender       ""
+    array set dev_descr_receiver     ""
+    array set dev_descr_sender_group ""
+    set sender_group                 ""
+     set receiver_links               ""
+    
+    #URL-Parameter
+    set iface             ""
+    set sender_address    ""
+    set receiver_address  ""
+    set name              ""
+    set description       ""
+    set group_name        ""
+    set group_description ""
+    set SNNewDev ""
+    set TypeNewDev ""
+    set IDNewDev ""
+
+    catch {import iface}
+    catch {import sender_address}
+    catch {import receiver_address}
+    catch {import name}
+    catch {import description}
+    catch {import group_name}
+    catch {import group_description}
+    catch {import SNNewDev}
+    catch {import TypeNewDev}
+    catch {import IDNewDev}
+    #-----------------------------------------
 
     http_head
     
-		if { $iface != "" && $sender_address != "" && $receiver_address != "" } then {
-			
-			set step 3
-			set url $iface_url($iface)
-    		array set dev_descr_sender   [xmlrpc $url getDeviceDescription [list string $sender_address  ]]
-	    	array set dev_descr_receiver [xmlrpc $url getDeviceDescription [list string $receiver_address]]
-			
-			catch { set sender_group $dev_descr_sender(GROUP) }
-			if {$sender_group != ""} then {
-	    		array set dev_descr_sender_group [xmlrpc $url getDeviceDescription [list string $sender_group]]
-			}
-
-			#Für die Prüfung, ob es die Verknüpfung schon gibt. Schutz vorm Überschreiben der Verknüpfung---
-			set flags 0
-   			set receiver_links [xmlrpc $url getLinks [list string $receiver_address] [list int $flags] ]
-			#-----------------------------------------------------------------------------------------------
-
-		} elseif {$iface != "" && $sender_address != ""} then {
-			
-			set step 2
-			set url $iface_url($iface)
-	    	array set dev_descr_sender [xmlrpc $url getDeviceDescription [list string $sender_address]]
-
-			catch { set sender_group $dev_descr_sender(GROUP) }
-			if {$sender_group != ""} then {
-	    		array set dev_descr_sender_group [xmlrpc $url getDeviceDescription [list string $sender_group]]
-			}
-			
-		} elseif {$iface != "" && $receiver_address != ""} then {
-			
-			set step 2
-			set url $iface_url($iface)
-	    	array set dev_descr_receiver [xmlrpc $url getDeviceDescription [list string $receiver_address]]
-
-		} else {
-			#step 1 wird nun angezeigt. "set step 1" wurde schon gesetzt
-		}
-		put_page
-	}
+    if { $iface != "" && $sender_address != "" && $receiver_address != "" } then {
+      
+      set step 3
+      set url $iface_url($iface)
+        array set dev_descr_sender   [xmlrpc $url getDeviceDescription [list string $sender_address  ]]
+        array set dev_descr_receiver [xmlrpc $url getDeviceDescription [list string $receiver_address]]
+      
+      catch { set sender_group $dev_descr_sender(GROUP) }
+      if {$sender_group != ""} then {
+          array set dev_descr_sender_group [xmlrpc $url getDeviceDescription [list string $sender_group]]
+      }
+
+      #Für die Prüfung, ob es die Verknüpfung schon gibt. Schutz vorm Überschreiben der Verknüpfung---
+      set flags 0
+         set receiver_links [xmlrpc $url getLinks [list string $receiver_address] [list int $flags] ]
+      #-----------------------------------------------------------------------------------------------
+
+    } elseif {$iface != "" && $sender_address != ""} then {
+      
+      set step 2
+      set url $iface_url($iface)
+        array set dev_descr_sender [xmlrpc $url getDeviceDescription [list string $sender_address]]
+
+      catch { set sender_group $dev_descr_sender(GROUP) }
+      if {$sender_group != ""} then {
+          array set dev_descr_sender_group [xmlrpc $url getDeviceDescription [list string $sender_group]]
+      }
+      
+    } elseif {$iface != "" && $receiver_address != ""} then {
+      
+      set step 2
+      set url $iface_url($iface)
+        array set dev_descr_receiver [xmlrpc $url getDeviceDescription [list string $receiver_address]]
+
+    } else {
+      #step 1 wird nun angezeigt. "set step 1" wurde schon gesetzt
+    }
+    put_page
+  }
 }
diff --git a/WebUI/www/config/img/devices/250/117_hm-sec-sir-wm.png b/WebUI/www/config/img/devices/250/117_hm-sec-sir-wm.png
new file mode 100755
index 00000000..5cd49504
Binary files /dev/null and b/WebUI/www/config/img/devices/250/117_hm-sec-sir-wm.png differ
diff --git a/WebUI/www/config/img/devices/250/126_hm-sen-li-o.png b/WebUI/www/config/img/devices/250/126_hm-sen-li-o.png
new file mode 100755
index 00000000..7d782438
Binary files /dev/null and b/WebUI/www/config/img/devices/250/126_hm-sen-li-o.png differ
diff --git a/WebUI/www/config/img/devices/250/127_hm-wds30-ot2-sm-2.png b/WebUI/www/config/img/devices/250/127_hm-wds30-ot2-sm-2.png
new file mode 100755
index 00000000..286d1be3
Binary files /dev/null and b/WebUI/www/config/img/devices/250/127_hm-wds30-ot2-sm-2.png differ
diff --git a/WebUI/www/config/img/devices/50/117_hm-sec-sir-wm_thumb.png b/WebUI/www/config/img/devices/50/117_hm-sec-sir-wm_thumb.png
new file mode 100755
index 00000000..23335e3c
Binary files /dev/null and b/WebUI/www/config/img/devices/50/117_hm-sec-sir-wm_thumb.png differ
diff --git a/WebUI/www/config/img/devices/50/126_hm-sen-li-o_thumb.png b/WebUI/www/config/img/devices/50/126_hm-sen-li-o_thumb.png
new file mode 100755
index 00000000..b43f9298
Binary files /dev/null and b/WebUI/www/config/img/devices/50/126_hm-sen-li-o_thumb.png differ
diff --git a/WebUI/www/config/img/devices/50/127_hm-wds30-ot2-sm-2_thumb.png b/WebUI/www/config/img/devices/50/127_hm-wds30-ot2-sm-2_thumb.png
new file mode 100755
index 00000000..3d44b6f3
Binary files /dev/null and b/WebUI/www/config/img/devices/50/127_hm-wds30-ot2-sm-2_thumb.png differ
diff --git a/WebUI/www/config/stringtable_de.txt b/WebUI/www/config/stringtable_de.txt
index 8ccb58b4..c4421599 100755
--- a/WebUI/www/config/stringtable_de.txt
+++ b/WebUI/www/config/stringtable_de.txt
@@ -70,22 +70,27 @@ ALARMACTUATOR|ON_TIME	${stringTableAlarmActuatorOnTime}
 ALARMACTUATOR|SABOTAGE_MSG	${stringTableAlarmActuatorSabotageMsg}
 ALARMACTUATOR|STATE=FALSE	${stringTableAlarmActuatorStateFalse}
 ALARMACTUATOR|STATE=TRUE	${stringTableAlarmActuatorStateTrue}
-ALL_LEDS	${stringTableAllLEDs}
-ANALOG_INPUT	${stringTableAnalog}
-ANALOG_OUTPUT	${stringTableAnalog}
-BACKLIGHT_AT_CHARGE	${stringTableBackLightAtCharge}
-BACKLIGHT_AT_KEYSTROKE	${stringTableBackLightAtKeystroke}
-BACKLIGHT_AT_MOTION	${stringTableBackLightAtMotion}
-BACKLIGHT_ON_TIME	${stringTableBackLightOnTime}
-BAT_DEFECT_LIMIT	${stringTableBatDefectLimit}
+
+ARMING|ACOUSTIC_MULTI_DELAY_ARM	${stringTableAcousticMultiDelayArm}
+ARMING|ACOUSTIC_ALLSENS_ARM	${stringTableAcousticAllSensArm}
+ARMING|ACOUSTIC_ALLSENS_DELAY_ARM	${stringTableAcousticAllsensDelayArm}
+ARMING|ACOUSTIC_EXTSENS_ARM	${stringTableAcousticExtsensArm}
+ARMING|ACOUSTIC_EXTSENS_DELAY_ARM	${stringTableAcousticExtsensDelayArm}
+ARMING|ACOUSTIC_DISARM	${stringTableAcousticDisarm}
+
+ARMING|OPTIC_MULTI_DELAY_ARM	${stringTableOpticMultiDelayArm}
+ARMING|OPTIC_ALLSENS_ARM	${stringTableOpticAllSensArm}
+ARMING|OPTIC_ALLSENS_DELAY_ARM	${stringTableOpticAllSensDelayArm}
+ARMING|OPTIC_EXTSENS_ARM	${stringTableOpticExtsensArm}
+ARMING|OPTIC_EXTSENS_DELAY_ARM	${stringTableOpticExtsensDelayArm}
+ARMING|OPTIC_DISARM	${stringTableOpticDisarm}
+
 BLIND	${stringTableBlindTitle}
 BLIND|CHANGE_OVER_DELAY	${stringTableBlindChangeOverDelay}
 BLIND|LEVEL	${stringTableBlindLevel}
 BLIND|REFERENCE_RUNNING_TIME_BOTTOM_TOP	${stringTableBlindRunnintTimeBottomTop}
 BLIND|REFERENCE_RUNNING_TIME_TOP_BOTTOM	${stringTableBlindRunningTimeTopBottom}
 BLIND|REFERENCE_RUN_COUNTER	${stringTableBlindRefRunCounter}
-BLIND|STATUSINFO_MINDELAY	${stringTableStatusInfoMinDelay}
-BLIND|STATUSINFO_RANDOM	${stringTableStatusInfoRandom}
 BLIND|STOP	${stringTableBlindStop}
 BURST_RX	${stringTableBurstRX}
 BUTTON_LOCK	${stringTableButtonLock}
@@ -229,10 +234,8 @@ DIMMER|RAMP_TIME	${stringTableDimmerRampTime}
 DIMMER|RAMP_STOP	${stringTableDimmerRampStop}
 DIMMER|REDUCE_LEVEL	${stringTableDimmerReduceLevel}
 DIMMER|REDUCE_TEMP_LEVEL	${stringTableDimmerReduceTempLevel}
-DIMMER|STATUSINFO_MINDELAY	${stringTableDimmerStatusInfoMinDelay}
 DIMMER|ERROR_OVERLOAD	${stringTableDimmerErrorOverload}
 DIMMER|ERROR_OVERHEAT	${stringTableDimmerErrorOverheat}
-DIMMER|STATUSINFO_RANDOM	${stringTableStatusInfoRandom}
 DIMMER|ERROR_REDUCED	${stringTableDimmerErrorReduced}
 DISPLAY|ALARM_COUNT	${stringTableDisplayAlarmCount}
 DISPLAY|ARROW_DOWN	${stringTableDisplayArrowDown}
@@ -536,6 +539,16 @@ POWERMETER_IGL|GAS_ENERGY_COUNTER	${stringTablePowerMeterEnergyCounterGas}
 POWERMETER_IGL|POWER	${stringTablePowerMeterPower}
 POWERMETER_IGL|GAS_POWER	${stringTableGasConsumption}
 
+POWERMETER_IEC1|ENERGY_COUNTER	${stringTablePowerMeterEnergyCounter}
+POWERMETER_IEC1|GAS_ENERGY_COUNTER	${stringTablePowerMeterEnergyCounterGas}
+POWERMETER_IEC1|POWER	${stringTablePowerMeterPower}
+POWERMETER_IEC1|GAS_POWER	${stringTableGasConsumption}
+POWERMETER_IEC1|IEC_ENERGY_COUNTER	${stringTablePowerMeterIECEnergyCounter}
+POWERMETER_IEC1|IEC_POWER	${stringTableIECPowerMeterPower}
+
+POWERMETER_IEC2|IEC_ENERGY_COUNTER	${stringTablePowerMeterIECEnergyCounter}
+POWERMETER_IEC2|IEC_POWER	${stringTableIECPowerMeterPower}
+
 POWERUP_OFF	${stringTablePowerUpOFF} 
 POWERUP_ON	${stringTablePowerUpON}
 PRESS_LONG	${stringTableKeyPressLong}
@@ -734,8 +747,6 @@ SWITCH|AES_ACTIVE	${stringTableSwitchAESActive}
 SWITCH|ON_TIME	${stringTableSwitchOnTime}
 SWITCH|STATE=FALSE	${stringTableSwitchStateFalse}
 SWITCH|STATE=TRUE	${stringTableSwitchStateTrue}
-SWITCH|STATUSINFO_MINDELAY	${stringTableSwitchStatusInfoMinDelay}
-SWITCH|STATUSINFO_RANDOM	${stringTableStatusInfoRandom}
 SWITCH|STATUSINFO_RANDOM_A	${stringTableStatusInfoRandomA}
 SWITCH_INTERFACE	${stringTableSwitchInterfaceTitle}
 SWITCH_INTERFACE|PRESS	${stringTableSwitchInterfacePress}
@@ -772,6 +783,7 @@ TILT_SENSOR|STATE=FALSE	${stringTableTiltSensorStateFalse}
 TILT_SENSOR|STATE=TRUE	 ${stringTableTiltSensorStateTrue}
 TRANSMIT_TRY_MAX	${stringTableTransmitTryMax}
 TRANSMIT_DEV_TRY_MAX	${stringTableTransmitDevTryMax}
+TX_THRESHOLD_POWER	${stringTablePowerMeterTxThresholdPower}
 USER_COLOR	${stringTableSubmit}
 USER_PROGRAM	${stringTableSubmit}
 VENT_CLOSED	${stringTableVentClosed}
@@ -783,7 +795,6 @@ VIRTUAL_DIMMER|ERROR_OVERHEAT	${stringTableDimmerErrorOverheat}
 VIRTUAL_DIMMER|ERROR_REDUCED	${stringTableDimmerErrorReduced}
 VIRTUAL_DIMMER|LOGIC_COMBINATION	${stringTableLogicCombination}
 VIRTUAL_DIMMER|POWERUP_ACTION	${stringTableVirtualDimmerPowerUpAction}
-VIRTUAL_DIMMER|STATUSINFO_MINDELAY	${stringTableVirtualDimmerStatusInfoMinDelay}
 VIRTUAL_DIMMER|STATUSINFO_RANDOM	${stringTableVirtualDimmerStatusInfoRandom}
 VIRTUAL_DIMMER|RAMP_STOP	${stringTableDimmerRampStop}
 VIRTUAL_KEY	${stringTableVirtualKeyTitle}
@@ -864,9 +875,18 @@ WINMATIC|STOP	${stringTableWinMaticStop}
 WINMATIC|TILT_MAX	${stringTableWinMaticTiltMax}
 
 
+ALL_LEDS	${stringTableAllLEDs}
+ANALOG_INPUT	${stringTableAnalog}
+ANALOG_OUTPUT	${stringTableAnalog}
 AUTO_MODE	${stringTableClimateControlRTTransceiverAutoMode}
 ACTUAL_HUMIDITY	${stringTableWeatherHumidity}
 ACTUAL_TEMPERATURE	${stringTableClimateControlRTTransceiverActualTemp}
+ALARMTIME_MAX	${stringTableAlarmTimeMax}
+BACKLIGHT_AT_CHARGE	${stringTableBackLightAtCharge}
+BACKLIGHT_AT_KEYSTROKE	${stringTableBackLightAtKeystroke}
+BACKLIGHT_AT_MOTION	${stringTableBackLightAtMotion}
+BACKLIGHT_ON_TIME	${stringTableBackLightOnTime}
+BAT_DEFECT_LIMIT	${stringTableBatDefectLimit}
 BATTERY_STATE	${stringTableClimateControlRTTransceiverBatteryState}
 BOOST_MODE	${stringTableClimateControlRTTransceiverBoostMode}
 BOOST_MODE=FALSE	${stringTableBoostModeFalse}
@@ -913,7 +933,11 @@ LOGIC_COMBINATION	${stringTableLogicCombination}
 LOWBAT_REPORTING	${stringTableLowbatReporting}
 LOWBAT_REPORTING=FALSE	${stringTableLowbatReportingFalse}
 LOWBAT_REPORTING=TRUE	${stringTableLowbatReportingTrue}
+LOWBAT_SIGNAL	${stringTableLowbatSignal}
 LOWERING_MODE	${stringTableClimateControlRTTransceiverLoweringMode}
+
+LUX	${stringTableLux}
+
 MANU_MODE	${stringTableClimateControlRTTransceiverManuMode}
 NOT_USED	${stringTableNotUsed}
 OLD_LEVEL	${stringTableDimmerOldLevel}
@@ -962,9 +986,15 @@ SET_TEMPERATURE	${stringTableClimateControlRTTransceiverSetTemperature}
 
 SECTION	${stringTableSection}
 
+SOUND_ID	${stringTableSoundID}
+
 STATE=FALSE	${stringTableStateFalse}
 STATE=TRUE	${stringTableStateTrue}
 
+STATUSINFO_MINDELAY	${stringTableStatusInfoMinDelay}
+STATUSINFO_RANDOM	${stringTableStatusInfoRandom}
+
+TX_MINDELAY	${stringTableTxMinDelay}
 TX_MINDELAY_UNIT	${stringTableTxMinDelayUnit}
 TX_MINDELAY_UNIT=100MS	${optionUnit100MS}
 TX_MINDELAY_UNIT=S	${optionUnitS}
@@ -972,6 +1002,8 @@ TX_MINDELAY_UNIT=M	${optionUnitM}
 TX_MINDELAY_UNIT=H	${optionUnitH}
 TX_MINDELAY_VALUE	${stringTableTxMinDelayValue}
 
+TX_THRESHOLD_PERCENT	${stringTableTxThresholdPercent}
+
 UNREACH=FALSE	${stringTableUnreachFalse}
 UNREACH=TRUE	${stringTableUnreachTrue}
 
diff --git a/WebUI/www/ise/img/lang/de/hm-sen-sir-wm_800.png b/WebUI/www/ise/img/lang/de/hm-sen-sir-wm_800.png
new file mode 100755
index 00000000..2ccc34d3
Binary files /dev/null and b/WebUI/www/ise/img/lang/de/hm-sen-sir-wm_800.png differ
diff --git a/WebUI/www/ise/img/lang/en/hm-sen-sir-wm_800.png b/WebUI/www/ise/img/lang/en/hm-sen-sir-wm_800.png
new file mode 100755
index 00000000..1ca3cb22
Binary files /dev/null and b/WebUI/www/ise/img/lang/en/hm-sen-sir-wm_800.png differ
diff --git a/WebUI/www/ise/img/lang/tr/hm-sen-sir-wm_800.png b/WebUI/www/ise/img/lang/tr/hm-sen-sir-wm_800.png
new file mode 100755
index 00000000..1ca3cb22
Binary files /dev/null and b/WebUI/www/ise/img/lang/tr/hm-sen-sir-wm_800.png differ
diff --git a/WebUI/www/rega/esp/controls/alarmsirene.fn b/WebUI/www/rega/esp/controls/alarmsirene.fn
new file mode 100755
index 00000000..758b2109
--- /dev/null
+++ b/WebUI/www/rega/esp/controls/alarmsirene.fn
@@ -0,0 +1,69 @@
+function ::CreateAlarmArmingControl()
+{
+  object objState = cObj.DPByControl("ARMING.ARMSTATE");
+  object oSabotage = cObj.DPByControl("DEVICE.SABOTAGE");
+  object oLowBat = cObj.DPByControl("DEVICE.LOWBAT");
+  string lblSabotage = "${lblSabotageUnknown}";
+  string lblLowBat = "${stringTableAccuStateUnkown}";
+
+  if( oLowBat) {
+    boolean lowBat = oLowBat.Value();
+    if(lowBat == true) {
+      lblLowBat = "${stringTableBatteryEmpty}";
+    } else {
+      lblLowBat = "${stringTableBatteryOk}";
+    }
+  }
+  if( oSabotage ) {
+    lblSabotage = "${lblSabotage_"#oSabotage.Value()#"}";
+  }
+
+  if( objState )
+  {
+    WriteLine("<td>");
+      WriteLine("<table>");
+
+        WriteLine("<tr>");
+          WriteLine("<td>");
+            !Alarm Aus");
+            WriteLine("<div id='"#chnId#"Off' class='ControlBtnOff CLASS02551 j_translate'>${actionAlarmControlLblOff}</div>");
+          WriteLine("</td>");
+
+          WriteLine("<td>");
+            !Extern scharf
+            WriteLine("<div id='"#chnId#"Extern' class='ControlBtnOff CLASS02551 j_translate'>${actionAlarmControlLblExtern}</div>");
+          WriteLine("</td>");
+
+          WriteLine("<td>");
+            !Intern scharf
+            WriteLine("<div id='"#chnId#"Intern' class='ControlBtnOff CLASS02551 j_translate'>${actionAlarmControlLblIntern}</div>");
+          WriteLine("</td>");
+
+          WriteLine("<td>");
+            !Alarm blocked
+            WriteLine("<div id='"#chnId#"Blocked' class='ControlBtnOff CLASS02551 j_translate' style='border-style: solid; border-color: #89989b; cursor:default'>${actionAlarmControlLblBlocked}</div>");
+          WriteLine("</td>");
+        WriteLine("</tr>");
+
+        WriteLine("<tr style='height:40px; color:black'><td colspan='4'><hr></td></tr>");
+
+        WriteLine("<tr class='ControlBtnInfo' style='height:40px;'>");
+
+          WriteLine("<td id='"#chnId#"lowBat' colspan='2'>");
+            WriteLine(lblLowBat);
+          WriteLine("</td>");
+
+          WriteLine("<td id='"#chnId#"sabotage' colspan='2'>");
+            WriteLine(lblSabotage);
+          WriteLine("</td>");
+        WriteLine("</tr>");
+
+      WriteLine("</table>");
+    WriteLine("</td>");
+
+      WriteLine("<script type='text/javascript'>");
+        WriteLine("ibs"#cObj.ID()#" = new iseArmAlarmSiren("#cObj.ID()#", "#objState.Value()#", "#objState.ID()#");");
+      WriteLine("</script>");
+  }
+  return;
+}
\ No newline at end of file
diff --git a/WebUI/www/rega/esp/controls/powermeter.fn b/WebUI/www/rega/esp/controls/powermeter.fn
index 27c872d6..24f7d8c5 100755
--- a/WebUI/www/rega/esp/controls/powermeter.fn
+++ b/WebUI/www/rega/esp/controls/powermeter.fn
@@ -1,8 +1,7 @@
 !POWERMETER
 function ::CreatePowermeterControl() {
-  object oDevice = dom.GetObject(cObj.Device());
-  ! TODO Kanalnummer nach Kanaltype ermitteln und nicht fix 2 annehmen, auch wenn es im Moment passt
-  object oChannel = dom.GetObject(oDevice.Channels().GetAt(2));
+
+  object oChannel = dom.GetObject(chnId);
   string chAddress = oChannel.Address();
 
   object oEnergyCounter = cObj.DPByControl("POWERMETER.ENERGY_COUNTER");
@@ -222,9 +221,8 @@ function ::CreatePowermeterControl() {
 
 !POWERMETER_IGL
 function ::CreatePowermeterIGLControl() {
-  object oDevice = dom.GetObject(cObj.Device());
-  ! TODO Kanalnummer nach Kanaltype ermitteln und nicht fix 1 annehmen, auch wenn es im Moment passt
-  object oChannel = dom.GetObject(oDevice.Channels().GetAt(1));
+
+  object oChannel = dom.GetObject(chnId);
   string chAddress = oChannel.Address();
   string chType = oChannel.ChannelType();
 
@@ -377,11 +375,10 @@ function ::CreatePowermeterIGLControl() {
   return;
 }
 
-POWERMETER_PSM
+! POWERMETER_PSM
 function ::CreatePowermeterPSMControl() {
-  object oDevice = dom.GetObject(cObj.Device());
-  ! TODO Kanalnummer nach Kanaltype ermitteln und nicht fix 6 annehmen, auch wenn es im Moment passt
-  object oChannel = dom.GetObject(oDevice.Channels().GetAt(6));
+
+  object oChannel = dom.GetObject(chnId);
   string chAddress = oChannel.Address();
 
   object oEnergyCounter = cObj.DPByControl("POWERMETER_PSM.ENERGY_COUNTER");
@@ -600,4 +597,216 @@ function ::CreatePowermeterPSMControl() {
   WriteLine("</script>")
 
   return;
-}
\ No newline at end of file
+}
+
+!CN_POWERMETER_IEC
+function ::CreatePowermeterIECControl() {
+
+  !# sLastControlName = POWERMETER_IEC1 or POWERMETER_IEC2
+
+  !object oDevice = dom.GetObject(cObj.Device());
+  ! object oChannel = dom.GetObject(oDevice.Channels().GetAt(1));
+
+  object oChannel = dom.GetObject(chnId);
+  string chAddress = oChannel.Address();
+  string chType = oChannel.ChannelType();
+
+  if (sLastControlName == "POWERMETER_IEC1.") {
+    object oEnergyCounter = cObj.DPByControl("POWERMETER_IEC1.ENERGY_COUNTER");
+    object oEnergyCounterGas = cObj.DPByControl("POWERMETER_IEC1.GAS_ENERGY_COUNTER");
+    object oPower = cObj.DPByControl("POWERMETER_IEC1.POWER");
+    object oPowerGas = cObj.DPByControl("POWERMETER_IEC1.GAS_POWER");
+    object oBoot = cObj.DPByControl("POWERMETER_IEC1.BOOT");
+
+    object oEnergyCounterIEC = cObj.DPByControl("POWERMETER_IEC1.IEC_ENERGY_COUNTER");
+    object oPowerIEC = cObj.DPByControl("POWERMETER_IEC1.IEC_POWER");
+  }
+
+  if (sLastControlName == "POWERMETER_IEC2.") {
+    ! WriteLine( "<script>jQuery('#dpc"#chnId#"').parent().hide();</script>" );
+    object oEnergyCounterIEC = cObj.DPByControl("POWERMETER_IEC2.IEC_ENERGY_COUNTER");
+    object oPowerIEC = cObj.DPByControl("POWERMETER_IEC2.IEC_POWER");
+  }
+
+  object sysVarEnergyCounter = dom.GetObject("svEnergyCounter_"#chnId#"_"#chAddress);
+
+  ! Determine the name of the interface
+  integer iFaceID = cObj.Interface();
+  object oIface = dom.GetObject(iFaceID);
+  string sInterface = oIface.Name();
+
+  var energyCounter = "unknown";
+
+  if (sysVarEnergyCounter) {
+    energyCounter = sysVarEnergyCounter.Value().ToString(2);
+  }
+
+
+  ! html
+  WriteLine("<tr>");
+    WriteLine("<td>");
+      WriteLine("<table>");
+      if (sLastControlName == "POWERMETER_IEC1.") {
+        ! EnergyCounter
+        WriteLine("<tr>");
+          WriteLine("<td>");
+            WriteLine("<table width='100%' _height='100%' cellspacing='4'>");
+              WriteLine("<tr>");
+                WriteLine("<td>");
+                  WriteLine("<table class='ControlBtnInfo' style='min-width: 205px;'>");
+                    WriteLine("<tr>");
+                      WriteLine("<td>");
+                        WriteLine("<span>${lblInfoStatusControlEnergyCounter}</span>");
+                      WriteLine("</td>");
+                    WriteLine("</tr>");
+                    WriteLine("<tr>");
+                      WriteLine("<td>");
+                        WriteLine("<span id='"#chnId#"EnergyCounter'>&nbsp;</span><br/><span id='"#chnId#"EnergyCostCCU' class='hidden'></span>");
+                      WriteLine("</td>");
+                    WriteLine("</tr>");
+                  WriteLine("</table>");
+                WriteLine("</td>");
+              WriteLine("</tr>");
+            WriteLine("</table>");
+          WriteLine("</td>");
+
+         ! Reset EnergyCounter
+          WriteLine("<td>");
+            WriteLine("<table width='100%' _height='100%' cellspacing='4'>");
+              WriteLine("<tr>");
+                WriteLine("<td>");
+                  WriteLine("<div class='ControlBtnOff CLASS02550' style='line-height:35px' id='"#chnId#"resetEnergyCounter' >Reset</div>");
+                WriteLine("</td>");
+              WriteLine("</tr>");
+            WriteLine("</table>");
+          WriteLine("</td>");
+        WriteLine("</tr>");
+      }
+      ! Energy counter of the device
+      WriteLine("<tr name='"#chnId#"channelActiv' class='hidden'>");
+        WriteLine("<td>");
+          WriteLine("<table width='100%' _height='100%' cellspacing='4'>");
+              WriteLine("<tr>");
+                WriteLine("<td>");
+                  WriteLine("<table class='ControlBtnInfo' style='min-width: 205px;'>");
+                    WriteLine("<tr>");
+                      WriteLine("<td>");
+                        WriteLine("<span>${lblInfoStatusControlDevice}</span>");
+                      WriteLine("</td>");
+                    WriteLine("</tr>");
+                    WriteLine("<tr>");
+                      WriteLine("<td>");
+
+                      if (sLastControlName != "POWERMETER_IEC2.") {
+                        WriteLine("<div name='"#chnId#"sensor' id='"#chnId#"CounterDevice' class ='hidden'><span>"#oEnergyCounter.Value().ToString(2)#"</span>&nbsp;<span name='"#chnId#"EnergyCostDeviceUnit' class='hidden'>"#oEnergyCounter.ValueUnit()#"</span><br/><span id='"#chnId#"EnergyCostDevice' class='hidden'></span></div>");
+                        WriteLine("<div name='"#chnId#"sensorGas' id='"#chnId#"CounterDeviceGas' class='hidden'><span>"#oEnergyCounterGas.Value().ToString(2)#"</span>&nbsp;<span name='"#chnId#"EnergyCostDeviceUnit' class='hidden'>"#oEnergyCounterGas.ValueUnit()#"</span><br/><span id='"#chnId#"EnergyCostDeviceGas' class='hidden'></span></div>");
+                      }
+                      WriteLine("<div name='"#chnId#"sensorIEC' id='"#chnId#"CounterDeviceIEC' class ='hidden'><span>"#oEnergyCounterIEC.Value().ToString(2)#"</span>&nbsp;<span name='"#chnId#"EnergyCostDeviceUnit' class='hidden'>"#oEnergyCounterIEC.ValueUnit()#"</span><br/><span id='"#chnId#"EnergyCostDeviceIEC' class='hidden'></span></div>");
+
+
+                      WriteLine("</td>");
+                    WriteLine("</tr>");
+                  WriteLine("</table>");
+                WriteLine("</td>");
+              WriteLine("</tr>");
+          WriteLine("</table>");
+        WriteLine("</td>");
+      WriteLine("</tr>");
+
+    ! Power
+      WriteLine("<tr name='"#chnId#"channelActiv' class='hidden'>");
+        WriteLine("<td>");
+          WriteLine("<table width='100%' _height='100%' cellspacing='4'>");
+            WriteLine("<tr>");
+              WriteLine("<td>");
+                WriteLine("<table class='ControlBtnInfo' style='min-width: 205px;'>");
+                  WriteLine("<tr>");
+                    WriteLine("<td>");
+                      WriteLine("<span name='"#chnId#"sensor' class='hidden'>${lblInfoStatusControlPower}</span>");
+                      WriteLine("<span name='"#chnId#"sensorIEC' class='hidden'>${lblInfoStatusControlPower}</span>");
+                      WriteLine("<span name='"#chnId#"sensorGas' class='hidden'>${lblInfoStatusControlGas}</span>");
+                    WriteLine("</td>");
+                  WriteLine("</tr>");
+                  WriteLine("<tr>");
+                    WriteLine("<td>");
+                      if (sLastControlName != "POWERMETER_IEC2.") {
+                        WriteLine("<div name='"#chnId#"sensor' class='hidden'><span id='"#chnId#"Power'>"#oPower.Value().ToString(2)#" "#oPower.ValueUnit()#"</span></div>");
+                        WriteLine("<div name='"#chnId#"sensorGas' class='hidden'><span id='"#chnId#"PowerGas'>"#oPowerGas.Value().ToString(2)#" m<sup>3</span></div>");
+                      }
+                      WriteLine("<div name='"#chnId#"sensorIEC' class='hidden'><span id='"#chnId#"PowerIEC'>"#oPowerIEC.Value().ToString(2)#" "#oPowerIEC.ValueUnit()#"</span></div>");
+
+                    WriteLine("</td>");
+                  WriteLine("</tr>");
+                WriteLine("</table>");
+              WriteLine("</td>");
+            WriteLine("</tr>");
+          WriteLine("</table>");
+        WriteLine("</td>");
+      WriteLine("</tr>");
+
+      WriteLine("</table>");
+    WriteLine("</td>");
+  WriteLine("</tr>");
+
+  WriteLine("<tr id='"#chnId#"channelNotActiv' class='hidden'>");
+    WriteLine("<td>");
+      WriteLine("<table class=\"ControlBtnInfo\">");
+        WriteLine("<tr>");
+          WriteLine("<td>");
+            WriteLine("<div>");
+              WriteLine("${controlChannelHasNoFunction}");
+            WriteLine("</div>");
+          WriteLine("</td>");
+        WriteLine("</tr>");
+      WriteLine("</table>");
+    WriteLine("</td>");
+  WriteLine("</tr>");
+
+  ! end html
+
+
+  WriteLine("<script type='text/javascript'>");
+    WriteLine("var opts = {};");
+
+    WriteLine("var chType =  '"#sLastControlName#"';");
+    WriteLine("opts.chType =  chType.split('.')[0];");
+    WriteLine("opts.iface = '"#sInterface#"';");
+    WriteLine("opts.chAddress = '"#chAddress#"';");
+
+    if (sLastControlName == "POWERMETER_IEC1.") {
+      WriteLine("opts.bootFlag = "#oBoot.Value()#";");
+      WriteLine("opts.idEnergyCounter = "#oEnergyCounter.ID()#";");
+      WriteLine("opts.valEnergyCounter = "#oEnergyCounter.Value()#";");
+      WriteLine("opts.unitEnergyCounter = '"#oEnergyCounter.ValueUnit()#"';");
+      WriteLine("opts.maxValEnergyCounter = '"#oEnergyCounter.ValueMax()#"';");
+      WriteLine("opts.minValEnergyCounter = '"#oEnergyCounter.ValueMin()#"';");
+      WriteLine("opts.idPower = "#oPower.ID()#";");
+      WriteLine("opts.valPower = "#oPower.Value()#";");
+      WriteLine("opts.unitPower = '"#oPower.ValueUnit()#"';");
+      WriteLine("opts.idEnergyCounterGas = "#oEnergyCounterGas.ID()#";");
+      WriteLine("opts.valEnergyCounterGas = "#oEnergyCounterGas.Value()#";");
+      WriteLine("opts.unitEnergyCounterGas = '"#oEnergyCounterGas.ValueUnit()#"';");
+      WriteLine("opts.maxValEnergyCounterGas = '"#oEnergyCounterGas.ValueMax()#"';");
+      WriteLine("opts.minValEnergyCounterGas = '"#oEnergyCounterGas.ValueMin()#"';");
+      WriteLine("opts.idPowerGas = "#oPowerGas.ID()#";");
+      WriteLine("opts.valPowerGas = "#oPowerGas.Value()#";");
+      WriteLine("opts.unitPowerGas = '"#oPowerGas.ValueUnit()#"';");
+    }
+    if (oEnergyCounterIEC) {
+      WriteLine("opts.idEnergyCounterIEC = "#oEnergyCounterIEC.ID()#";");
+      WriteLine("opts.valEnergyCounterIEC = "#oEnergyCounterIEC.Value()#";");
+      WriteLine("opts.unitEnergyCounterIEC = '"#oEnergyCounterIEC.ValueUnit()#"';");
+    }
+
+    if (oPowerIEC) {
+      WriteLine("opts.idPowerIEC = "#oPowerIEC.ID()#";");
+      WriteLine("opts.valPowerIEC = "#oPowerIEC.Value()#";");
+      WriteLine("opts.unitPowerIEC = '"#oPowerIEC.ValueUnit()#"';");
+    }
+
+    WriteLine("ipm"#chnId#" = new isePowerMeter("#chnId#",opts);");
+
+  WriteLine("</script>")
+
+  return;
+}
diff --git a/WebUI/www/rega/esp/controls/smokedetector.fn b/WebUI/www/rega/esp/controls/smokedetector.fn
new file mode 100755
index 00000000..433b33da
--- /dev/null
+++ b/WebUI/www/rega/esp/controls/smokedetector.fn
@@ -0,0 +1,42 @@
+function ::CreateSmokeDetectorControl()
+{
+  object objDangerState = cObj.DPByControl("DANGER.STATE");
+
+  if (objDangerState) {
+    string sDangerState = objDangerState.Value();
+  } else {
+    string sDangerState = "unknown";
+  }
+  object objState = cObj.DPByControl("SMOKE_DETECTOR.COMMAND");
+
+  if( objState )
+  {
+
+    WriteLine("<tr>");
+      WriteLine("<td colspan='2'>");
+        WriteLine("<hr>");
+        WriteLine("<div style='color:black'>${lblIntrusionAlarm}</div>");
+      WriteLine("</td>");
+    WriteLine("</tr>");
+
+    WriteLine("<tr>");
+      WriteLine("<td class='CLASS02521'>");
+        WriteLine("<div id='"#chnId#"Off' class='ControlBtnOff CLASS02522 j_translate'>${actionStatusControlLblOff}</div>");
+      WriteLine("</td>");
+
+      WriteLine("<td class='CLASS02521'>");
+        WriteLine("<div id='"#chnId#"On' class='ControlBtnOff CLASS02522 j_translate'>${actionStatusControlLblOn}</div>");
+      WriteLine("</td>");
+      WriteLine("<td class='CLASS02523'></td><td class='CLASS02523'></td><td class='CLASS02523'></td>");
+    WriteLine("</tr>");
+
+    WriteLine("<script type='text/javascript'>");
+      WriteLine("ibs"#cObj.ID()#" = new iseSmokeDetectorHmIP("#cObj.ID()#", "#objState.ID()#", "#sDangerState#");");
+
+      Write("jQuery('#"#chnId#"Off').html(translateKey('actionStatusControlLblOff')).show();");
+      Write("jQuery('#"#chnId#"On').html(translateKey('actionStatusControlLblOn')).show();");
+
+    WriteLine("</script>");
+  }
+  return;
+}
\ No newline at end of file
diff --git a/WebUI/www/rega/esp/datapointconfigurator.fn b/WebUI/www/rega/esp/datapointconfigurator.fn
index 833b131f..472bcaf6 100755
--- a/WebUI/www/rega/esp/datapointconfigurator.fn
+++ b/WebUI/www/rega/esp/datapointconfigurator.fn
@@ -111,20 +111,23 @@ function ::dcCreate()
     var CN_DOOR_SENSOR     = "DOOR_SENSOR.";
     var CN_RHS             = "RHS.";
     var CN_THERMO          = "TEMP.";
-    var CN_DIGITAL_ANALOG_OUTPUT            = "DIGITAL_ANALOG_OUTPUT.";
+    var CN_DIGITAL_ANALOG_OUTPUT      = "DIGITAL_ANALOG_OUTPUT.";
     var CN_CAPACITIVE_FILLING_SENSOR  = "CAPACITIVE_FILLING_LEVEL_SENSOR.";
     var CN_DANGER          = "DANGER.";
     var CN_WIN_SC          = "WIN_SC.";
-    var CN_WIN_SC_SENSOR          = "WIN_SC_SENSOR.";
-    var CN_WIN_SC_SECURE          = "WIN_SC_SECURE.";
-    var CN_HEATING_CONTROL          = "HEATING_CONTROL.";
+    var CN_WIN_SC_SENSOR   = "WIN_SC_SENSOR.";
+    var CN_WIN_SC_SECURE   = "WIN_SC_SECURE.";
+    var CN_HEATING_CONTROL = "HEATING_CONTROL.";
     var CN_HEATING_CONTROL_HMIP     = "HEATING_CONTROL_HMIP.";
-    var CN_POWERMETER          = "POWERMETER.";
-    var CN_POWERMETER_IGL          = "POWERMETER_IGL.";
-    var CN_POWERMETER_PSM          = "POWERMETER_PSM.";
-    var CN_RGBW_COLOR          = "RGBW_COLOR.";
-    var CN_RGBW_AUTOMATIC          = "RGBW_AUTOMATIC.";
-    var CN_SMOKE_DETECTOR          = "SMOKE_DETECTOR.";
+    var CN_POWERMETER      = "POWERMETER.";
+    var CN_POWERMETER_IGL  = "POWERMETER_IGL.";
+    var CN_POWERMETER_PSM  = "POWERMETER_PSM.";
+    var CN_POWERMETER_IEC1  = "POWERMETER_IEC1.";
+    var CN_POWERMETER_IEC2  = "POWERMETER_IEC2.";
+    var CN_RGBW_COLOR      = "RGBW_COLOR.";
+    var CN_RGBW_AUTOMATIC  = "RGBW_AUTOMATIC.";
+    var CN_SMOKE_DETECTOR  = "SMOKE_DETECTOR.";
+    var CN_ARMING          = "ARMING.";
 
     var CN_EVENT_INTERFACE = "EVENT_INTERFACE.";
     var CN_NOT_ACTIVE = "CHANNEL_NOT_ACTIVE";
@@ -313,7 +316,7 @@ function ::dcCreate()
 
 
          !# DANGER
-          bIsControl = ( sControlName.Find(CN_DANGER) > -1 );     !#### Attention: workaround!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+          bIsControl = ( sControlName.Find(CN_DANGER) > -1 );
           if( bIsControl && (sLastControlName!=CN_DANGER) )
           {
             WriteLine( "<script>conInfo('Control DANGER-Sensor found.');</script>" );
@@ -402,6 +405,26 @@ function ::dcCreate()
             Call("/esp/controls/powermeter.fn::CreatePowermeterPSMControl()");
           }
 
+          !# POWERMETER_IEC1
+          bIsControl = ( sControlName.Find(CN_POWERMETER_IEC1) > -1 );
+          if( bIsControl && (sLastControlName != CN_POWERMETER_IEC1) )
+          {
+            WriteLine( "<script>conInfo('Control CN_POWERMETER_IEC1 found.');</script>" );
+            isKnownControl = true;
+            sLastControlName = CN_POWERMETER_IEC1;
+            Call("/esp/controls/powermeter.fn::CreatePowermeterIECControl()");
+          }
+
+          !# POWERMETER_IEC2
+          bIsControl = ( sControlName.Find(CN_POWERMETER_IEC2) > -1 );
+          if( bIsControl && (sLastControlName != CN_POWERMETER_IEC2) )
+          {
+            WriteLine( "<script>conInfo('Control CN_POWERMETER_IEC2 found.');</script>" );
+            isKnownControl = true;
+            sLastControlName = CN_POWERMETER_IEC2;
+            Call("/esp/controls/powermeter.fn::CreatePowermeterIECControl()");
+          }
+
           !# CN_RGBW_COLOR
           bIsControl = ( sControlName.Find(CN_RGBW_COLOR) > -1 );
           if( bIsControl && (sLastControlName != CN_RGBW_COLOR) )
@@ -432,6 +455,17 @@ function ::dcCreate()
             Call("/esp/controls/smokedetector.fn::CreateSmokeDetectorControl()");
           }
 
+          !# CN_ARMING
+          bIsControl = ( sControlName.Find(CN_ARMING) > -1 );
+          if( bIsControl && (sLastControlName != CN_ARMING) )
+          {
+            WriteLine( "<script>conInfo('Control CN_ARMING found.');</script>" );
+            isKnownControl = true;
+            sLastControlName = CN_ARMING;
+            Call("/esp/controls/alarmsirene.fn::CreateAlarmArmingControl()");
+          }
+
+
           !# EVENT_INTERFACE
           bIsControl = ( sControlName.Find(CN_EVENT_INTERFACE) > -1 );
           if( bIsControl && (sLastControlName!=CN_EVENT_INTERFACE) )
@@ -645,12 +679,16 @@ function ::CreateUnknown()
               string sShortKey = oDP.HSSID();
               if( (oDP.ValueType() == ivtInteger) && (oDP.ValueSubType() == istEnum) )
               {
-                ! TODO Current HmIP devices don`t work properly with web.webGetValueFromList
-                ! Therefore for testing reasons this is deactivated
-                !sLongKey = sLongKey#"="#web.webGetValueFromList( oDP.ValueList(), value );
-                sLongKey = sLongKey#"="#value;
-                !sShortKey = sShortKey#"="#web.webGetValueFromList( oDP.ValueList(), value );
-                sShortKey = sShortKey#"="#value;
+                ! Current HmIP devices don`t work properly with web.webGetValueFromList
+                ! Therefore this is deactivated
+                if ( (oEName.Find("HmIP-RF.") == -1) ) {
+                 sLongKey = sLongKey#"="#web.webGetValueFromList( oDP.ValueList(), value );
+                 sShortKey = sShortKey#"="#web.webGetValueFromList( oDP.ValueList(), value );
+                } else {
+                  sLongKey = sLongKey#"="#value;
+                  sShortKey = sShortKey#"="#value;
+                }
+
                 bHideValue = true;
               }
               if( (oDP.ValueType() == ivtBinary ) && ((oDP.ValueSubType() == istGeneric)||(oDP.ValueSubType() == istBool)||(oDP.ValueSubType() == istSwitch)) )
diff --git a/WebUI/www/rega/esp/system.fn b/WebUI/www/rega/esp/system.fn
index 1cd0d42f..51d62f07 100755
--- a/WebUI/www/rega/esp/system.fn
+++ b/WebUI/www/rega/esp/system.fn
@@ -442,12 +442,6 @@ function ::UpdateUI()
     }    
   }
 
-  !###################
-  !# PowerMeter #
-  !###################
-
-  ! WriteLine("updateSysVarEnergyCounter();");
-
   string s;
   foreach(s,dom.TestReadyIDs().EnumIDs())
   {
@@ -568,15 +562,16 @@ function ::UpdateUI()
       {
         string sLastTime = "";
         Call("/esp/system.fn::getLastTime()");
-				if ( oTmp.IsTypeOf(OT_PROGRAM) ) {
+        if ( oTmp.IsTypeOf(OT_PROGRAM) ) {
           if ( ( sTM != sLastTime # oTmp.Active() ) ) {
             Write( 'recreateControl('#cId#',"'#sLastTime#'");' );
           }
         } else {
-          if ( ( sTM != sLastTime ) ) {
+          if ( (sLastTime != "") && ( sTM != sLastTime ) ) {
             Write( 'recreateControl('#cId#',"'#sLastTime#'");' );
           }
-        }        Call("/esp/system.fn::writeWarnStateJS()");
+        }
+        Call("/esp/system.fn::writeWarnStateJS()");
       }
     }
   }
@@ -1143,12 +1138,12 @@ function ::getLastTime()
       sLastTime = obj.ProgramLastExecuteTime();
       iSeconds = obj.ProgramLastExecuteTimeSeconds();
     }
-	  if( iSeconds == 0 )
-	  {
-	    sLastTime = "";
-	  }
-	  else
-	  {
+    if( iSeconds == 0 )
+    {
+      sLastTime = "";
+    }
+    else
+    {
       sLastTime = sLastTime.Format("%d.%m.%Y %H:%M:%S");
     }
   }
@@ -1200,7 +1195,7 @@ function ::writeProgCtrl()
     Write("<td></td>");
   }
   Write("<td></td><td></td><td></td>");
-	
+  
   Write("</tr>");
   Write("</table>");
     Write("<script type='text/javascript'>");
diff --git a/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm b/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm
index 91c1c41e..dd7d2358 100755
--- a/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm
+++ b/WebUI/www/rega/pages/tabs/admin/views/newdevices.htm
@@ -751,102 +751,6 @@
 // Current/Gas EnergyCounter
 CreateSysVarEnergyCounterScriptIGL = function (chn, channelType, sensorType) {
 
-
-  //Standard EnergyCounter
-  CreateSysVarEnergyCounterScript = function(chn) {
-
-    var sysVarIds = getSysVarEnergyCounterIds(chn);
-    var sysVarId = sysVarIds.counterId,
-      sysVarOldValId = sysVarIds.tmpCounterId;
-
-    var updateScript =
-    "object chn = dom.GetObject('"+chn.id+"');\n" +
-    "object oBoot = chn.DPByControl('POWERMETER.BOOT');\n" +
-    "object oEnergyCounter = chn.DPByControl('POWERMETER.ENERGY_COUNTER');\n" +
-    "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
-    "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
-
-    "boolean bootFlag = oBoot.Value();\n" +
-    "real devVal = oEnergyCounter.Value();\n" +
-    "real devValMax = oEnergyCounter.ValueMax();\n" +
-    "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
-    "real diffVal = 0.0;\n" +
-    "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
-    "integer tmp_devVal = (devVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-    "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 100000).ToInteger();\n" +
-
-
-    "if (oldDevVal <= 0) {\n" +
-      "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-      "oSysVarEnergyCounter.State(devVal);\n" +
-    "} else {\n" +
-      "if ( ( bootFlag == true ) && ( tmp_devVal < tmp_oldDevVal ) ) {\n" +
-        "diffVal = devVal;\n" +
-      "} else {\n" +
-        "if (tmp_devVal >= tmp_oldDevVal) {\n" +
-          "diffVal = devVal - oldDevVal;\n" +
-        "}\n"+
-
-        "if ((tmp_devVal > 0) && (tmp_devVal < tmp_oldDevVal)) {\n" +
-          "diffVal = (devVal + devValMax) - oldDevVal;\n" +
-        "}\n" +
-      "}\n"+
-      "if (devVal > 0) {\n" +
-        "oSysVarEnergyCounterOldVal.State(devVal);\n" +
-      "}\n" +
-      "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n" +
-    "}\n";
-
-    var script =
-    "var sysVarId = '"+sysVarId+"';\n" +
-    "var channel = dom.GetObject('"+chn.id+"');\n" +
-    "var channelId = channel.ID();\n" +
-    "var paramId = channel.DPByControl('POWERMETER.ENERGY_COUNTER').ID();\n"+
-    "var _script = \""+updateScript+"\";\n" +
-
-    "var DP_VALUE_CHECK_UPDATE = 13;"+
-
-    "var programs = dom.GetObject(ID_PROGRAMS);"+
-    "var program  = dom.CreateObject(OT_PROGRAM);"+
-    "program.Name('prgEnergyCounter_"+ chn.id +"_"+chn.address+"');"+
-    "program.Internal(true);"+
-    "programs.Add(program.ID());"+
-
-
-    "var rule = program.Rule();"+
-    "rule.RuleOperatorType(OPERATOR_NONE);"+
-
-    "var condition = rule.RuleAddCondition();"+
-    "condition.CndOperatorType(OPERATOR_NONE);"+
-
-    "var singleCondition = condition.CndAddSingle();"+
-    "singleCondition.OperatorType(OPERATOR_NONE);"+
-    "singleCondition.ConditionType(9);"+
-    "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
-    "singleCondition.LeftValType(ivtObjectId);"+
-    "singleCondition.LeftVal(paramId);"+
-    "singleCondition.RightVal1ValType(ivtFloat);"+
-    "singleCondition.RightVal1(0.0);"+
-    "singleCondition.RightVal2ValType(ivtFloat);"+
-    "singleCondition.RightVal2(0.0);"+
-
-    "singleCondition.ConditionChannel(channelId);"+
-
-    "var destination = rule.RuleDestination();"+
-    "var action = destination.DestAddSingle();"+
-    "action.DestinationParam(ivtString);"+
-    "action.DestinationValueType(ivtString);"+
-    "action.DestinationValue(_script);"+
-
-    "program.Active(true);"+
-    "dom.RTUpdate(0);";
-
-    homematic("ReGa.runScript", {"script": script});
-  };
-
-  // channelType = POWERMETER or POWERMETER_IGS
-  // sensorType = "GAS" or "CURRENT"
-
   var sysVarIds = (sensorType == "CURRENT") ? getSysVarEnergyCounterIds(chn) : getSysVarEnergyCounterGasIds(chn);
   var sysVarId = sysVarIds.counterId,
     sysVarOldValId = sysVarIds.tmpCounterId;
@@ -1068,6 +972,87 @@
   homematic("ReGa.runScript", {"script": script});
 };
 
+//POWERMETER_IEC1
+CreateSysVarEnergyCounterScriptIEC = function(chn) {
+
+  var sysVarIds = getSysVarEnergyCounterIECIds(chn);
+  var sysVarId = sysVarIds.counterId,
+    sysVarOldValId = sysVarIds.tmpCounterId;
+
+  var updateScript =
+  "object chn = dom.GetObject('"+chn.id+"');\n" +
+  "object oEnergyCounter = chn.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER');\n" +
+  "object oSysVarEnergyCounter = dom.GetObject('"+sysVarId+"');\n" +
+  "object oSysVarEnergyCounterOldVal = dom.GetObject('"+sysVarOldValId+"');\n" +
+
+  "real devVal = oEnergyCounter.Value();\n" +
+  "real devValMax = oEnergyCounter.ValueMax();\n" +
+  "real oldDevVal = oSysVarEnergyCounterOldVal.Value();\n" +
+  "real diffVal = 0.0;\n" +
+  "real sysVarVal = oSysVarEnergyCounter.Value();\n" +
+  "integer tmp_devVal = (devVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+  "integer tmp_oldDevVal = (oldDevVal.ToString().ToFloat() * 1000).ToInteger();\n" +
+
+
+    "!overFlow is true\n" +
+    "if (tmp_oldDevVal > tmp_devVal) {\n" +
+      "! An device overflow has occured\n" +
+      "diffVal = (devVal + devValMax) - oldDevVal;\n" +
+    "} else {\n" +
+      "! This is the normal condition\n" +
+      "diffVal = devVal - oldDevVal;\n" +
+    "}\n" +
+
+  "oSysVarEnergyCounterOldVal.State(devVal);\n" +
+  "oSysVarEnergyCounter.State(sysVarVal + diffVal);\n";
+
+  var script =
+  "var sysVarId = '"+sysVarId+"';\n" +
+  "var channel = dom.GetObject('"+chn.id+"');\n" +
+  "var channelId = channel.ID();\n" +
+  "var paramId = channel.DPByControl('POWERMETER_IEC1.IEC_ENERGY_COUNTER').ID();\n"+
+  "var _script = \""+updateScript+"\";\n" +
+
+  "var DP_VALUE_CHECK_UPDATE = 13;"+
+
+  "var programs = dom.GetObject(ID_PROGRAMS);"+
+  "var program  = dom.CreateObject(OT_PROGRAM);"+
+  "program.Name('prgEnergyCounterIEC_"+ chn.id +"_"+chn.address+"');"+
+  "program.Internal(true);"+
+  "programs.Add(program.ID());"+
+
+
+  "var rule = program.Rule();"+
+  "rule.RuleOperatorType(OPERATOR_NONE);"+
+
+  "var condition = rule.RuleAddCondition();"+
+  "condition.CndOperatorType(OPERATOR_NONE);"+
+
+  "var singleCondition = condition.CndAddSingle();"+
+  "singleCondition.OperatorType(OPERATOR_NONE);"+
+  "singleCondition.ConditionType(9);"+
+  "singleCondition.ConditionType2(DP_VALUE_CHECK_UPDATE);"+
+  "singleCondition.LeftValType(ivtObjectId);"+
+  "singleCondition.LeftVal(paramId);"+
+  "singleCondition.RightVal1ValType(ivtFloat);"+
+  "singleCondition.RightVal1(0.0);"+
+  "singleCondition.RightVal2ValType(ivtFloat);"+
+  "singleCondition.RightVal2(0.0);"+
+
+  "singleCondition.ConditionChannel(channelId);"+
+
+  "var destination = rule.RuleDestination();"+
+  "var action = destination.DestAddSingle();"+
+  "action.DestinationParam(ivtString);"+
+  "action.DestinationValueType(ivtString);"+
+  "action.DestinationValue(_script);"+
+
+  "program.Active(true);"+
+  "dom.RTUpdate(0);";
+
+  homematic("ReGa.runScript", {"script": script});
+};
+
 getSysVarEnergyCounterIds = function (chn) {
   return {"counterId": "svEnergyCounter_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterOldVal_" + chn.id};
 };
@@ -1076,12 +1061,16 @@
   return {"counterId": "svEnergyCounterGas_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterGasOldVal_" + chn.id};
 };
 
+getSysVarEnergyCounterIECIds = function (chn) {
+  return {"counterId": "svEnergyCounterIEC_" + chn.id + "_" + chn.address, "tmpCounterId": "svEnergyCounterIECOldVal_" + chn.id};
+};
+
 CheckAndCreateSysVarEnergyCounter = function(chn) {
   var sysVarIds = getSysVarEnergyCounterIds(chn);
   var SysVarEnergyCounterId = sysVarIds.counterId,
    SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
 
-   oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
+  var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
 
   // SysVar svEnergyCounter_xxxx doesn´t exist
   if (!oSysVarEnergyCounter) {
@@ -1099,12 +1088,37 @@
   }
 };
 
+//***
+
+CheckAndCreateSysVarEnergyCounterIEC = function(chn) {
+  conInfo("CheckAndCreateSysVarEnergyCounterIEC");
+  var sysVarIds = getSysVarEnergyCounterIECIds(chn);
+  var SysVarEnergyCounterId = sysVarIds.counterId,
+   SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
+
+   var oSysVarEnergyCounter = homematic("SysVar.get", {"id" : SysVarEnergyCounterId});
+
+  // SysVar svEnergyCounter_xxxx doesn´t exist
+  if (!oSysVarEnergyCounter) {
+    conInfo("create system variable: " + SysVarEnergyCounterId);
+    oSysVarEnergyCounter = CreateSysVarEnergyCounter(SysVarEnergyCounterId, "float");
+    CreateSysVarEnergyCounter(SysVarEnergyCounterOldValId, "float");
+    conInfo("CreateSysVarEnergyCounterScriptIEC");
+    CreateSysVarEnergyCounterScriptIEC(chn);
+    readEnergyCounter = true; // sorgt dafür, daß die Liste der EnergyCounter aktualisiert wird.
+  }
+};
+
+//***
+
+
 CheckAndCreateSysVarEnergyCounterIGL = function (chn, channelType) {
+  conInfo("CheckAndCreateSysVarEnergyCounterIGL");
   var sysVarIds = getSysVarEnergyCounterIds(chn);
   var SysVarEnergyCounterId = sysVarIds.counterId,
     SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
 
-  oSysVarEnergyCounter = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
+  var oSysVarEnergyCounter = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
 
   // SysVar svEnergyCounter_xxxx doesn´t exist
   if (!oSysVarEnergyCounter) {
@@ -1120,11 +1134,12 @@
 };
 
 CheckAndCreateSysVarEnergyCounterGasIGL = function (chn, channelType) {
+  conInfo("CheckAndCreateSysVarEnergyCounterGasIGL");
   var sysVarIds = getSysVarEnergyCounterGasIds(chn);
   var SysVarEnergyCounterId = sysVarIds.counterId,
     SysVarEnergyCounterOldValId = sysVarIds.tmpCounterId;
 
-  oSysVarEnergyCounterGas = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
+  var oSysVarEnergyCounterGas = homematic("SysVar.get", {"id": SysVarEnergyCounterId});
 
   // SysVar svEnergyCounterGas_xxxx doesn´t exist
   if (!oSysVarEnergyCounterGas) {
@@ -1142,6 +1157,7 @@
 CheckIfDevHasPowerMeter = function (devId) {
   var oDevice = homematic("Device.get", {"id": devId});
   if (oDevice) {
+    ShowWaitAnim();
     jQuery.each(oDevice.channels, function (index, channel) {
       var channelType = GetChannelType(channel);
       if (channelType == "POWERMETER") {
@@ -1156,7 +1172,15 @@
       if (channelType == "ENERGIE_METER_TRANSMITTER") {
         CheckAndCreateSysVarEnergyCounter(channel);
       }
+
+      if (channelType == "POWERMETER_IEC1") {
+        // IEC Sensor 1
+        CheckAndCreateSysVarEnergyCounterIGL(channel, channelType);
+        CheckAndCreateSysVarEnergyCounterGasIGL(channel, channelType);
+        CheckAndCreateSysVarEnergyCounterIEC(channel);
+      }
     });
+    HideWaitAnim();
   }
 };
 
diff --git a/WebUI/www/webui/js/common/viewmodels.js b/WebUI/www/webui/js/common/viewmodels.js
index 3d5dca4a..e3f119a6 100755
--- a/WebUI/www/webui/js/common/viewmodels.js
+++ b/WebUI/www/webui/js/common/viewmodels.js
@@ -3,157 +3,157 @@ virtualDevicePrefix = "INT";
 //Class to represent a device
 function GroupDevice(id, serialNumber, type)
 {
-	var self = this;
-	self.id = id;
-	self.serialNumber = serialNumber;
-	self.device = DeviceList.getDeviceByAddress(serialNumber);
-	self.type = type;
-	if(typeof self.device == "undefined")
-	{
-		self.name = type +" "+ serialNumber;
-		
-	}
-	else
-	{
-		self.name = self.device.getName();
-	}
-	
-	self.getConfigPending = function()
-	{
-		var deviceParamSet = homematic('Interface.getParamset', {"interface": "BidCos-RF", "address" : self.serialNumber+":0", "paramsetKey" : "VALUES"});
-		if(deviceParamSet.CONFIG_PENDING === '1')
-		{
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	};
-	
-	self.imagePath = ko.computed(function() {
-		if(this.type == "unknown")
-		{
-			return "/config/img/devices/50/unknown_device_thumb.png";
-		}
-		else
-		{
-			return DEV_getImagePath(this.type, 50);
-		}
+  var self = this;
+  self.id = id;
+  self.serialNumber = serialNumber;
+  self.device = DeviceList.getDeviceByAddress(serialNumber);
+  self.type = type;
+  if(typeof self.device == "undefined")
+  {
+    self.name = type +" "+ serialNumber;
+    
+  }
+  else
+  {
+    self.name = self.device.getName();
+  }
+  
+  self.getConfigPending = function()
+  {
+    var deviceParamSet = homematic('Interface.getParamset', {"interface": "BidCos-RF", "address" : self.serialNumber+":0", "paramsetKey" : "VALUES"});
+    if(deviceParamSet.CONFIG_PENDING === '1')
+    {
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  };
+  
+  self.imagePath = ko.computed(function() {
+    if(this.type == "unknown")
+    {
+      return "/config/img/devices/50/unknown_device_thumb.png";
+    }
+    else
+    {
+      return DEV_getImagePath(this.type, 50);
+    }
         
     }, this);
-	
-	self.showDevicePicture = function(groupdevice, mouseoverevent)
-	{
-		picDivShow(jg_250, self.type, 250, -1, mouseoverevent.currentTarget);
-	};
-	
-	self.hideDevicePicture = function()
-	{
-		picDivHide(jg_250);
-	};
+  
+  self.showDevicePicture = function(groupdevice, mouseoverevent)
+  {
+    picDivShow(jg_250, self.type, 250, -1, mouseoverevent.currentTarget);
+  };
+  
+  self.hideDevicePicture = function()
+  {
+    picDivHide(jg_250);
+  };
 }
 
 function Header(title, propertyName)
 {
-	var self = this;
-	self.title = title;
-	self.sortPropertyName = propertyName;
-	self.colspan = 1;
-	self.asc = true;
-	self.isActive = ko.observable(false);
-	self.headerClass = ko.computed(function(){
-		return self.isActive() ? "DeviceListHead_Active" : "DeviceListHead";
-	});
+  var self = this;
+  self.title = title;
+  self.sortPropertyName = propertyName;
+  self.colspan = 1;
+  self.asc = true;
+  self.isActive = ko.observable(false);
+  self.headerClass = ko.computed(function(){
+    return self.isActive() ? "DeviceListHead_Active" : "DeviceListHead";
+  });
 }
 
 function padLeft(nr, n, str){
-	return Array(n-String(nr).length+1).join(str||'0')+nr;
+  return Array(n-String(nr).length+1).join(str||'0')+nr;
 }
 
 function createVirtualDeviceSerialNumber (id) {
-		return virtualDevicePrefix+padLeft(id,7);
+    return virtualDevicePrefix+padLeft(id,7);
 }
 
 function retryGetDeviceAndDeviceName(group, tries) {
-	function getGroupDeviceFromRega () {
-		group.device = DeviceList.getDeviceByAddress(group.virtualDeviceSerialNumber);
-		if(typeof group.device === "undefined")
-		{
-			if(tries > 0) {
-				retryGetDeviceAndDeviceName(group, tries - 1);
-			} else {
-				group.virtualDeviceName("");
+  function getGroupDeviceFromRega () {
+    group.device = DeviceList.getDeviceByAddress(group.virtualDeviceSerialNumber);
+    if(typeof group.device === "undefined")
+    {
+      if(tries > 0) {
+        retryGetDeviceAndDeviceName(group, tries - 1);
+      } else {
+        group.virtualDeviceName("");
         group.groupDeviceName("");
-			}
-		}
-		else
-		{
-			group.virtualDeviceName(group.device.getName());
+      }
+    }
+    else
+    {
+      group.virtualDeviceName(group.device.getName());
       group.groupDeviceName(group.device.getName());
-		}
-	}	
-	
-	window.setTimeout(getGroupDeviceFromRega, 1000);
+    }
+  }  
+  
+  window.setTimeout(getGroupDeviceFromRega, 1000);
 }
 
 function VirtualGroup(id, name, groupTypeLabel, virtualDeviceType)
 {
-	var selfGroup = this;
-	selfGroup.id = id;
-	selfGroup.name = name;
+  var selfGroup = this;
+  selfGroup.id = id;
+  selfGroup.name = name;
   var temp = createVirtualDeviceSerialNumber(selfGroup.id);
-	selfGroup.virtualDeviceSerialNumber = temp;
-	selfGroup.device = DeviceList.getDeviceByAddress(temp);
-	selfGroup.groupTypeLabel = groupTypeLabel;
-	selfGroup.virtualDeviceName = ko.observable(""); // Todo check if this is still in use somewhere
-	selfGroup.groupDeviceName = ko.observable("");
+  selfGroup.virtualDeviceSerialNumber = temp;
+  selfGroup.device = DeviceList.getDeviceByAddress(temp);
+  selfGroup.groupTypeLabel = groupTypeLabel;
+  selfGroup.virtualDeviceName = ko.observable(""); // Todo check if this is still in use somewhere
+  selfGroup.groupDeviceName = ko.observable("");
   if(typeof selfGroup.device === "undefined")
-	{
-		retryGetDeviceAndDeviceName(selfGroup, 3);
-	}
-	else
-	{
+  {
+    retryGetDeviceAndDeviceName(selfGroup, 3);
+  }
+  else
+  {
     selfGroup.virtualDeviceName(selfGroup.device.getName());
     selfGroup.groupDeviceName(selfGroup.device.getName());
-	}
+  }
 
-	selfGroup.configureVirtualDevice = function()
-	{
-	ShowWaitAnim();
-		jQuery.get( "/config/ic_deviceparameters.cgi?sid="+SessionId+"&iface=VirtualDevices&address="+selfGroup.virtualDeviceSerialNumber+"&redirect_url=GO_BACK",
-		function( data ) {
-			WebUI.previousPage        = WebUI.currentPage;
-			WebUI.previousPageOptions = WebUI.currentPageOptions;
-			WebUI.currentPage = DeviceListPage;
-			HideWaitAnim();
-			jQuery("#content").html(data);
-		});
-	};
+  selfGroup.configureVirtualDevice = function()
+  {
+  ShowWaitAnim();
+    jQuery.get( "/config/ic_deviceparameters.cgi?sid="+SessionId+"&iface=VirtualDevices&address="+selfGroup.virtualDeviceSerialNumber+"&redirect_url=GO_BACK",
+    function( data ) {
+      WebUI.previousPage        = WebUI.currentPage;
+      WebUI.previousPageOptions = WebUI.currentPageOptions;
+      WebUI.currentPage = DeviceListPage;
+      HideWaitAnim();
+      jQuery("#content").html(data);
+    });
+  };
 
-	selfGroup.operateVirtualDevice = function()
-	{
-		var virtualDevice = new GroupDevice(selfGroup.virtualDeviceSerialNumber,selfGroup.virtualDeviceSerialNumber);
-		var url = '/pages/tabs/control/devices.htm?sid='+SessionId;
-		var pb = "{}";
-		var opt =
-		{
-			postBody: pb,
-			onComplete: function(t)
-			{
-				WebUI.previousPage        = WebUI.currentPage;
-				WebUI.previousPageOptions = WebUI.currentPageOptions;
-				WebUI.currentPage = ControlDevicesPage;
-				var regularExpression = new RegExp("loadChannels\\W\\s[0-9]+\\s\\W");
-				var newContent = t.responseText.replace(regularExpression, "loadChannels("+virtualDevice.device.id+")");
+  selfGroup.operateVirtualDevice = function()
+  {
+    var virtualDevice = new GroupDevice(selfGroup.virtualDeviceSerialNumber,selfGroup.virtualDeviceSerialNumber);
+    var url = '/pages/tabs/control/devices.htm?sid='+SessionId;
+    var pb = "{}";
+    var opt =
+    {
+      postBody: pb,
+      onComplete: function(t)
+      {
+        WebUI.previousPage        = WebUI.currentPage;
+        WebUI.previousPageOptions = WebUI.currentPageOptions;
+        WebUI.currentPage = ControlDevicesPage;
+        var regularExpression = new RegExp("loadChannels\\W\\s[0-9]+\\s\\W");
+        var newContent = t.responseText.replace(regularExpression, "loadChannels("+virtualDevice.device.id+")");
 
-				/*regularExpression = new RegExp("WebUI.goBack\\(\\)");
-				newContent = newContent.replace(regularExpression, "WebUI.enter"+"(CreateGroupPage)");*/
+        /*regularExpression = new RegExp("WebUI.goBack\\(\\)");
+        newContent = newContent.replace(regularExpression, "WebUI.enter"+"(CreateGroupPage)");*/
 
 
-				jQuery("#content").html(newContent);
-			}
-		};
-		new Ajax.Request(url,opt);
-	};
+        jQuery("#content").html(newContent);
+      }
+    };
+    new Ajax.Request(url,opt);
+  };
 }
\ No newline at end of file
diff --git a/WebUI/www/webui/js/lang/de/translate.lang.deviceDescription.js b/WebUI/www/webui/js/lang/de/translate.lang.deviceDescription.js
index f6652f3d..4349298d 100755
--- a/WebUI/www/webui/js/lang/de/translate.lang.deviceDescription.js
+++ b/WebUI/www/webui/js/lang/de/translate.lang.deviceDescription.js
@@ -1,5 +1,8 @@
 jQuery.extend(true,langJSON, {
   "de" : {
+    "HM-WDS30-OT2-SM" : "Funk-Temperaturdifferenz-Sensor",
+    "HM-Sec-Sir-WM" : "Funk-Innensirene",
+    "HM-Sen-LI-O" : "Funk-Helligkeitsensor f%FCr Au%DFenmontage",
     "HM-OU-CFM-TW" : "MP3 Funk-Gong mit Signalleuchte f%FCr Batteriebetrieb",
     "HM-ES-PMSw1-SM" : "Funk-Schaltaktor mit Leistungsmessung",
     "OLIGO.smart.iq.HM" : "Funk-Dimmaktor",
diff --git a/WebUI/www/webui/js/lang/de/translate.lang.diagram.js b/WebUI/www/webui/js/lang/de/translate.lang.diagram.js
index 959b5cbd..1fd94cc6 100755
--- a/WebUI/www/webui/js/lang/de/translate.lang.diagram.js
+++ b/WebUI/www/webui/js/lang/de/translate.lang.diagram.js
@@ -60,6 +60,7 @@ jQuery.extend(true, langJSON, {
     "diagramValueTypeTEMPERATURE": "Temperatur",
     "diagramValueTypeHUMIDITY": "Luftfeuchtigkeit",
     "diagramValueTypeBRIGHTNESS": "Helligkeit",
+    "diagramValueTypeLUX": "Helligkeit",
     "diagramValueTypeWIND_SPEED": "Windgeschwindigkeit",
     "diagramValueTypeWIND_DIRECTION": "Windrichtung",
     "diagramValueTypeRAINING": "Regenzustand",
diff --git a/WebUI/www/webui/js/lang/de/translate.lang.extension.js b/WebUI/www/webui/js/lang/de/translate.lang.extension.js
index 9326a584..440e95bb 100755
--- a/WebUI/www/webui/js/lang/de/translate.lang.extension.js
+++ b/WebUI/www/webui/js/lang/de/translate.lang.extension.js
@@ -884,6 +884,17 @@ jQuery.extend(true,langJSON, {
     "stringTableButtonLock" : "Lokale Bediensperre",
     "stringTableGlobalButtonLock" : "Globale Bediensperre",
 
+    "stringTableTxThresholdPercent" : "N%F6tige %C4nderung in %25 f%FCr erneute Statusmitteilung",
+    "stringTableLux" : "Helligkeit",
+
+    "optionBaud300" : "300 Baud",
+    "optionBaud600" : "600 Baud",
+    "optionBaud1200" : "1200 Baud",
+    "optionBaud2400" : "2400 Baud",
+    "optionBaud4800" : "4800 Baud",
+    "optionBaud9600" : "9600 Baud",
+    "optionBaud19200" : "19200 Baud",
+
     "theEnd" : ""
 
 
diff --git a/WebUI/www/webui/js/lang/de/translate.lang.notTranslated.js b/WebUI/www/webui/js/lang/de/translate.lang.notTranslated.js
index 959dc443..488f99e9 100755
--- a/WebUI/www/webui/js/lang/de/translate.lang.notTranslated.js
+++ b/WebUI/www/webui/js/lang/de/translate.lang.notTranslated.js
@@ -2,6 +2,42 @@ jQuery.extend(true,langJSON, {
   "de" : {
     "comment" : "ATTENTION **** not yet translated **** ATTENTION",
 
+    "actionAlarmControlLblOff" : "Alarm<br />Aus",
+    "actionAlarmControlLblExtern" : "Extern<br />scharf",
+    "actionAlarmControlLblIntern" : "Intern<br />scharf",
+    "actionAlarmControlLblBlocked" : "Alarm<br />blockiert",
+
+    "lblSabotageUnknown" : "Sabotagekontakt:<br >Zustand unbekannt",
+    "lblSabotage_0" : "Sabotagekontakt: OK",
+    "lblSabotage_1" : "Sabotagekontakt<br />ausgel%F6st",
+
+    "stringTableSoundID" : "Alarmsignal",
+    "stringTableLowbatSignal" : "Low-Bat.-Signal",
+    "stringTableAlarmTimeMax" : "Max. Alarmdauer",
+
+
+    "stringTableAcousticMultiDelayArm" : "Akustische Signale f%FCr verz%F6gerte Scharfschaltungen mehrfach ausgeben",
+    "stringTableAcousticAllSensArm" : "Akustisches Signal f%FCr Scharfschaltung extern",
+    "stringTableAcousticAllsensDelayArm" : "Akustisches Signal f%FCr Scharfschaltverz%F6gerung extern",
+    "stringTableAcousticExtsensArm" : "Akustisches Signal f%FCr Scharfschaltung intern",
+    "stringTableAcousticExtsensDelayArm" : "Akustisches Signal f%FCr Scharfschaltverz%F6gerung intern",
+    "stringTableAcousticDisarm" : "Akustisches Signal f%FCr Unscharfschaltung",
+
+    "stringTableOpticMultiDelayArm" : "Optische Signale f%FCr verz%F6gerte Scharfschaltungen mehrfach ausgeben",
+    "stringTableOpticAllSensArm" : "Optisches Signal f%FCr Scharfschaltung extern",
+    "stringTableOpticAllSensDelayArm" : "Optisches Signal f%FCr Scharfschaltverz%F6gerung extern",
+    "stringTableOpticExtsensArm" : "Optisches Signal f%FCr Scharfschaltung intern",
+    "stringTableOpticExtsensDelayArm" : "Optisches Signal f%FCr Scharfschaltverz%F6gerung intern",
+    "stringTableOpticDisarm" : "Optisches Signal f%FCr Unscharfschaltung",
+
+    "lblIndoorSirenInternAlarm" : "Interner Alarm",
+    "lblIndoorSirenExternAlarm" : "Externer Alarm",
+    "lblIndoorSirenPanicAlarm" : "Panik Alarm",
+    "lblIndoorSirenArming" : "Scharfschalten",
+
+
+
     "noMoreKeys" : ""
   }
 });
+
diff --git a/WebUI/www/webui/js/lang/de/translate.lang.stringtable.js b/WebUI/www/webui/js/lang/de/translate.lang.stringtable.js
index 34a6165e..27bb2a65 100755
--- a/WebUI/www/webui/js/lang/de/translate.lang.stringtable.js
+++ b/WebUI/www/webui/js/lang/de/translate.lang.stringtable.js
@@ -581,8 +581,6 @@ jQuery.extend(true,langJSON, {
     "stringTableClimateControlRTTransceiverActualTemp" : "Ist-Temperatur",
     "stringTableClimateControlRTTransceiverSetTemperature" : "Soll-Temperatur",
 
-    "stringTableSwitchStatusInfoMinDelay" : "Statusmeldungen Mindestverz%F6gerung",
-
     "stringTablePowerMeterAveraging" : "Mittelwertbildung &uuml;ber",
     "stringTablePowerMeterTxMinDelay" : "Statusmeldung Mindestverz&ouml;gerung",
     "stringTablePowerMeterTxThresholdPower" : "TX Differenz Leistung",
@@ -590,7 +588,9 @@ jQuery.extend(true,langJSON, {
     "stringTablePowerMeterTxThresholdVoltage" : "TX Differenz Spannung",
     "stringTablePowerMeterTxThresholdFrequency" : "TX Differenz Frequenz",
     "stringTablePowerMeterEnergyCounter": "Energie-Z%E4hler Ger%E4t",
+    "stringTablePowerMeterIECEnergyCounter": "IEC Energie-Z%E4hler Ger%E4t",
     "stringTablePowerMeterPower": "Leistung",
+    "stringTableIECPowerMeterPower": "IEC Leistung",
     "stringTablePowerMeterCurrent": "Strom",
     "stringTablePowerMeterVoltage": "Spannung",
     "stringTablePowerMeterFrequency": "Frequenz",
diff --git a/WebUI/www/webui/js/lang/en/translate.lang.deviceDescription.js b/WebUI/www/webui/js/lang/en/translate.lang.deviceDescription.js
index e3adde45..56c86560 100755
--- a/WebUI/www/webui/js/lang/en/translate.lang.deviceDescription.js
+++ b/WebUI/www/webui/js/lang/en/translate.lang.deviceDescription.js
@@ -1,6 +1,8 @@
 jQuery.extend(true,langJSON, {
   "en" : {
-
+    "HM-WDS30-OT2-SM" : "Wireless Temperature Difference Sensor",
+    "HM-Sec-Sir-WM" : "Wireless Indoor Siren",
+    "HM-Sen-LI-O" : "Wireless Light Intensity Sensor, outdoor",
     "HM-OU-CFM-TW" : "MP3 Wireless Chime with light flash, battery",
     "HM-ES-PMSw1-SM" : "Wireless Switch actuator with power measurement",
     "OLIGO.smart.iq.HM" : "Wireless Dimming Actuator",
diff --git a/WebUI/www/webui/js/lang/en/translate.lang.diagram.js b/WebUI/www/webui/js/lang/en/translate.lang.diagram.js
index b4b26b3e..33d756cf 100755
--- a/WebUI/www/webui/js/lang/en/translate.lang.diagram.js
+++ b/WebUI/www/webui/js/lang/en/translate.lang.diagram.js
@@ -59,6 +59,7 @@ jQuery.extend(true, langJSON, {
     "diagramValueTypeTEMPERATURE": "Temperature",
     "diagramValueTypeHUMIDITY": "Humidity",
     "diagramValueTypeBRIGHTNESS": "Brightness",
+    "diagramValueTypeLUX": "Brightness",
     "diagramValueTypeWIND_SPEED": "Wind velocity",
     "diagramValueTypeWIND_DIRECTION": "Wind direction",
     "diagramValueTypeRAINING": "Rain condition",
diff --git a/WebUI/www/webui/js/lang/en/translate.lang.extension.js b/WebUI/www/webui/js/lang/en/translate.lang.extension.js
index 7694131a..2a8e1a3f 100755
--- a/WebUI/www/webui/js/lang/en/translate.lang.extension.js
+++ b/WebUI/www/webui/js/lang/en/translate.lang.extension.js
@@ -875,6 +875,17 @@ jQuery.extend(true, langJSON, {
     "stringTableButtonLock" : "Local operating lock",
     "stringTableGlobalButtonLock" : "Global operating lock",
 
+    "stringTableTxThresholdPercent" : "Necessary change in %25 for state report",
+    "stringTableLux" : "Brightness",
+
+    "optionBaud300" : "300 baud",
+    "optionBaud600" : "600 baud",
+    "optionBaud1200" : "1200 baud",
+    "optionBaud2400" : "2400 baud",
+    "optionBaud4800" : "4800 baud",
+    "optionBaud9600" : "9600 baud",
+    "optionBaud19200" : "19200 baud",
+
     "theEnd" : ""
   }
 });
diff --git a/WebUI/www/webui/js/lang/en/translate.lang.notTranslated.js b/WebUI/www/webui/js/lang/en/translate.lang.notTranslated.js
index 55f91a6c..02742643 100755
--- a/WebUI/www/webui/js/lang/en/translate.lang.notTranslated.js
+++ b/WebUI/www/webui/js/lang/en/translate.lang.notTranslated.js
@@ -2,6 +2,37 @@ jQuery.extend(true,langJSON, {
   "en" : {
     "comment" : "ATTENTION **** not yet translated **** ATTENTION",
 
+    "actionAlarmControlLblOff" : "Alarm<br />off",
+    "actionAlarmControlLblExtern" : "External<br />Alarm",
+    "actionAlarmControlLblIntern" : "Internal<br />Alarm",
+    "actionAlarmControlLblBlocked" : "Alarm<br />blocked",
+
+    "lblSabotageUnknown" : "Sabotage contact:<br />State unknown",
+    "lblSabotage_0" : "Sabotage contact: OK",
+    "lblSabotage_1" : "Sabotage contact<br />Open",
+
+    "stringTableSoundID" : "Alarm signal",
+    "stringTableLowbatSignal" : "Low battery signal",
+    "stringTableAlarmTimeMax" : "Max. alarm duration",
+
+    "stringTableAcousticMultiDelayArm" : "en Akustische Signale für verzögerte Scharfschaltungen mehrfach ausgeben",
+    "stringTableAcousticAllSensArm" : "en Akustisches Signal für Scharfschaltung extern",
+    "stringTableAcousticAllsensDelayArm" : "en Akustisches Signal für Scharfschaltverzögerung extern",
+    "stringTableAcousticExtsensArm" : "en Akustisches Signal für Scharfschaltung intern",
+    "stringTableAcousticExtsensDelayArm" : "en Akustisches Signal für Scharfschaltverzögerung intern",
+    "stringTableAcousticDisarm" : "en Akustisches Signal für Unscharfschaltung",
+
+    "stringTableOpticMultiDelayArm" : "en Optische Signale für verzögerte Scharfschaltungen mehrfach ausgeben",
+    "stringTableOpticAllSensArm" : "en Optisches Signal für Scharfschaltung extern",
+    "stringTableOpticAllSensDelayArm" : "en Optisches Signal für Scharfschaltverzögerung extern",
+    "stringTableOpticExtsensArm" : "en Optisches Signal für Scharfschaltung intern",
+    "stringTableOpticExtsensDelayArm" : "en Optisches Signal für Scharfschaltverzögerung intern",
+    "stringTableOpticDisarm" : "en Optisches Signal für Unscharfschaltung",
+
+    "lblIndoorSirenInternAlarm" : "en Interner Alarm",
+    "lblIndoorSirenExternAlarm" : "en Externer Alarm",
+    "lblIndoorSirenPanicAlarm" : "en Panik Alarm",
+    "lblIndoorSirenArming" : "en Scharfschalten",
 
     "noMoreKeys" : ""
   }
diff --git a/WebUI/www/webui/js/lang/en/translate.lang.stringtable.js b/WebUI/www/webui/js/lang/en/translate.lang.stringtable.js
index b8c93fa8..f5336353 100755
--- a/WebUI/www/webui/js/lang/en/translate.lang.stringtable.js
+++ b/WebUI/www/webui/js/lang/en/translate.lang.stringtable.js
@@ -580,17 +580,18 @@ jQuery.extend(true,langJSON, {
     "stringTableClimateControlRTTransceiverVentPos" : "Valve position",
     "stringTableClimateControlRTTransceiverActualTemp" : "Actual temperature",
     "stringTableClimateControlRTTransceiverSetTemperature" : "Setpoint temperature",
-    "stringTableSwitchStatusInfoMinDelay" : "Status messages minimum delay time",
 
     "stringTablePowerMeterAveraging" : "Averaging via",
-    "stringTablePowerMeterTxMinDelay" : "engl TX Mindelay ????",
-    "stringTablePowerMeterTxThresholdPower" : "engl TX Difference Power",
-    "stringTablePowerMeterTxThresholdCurrent" : "engl TX Difference Current",
-    "stringTablePowerMeterTxThresholdVoltage" : "engl TX Difference Voltage",
-    "stringTablePowerMeterTxThresholdFrequency" : "engl TX Difference Frequency",
+    "stringTablePowerMeterTxMinDelay" : "Status messages minimum delays",
+    "stringTablePowerMeterTxThresholdPower" : "TX Difference Power",
+    "stringTablePowerMeterTxThresholdCurrent" : "TX Difference Current",
+    "stringTablePowerMeterTxThresholdVoltage" : "TX Difference Voltage",
+    "stringTablePowerMeterTxThresholdFrequency" : "TX Difference Frequency",
 
     "stringTablePowerMeterEnergyCounter": "Energy counter device",
+    "stringTablePowerMeterIECEnergyCounter": "IEC Energy counter device",
     "stringTablePowerMeterPower": "Power",
+    "stringTableIECPowerMeterPower": "IEC Power",
     "stringTablePowerMeterCurrent": "Current",
     "stringTablePowerMeterVoltage": "Voltage",
     "stringTablePowerMeterFrequency": "Frequency",
diff --git a/WebUI/www/webui/js/lang/tr/translate.lang.deviceDescription.js b/WebUI/www/webui/js/lang/tr/translate.lang.deviceDescription.js
index 1491833a..feef0f21 100755
--- a/WebUI/www/webui/js/lang/tr/translate.lang.deviceDescription.js
+++ b/WebUI/www/webui/js/lang/tr/translate.lang.deviceDescription.js
@@ -1,6 +1,8 @@
 jQuery.extend(true,langJSON, {
   "tr" : {
-
+    "HM-WDS30-OT2-SM" : "Wireless Temperature Difference Sensor",
+    "HM-Sec-Sir-WM" : "Wireless Indoor Siren",
+    "HM-Sen-LI-O" : "Wireless Light Intensity Sensor, outdoor",
     "HM-OU-CFM-TW" : "Sinyal lambali MP3 kablosuz gong, batarya",
     "HM-ES-PMSw1-SM" : "G%FCc %F6lc%FCm fonksiyonuna sahip kablosuz salter akt%FCat%F6r%FC",
     "OLIGO.smart.iq.HM" : "Kablosuz dimmer akt%FCat%F6r%FC",
diff --git a/WebUI/www/webui/js/lang/tr/translate.lang.diagram.js b/WebUI/www/webui/js/lang/tr/translate.lang.diagram.js
index 0e647b87..c6e8f1fe 100755
--- a/WebUI/www/webui/js/lang/tr/translate.lang.diagram.js
+++ b/WebUI/www/webui/js/lang/tr/translate.lang.diagram.js
@@ -59,6 +59,7 @@ jQuery.extend(true, langJSON, {
     "diagramValueTypeTEMPERATURE": "Sicaklik",
     "diagramValueTypeHUMIDITY": "Havadaki nem",
     "diagramValueTypeBRIGHTNESS": "Aydinlik",
+    "diagramValueTypeLUX": "Aydinlik",
     "diagramValueTypeWIND_SPEED": "R%FCzgar hizi",
     "diagramValueTypeWIND_DIRECTION": "R%FCzgar y%F6n%FC",
     "diagramValueTypeRAINING": "Yagmur durumu",
diff --git a/WebUI/www/webui/js/lang/tr/translate.lang.notTranslated.js b/WebUI/www/webui/js/lang/tr/translate.lang.notTranslated.js
index 8423a6f2..e26447e9 100755
--- a/WebUI/www/webui/js/lang/tr/translate.lang.notTranslated.js
+++ b/WebUI/www/webui/js/lang/tr/translate.lang.notTranslated.js
@@ -183,6 +183,48 @@ jQuery.extend(true,langJSON, {
     "lblTeachInKEY" : "KEY",
     "lblIntrusionAlarm" : "Burglar alarm",
 
+    "stringTableTxThresholdPercent" : "Necessary change in %25 for state report",
+    "stringTableLux" : "Brightness",
+
+    "actionAlarmControlLblOff" : "Alarm<br />off",
+    "actionAlarmControlLblExtern" : "External<br />Alarm",
+    "actionAlarmControlLblIntern" : "Internal<br />Alarm",
+    "actionAlarmControlLblBlocked" : "Alarm<br />blocked",
+
+    "lblSabotageUnknown" : "Sabotage contact:<br >State unknown",
+    "lblSabotage_0" : "Sabotage contact: OK",
+    "lblSabotage_1" : "Sabotage contact<br />Open",
+
+    "stringTableSoundID" : "Alarm signal",
+    "stringTableLowbatSignal" : "Low battery signal",
+    "stringTableAlarmTimeMax" : "Max. alarm duration",
+
+    "stringTableAcousticMultiDelayArm" : "tr Akustische Signale für verzögerte Scharfschaltungtr mehrfach ausgeben",
+    "stringTableAcousticAllSensArm" : "tr Akustisches Signal für Scharfschaltung extern",
+    "stringTableAcousticAllsensDelayArm" : "tr Akustisches Signal für Scharfschaltverzögerung extern",
+    "stringTableAcousticExtsensArm" : "tr Akustisches Signal für Scharfschaltung intern",
+    "stringTableAcousticExtsensDelayArm" : "tr Akustisches Signal für Scharfschaltverzögerung intern",
+    "stringTableAcousticDisarm" : "tr Akustisches Signal für Unscharfschaltung",
+
+    "stringTableOpticMultiDelayArm" : "tr Optische Signale für verzögerte Scharfschaltungtr mehrfach ausgeben",
+    "stringTableOpticAllSensArm" : "tr Optisches Signal für Scharfschaltung extern",
+    "stringTableOpticAllSensDelayArm" : "tr Optisches Signal für Scharfschaltverzögerung extern",
+    "stringTableOpticExtsensArm" : "tr Optisches Signal für Scharfschaltung intern",
+    "stringTableOpticExtsensDelayArm" : "tr Optisches Signal für Scharfschaltverzögerung intern",
+    "stringTableOpticDisarm" : "tr Optisches Signal für Unscharfschaltung",
+
+    "lblIndoorSirenInternAlarm" : "tr Interner Alarm",
+    "lblIndoorSirenExternAlarm" : "tr Externer Alarm",
+    "lblIndoorSirenPanicAlarm" : "tr Panik Alarm",
+    "lblIndoorSirenArming" : "tr Scharfschalten",
+
+    "optionBaud300" : "300 baud",
+    "optionBaud600" : "600 baud",
+    "optionBaud1200" : "1200 baud",
+    "optionBaud2400" : "2400 baud",
+    "optionBaud4800" : "4800 baud",
+    "optionBaud9600" : "9600 baud",
+    "optionBaud19200" : "19200 baud",
     "noMoreKeys" : ""
   }
 });
diff --git a/WebUI/www/webui/js/lang/tr/translate.lang.stringtable.js b/WebUI/www/webui/js/lang/tr/translate.lang.stringtable.js
index cfbcd2f1..b6e07527 100755
--- a/WebUI/www/webui/js/lang/tr/translate.lang.stringtable.js
+++ b/WebUI/www/webui/js/lang/tr/translate.lang.stringtable.js
@@ -579,15 +579,16 @@ jQuery.extend(true, langJSON, {
     "stringTableClimateControlRTTransceiverVentPos": "Valf pozisyonu",
     "stringTableClimateControlRTTransceiverActualTemp": "Gercek sicaklik",
     "stringTableClimateControlRTTransceiverSetTemperature": "Hedef sicaklik",
-    "stringTableSwitchStatusInfoMinDelay": "Minimum gecikmede durum bildirileri",
     "stringTablePowerMeterAveraging": "orta deger olusumu ... kadar",
-    "stringTablePowerMeterTxMinDelay": "TX Mindelay ????",
+    "stringTablePowerMeterTxMinDelay": "Minimum gecikmelerde durum bildirileri",
     "stringTablePowerMeterTxThresholdPower": "TX farki g%FCc",
     "stringTablePowerMeterTxThresholdCurrent": "TX farki akim",
     "stringTablePowerMeterTxThresholdVoltage": "TX farki voltaj",
     "stringTablePowerMeterTxThresholdFrequency": "TX farki frekans",
     "stringTablePowerMeterEnergyCounter": "Enerji sayac cihazi",
+    "stringTablePowerMeterIECEnergyCounter": "IEC Enerji sayac cihazi",
     "stringTablePowerMeterPower": "G%FCc",
+    "stringTableIECPowerMeterPower": "IEC G%FCc",
     "stringTablePowerMeterCurrent": "Elektrik",
     "stringTablePowerMeterVoltage": "Voltaj",
     "stringTablePowerMeterFrequency": "Frekans",
diff --git a/WebUI/www/webui/webui.js b/WebUI/www/webui/webui.js
index ea0cf2de..7e249b64 100755
--- a/WebUI/www/webui/webui.js
+++ b/WebUI/www/webui/webui.js
@@ -1127,6 +1127,12 @@ DEV_PATHS["HM-Sec-Key"] = new Object();
 DEV_PATHS["HM-Sec-Key"]["50"] = "/config/img/devices/50/14_hm-sec-key_thumb.png";
 DEV_PATHS["HM-Sec-Key"]["250"] = "/config/img/devices/250/14_hm-sec-key.png";
 DEV_HIGHLIGHT["HM-Sec-Key"] = new Object();
+DEV_LIST.push('HM-Sen-LI-O');
+DEV_DESCRIPTION["HM-Sen-LI-O"] = "HM-Sen-LI-O";
+DEV_PATHS["HM-Sen-LI-O"] = new Object();
+DEV_PATHS["HM-Sen-LI-O"]["50"] = "/config/img/devices/50/126_hm-sen-li-o_thumb.png";
+DEV_PATHS["HM-Sen-LI-O"]["250"] = "/config/img/devices/250/126_hm-sen-li-o.png";
+DEV_HIGHLIGHT["HM-Sen-LI-O"] = new Object();
 DEV_LIST.push('HMW-IO-12-Sw7-DR');
 DEV_DESCRIPTION["HMW-IO-12-Sw7-DR"] = "HMW-IO-12-Sw7-DR";
 DEV_PATHS["HMW-IO-12-Sw7-DR"] = new Object();
@@ -1709,6 +1715,12 @@ DEV_HIGHLIGHT["HM-RC-Key4-3"]["3"] = [5, '4_Arrow'];
 DEV_HIGHLIGHT["HM-RC-Key4-3"]["4"] = [5, '3_Arrow'];
 DEV_HIGHLIGHT["HM-RC-Key4-3"]["1+2"] = [5, '1_Arrow', '2_Arrow'];
 DEV_HIGHLIGHT["HM-RC-Key4-3"]["3+4"] = [5, '3_Arrow', '4_Arrow'];
+DEV_LIST.push('HM-Sec-Sir-WM');
+DEV_DESCRIPTION["HM-Sec-Sir-WM"] = "HM-Sec-Sir-WM";
+DEV_PATHS["HM-Sec-Sir-WM"] = new Object();
+DEV_PATHS["HM-Sec-Sir-WM"]["50"] = "/config/img/devices/50/117_hm-sec-sir-wm_thumb.png";
+DEV_PATHS["HM-Sec-Sir-WM"]["250"] = "/config/img/devices/250/117_hm-sec-sir-wm.png";
+DEV_HIGHLIGHT["HM-Sec-Sir-WM"] = new Object();
 DEV_LIST.push('ZEL STG RM FEP 230V');
 DEV_DESCRIPTION["ZEL STG RM FEP 230V"] = "ZEL_STG_RM_FEP_230V";
 DEV_PATHS["ZEL STG RM FEP 230V"] = new Object();
@@ -2568,6 +2580,12 @@ DEV_HIGHLIGHT["HM-OU-CF-Pl"]["SP_beam_1"] = [6, 0.75, 0.7, 0.832, 0.632, 0.016];
 DEV_HIGHLIGHT["HM-OU-CF-Pl"]["SP_beam_2"] = [6, 0.75, 0.748, 0.832, 0.748, 0.016];
 DEV_HIGHLIGHT["HM-OU-CF-Pl"]["SP_beam_3"] = [6, 0.75, 0.796, 0.832, 0.86, 0.016];
 DEV_HIGHLIGHT["HM-OU-CF-Pl"]["2"] = [5, 'SP_1', 'SP_2', 'SP_3', 'SP_4', 'SP_5', 'SP_6', 'SP_7', 'SP_beam_1', 'SP_beam_2', 'SP_beam_3'];
+DEV_LIST.push('HM-WDS30-OT2-SM-2');
+DEV_DESCRIPTION["HM-WDS30-OT2-SM-2"] = "HM-WDS30-OT2-SM";
+DEV_PATHS["HM-WDS30-OT2-SM-2"] = new Object();
+DEV_PATHS["HM-WDS30-OT2-SM-2"]["50"] = "/config/img/devices/50/127_hm-wds30-ot2-sm-2_thumb.png";
+DEV_PATHS["HM-WDS30-OT2-SM-2"]["250"] = "/config/img/devices/250/127_hm-wds30-ot2-sm-2.png";
+DEV_HIGHLIGHT["HM-WDS30-OT2-SM-2"] = new Object();
 DEV_LIST.push('HM-OU-CFM-TW');
 DEV_DESCRIPTION["HM-OU-CFM-TW"] = "HM-OU-CFM-TW";
 DEV_PATHS["HM-OU-CFM-TW"] = new Object();
@@ -2806,22 +2824,24 @@ elvST['ALARMACTUATOR|ON_TIME'] = '${stringTableAlarmActuatorOnTime}';
 elvST['ALARMACTUATOR|SABOTAGE_MSG'] = '${stringTableAlarmActuatorSabotageMsg}';
 elvST['ALARMACTUATOR|STATE=FALSE'] = '${stringTableAlarmActuatorStateFalse}';
 elvST['ALARMACTUATOR|STATE=TRUE'] = '${stringTableAlarmActuatorStateTrue}';
-elvST['ALL_LEDS'] = '${stringTableAllLEDs}';
-elvST['ANALOG_INPUT'] = '${stringTableAnalog}';
-elvST['ANALOG_OUTPUT'] = '${stringTableAnalog}';
-elvST['BACKLIGHT_AT_CHARGE'] = '${stringTableBackLightAtCharge}';
-elvST['BACKLIGHT_AT_KEYSTROKE'] = '${stringTableBackLightAtKeystroke}';
-elvST['BACKLIGHT_AT_MOTION'] = '${stringTableBackLightAtMotion}';
-elvST['BACKLIGHT_ON_TIME'] = '${stringTableBackLightOnTime}';
-elvST['BAT_DEFECT_LIMIT'] = '${stringTableBatDefectLimit}';
+elvST['ARMING|ACOUSTIC_MULTI_DELAY_ARM'] = '${stringTableAcousticMultiDelayArm}';
+elvST['ARMING|ACOUSTIC_ALLSENS_ARM'] = '${stringTableAcousticAllSensArm}';
+elvST['ARMING|ACOUSTIC_ALLSENS_DELAY_ARM'] = '${stringTableAcousticAllsensDelayArm}';
+elvST['ARMING|ACOUSTIC_EXTSENS_ARM'] = '${stringTableAcousticExtsensArm}';
+elvST['ARMING|ACOUSTIC_EXTSENS_DELAY_ARM'] = '${stringTableAcousticExtsensDelayArm}';
+elvST['ARMING|ACOUSTIC_DISARM'] = '${stringTableAcousticDisarm}';
+elvST['ARMING|OPTIC_MULTI_DELAY_ARM'] = '${stringTableOpticMultiDelayArm}';
+elvST['ARMING|OPTIC_ALLSENS_ARM'] = '${stringTableOpticAllSensArm}';
+elvST['ARMING|OPTIC_ALLSENS_DELAY_ARM'] = '${stringTableOpticAllSensDelayArm}';
+elvST['ARMING|OPTIC_EXTSENS_ARM'] = '${stringTableOpticExtsensArm}';
+elvST['ARMING|OPTIC_EXTSENS_DELAY_ARM'] = '${stringTableOpticExtsensDelayArm}';
+elvST['ARMING|OPTIC_DISARM'] = '${stringTableOpticDisarm}';
 elvST['BLIND'] = '${stringTableBlindTitle}';
 elvST['BLIND|CHANGE_OVER_DELAY'] = '${stringTableBlindChangeOverDelay}';
 elvST['BLIND|LEVEL'] = '${stringTableBlindLevel}';
 elvST['BLIND|REFERENCE_RUNNING_TIME_BOTTOM_TOP'] = '${stringTableBlindRunnintTimeBottomTop}';
 elvST['BLIND|REFERENCE_RUNNING_TIME_TOP_BOTTOM'] = '${stringTableBlindRunningTimeTopBottom}';
 elvST['BLIND|REFERENCE_RUN_COUNTER'] = '${stringTableBlindRefRunCounter}';
-elvST['BLIND|STATUSINFO_MINDELAY'] = '${stringTableStatusInfoMinDelay}';
-elvST['BLIND|STATUSINFO_RANDOM'] = '${stringTableStatusInfoRandom}';
 elvST['BLIND|STOP'] = '${stringTableBlindStop}';
 elvST['BURST_RX'] = '${stringTableBurstRX}';
 elvST['BUTTON_LOCK'] = '${stringTableButtonLock}';
@@ -2960,10 +2980,8 @@ elvST['DIMMER|RAMP_TIME'] = '${stringTableDimmerRampTime}';
 elvST['DIMMER|RAMP_STOP'] = '${stringTableDimmerRampStop}';
 elvST['DIMMER|REDUCE_LEVEL'] = '${stringTableDimmerReduceLevel}';
 elvST['DIMMER|REDUCE_TEMP_LEVEL'] = '${stringTableDimmerReduceTempLevel}';
-elvST['DIMMER|STATUSINFO_MINDELAY'] = '${stringTableDimmerStatusInfoMinDelay}';
 elvST['DIMMER|ERROR_OVERLOAD'] = '${stringTableDimmerErrorOverload}';
 elvST['DIMMER|ERROR_OVERHEAT'] = '${stringTableDimmerErrorOverheat}';
-elvST['DIMMER|STATUSINFO_RANDOM'] = '${stringTableStatusInfoRandom}';
 elvST['DIMMER|ERROR_REDUCED'] = '${stringTableDimmerErrorReduced}';
 elvST['DISPLAY|ALARM_COUNT'] = '${stringTableDisplayAlarmCount}';
 elvST['DISPLAY|ARROW_DOWN'] = '${stringTableDisplayArrowDown}';
@@ -3246,6 +3264,14 @@ elvST['POWERMETER_IGL|ENERGY_COUNTER'] = '${stringTablePowerMeterEnergyCounter}'
 elvST['POWERMETER_IGL|GAS_ENERGY_COUNTER'] = '${stringTablePowerMeterEnergyCounterGas}';
 elvST['POWERMETER_IGL|POWER'] = '${stringTablePowerMeterPower}';
 elvST['POWERMETER_IGL|GAS_POWER'] = '${stringTableGasConsumption}';
+elvST['POWERMETER_IEC1|ENERGY_COUNTER'] = '${stringTablePowerMeterEnergyCounter}';
+elvST['POWERMETER_IEC1|GAS_ENERGY_COUNTER'] = '${stringTablePowerMeterEnergyCounterGas}';
+elvST['POWERMETER_IEC1|POWER'] = '${stringTablePowerMeterPower}';
+elvST['POWERMETER_IEC1|GAS_POWER'] = '${stringTableGasConsumption}';
+elvST['POWERMETER_IEC1|IEC_ENERGY_COUNTER'] = '${stringTablePowerMeterIECEnergyCounter}';
+elvST['POWERMETER_IEC1|IEC_POWER'] = '${stringTableIECPowerMeterPower}';
+elvST['POWERMETER_IEC2|IEC_ENERGY_COUNTER'] = '${stringTablePowerMeterIECEnergyCounter}';
+elvST['POWERMETER_IEC2|IEC_POWER'] = '${stringTableIECPowerMeterPower}';
 elvST['POWERUP_OFF'] = '${stringTablePowerUpOFF} ';
 elvST['POWERUP_ON'] = '${stringTablePowerUpON}';
 elvST['PRESS_LONG'] = '${stringTableKeyPressLong}';
@@ -3440,8 +3466,6 @@ elvST['SWITCH|AES_ACTIVE'] = '${stringTableSwitchAESActive}';
 elvST['SWITCH|ON_TIME'] = '${stringTableSwitchOnTime}';
 elvST['SWITCH|STATE=FALSE'] = '${stringTableSwitchStateFalse}';
 elvST['SWITCH|STATE=TRUE'] = '${stringTableSwitchStateTrue}';
-elvST['SWITCH|STATUSINFO_MINDELAY'] = '${stringTableSwitchStatusInfoMinDelay}';
-elvST['SWITCH|STATUSINFO_RANDOM'] = '${stringTableStatusInfoRandom}';
 elvST['SWITCH|STATUSINFO_RANDOM_A'] = '${stringTableStatusInfoRandomA}';
 elvST['SWITCH_INTERFACE'] = '${stringTableSwitchInterfaceTitle}';
 elvST['SWITCH_INTERFACE|PRESS'] = '${stringTableSwitchInterfacePress}';
@@ -3473,6 +3497,7 @@ elvST['TILT_SENSOR|STATE=FALSE'] = '${stringTableTiltSensorStateFalse}';
 elvST['TILT_SENSOR|STATE=TRUE'] = ' ${stringTableTiltSensorStateTrue}';
 elvST['TRANSMIT_TRY_MAX'] = '${stringTableTransmitTryMax}';
 elvST['TRANSMIT_DEV_TRY_MAX'] = '${stringTableTransmitDevTryMax}';
+elvST['TX_THRESHOLD_POWER'] = '${stringTablePowerMeterTxThresholdPower}';
 elvST['USER_COLOR'] = '${stringTableSubmit}';
 elvST['USER_PROGRAM'] = '${stringTableSubmit}';
 elvST['VENT_CLOSED'] = '${stringTableVentClosed}';
@@ -3484,7 +3509,6 @@ elvST['VIRTUAL_DIMMER|ERROR_OVERHEAT'] = '${stringTableDimmerErrorOverheat}';
 elvST['VIRTUAL_DIMMER|ERROR_REDUCED'] = '${stringTableDimmerErrorReduced}';
 elvST['VIRTUAL_DIMMER|LOGIC_COMBINATION'] = '${stringTableLogicCombination}';
 elvST['VIRTUAL_DIMMER|POWERUP_ACTION'] = '${stringTableVirtualDimmerPowerUpAction}';
-elvST['VIRTUAL_DIMMER|STATUSINFO_MINDELAY'] = '${stringTableVirtualDimmerStatusInfoMinDelay}';
 elvST['VIRTUAL_DIMMER|STATUSINFO_RANDOM'] = '${stringTableVirtualDimmerStatusInfoRandom}';
 elvST['VIRTUAL_DIMMER|RAMP_STOP'] = '${stringTableDimmerRampStop}';
 elvST['VIRTUAL_KEY'] = '${stringTableVirtualKeyTitle}';
@@ -3558,9 +3582,18 @@ elvST['WINMATIC|STATE_UNCERTAIN=FALSE'] = '${stringTableWinMaticStateUncertainFa
 elvST['WINMATIC|STATE_UNCERTAIN=TRUE'] = '${stringTableWinMaticStateUncertainTrue}';
 elvST['WINMATIC|STOP'] = '${stringTableWinMaticStop}';
 elvST['WINMATIC|TILT_MAX'] = '${stringTableWinMaticTiltMax}';
+elvST['ALL_LEDS'] = '${stringTableAllLEDs}';
+elvST['ANALOG_INPUT'] = '${stringTableAnalog}';
+elvST['ANALOG_OUTPUT'] = '${stringTableAnalog}';
 elvST['AUTO_MODE'] = '${stringTableClimateControlRTTransceiverAutoMode}';
 elvST['ACTUAL_HUMIDITY'] = '${stringTableWeatherHumidity}';
 elvST['ACTUAL_TEMPERATURE'] = '${stringTableClimateControlRTTransceiverActualTemp}';
+elvST['ALARMTIME_MAX'] = '${stringTableAlarmTimeMax}';
+elvST['BACKLIGHT_AT_CHARGE'] = '${stringTableBackLightAtCharge}';
+elvST['BACKLIGHT_AT_KEYSTROKE'] = '${stringTableBackLightAtKeystroke}';
+elvST['BACKLIGHT_AT_MOTION'] = '${stringTableBackLightAtMotion}';
+elvST['BACKLIGHT_ON_TIME'] = '${stringTableBackLightOnTime}';
+elvST['BAT_DEFECT_LIMIT'] = '${stringTableBatDefectLimit}';
 elvST['BATTERY_STATE'] = '${stringTableClimateControlRTTransceiverBatteryState}';
 elvST['BOOST_MODE'] = '${stringTableClimateControlRTTransceiverBoostMode}';
 elvST['BOOST_MODE=FALSE'] = '${stringTableBoostModeFalse}';
@@ -3603,7 +3636,9 @@ elvST['LOGIC_COMBINATION'] = '${stringTableLogicCombination}';
 elvST['LOWBAT_REPORTING'] = '${stringTableLowbatReporting}';
 elvST['LOWBAT_REPORTING=FALSE'] = '${stringTableLowbatReportingFalse}';
 elvST['LOWBAT_REPORTING=TRUE'] = '${stringTableLowbatReportingTrue}';
+elvST['LOWBAT_SIGNAL'] = '${stringTableLowbatSignal}';
 elvST['LOWERING_MODE'] = '${stringTableClimateControlRTTransceiverLoweringMode}';
+elvST['LUX'] = '${stringTableLux}';
 elvST['MANU_MODE'] = '${stringTableClimateControlRTTransceiverManuMode}';
 elvST['NOT_USED'] = '${stringTableNotUsed}';
 elvST['OLD_LEVEL'] = '${stringTableDimmerOldLevel}';
@@ -3643,14 +3678,19 @@ elvST['PROCESS=NOT_STABLE'] = '${stringTableProcessNotStable}';
 elvST['RAMP_TIME'] = '${stringTableDimmerRampTime}';
 elvST['SET_TEMPERATURE'] = '${stringTableClimateControlRTTransceiverSetTemperature}';
 elvST['SECTION'] = '${stringTableSection}';
+elvST['SOUND_ID'] = '${stringTableSoundID}';
 elvST['STATE=FALSE'] = '${stringTableStateFalse}';
 elvST['STATE=TRUE'] = '${stringTableStateTrue}';
+elvST['STATUSINFO_MINDELAY'] = '${stringTableStatusInfoMinDelay}';
+elvST['STATUSINFO_RANDOM'] = '${stringTableStatusInfoRandom}';
+elvST['TX_MINDELAY'] = '${stringTableTxMinDelay}';
 elvST['TX_MINDELAY_UNIT'] = '${stringTableTxMinDelayUnit}';
 elvST['TX_MINDELAY_UNIT=100MS'] = '${optionUnit100MS}';
 elvST['TX_MINDELAY_UNIT=S'] = '${optionUnitS}';
 elvST['TX_MINDELAY_UNIT=M'] = '${optionUnitM}';
 elvST['TX_MINDELAY_UNIT=H'] = '${optionUnitH}';
 elvST['TX_MINDELAY_VALUE'] = '${stringTableTxMinDelayValue}';
+elvST['TX_THRESHOLD_PERCENT'] = '${stringTableTxThresholdPercent}';
 elvST['UNREACH=FALSE'] = '${stringTableUnreachFalse}';
 elvST['UNREACH=TRUE'] = '${stringTableUnreachTrue}';
 elvST['UPDATE_PENDING'] = '${stringTableUpdatePending}';
@@ -9034,19 +9074,6 @@ MultiChannelChooser = Singleton.create({
       (this.FuncFilter.matchArray(channel.subsections)));     
   },
   
-  /**
-   * Filtert eine Kanalliste
-   **/
-  _filter: function(channels)
-  {
-    var result = new Array();
-    
-    channels.each(function(channel) {
-      if (this.match(channel)) { result.push(channel); }
-    }, this);
-    
-    return result;    
-  },
 
   filterHmIPChannels: function(channel, result) {
     conInfo("filterHmIPChannels");
@@ -10125,7 +10152,7 @@ DeleteDeviceDialog = Class.create({
     var result = {"id": 0, "address" : "", "type": "" };
     try {
       jQuery.each(this.m_device.channels, function(index, channel) {
-        if ((channel.channelType == "POWERMETER") || (channel.channelType == "POWERMETER_IGL") || (channel.channelType == "ENERGIE_METER_TRANSMITTER")) {
+        if ((channel.channelType == "POWERMETER") || (channel.channelType == "POWERMETER_IEC1") || (channel.channelType == "ENERGIE_METER_TRANSMITTER")) {
           result.id = channel.id;
           result.address = channel.address;
           result.type = channel.channelType;
@@ -10144,6 +10171,7 @@ DeleteDeviceDialog = Class.create({
           homematic("SysVar.deleteSysVarByName", {"name": "svEnergyCounter_" + chId + "_" + chAddress + "_DEVICE_RESET"}, function () {
             homematic("SysVar.deleteSysVarByName", {"name": "svEnergyCounter_" + chId + "_" + chAddress + "_TMP_OLDVAL"}, function () {
               homematic("Program.deleteProgramByName", {"name": "prgEnergyCounter_" + chId + "_" + chAddress}, function () {
+                conInfo(chAddress + "ProgSysvarPOWERMETER deleted - next: save ObjectModel");
                 homematic("system.saveObjectModel", {}, function () {
                   conInfo("ObjectModel saved");
                 });
@@ -10163,6 +10191,7 @@ DeleteDeviceDialog = Class.create({
           homematic("SysVar.deleteSysVarByName", {"name": "svEnergyCounterGas_" + chId + "_" + chAddress + "_DEVICE_RESET"}, function () {
             homematic("SysVar.deleteSysVarByName", {"name": "svEnergyCounterGas_" + chId + "_" + chAddress + "_TMP_OLDVAL"}, function () {
               homematic("Program.deleteProgramByName", {"name": "prgEnergyCounterGAS_" + chId + "_" + chAddress}, function () {
+                conInfo(chAddress + "ProgSysvarPOWERMETER_IGL deleted - next to delete: ProgSysvarPOWERMETER");
                 self.m_deleteProgSysvarPOWERMETER(chId, chAddress);
               });
             });
@@ -10171,6 +10200,19 @@ DeleteDeviceDialog = Class.create({
       });
     });
   },
+
+  m_deleteProgSysvarPOWERMETER_IEC: function(chId, chAddress) {
+    var self = this;
+    homematic("SysVar.deleteSysVarByName", {"name": "svEnergyCounterIEC_" + chId + "_" + chAddress}, function () {
+        homematic("SysVar.deleteSysVarByName", {"name": "svEnergyCounterIECOldVal_" + chId}, function () {
+          homematic("Program.deleteProgramByName", {"name": "prgEnergyCounterIEC_" + chId + "_" + chAddress}, function () {
+            conInfo(chAddress + " ProgSysvarPOWERMETER_IEC deleted - next to delete: ProgSysvarPOWERMETER_IGL");
+            self.m_deleteProgSysvarPOWERMETER_IGL(chId, chAddress);
+          });
+        });
+    });
+  },
+
   m_onDeviceDeleted: function(errorCode)
   {
 
@@ -10187,6 +10229,8 @@ DeleteDeviceDialog = Class.create({
           this.m_deleteProgSysvarPOWERMETER(chId, chAddress);
         } else if (oEnergyCounter.type == "POWERMETER_IGL")  {
           this.m_deleteProgSysvarPOWERMETER_IGL(chId, chAddress);
+        } else if (oEnergyCounter.type == "POWERMETER_IEC1") {
+          this.m_deleteProgSysvarPOWERMETER_IEC(chId, chAddress);
         }
       }
       if (this.m_callback) { this.m_callback(true); }
@@ -10370,178 +10414,172 @@ HMScriptExecutor.CONTENT_HEIGHT = 485;
 /**
  * firewallconfigdialog.js
  **/
- 
+
 FirewallConfigDialog = Class.create({
 
   /**
    * @constructor
    * Erzeugt einen neuen FirewallConfigDialog
    **/
-  initialize: function()
-  {
-    var screenWidth  = WebUI.getWidth();
+  initialize: function () {
+    var screenWidth = WebUI.getWidth();
     var screenHeight = WebUI.getHeight();
-    var frameWidth   = FirewallConfigDialog.CONTENT_WIDTH;
-    var frameHeight  = FirewallConfigDialog.CONTENT_HEIGHT;
-    var frameX       = parseInt((screenWidth  - frameWidth)  / 2);
-    var frameY       = parseInt((screenHeight - frameHeight) / 2);
-    
+    var frameWidth = FirewallConfigDialog.CONTENT_WIDTH;
+    var frameHeight = FirewallConfigDialog.CONTENT_HEIGHT;
+    var frameX = parseInt((screenWidth - frameWidth) / 2);
+    var frameY = parseInt((screenHeight - frameHeight) / 2);
+
     this.m_layer = document.createElement("div");
     this.m_layer.className = "DialogLayer";
-    
-		this.m_xmlrpcListBox = new UI.ListBox()
-			.setPosition(FirewallConfigDialog.CONTENT_WIDTH - 160, 10)
-			.setWidth(150)
-			//.add({id: "full"      , name: "Vollzugriff"})
-			//.add({id: "restricted", name: "eingeschränkt"})
-			//.add({id: "none"      , name: "kein Zugriff"});
-      .add({id: "full"      , name: translateKey("dialogSettingsFirewallLblFullAccess")})
+
+    this.m_xmlrpcListBox = new UI.ListBox()
+      .setPosition(FirewallConfigDialog.CONTENT_WIDTH - 160, 10)
+      .setWidth(150)
+      //.add({id: "full"      , name: "Vollzugriff"})
+      //.add({id: "restricted", name: "eingeschränkt"})
+      //.add({id: "none"      , name: "kein Zugriff"});
+      .add({id: "full", name: translateKey("dialogSettingsFirewallLblFullAccess")})
       .add({id: "restricted", name: translateKey("dialogSettingsFirewallLblRestrictedAccess")})
-      .add({id: "none"      , name: translateKey("dialogSettingsFirewallLblNoAccess")});
-      
-		
-		this.m_hmscriptListBox = new UI.ListBox()
-			.setPosition(FirewallConfigDialog.CONTENT_WIDTH - 160, 80)
-			.setWidth(150)
-			//.add({id: "full"      , name: "Vollzugriff"})
-			//.add({id: "restricted", name: "eingeschränkt"})
-			//.add({id: "none"      , name: "kein Zugriff"});
-      .add({id: "full"      , name: translateKey("dialogSettingsFirewallLblFullAccess")})
+      .add({id: "none", name: translateKey("dialogSettingsFirewallLblNoAccess")});
+
+
+    this.m_hmscriptListBox = new UI.ListBox()
+      .setPosition(FirewallConfigDialog.CONTENT_WIDTH - 160, 80)
+      .setWidth(150)
+      //.add({id: "full"      , name: "Vollzugriff"})
+      //.add({id: "restricted", name: "eingeschränkt"})
+      //.add({id: "none"      , name: "kein Zugriff"});
+      .add({id: "full", name: translateKey("dialogSettingsFirewallLblFullAccess")})
       .add({id: "restricted", name: translateKey("dialogSettingsFirewallLblRestrictedAccess")})
-      .add({id: "none"      , name: translateKey("dialogSettingsFirewallLblNoAccess")});
-		
-		this.m_ipTextArea = new UI.Textarea()
-			.setPosition(10, 180)
-			.setWidth(FirewallConfigDialog.CONTENT_WIDTH - 20)
-			.setHeight(100)
-			.setWrap(true);
-		
+      .add({id: "none", name: translateKey("dialogSettingsFirewallLblNoAccess")});
+
+    this.m_ipTextArea = new UI.Textarea()
+      .setPosition(10, 180)
+      .setWidth(FirewallConfigDialog.CONTENT_WIDTH - 20)
+      .setHeight(100)
+      .setWrap(true);
+
     this.m_frame = new UI.Frame()
       //.setTitle("Firewall Konfiguration")
       .setTitle(translateKey("dialogSettingsFirewallTitle"))
       .setContentSize(frameWidth, frameHeight)
       .setPosition(frameX, frameY)
-			.add(new UI.Text()
-				.setPosition(10, 10)
-				//.setHtml("<b>HomeMatic XML-RPC API:</b>")
-				.setHtml(translateKey("dialogSettingsFirewallLblXMLRPCAPI"))
-			)
-			.add(new UI.Text()
-				.setPosition(10, 40)
-				.setWidth(FirewallConfigDialog.CONTENT_WIDTH - 20)
-				//.setText("Ermöglicht den direkten Zugriff auf angelernte HomeMatic Geräte")
+      .add(new UI.Text()
+        .setPosition(10, 10)
+        //.setHtml("<b>HomeMatic XML-RPC API:</b>")
+        .setHtml(translateKey("dialogSettingsFirewallLblXMLRPCAPI"))
+    )
+      .add(new UI.Text()
+        .setPosition(10, 40)
+        .setWidth(FirewallConfigDialog.CONTENT_WIDTH - 20)
+        //.setText("Ermöglicht den direkten Zugriff auf angelernte HomeMatic Geräte")
         .setText(translateKey("dialogSettingsFirewallLblHintXMLRPCAPI"))
-        
-			)
-			.add(this.m_xmlrpcListBox)
-			.add(new UI.Text()
-				.setPosition(10, 80)
-				//.setHtml("<b>Remote HomeMatic-Script API:</b>")
+    )
+      .add(this.m_xmlrpcListBox)
+      .add(new UI.Text()
+        .setPosition(10, 80)
+        //.setHtml("<b>Remote HomeMatic-Script API:</b>")
         .setHtml(translateKey("dialogSettingsFirewallLblScriptAPI"))
-			)
-			.add(new UI.Text()
-				.setPosition(10, 110)
-				.setWidth(FirewallConfigDialog.CONTENT_WIDTH - 20)
-				//.setText("Ermöglicht den Zugriff auf die Logikschicht der HomeMatic Zentrale")
+    )
+      .add(new UI.Text()
+        .setPosition(10, 110)
+        .setWidth(FirewallConfigDialog.CONTENT_WIDTH - 20)
+        //.setText("Ermöglicht den Zugriff auf die Logikschicht der HomeMatic Zentrale")
         .setText(translateKey("dialogSettingsFirewallLblHintScriptAPI"))
-        
-			)
-			.add(this.m_hmscriptListBox)
-			.add(new UI.Text()
-				.setPosition(10, 150)
-				//.setHtml("<b>IP-Adressen für den eingeschränkten Zugriff:</b>")
+    )
+      .add(this.m_hmscriptListBox)
+      .add(new UI.Text()
+        .setPosition(10, 150)
+        //.setHtml("<b>IP-Adressen für den eingeschränkten Zugriff:</b>")
         .setHtml(translateKey("dialogSettingsFirewallLblIPAddresses"))
-			)
-			.add(this.m_ipTextArea)
-			.add(new UI.Text()
-				.setPosition(10, 290)
-				.setWidth(FirewallConfigDialog.CONTENT_WIDTH - 20)
-				//.setText("Sie können den Zugriff wahlweise für einzelne IP-Adressen (z.B. 192.168.0.1) oder ganze Adressbereiche (z.B. 192.168.0.0/16) freigeben.")
+    )
+      .add(this.m_ipTextArea)
+      .add(new UI.Text()
+        .setPosition(10, 290)
+        .setWidth(FirewallConfigDialog.CONTENT_WIDTH - 20)
+        //.setText("Sie können den Zugriff wahlweise für einzelne IP-Adressen (z.B. 192.168.0.1) oder ganze Adressbereiche (z.B. 192.168.0.0/16) freigeben.")
         .setText(translateKey("dialogSettingsFirewallLblHintIPAddresses"))
-      )
+    )
       .add(new UI.Button()
         .setPosition(10, FirewallConfigDialog.CONTENT_HEIGHT - 30)
         //.setText("Abbrechen")
         .setText(translateKey("btnCancel"))
-        
+
         .setAction(this.close, this)
-      )
+    )
       .add(new UI.Button()
         .setPosition(FirewallConfigDialog.CONTENT_WIDTH - 160, FirewallConfigDialog.CONTENT_HEIGHT - 30)
         //.setText("OK")
         .setText(translateKey("btnOk"))
         .setAction(this.ok, this)
-      );
+    );
 
-		this.loadConfiguration();
+    this.loadConfiguration();
 
     this.m_layer.appendChild(this.m_frame.getElement());
     Layer.add(this.m_layer);
   },
-  
-	loadConfiguration: function()
-	{
-		
-		var response = homematic("Firewall.getConfiguration");
-		if (null != response)
-		{
-			var services     = response.services;
-			var ips          = response.ips.join(";\n");
-			var xmlrpcAccess = "full";
-			var hmscriptAccess   = "full";
-			
-			for (var i = 0, len = services.length; i < len; i++)
-			{
-				var service = services[i];
-				if (service.id == "XMLRPC") { xmlrpcAccess   = service.access; }
-				if (service.id == "REGA"  ) { hmscriptAccess = service.access; }
-			}
-			
-			this.m_xmlrpcListBox.selectItemById(xmlrpcAccess);
-			this.m_hmscriptListBox.selectItemById(hmscriptAccess);
-			this.m_ipTextArea.setText(ips);
-		}
-	},
-	
+
+  loadConfiguration: function () {
+
+    var response = homematic("Firewall.getConfiguration");
+    if (null != response) {
+      var services = response.services;
+      var ips = response.ips.join(";\n");
+      var xmlrpcAccess = "full";
+      var hmscriptAccess = "full";
+
+      for (var i = 0, len = services.length; i < len; i++) {
+        var service = services[i];
+        if (service.id == "XMLRPC") {
+          xmlrpcAccess = service.access;
+        }
+        if (service.id == "REGA") {
+          hmscriptAccess = service.access;
+        }
+      }
+
+      this.m_xmlrpcListBox.selectItemById(xmlrpcAccess);
+      this.m_hmscriptListBox.selectItemById(hmscriptAccess);
+      this.m_ipTextArea.setText(ips);
+    }
+  },
+
   /**
    * Schließt den FirewallConfigDialog ohne Änderungen zu übernehmen.
    **/
-  close: function()
-  {
+  close: function () {
     Layer.remove(this.m_layer);
   },
-  
+
   /**
    * Übernimmt die Änderungen und schließt den FirewallConfigDialog anschließend.
    **/
-  ok: function()
-  {
-		var xmlrpcAccess   = this.m_xmlrpcListBox.getSelectedItem().id;
-		var hmscriptAccess = this.m_hmscriptListBox.getSelectedItem().id;
-		var ips  = this.m_ipTextArea.getText().replace(/\s+/g,'').split(";");
-		var isOk = true;
-		for (var i = 0, len = ips.length; i < len; i++)
-		{
-			var ip = ips[i];
-			if (!ip.match(/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]+)?$/)) { isOk = false; }
-		}
-		
-		if (isOk)
-		{
-			homematic("Firewall.setConfiguration", {
-				services: 
-				[
-					{name: "XMLRPC", access: xmlrpcAccess},
-					{name: "REGA", access: hmscriptAccess}
-				],
-				ips: ips
-			});
-			this.close();
-		}
-		else
-		{
-			//MessageBox.show("Eingabefehler", "Verwenden Sie bitte nur IP-Adressen im Format \"1.2.3.4\" und Adressgruppen im Format \"1.2.3.0/8\". Separieren Sie die einzelnen Adressen durch Semikola.");
-			MessageBox.show(translateKey("dialogSettingsFirewallErrorMsgTitle"), translateKey("dialogSettingsFirewallErrorMsgContent"));
+  ok: function () {
+    var xmlrpcAccess = this.m_xmlrpcListBox.getSelectedItem().id;
+    var hmscriptAccess = this.m_hmscriptListBox.getSelectedItem().id;
+    var ips = this.m_ipTextArea.getText().replace(/\s+/g, '').split(";");
+    var isOk = true;
+    for (var i = 0, len = ips.length; i < len; i++) {
+      var ip = ips[i];
+      if (!ip.match(/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(\/[0-9]+)?$/)) {
+        isOk = false;
+      }
+    }
+
+    if (isOk) {
+      homematic("Firewall.setConfiguration", {
+        services: [
+          {name: "XMLRPC", access: xmlrpcAccess},
+          {name: "REGA", access: hmscriptAccess}
+        ],
+        ips: ips
+      });
+      this.close();
+    }
+    else {
+      //MessageBox.show("Eingabefehler", "Verwenden Sie bitte nur IP-Adressen im Format \"1.2.3.4\" und Adressgruppen im Format \"1.2.3.0/8\". Separieren Sie die einzelnen Adressen durch Semikola.");
+      MessageBox.show(translateKey("dialogSettingsFirewallErrorMsgTitle"), translateKey("dialogSettingsFirewallErrorMsgContent"));
 
     }
   }
@@ -20135,6 +20173,7 @@ writeReadyField = function(tdParent, obj) {
 };
 
 writeDeviceAction = function(tdParent, includeChecks, bIsDev, bDelBtn, obj, bIsGroup) {
+  var HmIPIfaceSelector = "HmIP-RF";
   var id = 0;
   if (obj) { id = obj['id']; }
   var tbl = Builder.node('table', {width: '100%', cellpadding: '0'}, [
@@ -20181,7 +20220,7 @@ writeDeviceAction = function(tdParent, includeChecks, bIsDev, bDelBtn, obj, bIsG
   tbodySub.appendChild(trSub);
 
   /* Geraetetausch */
-  if (bIsDev && bDelBtn) {
+  if (bIsDev && bDelBtn && (obj['iface'] != HmIPIfaceSelector)) {
     //divSub = Builder.node('div', {className: 'StdButton', onclick: 'loadDevicesToChange(\''+obj['sn']+'\',\''+obj['type']+'\')'}, translateKey('replaceDeviceBtn'));
     divSub = Builder.node('div', {className: 'StdButton', onclick: 'loadDevicesToChange(\''+obj['sn']+'\',\''+obj['type']+'\',\''+obj['id']+'\')'}, translateKey('replaceDeviceBtn'));
     tdSub.appendChild(divSub);
@@ -21917,6 +21956,25 @@ getExtendedDescription = function(type, ch) {
             }
             break;
 
+    // Radio-controlled indoor siren
+    case "HM-Sec-Sir-WM":
+      switch (ch) {
+        case 1 :
+          result = translateKey("lblIndoorSirenInternAlarm");
+          break;
+        case 2 :
+          result = translateKey("lblIndoorSirenExternAlarm");
+          break;
+        case 3 :
+          result = translateKey("lblIndoorSirenPanicAlarm");
+          break;
+        case 4 :
+          result = translateKey("lblIndoorSirenArming");
+          break;
+        default: result = "";
+      }
+     break;
+
   }
   return result;
 };
@@ -26201,60 +26259,115 @@ isePowerMeter.prototype = {
   initialize: function(id, opts) {
     conInfo("PowerMeter");
     var self = this;
-    // 0 = Gas-Sensor, 1 = Electricity (IR-Sensor), 2 = Electricity (LED-Sensor), 3 = Unknown
-    this.arMeasurementTypes = ["Gas", "Electricity", "Electricity", "Unknown"];
+    this.arMeasurementTypes = [];
+    this.sensorTypeID = {};
+    this.sensorTypeID.gas = "Gas";
+    this.sensorTypeID.eletricity = "Electricity";
+    this.sensorTypeID.iec = "IEC";
+    this.sensorTypeID.unknown = "Unknown";
+    this.kiloPrefix = "";
+
     this.id = id;
     this.opts = opts;
-    this.EnergyCounterID = "svEnergyCounter_" + this.id + "_" + this.opts.chAddress;
-    this.EnergyCounterRESETID = "svEnergyCounter_" + this.id + "_" + this.opts.chAddress + "_RESET";
-    this.EnergyCounterOldValID = "svEnergyCounterOldVal_" + this.id;
-    this.EnergyPrice = "unknown";
     this.summedUpEnergy = 0.0;
-    this.measurementType = this.arMeasurementTypes[1]; // Default set to 'Electricity'
-    this.bindEvents();
+    this.measurementType = this.getSensorType();
+    conInfo("Identified sensor: " + this.measurementType);
+
+    this.panel2Show = null;
 
-    if (opts.chType == "POWERMETER_IGL") {
-      this.measurementType = this.getSensorType();
-      this.setGenericInfoPanels(["Power"]);
+    // Channel 2 is only visible when a IEC-Sensor is attached
+    if (this.opts.chType == "POWERMETER_IEC2") {
+      switch (this.measurementType) {
+        case this.sensorTypeID.iec:
+          this.panel2Show = this.getJElemsByName("channelActiv");
+          break;
+        default: this.panel2Show = this.getJElemByID("channelNotActiv");
+      }
+      this.panel2Show.show();
     } else {
-      this.setGenericInfoPanels(["Voltage", "Current", "Power", "Frequency"]);
+      this.panel2Show = this.getJElemsByName("channelActiv");
+      this.panel2Show.show();
     }
 
+    this.EnergyCounterID = "svEnergyCounter" + this.getSensorExtension() + "_" + this.id + "_" + this.opts.chAddress;
+    this.EnergyCounterRESETID = "svEnergyCounter_" + this.id + "_" + this.opts.chAddress + "_RESET";
+    this.EnergyCounterOldValID = "svEnergyCounter" + this.getSensorExtension() + "OldVal_" + this.id;
+    this.EnergyPrice = "unknown";
+
+    this.bindEvents();
+
+    this.setGenericInfoPanels(this.getVisibleInfoPanels());
+
     // When gas sensor change the unit from Wh to m^3 and change the EnergyCounterID
-    if (this.measurementType == this.arMeasurementTypes[0]) {
+    if (this.measurementType == this.sensorTypeID.gas) {
       this.opts.unitEnergyCounter = "m<sup>3</sup>";
       this.EnergyCounterID = "svEnergyCounterGas_" + this.id + "_" + this.opts.chAddress;
       this.EnergyCounterRESETID = "svEnergyCounterGas_" + this.id + "_" + this.opts.chAddress + "_RESET";
       this.EnergyCounterOldValID = "svEnergyCounterGasOldVal_" + this.id;
-    } else if (this.measurementType == this.arMeasurementTypes[3]) {
+    } else if (this.measurementType == this.sensorTypeID.unknown) {
       // Unknown sensor
       this.opts.unitEnergyCounter = "";
+    } else if (this.measurementType == this.sensorTypeID.iec) {
+      this.opts.unitEnergyCounter = this.opts.unitEnergyCounterIEC;
     }
-    jQuery("[name = '"+ this.id + "EnergyCostDeviceUnit']").html(this.opts.unitEnergyCounter).show();
+    jQuery("[name = '" + this.id + "EnergyCostDeviceUnit']").html(this.opts.unitEnergyCounter).show();
     this.setEnergyCounterPanel();
 
-    this.energyConfig = homematic("system.getEnergyPrice", {}, function(result){
+    this.energyConfig = homematic("system.getEnergyPrice", {}, function (result) {
       self.energyConfig = result;
       // When the energy price config is available and it´s a known sensor (electricity or gas)
       // then show the energy cost
-      if (result && (self.measurementType != self.arMeasurementTypes[3])) {
+      if (result && (self.measurementType != self.sensorTypeID.unknown)) {
         self.showEnergyCost();
       }
     });
-    jQuery("[name = '"+this.id+"sensor"+this.getGasExtension()+"']").show();
+    jQuery("[name = '" + this.id + "sensor" + this.getSensorExtension() + "']").show();
     conInfo("Interface: " + this.opts.iface);
     conInfo("MeasurementType: " + this.measurementType);
+
+  },
+
+  getVisibleInfoPanels: function() {
+    switch (this.opts.chType) {
+      //Wireless sender for power meter sensor
+      case "POWERMETER_IGL":
+      case "POWERMETER_IEC1":
+      case "POWERMETER_IEC2":
+        return ["Power"];
+      default:
+        // POWERMETER - power meter switch actuator
+        return ["Voltage", "Current", "Power", "Frequency"];
+    }
   },
 
   getSensorType: function() {
-      // Determine the type of measurement (gas or electicity)
-      var paramSet = homematic("Interface.getParamset", {"interface": this.opts.iface, "address" : this.opts.chAddress, "paramsetKey" :"MASTER"});
-      //METER_TYPE can be
-      // 0 = Gas-Sensor
-      // 1 = Electricity (IR-Sensor)
-      // 2 = Electricity (LED-Sensor)
-      // 3 = Unknown
-      return this.arMeasurementTypes[parseInt(paramSet.METER_TYPE)];
+    // Determine the type of measurement (gas or electicity)
+    var paramSet = homematic("Interface.getParamset", {"interface": this.opts.iface, "address" : this.opts.chAddress, "paramsetKey" :"MASTER"});
+
+    /* No meter type available
+       The device is an ordinary powermeter
+    */
+    if (paramSet.METER_TYPE == undefined) {
+      return this.sensorTypeID.eletricity;
+    }
+
+    // No IEC Sensor
+    // 0 = Gas-Sensor, 1 = Electricity (IR-Sensor), 2 = Electricity (LED-Sensor), 3 = Unknown
+
+    // IEC-Sensor
+    // 0 = Gas-Sensor, 1 = Electricity (IR-Sensor), 2 = Electricity (LED-Sensor), 3 = IEC-Sensor, 4 = Unknown
+
+    switch (this.opts.chType) {
+      case "POWERMETER":
+      case "POWERMETER_IGL":
+        this.arMeasurementTypes = ["Gas", "Electricity", "Electricity", "Unknown"];
+        break;
+      case "POWERMETER_IEC1":
+      case "POWERMETER_IEC2":
+        this.arMeasurementTypes = ["Gas", "Electricity", "Electricity", "IEC", "Unknown"];
+        break;
+    }
+    return this.arMeasurementTypes[parseInt(paramSet.METER_TYPE)];
 
   },
 
@@ -26280,6 +26393,40 @@ isePowerMeter.prototype = {
       self.setEnergyCounterPanel();
       self.showEnergyCost();
     });
+
+    /*
+    jQuery("#"+ this.id + "setEnergyCounter").bind("click", function(){
+      conInfo("Set EnergyCounter");
+      var dlgContent = "<table align='center'><tr><td><input type='text' id='meterReading'></td></tr></table>",
+        valMeterReading;
+
+      setEnergyCounterDlg = new YesNoDialog("trans Enter meter readings", dlgContent, function(result) {
+        if (result == YesNoDialog.RESULT_YES) {
+          valMeterReading = jQuery("#meterReading").val();
+          // TODO check if the value is a valid float
+
+          // This removes the dialog from the screen
+          Layer.remove(this.m_layer);
+
+          // This sets the new value of the power meter
+          homematic("SysVar.setFloat", {"name" : self.EnergyCounterID, "value" : valMeterReading}, function() {
+            self.setEnergyCounterPanel();
+            self.showEnergyCost();
+          });
+        } else {
+          // NO pressed
+          // This removes the dialog from the screen
+          Layer.remove(this.m_layer);
+        }
+      }, "html");
+
+      // Overwrites the original close method
+      setEnergyCounterDlg.close = function(result) {
+        if (this.m_callback) { this.m_callback(result); }
+      };
+
+    });
+    */
   },
 
   /**
@@ -26297,64 +26444,116 @@ isePowerMeter.prototype = {
    * @param {string} elem The name of the desired element
    * @return {object} The desired element
    */
-  getJElem: function(elem) {
+  getJElemByID: function(elem) {
     return jQuery("#" + this.id + elem);
   },
 
-  getGasExtension: function() {
-    return (this.measurementType == this.arMeasurementTypes[0]) ? this.arMeasurementTypes[0] : "";
+  getJElemsByName: function(elem) {
+    return jQuery("[name='" + this.id + elem + "']");
+  },
+
+  getSensorExtension: function() {
+    switch (this.measurementType) {
+      case  this.sensorTypeID.gas:
+        return this.sensorTypeID.gas;
+      case this.sensorTypeID.iec:
+        return this.sensorTypeID.iec;
+      default: return "";
+    }
   },
   /**
    * Sets the text (value + unit) of the desired element
    * @param {string} panel The name of the desired element
    */
   setGenericPanel: function(panel) {
-    var gasExtension = this.getGasExtension();
-    var j_panel = this.getJElem(panel),
-      value = this.opts["val" + panel + gasExtension],
-      unit = this.opts["unit" + panel + gasExtension];
-    j_panel.text(value.toFixed(2) + " " + unit);
+    var sensorExtension = this.getSensorExtension();
+    var j_panel = this.getJElemByID(panel),
+      value = this.opts["val" + panel + sensorExtension],
+      unit = this.opts["unit" + panel + sensorExtension];
+    if (value && unit) {
+      j_panel.text(value.toFixed(2) + " " + unit);
+    }
+  },
+
+  changeToKilo: function() {
+    return (this.summedUpEnergy/1000).toFixed(3);
   },
 
   setEnergyCounterPanel: function() {
-    var j_panel = this.getJElem("EnergyCounter");
+    var j_panel = this.getJElemByID("EnergyCounter");
     this.summedUpEnergy = parseFloat(homematic("SysVar.getValue", {"id" : this.EnergyCounterID})).toFixed(2);
-    j_panel.html(this.summedUpEnergy + " " + this.opts.unitEnergyCounter);
+    conInfo("setEnergyCounterPanel - this.summedUpEnergy: " + this.summedUpEnergy);
+
+    if (this.summedUpEnergy >= 1000.0 && (this.measurementType != this.sensorTypeID.gas) && (this.measurementType != this.sensorTypeID.iec)) {
+      this.kiloPrefix = "k";
+      this.summedUpEnergy = this.changeToKilo();
+    }
+
+    j_panel.html(this.summedUpEnergy + " " + this.kiloPrefix + this.opts.unitEnergyCounter);
   },
 
   getEnergyConsumption: function(sType) {
     // Electricity sensor
-    if ((this.measurementType == this.arMeasurementTypes[1])) {
+    if ((this.measurementType == this.sensorTypeID.eletricity )) {
       if (sType == "CCU")  return this.summedUpEnergy;
       if (sType == "Device") return this.opts.valEnergyCounter;
     }
 
     // Gas sensor
-    if (this.measurementType == this.arMeasurementTypes[0]) {
+    if (this.measurementType == this.sensorTypeID.gas) {
       if (sType == "CCU")  return (this.summedUpEnergy * this.energyConfig.gasHeatingValue * this.energyConfig.gasConditionNumber) ;
-      if (sType == "Device") return (this.opts.valEnergyCounter * this.energyConfig.gasHeatingValue * this.energyConfig.gasConditionNumber);
+      if (sType == "Device") return (this.opts.valEnergyCounterGas * this.energyConfig.gasHeatingValue * this.energyConfig.gasConditionNumber);
+    }
+
+    // IEC sensor
+    if ((this.measurementType == this.sensorTypeID.iec)) {
+      if (sType == "CCU")  return this.summedUpEnergy;
+      if (sType == "Device") return this.opts["valEnergyCounter" + this.getSensorExtension()];
+    }
+
+  },
+
+  // Some channels aren't allowed to show the energy cost
+  // E. g. the channel POWERMETER_IEC2 measures the energy which a client feeds into the power supply system (solar, wind or so)
+  isChannelValid2ShowEnergyCost: function() {
+    switch (this.opts.chType) {
+      case "POWERMETER_IEC2":
+        return false;
+      default: return true;
     }
+
   },
 
   showEnergyCost: function() {
-    if (this.energyConfig && (this.measurementType != this.arMeasurementTypes[3])) {
-      var unitFactor = 1000,
+    if (this.energyConfig && (this.measurementType != this.sensorTypeID.unknown) && ( this.isChannelValid2ShowEnergyCost()) ) {
+      var unitFactorCCU = 1000,
+        unitFactorDevice = 1000,
         kWh = " kWh";
 
-      if (this.measurementType == this.arMeasurementTypes[0]) {
+      if (this.kiloPrefix == "k") {
+        unitFactorCCU = 1;
+      }
+
+      if ((this.measurementType == this.sensorTypeID.iec)) {
+        unitFactorCCU = 1;
+        unitFactorDevice = 1;
+      }
+
+      if (this.measurementType == this.sensorTypeID.gas) {
         this.EnergyPrice = this.energyConfig.gasPrice;
-        unitFactor = 1;
+        unitFactorCCU = 1;
+        unitFactorDevice = 1;
       }
-      if (this.measurementType == this.arMeasurementTypes[1]) this.EnergyPrice = this.energyConfig.curPrice;
+      if (this.measurementType == this.sensorTypeID.eletricity || this.measurementType == this.sensorTypeID.iec) this.EnergyPrice = this.energyConfig.curPrice;
 
       if (this.EnergyPrice != "unknown" && this.energyConfig.currency != null) {
-        var j_energyCostCCU = this.getJElem("EnergyCostCCU"),
-          j_energyCostDevice = this.getJElem("EnergyCostDevice"),
+        var j_energyCostCCU = this.getJElemByID("EnergyCostCCU"),
+          j_energyCostDevice = this.getJElemByID("EnergyCostDevice"+this.getSensorExtension()),
           energyConsumptionCCU = this.getEnergyConsumption("CCU"),
           energyConsumptionDevice = this.getEnergyConsumption("Device"),
-          energyCostCCU = ((energyConsumptionCCU * this.EnergyPrice) / unitFactor).toFixed(2) + " " + this.energyConfig.currency,
-          energyCostDevice = ((energyConsumptionDevice * this.EnergyPrice) / unitFactor).toFixed(2) + " " + this.energyConfig.currency;
-        if (this.measurementType == this.arMeasurementTypes[0]) {
+          energyCostCCU = ((energyConsumptionCCU * this.EnergyPrice) / unitFactorCCU).toFixed(2) + " " + this.energyConfig.currency,
+          energyCostDevice = ((energyConsumptionDevice * this.EnergyPrice) / unitFactorDevice).toFixed(2) + " " + this.energyConfig.currency;
+        if (this.measurementType == this.sensorTypeID.gas) {
           j_energyCostCCU.text(energyConsumptionCCU.toFixed(1) + kWh + " = " + energyCostCCU).show();
           j_energyCostDevice.text(energyConsumptionDevice.toFixed(1) + kWh + " = " + energyCostDevice).show();
         } else {
@@ -26441,6 +26640,167 @@ iseRGBWController.prototype = {
     });
   }
 
+};/**
+ * ise/iseButtonsSwitch.js
+ **/
+
+/**
+ * @fileOverview ?
+ * @author ise
+ **/
+
+/**
+ * @class
+ **/
+iseSmokeDetectorHmIP = Class.create();
+
+iseSmokeDetectorHmIP.prototype = {
+
+  initialize: function(id, controlID, dangerState) {
+
+    this.id = id;
+    this.state = parseInt(dangerState);
+    this.divOn = $(this.id + "On");
+    this.divOff = $(this.id + "Off");
+    this.idDpState = controlID;
+    
+    if (this.state == 2) { ControlBtn.on(this.divOn); }
+    else  { ControlBtn.on(this.divOff); }
+      
+    // Add event handlers
+    this.clickOff = this.onClickOff.bindAsEventListener(this);
+    Event.observe(this.divOff, 'mousedown', this.clickOff);
+
+    this.clickOn = this.onClickOn.bindAsEventListener(this);
+    Event.observe(this.divOn, 'mousedown', this.clickOn);
+
+
+  },
+  
+  onClickOff: function() {
+    ControlBtn.pushed(this.divOff);
+    setDpState(this.idDpState, 1, false);
+    var t = this;
+    new PeriodicalExecuter(function(pe) {
+      t.refresh();
+      pe.stop();
+    }, 1);
+  },
+ 
+  onClickOn: function() {
+    ControlBtn.pushed(this.divOn);
+    setDpState(this.idDpState, 2, false);
+    var t = this;
+    new PeriodicalExecuter(function(pe) {
+      t.refresh();
+      pe.stop();
+    }, 1);
+  },
+ 
+  
+  refresh: function() {
+    if (this.state == 2) {
+      ControlBtn.on(this.divOn);
+      ControlBtn.off(this.divOff);
+    }
+    else {
+      ControlBtn.off(this.divOn);
+      ControlBtn.on(this.divOff);
+    }
+  }
+};
+
+/**
+ * @class
+ **/
+iseArmAlarmSiren = Class.create();
+
+iseArmAlarmSiren.prototype = {
+
+  initialize: function(id, initState, idDpState) {
+    console.log("id: " + id + " - initState: " + initState + " - idDpState: " + idDpState);
+    this.id = id;
+    this.state = initState;
+    this.divOff = $(this.id + "Off");
+    this.divExtern = $(this.id + "Extern");
+    this.divIntern = $(this.id + "Intern");
+    this.divBlocked = $(this.id + "Blocked");
+    this.idDpState = idDpState;
+
+    this.initAllElements();
+
+    // Add event handlers
+    this.clickOff = this.onClickOff.bindAsEventListener(this);
+    Event.observe(this.divOff, 'mousedown', this.clickOff);
+
+    this.clickExtern = this.onClickExtern.bindAsEventListener(this);
+    Event.observe(this.divExtern, 'mousedown', this.clickExtern);
+
+    this.clickIntern = this.onClickIntern.bindAsEventListener(this);
+    Event.observe(this.divIntern, 'mousedown', this.clickIntern);
+
+  },
+
+  initAllElements: function() {
+    ControlBtn.off(this.divOff);
+    ControlBtn.off(this.divExtern);
+    ControlBtn.off(this.divIntern);
+    ControlBtn.off(this.divBlocked);
+    switch(this.state) {
+      case 0:
+        ControlBtn.on(this.divOff);
+        break;
+      case 1:
+        ControlBtn.on(this.divExtern);
+        break;
+      case 2:
+        ControlBtn.on(this.divIntern);
+        break;
+      case 3:
+        ControlBtn.on(this.divBlocked);
+    }
+  },
+
+  onClickOff: function() {
+    ControlBtn.pushed(this.divOff);
+    setDpState(this.idDpState, 0, false);
+    var t = this;
+    new PeriodicalExecuter(function(pe) {
+      t.refresh();
+      pe.stop();
+    }, 1);
+  },
+
+  onClickExtern: function() {
+    ControlBtn.pushed(this.divExtern);
+    setDpState(this.idDpState, 1, false);
+    var t = this;
+    new PeriodicalExecuter(function(pe) {
+      t.refresh();
+      pe.stop();
+    }, 1);
+  },
+
+  onClickIntern: function() {
+    ControlBtn.pushed(this.divIntern);
+    setDpState(this.idDpState, 2, false);
+    var t = this;
+    new PeriodicalExecuter(function(pe) {
+      t.refresh();
+      pe.stop();
+    }, 1);
+  },
+
+  refresh: function() {
+    if (this.state) {
+      ControlBtn.on(this.divOn);
+      ControlBtn.off(this.divOff);
+    }
+    else {
+      ControlBtn.off(this.divOn);
+      ControlBtn.on(this.divOff);
+    }
+  }
 };/**
  * ic_gd.js
  **/
@@ -32268,26 +32628,77 @@ WEATHER_change_thres = function(id)
 
 WEATHER_check_dir = function()
 {
+  var newSensor = "HM-WDS100-C6-O-2";
+  var sensorTypeDesc = jQuery("#weatherSensor").val();
+  var selectedWindDirection = jQuery("[name=\"subset_1_1\"]").prop("selectedIndex");
+
   var ein;
   var aus;
   //1 
-  
-  if (switch_dir) 
-  {  
-    //ein = document.createTextNode("Einschaltschwelle");
-    ein = document.createTextNode(translateKey("upperStormThreshold"));
-    //aus = document.createTextNode("Ausschaltschwelle");
-    aus = document.createTextNode(translateKey("lowerStormThreshold"));
+
+  if (sensorTypeDesc != newSensor) {
+    if (switch_dir) {
+      //ein = document.createTextNode("Einschaltschwelle");
+      ein = document.createTextNode(translateKey("upperStormThreshold"));
+      //aus = document.createTextNode("Ausschaltschwelle");
+      aus = document.createTextNode(translateKey("lowerStormThreshold"));
+    }
+    else {
+      //ein = document.createTextNode("Ausschaltschwelle");
+      ein = document.createTextNode(translateKey("lowerStormThreshold"));
+      //aus = document.createTextNode("Einschaltschwelle");
+      aus = document.createTextNode(translateKey("upperStormThreshold"));
+    }
+  } else {
+    // new Sensor
+    var ctON = jQuery("[name=\"SHORT_CT_ON\"]").prop("selectedIndex");
+    var ctOFF = jQuery("[name=\"SHORT_CT_OFF\"]").prop("selectedIndex");
+
+    if (switch_dir == 1) {
+      //ein = document.createTextNode("Einschaltschwelle");
+      ein = document.createTextNode(translateKey("upperStormThreshold"));
+      //aus = document.createTextNode("Ausschaltschwelle");
+      aus = document.createTextNode(translateKey("lowerStormThreshold"));
+      $('ein').replaceChild(ein, $('ein').firstChild);
+      $('aus').replaceChild(aus, $('aus').firstChild);
+      return;
+    }
+    else if (switch_dir == 0) {
+      //ein = document.createTextNode("Ausschaltschwelle");
+      ein = document.createTextNode(translateKey("lowerStormThreshold"));
+      //aus = document.createTextNode("Einschaltschwelle");
+      aus = document.createTextNode(translateKey("upperStormThreshold"));
+      $('ein').replaceChild(ein, $('ein').firstChild);
+      $('aus').replaceChild(aus, $('aus').firstChild);
+      return;
+    }
+
+    // X GE LO = 0
+    // X GE HI = 1
+    // X LT LO = 2
+    // X LT HI = 3
+    // Starker Wind EIN, schwacher Wind AUS / oder EIN nur bei starkem Wind, nicht aus (2. Profil)
+    if ((ctON == 2 && ctOFF == 1) || (ctON == 1 && ctOFF == 1)) {
+      //ein = document.createTextNode("Einschaltschwelle");
+      ein = document.createTextNode(translateKey("upperStormThreshold"));
+      //aus = document.createTextNode("Ausschaltschwelle");
+      aus = document.createTextNode(translateKey("lowerStormThreshold"));
+    }
+    // Starker Wind AUS, schwacher Wind EIN
+    if (ctON == 1 && ctOFF == 2) {
+      //ein = document.createTextNode("Ausschaltschwelle");
+      ein = document.createTextNode(translateKey("lowerStormThreshold"));
+      //aus = document.createTextNode("Einschaltschwelle");
+      aus = document.createTextNode(translateKey("upperStormThreshold"));
+    }
+
+
+
   }
-  else 
-  {
-    //ein = document.createTextNode("Ausschaltschwelle");
-    ein = document.createTextNode(translateKey("lowerStormThreshold"));
-    //aus = document.createTextNode("Einschaltschwelle");
-    aus = document.createTextNode(translateKey("upperStormThreshold"));
-  }  
-  $('ein').replaceChild(ein, $('ein').firstChild);
-  $('aus').replaceChild(aus, $('aus').firstChild);
+  try {
+    $('ein').replaceChild(ein, $('ein').firstChild);
+    $('aus').replaceChild(aus, $('aus').firstChild);
+  } catch (e) {}
 };
 
 WEATHER_check_expert = function()
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/HS485D/lib/libelvutils.so b/X86_32_Debian_Wheezy/packages-eQ-3/HS485D/lib/libelvutils.so
index 5a0edcbf..d6213383 100755
Binary files a/X86_32_Debian_Wheezy/packages-eQ-3/HS485D/lib/libelvutils.so and b/X86_32_Debian_Wheezy/packages-eQ-3/HS485D/lib/libelvutils.so differ
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/LinuxBasis/lib/libeq3config.so b/X86_32_Debian_Wheezy/packages-eQ-3/LinuxBasis/lib/libeq3config.so
index 58289434..5df83bb7 100644
Binary files a/X86_32_Debian_Wheezy/packages-eQ-3/LinuxBasis/lib/libeq3config.so and b/X86_32_Debian_Wheezy/packages-eQ-3/LinuxBasis/lib/libeq3config.so differ
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/bin/avrprog b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/bin/avrprog
index e5818245..a2e28368 100755
Binary files a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/bin/avrprog and b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/bin/avrprog differ
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/bin/multimacd b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/bin/multimacd
index 4a9d5064..4adb2917 100755
Binary files a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/bin/multimacd and b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/bin/multimacd differ
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/config/rfd.conf b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/config/rfd.conf
index c5476776..6113238e 100644
--- a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/config/rfd.conf
+++ b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/config/rfd.conf
@@ -19,6 +19,6 @@ Replacemap File = /opt/hm/firmware/rftypes/replaceMap/rfReplaceMap.xml
 
 [Interface 0]
 Type = CCU2
-ComPortFile = /dev/mmd_bidcos
+ComPortFile = /dev/ttyAPP0
 AccessFile = /dev/null
-ResetFile = /dev/null
+ResetFile = /dev/ccu2-ic200
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/crRFD.conf b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/crRFD.conf
index 2781f908..2d5d333a 100644
--- a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/crRFD.conf
+++ b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/crRFD.conf
@@ -2,8 +2,8 @@
 Adapter.1.Type=HMIP_CCU2
 Adapter.1.Port=/dev/ttyS0
 
-Config.Dir=/etc/config
-Config.Include=hmip_address.conf;hmip_networkkey.conf;hmip_user.conf
+Config.Dir=/etc/config/crRFD
+Config.Include=hmip_user.conf
 
 # Directory Configuration
 Persistence.Home=/etc/config/crRFD/data
@@ -18,6 +18,8 @@ Legacy.Parameter.Definition.File=/opt/HmIP/legacy-parameter-definition.config
 # Legacy.RemoveUnreachableClients=false
 Legacy.AddressPrefix=3014F711A0
 Legacy.SwitchTypeAndSubtype=true
+Legacy.HandlersFilename=/var/LegacyService.handlers
+Legacy.DiscardDutyCycleEvents=true
 
 # Miscellaneous Configuration
 CyclicTimeout.TimerStartMaxDelay=90
@@ -27,3 +29,5 @@ Legacy.Parameter.ReplaceEnumValueWithOrdinal=true
 ### Configuration for Inclusion with key server (internet) or local key (offline)
 KeyServer.Mode=KEYSERVER_LOCAL
 KeyServer.Gateway.URL=secgtw.homematic.com
+KeyServer.Gateway.Port=8443
+KeyServer.Gateway.SSL.Enabled=true
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/init.d/S60multimacd b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/init.d/S60multimacd
index 5da0bfbd..a87ed5d1 100755
--- a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/init.d/S60multimacd
+++ b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/etc/init.d/S60multimacd
@@ -29,7 +29,15 @@ check_bo(){
 	avrprog --bo
 	fi
 }
-
+check_rf_address(){
+        sed 1q /sys/module/plat_eq3ccu2/parameters/radio_mac > /var/log/rf_address
+        /bin/eq3configcmd read-default-rf-address -l 0 -v -h -f /dev/mxs_auart_raw.0 | grep -q -F -f /var/log/rf_address
+        if ! [ 0 -eq $? ];
+        then
+        avrprog --bo
+        fi
+        rm /var/log/rf_address
+}
 init() {
 	export TZ=`cat /etc/config/TZ`
 	
@@ -51,6 +59,7 @@ start() {
 	init
 	if [ ! -e $PIDFILE ] ; then
 		check_bo
+                check_rf_address
 		update
 	else
 		echo "Skipping coprocessor update because multimacd is running."
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/lib/libelvutils.so b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/lib/libelvutils.so
index 5a0edcbf..d6213383 100755
Binary files a/X86_32_Debian_Wheezy/packages-eQ-3/RFD/lib/libelvutils.so and b/X86_32_Debian_Wheezy/packages-eQ-3/RFD/lib/libelvutils.so differ
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/bin/tclsh b/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/bin/tclsh
index 8cbb7d87..ea8d1628 100755
Binary files a/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/bin/tclsh and b/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/bin/tclsh differ
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf b/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf
index 5bd5a85e..3885df98 100644
--- a/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf
+++ b/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf
@@ -1,3 +1,4 @@
 setenv.add-environment = (
-        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00"
+        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00",
+	"EQ3_OS_PLATFORM" => "HM-RASPBERRYMATIC"
 )
diff --git a/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/lib/libelvutils.so b/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/lib/libelvutils.so
index 5a0edcbf..d6213383 100755
Binary files a/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/lib/libelvutils.so and b/X86_32_Debian_Wheezy/packages-eQ-3/WebUI/lib/libelvutils.so differ
diff --git a/X86_32_Debian_Wheezy/packages/lighttpd/bin/lighttpd b/X86_32_Debian_Wheezy/packages/lighttpd/bin/lighttpd
index 11f5b416..81dc5a4b 100755
Binary files a/X86_32_Debian_Wheezy/packages/lighttpd/bin/lighttpd and b/X86_32_Debian_Wheezy/packages/lighttpd/bin/lighttpd differ
diff --git a/X86_32_Debian_Wheezy/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf b/X86_32_Debian_Wheezy/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf
index 5bd5a85e..3885df98 100644
--- a/X86_32_Debian_Wheezy/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf
+++ b/X86_32_Debian_Wheezy/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf
@@ -1,3 +1,4 @@
 setenv.add-environment = (
-        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00"
+        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00",
+	"EQ3_OS_PLATFORM" => "HM-RASPBERRYMATIC"
 )
diff --git a/arm-gnueabihf/packages-eQ-3/HS485D/lib/libelvutils.so b/arm-gnueabihf/packages-eQ-3/HS485D/lib/libelvutils.so
index 69490eb6..9b54a2f9 100755
Binary files a/arm-gnueabihf/packages-eQ-3/HS485D/lib/libelvutils.so and b/arm-gnueabihf/packages-eQ-3/HS485D/lib/libelvutils.so differ
diff --git a/arm-gnueabihf/packages-eQ-3/LinuxBasis/lib/libeq3config.so b/arm-gnueabihf/packages-eQ-3/LinuxBasis/lib/libeq3config.so
index 47c48d8f..7a193959 100644
Binary files a/arm-gnueabihf/packages-eQ-3/LinuxBasis/lib/libeq3config.so and b/arm-gnueabihf/packages-eQ-3/LinuxBasis/lib/libeq3config.so differ
diff --git a/arm-gnueabihf/packages-eQ-3/RFD/bin/avrprog b/arm-gnueabihf/packages-eQ-3/RFD/bin/avrprog
index 65fadcbd..02eea8cf 100755
Binary files a/arm-gnueabihf/packages-eQ-3/RFD/bin/avrprog and b/arm-gnueabihf/packages-eQ-3/RFD/bin/avrprog differ
diff --git a/arm-gnueabihf/packages-eQ-3/RFD/bin/multimacd b/arm-gnueabihf/packages-eQ-3/RFD/bin/multimacd
index 28e47bcd..81e3fb0b 100755
Binary files a/arm-gnueabihf/packages-eQ-3/RFD/bin/multimacd and b/arm-gnueabihf/packages-eQ-3/RFD/bin/multimacd differ
diff --git a/arm-gnueabihf/packages-eQ-3/RFD/etc/config/rfd.conf b/arm-gnueabihf/packages-eQ-3/RFD/etc/config/rfd.conf
index c5476776..6113238e 100644
--- a/arm-gnueabihf/packages-eQ-3/RFD/etc/config/rfd.conf
+++ b/arm-gnueabihf/packages-eQ-3/RFD/etc/config/rfd.conf
@@ -19,6 +19,6 @@ Replacemap File = /opt/hm/firmware/rftypes/replaceMap/rfReplaceMap.xml
 
 [Interface 0]
 Type = CCU2
-ComPortFile = /dev/mmd_bidcos
+ComPortFile = /dev/ttyAPP0
 AccessFile = /dev/null
-ResetFile = /dev/null
+ResetFile = /dev/ccu2-ic200
diff --git a/arm-gnueabihf/packages-eQ-3/RFD/etc/config_templates/multimacd.conf b/arm-gnueabihf/packages-eQ-3/RFD/etc/config_templates/multimacd.conf
index c20bf40b..4e6f0409 100644
--- a/arm-gnueabihf/packages-eQ-3/RFD/etc/config_templates/multimacd.conf
+++ b/arm-gnueabihf/packages-eQ-3/RFD/etc/config_templates/multimacd.conf
@@ -1,4 +1,4 @@
-Coprocessor Device Path = /dev/ttyAPP0
+Coprocessor Device Path = /dev/mxs_auart_raw.0
 #Cuse Device Name = ttyS0
 Log Level = 3
 Log Identifier = multimac
diff --git a/arm-gnueabihf/packages-eQ-3/RFD/etc/crRFD.conf b/arm-gnueabihf/packages-eQ-3/RFD/etc/crRFD.conf
index 2781f908..2d5d333a 100644
--- a/arm-gnueabihf/packages-eQ-3/RFD/etc/crRFD.conf
+++ b/arm-gnueabihf/packages-eQ-3/RFD/etc/crRFD.conf
@@ -2,8 +2,8 @@
 Adapter.1.Type=HMIP_CCU2
 Adapter.1.Port=/dev/ttyS0
 
-Config.Dir=/etc/config
-Config.Include=hmip_address.conf;hmip_networkkey.conf;hmip_user.conf
+Config.Dir=/etc/config/crRFD
+Config.Include=hmip_user.conf
 
 # Directory Configuration
 Persistence.Home=/etc/config/crRFD/data
@@ -18,6 +18,8 @@ Legacy.Parameter.Definition.File=/opt/HmIP/legacy-parameter-definition.config
 # Legacy.RemoveUnreachableClients=false
 Legacy.AddressPrefix=3014F711A0
 Legacy.SwitchTypeAndSubtype=true
+Legacy.HandlersFilename=/var/LegacyService.handlers
+Legacy.DiscardDutyCycleEvents=true
 
 # Miscellaneous Configuration
 CyclicTimeout.TimerStartMaxDelay=90
@@ -27,3 +29,5 @@ Legacy.Parameter.ReplaceEnumValueWithOrdinal=true
 ### Configuration for Inclusion with key server (internet) or local key (offline)
 KeyServer.Mode=KEYSERVER_LOCAL
 KeyServer.Gateway.URL=secgtw.homematic.com
+KeyServer.Gateway.Port=8443
+KeyServer.Gateway.SSL.Enabled=true
diff --git a/arm-gnueabihf/packages-eQ-3/RFD/etc/init.d/S60multimacd b/arm-gnueabihf/packages-eQ-3/RFD/etc/init.d/S60multimacd
index 5da0bfbd..a87ed5d1 100755
--- a/arm-gnueabihf/packages-eQ-3/RFD/etc/init.d/S60multimacd
+++ b/arm-gnueabihf/packages-eQ-3/RFD/etc/init.d/S60multimacd
@@ -29,7 +29,15 @@ check_bo(){
 	avrprog --bo
 	fi
 }
-
+check_rf_address(){
+        sed 1q /sys/module/plat_eq3ccu2/parameters/radio_mac > /var/log/rf_address
+        /bin/eq3configcmd read-default-rf-address -l 0 -v -h -f /dev/mxs_auart_raw.0 | grep -q -F -f /var/log/rf_address
+        if ! [ 0 -eq $? ];
+        then
+        avrprog --bo
+        fi
+        rm /var/log/rf_address
+}
 init() {
 	export TZ=`cat /etc/config/TZ`
 	
@@ -51,6 +59,7 @@ start() {
 	init
 	if [ ! -e $PIDFILE ] ; then
 		check_bo
+                check_rf_address
 		update
 	else
 		echo "Skipping coprocessor update because multimacd is running."
diff --git a/arm-gnueabihf/packages-eQ-3/RFD/lib/libelvutils.so b/arm-gnueabihf/packages-eQ-3/RFD/lib/libelvutils.so
index 69490eb6..9b54a2f9 100755
Binary files a/arm-gnueabihf/packages-eQ-3/RFD/lib/libelvutils.so and b/arm-gnueabihf/packages-eQ-3/RFD/lib/libelvutils.so differ
diff --git a/arm-gnueabihf/packages-eQ-3/WebUI/bin/tclsh b/arm-gnueabihf/packages-eQ-3/WebUI/bin/tclsh
index 7a27ef6a..fee86e83 100755
Binary files a/arm-gnueabihf/packages-eQ-3/WebUI/bin/tclsh and b/arm-gnueabihf/packages-eQ-3/WebUI/bin/tclsh differ
diff --git a/arm-gnueabihf/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf b/arm-gnueabihf/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf
index 5bd5a85e..3885df98 100644
--- a/arm-gnueabihf/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf
+++ b/arm-gnueabihf/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf
@@ -1,3 +1,4 @@
 setenv.add-environment = (
-        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00"
+        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00",
+	"EQ3_OS_PLATFORM" => "HM-RASPBERRYMATIC"
 )
diff --git a/arm-gnueabihf/packages-eQ-3/WebUI/lib/libelvutils.so b/arm-gnueabihf/packages-eQ-3/WebUI/lib/libelvutils.so
index 69490eb6..9b54a2f9 100755
Binary files a/arm-gnueabihf/packages-eQ-3/WebUI/lib/libelvutils.so and b/arm-gnueabihf/packages-eQ-3/WebUI/lib/libelvutils.so differ
diff --git a/arm-gnueabihf/packages/lighttpd/bin/lighttpd b/arm-gnueabihf/packages/lighttpd/bin/lighttpd
index 413250ee..1ea01337 100755
Binary files a/arm-gnueabihf/packages/lighttpd/bin/lighttpd and b/arm-gnueabihf/packages/lighttpd/bin/lighttpd differ
diff --git a/arm-gnueabihf/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf b/arm-gnueabihf/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf
index 5bd5a85e..3885df98 100644
--- a/arm-gnueabihf/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf
+++ b/arm-gnueabihf/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf
@@ -1,3 +1,4 @@
 setenv.add-environment = (
-        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00"
+        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00",
+	"EQ3_OS_PLATFORM" => "HM-RASPBERRYMATIC"
 )
diff --git a/mips/packages-eQ-3/HS485D/lib/libelvutils.so b/mips/packages-eQ-3/HS485D/lib/libelvutils.so
index 518c9566..2457519c 100755
Binary files a/mips/packages-eQ-3/HS485D/lib/libelvutils.so and b/mips/packages-eQ-3/HS485D/lib/libelvutils.so differ
diff --git a/mips/packages-eQ-3/LinuxBasis/lib/libeq3config.so b/mips/packages-eQ-3/LinuxBasis/lib/libeq3config.so
index f756155d..9ae6ba72 100644
Binary files a/mips/packages-eQ-3/LinuxBasis/lib/libeq3config.so and b/mips/packages-eQ-3/LinuxBasis/lib/libeq3config.so differ
diff --git a/mips/packages-eQ-3/RFD/bin/avrprog b/mips/packages-eQ-3/RFD/bin/avrprog
index 6da79c6c..1f8b2a05 100755
Binary files a/mips/packages-eQ-3/RFD/bin/avrprog and b/mips/packages-eQ-3/RFD/bin/avrprog differ
diff --git a/mips/packages-eQ-3/RFD/bin/multimacd b/mips/packages-eQ-3/RFD/bin/multimacd
index eeb3410b..3ebbd3db 100755
Binary files a/mips/packages-eQ-3/RFD/bin/multimacd and b/mips/packages-eQ-3/RFD/bin/multimacd differ
diff --git a/mips/packages-eQ-3/RFD/etc/config/rfd.conf b/mips/packages-eQ-3/RFD/etc/config/rfd.conf
index c5476776..6113238e 100644
--- a/mips/packages-eQ-3/RFD/etc/config/rfd.conf
+++ b/mips/packages-eQ-3/RFD/etc/config/rfd.conf
@@ -19,6 +19,6 @@ Replacemap File = /opt/hm/firmware/rftypes/replaceMap/rfReplaceMap.xml
 
 [Interface 0]
 Type = CCU2
-ComPortFile = /dev/mmd_bidcos
+ComPortFile = /dev/ttyAPP0
 AccessFile = /dev/null
-ResetFile = /dev/null
+ResetFile = /dev/ccu2-ic200
diff --git a/mips/packages-eQ-3/RFD/etc/crRFD.conf b/mips/packages-eQ-3/RFD/etc/crRFD.conf
index 2781f908..2d5d333a 100644
--- a/mips/packages-eQ-3/RFD/etc/crRFD.conf
+++ b/mips/packages-eQ-3/RFD/etc/crRFD.conf
@@ -2,8 +2,8 @@
 Adapter.1.Type=HMIP_CCU2
 Adapter.1.Port=/dev/ttyS0
 
-Config.Dir=/etc/config
-Config.Include=hmip_address.conf;hmip_networkkey.conf;hmip_user.conf
+Config.Dir=/etc/config/crRFD
+Config.Include=hmip_user.conf
 
 # Directory Configuration
 Persistence.Home=/etc/config/crRFD/data
@@ -18,6 +18,8 @@ Legacy.Parameter.Definition.File=/opt/HmIP/legacy-parameter-definition.config
 # Legacy.RemoveUnreachableClients=false
 Legacy.AddressPrefix=3014F711A0
 Legacy.SwitchTypeAndSubtype=true
+Legacy.HandlersFilename=/var/LegacyService.handlers
+Legacy.DiscardDutyCycleEvents=true
 
 # Miscellaneous Configuration
 CyclicTimeout.TimerStartMaxDelay=90
@@ -27,3 +29,5 @@ Legacy.Parameter.ReplaceEnumValueWithOrdinal=true
 ### Configuration for Inclusion with key server (internet) or local key (offline)
 KeyServer.Mode=KEYSERVER_LOCAL
 KeyServer.Gateway.URL=secgtw.homematic.com
+KeyServer.Gateway.Port=8443
+KeyServer.Gateway.SSL.Enabled=true
diff --git a/mips/packages-eQ-3/RFD/etc/init.d/S60multimacd b/mips/packages-eQ-3/RFD/etc/init.d/S60multimacd
index 5da0bfbd..a87ed5d1 100755
--- a/mips/packages-eQ-3/RFD/etc/init.d/S60multimacd
+++ b/mips/packages-eQ-3/RFD/etc/init.d/S60multimacd
@@ -29,7 +29,15 @@ check_bo(){
 	avrprog --bo
 	fi
 }
-
+check_rf_address(){
+        sed 1q /sys/module/plat_eq3ccu2/parameters/radio_mac > /var/log/rf_address
+        /bin/eq3configcmd read-default-rf-address -l 0 -v -h -f /dev/mxs_auart_raw.0 | grep -q -F -f /var/log/rf_address
+        if ! [ 0 -eq $? ];
+        then
+        avrprog --bo
+        fi
+        rm /var/log/rf_address
+}
 init() {
 	export TZ=`cat /etc/config/TZ`
 	
@@ -51,6 +59,7 @@ start() {
 	init
 	if [ ! -e $PIDFILE ] ; then
 		check_bo
+                check_rf_address
 		update
 	else
 		echo "Skipping coprocessor update because multimacd is running."
diff --git a/mips/packages-eQ-3/RFD/lib/libelvutils.so b/mips/packages-eQ-3/RFD/lib/libelvutils.so
index 518c9566..2457519c 100755
Binary files a/mips/packages-eQ-3/RFD/lib/libelvutils.so and b/mips/packages-eQ-3/RFD/lib/libelvutils.so differ
diff --git a/mips/packages-eQ-3/WebUI/bin/tclsh b/mips/packages-eQ-3/WebUI/bin/tclsh
index 6fe62616..87354f7b 100755
Binary files a/mips/packages-eQ-3/WebUI/bin/tclsh and b/mips/packages-eQ-3/WebUI/bin/tclsh differ
diff --git a/mips/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf b/mips/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf
index 5bd5a85e..3885df98 100644
--- a/mips/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf
+++ b/mips/packages-eQ-3/WebUI/etc/lighttpd/conf.d/setenv.conf
@@ -1,3 +1,4 @@
 setenv.add-environment = (
-        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00"
+        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00",
+	"EQ3_OS_PLATFORM" => "HM-RASPBERRYMATIC"
 )
diff --git a/mips/packages-eQ-3/WebUI/lib/libelvutils.so b/mips/packages-eQ-3/WebUI/lib/libelvutils.so
index 518c9566..2457519c 100755
Binary files a/mips/packages-eQ-3/WebUI/lib/libelvutils.so and b/mips/packages-eQ-3/WebUI/lib/libelvutils.so differ
diff --git a/mips/packages/lighttpd/bin/lighttpd b/mips/packages/lighttpd/bin/lighttpd
index 2a12afef..31a02031 100755
Binary files a/mips/packages/lighttpd/bin/lighttpd and b/mips/packages/lighttpd/bin/lighttpd differ
diff --git a/mips/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf b/mips/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf
index 5bd5a85e..3885df98 100644
--- a/mips/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf
+++ b/mips/packages/lighttpd/etc/lighttpd/conf.d/setenv.conf
@@ -1,3 +1,4 @@
 setenv.add-environment = (
-        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00"
+        "TZ" => "CET-1CEST-2,M3.5.0/02:00:00,M10.5.0/03:00:00",
+	"EQ3_OS_PLATFORM" => "HM-RASPBERRYMATIC"
 )