From 3659aa483d654f9a7800faf701a1c6583466321a Mon Sep 17 00:00:00 2001
From: pawel32640
 <pawel32640@r999  pawel32640  2010-05-24 11:06:45 +0200 (lun. 24 mai 2010)>
Date: Mon, 25 Nov 2013 15:41:58 +0000
Subject: [PATCH] adding terminals to the elements knx

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2639 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 .../automatisme/knx/actionneur/knx_035.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_036.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_037.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_038.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_039.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_040.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_041.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_047.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_048.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_049.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_050.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_062.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_068.elmt   | 14 ++++++++++---
 .../automatisme/knx/actionneur/knx_071.elmt   | 16 ++++++++++++---
 .../automatisme/knx/actionneur/knx_072.elmt   | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_012.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_013.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_014.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_015.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_016.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_017.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_018.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_019.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_020.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_026.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_027.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_028.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_029.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_030.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_031.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_032.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_033.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_034.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_052.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_053.elmt     | 14 +++++++++++--
 .../automatisme/knx/capteurs/knx_054.elmt     | 14 +++++++++++--
 .../automatisme/knx/capteurs/knx_055.elmt     | 14 ++++++++++---
 .../automatisme/knx/capteurs/knx_058.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_059.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_061.elmt     | 16 ++++++++++++---
 .../automatisme/knx/capteurs/knx_064.elmt     | 18 ++++++++++++++---
 .../automatisme/knx/capteurs/knx_067.elmt     | 14 ++++++++++---
 .../automatisme/knx/capteurs/knx_075.elmt     | 16 ++++++++++++---
 elements/automatisme/knx/divers/knx_003.elmt  | 14 ++++++++++---
 elements/automatisme/knx/divers/knx_004.elmt  |  6 +++---
 elements/automatisme/knx/divers/knx_005.elmt  | 16 ++++++++++++---
 elements/automatisme/knx/divers/knx_006.elmt  | 20 ++++++++++++++-----
 elements/automatisme/knx/divers/knx_011.elmt  | 16 ++++++++++++---
 elements/automatisme/knx/divers/knx_021.elmt  | 20 ++++++++++++++-----
 elements/automatisme/knx/divers/knx_022.elmt  | 20 ++++++++++++++-----
 elements/automatisme/knx/divers/knx_023.elmt  | 20 ++++++++++++++-----
 elements/automatisme/knx/divers/knx_024.elmt  | 20 ++++++++++++++-----
 elements/automatisme/knx/divers/knx_025.elmt  | 20 ++++++++++++++-----
 elements/automatisme/knx/divers/knx_044.elmt  | 16 ++++++++++++---
 elements/automatisme/knx/divers/knx_046.elmt  | 18 ++++++++++++++---
 elements/automatisme/knx/divers/knx_051.elmt  | 16 ++++++++++++---
 elements/automatisme/knx/divers/knx_056.elmt  | 16 ++++++++++++---
 elements/automatisme/knx/divers/knx_060.elmt  | 14 ++++++++++---
 elements/automatisme/knx/divers/knx_069.elmt  | 20 ++++++++++++++-----
 elements/automatisme/knx/divers/knx_070.elmt  | 18 ++++++++++++-----
 .../automatisme/knx/poussoirs/knx_007.elmt    | 16 ++++++++++++---
 .../automatisme/knx/poussoirs/knx_008.elmt    | 16 ++++++++++++---
 .../automatisme/knx/poussoirs/knx_009.elmt    | 16 ++++++++++++---
 .../automatisme/knx/poussoirs/knx_010.elmt    | 16 ++++++++++++---
 .../automatisme/knx/recepteurs/knx_043.elmt   | 13 ++++++++++--
 .../automatisme/knx/recepteurs/knx_045.elmt   | 14 ++++++++++---
 .../automatisme/knx/recepteurs/knx_063.elmt   | 14 ++++++++++---
 .../automatisme/knx/recepteurs/knx_074.elmt   | 18 ++++++++++++++---
 .../knx/transmetteurs/knx_042.elmt            | 13 ++++++++++--
 69 files changed, 887 insertions(+), 219 deletions(-)

diff --git a/elements/automatisme/knx/actionneur/knx_035.elmt b/elements/automatisme/knx/actionneur/knx_035.elmt
index 7fd50c29b..aa2495e62 100644
--- a/elements/automatisme/knx/actionneur/knx_035.elmt
+++ b/elements/automatisme/knx/actionneur/knx_035.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary output, single</name>
         <name lang="it">Uscita digitale, singola</name>
@@ -14,8 +14,18 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="0" y3="-3" x3="10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="15" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_036.elmt b/elements/automatisme/knx/actionneur/knx_036.elmt
index c99b30889..bdd809e97 100644
--- a/elements/automatisme/knx/actionneur/knx_036.elmt
+++ b/elements/automatisme/knx/actionneur/knx_036.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary output, 2-fold</name>
         <name lang="IT">Uscita digitale, 2 vie</name>
@@ -14,8 +14,18 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="0" y3="-3" x3="10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="15" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_037.elmt b/elements/automatisme/knx/actionneur/knx_037.elmt
index 42dfae502..ed4c778c5 100644
--- a/elements/automatisme/knx/actionneur/knx_037.elmt
+++ b/elements/automatisme/knx/actionneur/knx_037.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary output, 4-fold</name>
         <name lang="it">Uscita digitale, 4 vie</name>
@@ -14,8 +14,18 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="0" y3="-3" x3="10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="15" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_038.elmt b/elements/automatisme/knx/actionneur/knx_038.elmt
index 9b3e98bb0..098926a1b 100644
--- a/elements/automatisme/knx/actionneur/knx_038.elmt
+++ b/elements/automatisme/knx/actionneur/knx_038.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Analog output, single</name>
         <name lang="it">Uscita analogica, 1 vie</name>
@@ -10,11 +10,21 @@
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <polygon x4="15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="15" y2="-4" x2="15" y3="2" x3="-7" y4="2"/>
         <text x="11" y="11" size="6" text="1"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_039.elmt b/elements/automatisme/knx/actionneur/knx_039.elmt
index 05059563a..ad2c81427 100644
--- a/elements/automatisme/knx/actionneur/knx_039.elmt
+++ b/elements/automatisme/knx/actionneur/knx_039.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Analog output, 2-fold</name>
         <name lang="it">Uscita analogica, 2 vie</name>
@@ -10,11 +10,21 @@
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <polygon x4="15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="15" y2="-4" x2="15" y3="2" x3="-7" y4="2"/>
         <text x="11" y="11" size="6" text="2"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_040.elmt b/elements/automatisme/knx/actionneur/knx_040.elmt
index f75adaa8c..c2f9aa1ae 100644
--- a/elements/automatisme/knx/actionneur/knx_040.elmt
+++ b/elements/automatisme/knx/actionneur/knx_040.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Analog output, 4-fold</name>
         <name lang="it">Uscita analogica, 4 vie</name>
@@ -10,11 +10,21 @@
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <polygon x4="15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="15" y2="-4" x2="15" y3="2" x3="-7" y4="2"/>
         <text x="11" y="11" size="6" text="4"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_041.elmt b/elements/automatisme/knx/actionneur/knx_041.elmt
index 9e8f44682..d6a8278f7 100644
--- a/elements/automatisme/knx/actionneur/knx_041.elmt
+++ b/elements/automatisme/knx/actionneur/knx_041.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Analog output, general</name>
         <name lang="it">Uscita analogica, generica</name>
@@ -10,11 +10,21 @@
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <polygon x4="15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="15" y2="-4" x2="15" y3="2" x3="-7" y4="2"/>
         <text x="11" y="11" size="6" text="n"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_047.elmt b/elements/automatisme/knx/actionneur/knx_047.elmt
index 187fe3231..0d85e24a8 100644
--- a/elements/automatisme/knx/actionneur/knx_047.elmt
+++ b/elements/automatisme/knx/actionneur/knx_047.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary output, 3-fold</name>
         <name lang="it">Uscita digitale, 3 vie</name>
@@ -14,8 +14,18 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="0" y3="-3" x3="10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="15" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_048.elmt b/elements/automatisme/knx/actionneur/knx_048.elmt
index eb2de5b42..25dd67f16 100644
--- a/elements/automatisme/knx/actionneur/knx_048.elmt
+++ b/elements/automatisme/knx/actionneur/knx_048.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary output, general</name>
         <name lang="it">Uscita digitale, generica</name>
@@ -14,8 +14,18 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="0" y3="-3" x3="10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="15" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_049.elmt b/elements/automatisme/knx/actionneur/knx_049.elmt
index f3d8b39eb..2667c08ae 100644
--- a/elements/automatisme/knx/actionneur/knx_049.elmt
+++ b/elements/automatisme/knx/actionneur/knx_049.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Shutter actuator, single</name>
         <name lang="it">Attuatore tapparella, 1 via</name>
@@ -11,12 +11,22 @@
         <input x="-6" y="7.5" size="5" rotate="true" text="1"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-3" y2="0" x2="5"/>
         <circle x="0" y="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="2"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="4" y2="-2" x2="13"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="4" y2="2" x2="13"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_050.elmt b/elements/automatisme/knx/actionneur/knx_050.elmt
index c6e1565de..1cf79a9ff 100644
--- a/elements/automatisme/knx/actionneur/knx_050.elmt
+++ b/elements/automatisme/knx/actionneur/knx_050.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Shutter actuator, 2-fold</name>
         <name lang="it">Attuatore tapparella, 2 vie</name>
@@ -11,12 +11,22 @@
         <input x="-5" y="7.5" size="5" rotate="true" text="2"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-2" y2="0" x2="6"/>
         <circle x="1" y="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="2"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="5" y2="-2" x2="14"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="5" y2="2" x2="14"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_062.elmt b/elements/automatisme/knx/actionneur/knx_062.elmt
index 612e75050..87d92ff81 100644
--- a/elements/automatisme/knx/actionneur/knx_062.elmt
+++ b/elements/automatisme/knx/actionneur/knx_062.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Valve</name>
         <name lang="it">Comando valvola</name>
@@ -11,13 +11,23 @@
         <circle x="5.5" y="-4.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="9"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <text x="7" y="2.5" size="5" text="M"/>
         <polygon x4="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="10" y2="-8" x2="-8" y3="-13" x3="10" y4="-8"/>
         <polygon x4="16" y5="7" x5="4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="4" y2="13" x2="4" y3="7" x3="16" y4="13"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="10" y2="9" x2="10"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_068.elmt b/elements/automatisme/knx/actionneur/knx_068.elmt
index 985483713..44f622fad 100644
--- a/elements/automatisme/knx/actionneur/knx_068.elmt
+++ b/elements/automatisme/knx/actionneur/knx_068.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary Output module single</name>
         <name lang="it">Uscita digitale, 1 via</name>
@@ -11,7 +11,15 @@
         <input x="9" y="8.5" size="5" rotate="true" text="1"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="0" y3="-3" x3="10"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="15" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-10"/>
-        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-10" y="10" number="" name="" orientation="w"/>
+        <terminal x="-10" y="0" number="" name="" orientation="w"/>
+        <terminal x="-10" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_071.elmt b/elements/automatisme/knx/actionneur/knx_071.elmt
index a03efbb52..e5b66f97f 100644
--- a/elements/automatisme/knx/actionneur/knx_071.elmt
+++ b/elements/automatisme/knx/actionneur/knx_071.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Electrical Heater</name>
         <name lang="it">Riscaldatore elettrico</name>
@@ -12,11 +12,21 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-5" y2="-8" x2="0" y3="-11" x3="10"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="15" y2="-8" x2="10"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <text x="10" y="12" size="6" text="T"/>
         <polygon x4="-5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-5" y2="2" x2="15" y3="-3" x3="15" y4="2"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/actionneur/knx_072.elmt b/elements/automatisme/knx/actionneur/knx_072.elmt
index 15a1adedb..64a7c5f41 100644
--- a/elements/automatisme/knx/actionneur/knx_072.elmt
+++ b/elements/automatisme/knx/actionneur/knx_072.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary output, 6-fold</name>
         <name lang="it">Uscita digitale, 6 vie</name>
@@ -13,9 +13,19 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="0" y3="-3" x3="10"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="15" y2="0" x2="10"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_012.elmt b/elements/automatisme/knx/capteurs/knx_012.elmt
index 5be4af5bb..204b3d52b 100644
--- a/elements/automatisme/knx/capteurs/knx_012.elmt
+++ b/elements/automatisme/knx/capteurs/knx_012.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="34" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="24" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Temperature sensor</name>
         <name lang="it">Sensore di temperatura</name>
@@ -13,8 +13,18 @@
         <input x="10" y="8.5" size="5" rotate="true" text="T"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_013.elmt b/elements/automatisme/knx/capteurs/knx_013.elmt
index 3f6305247..9c4636b50 100644
--- a/elements/automatisme/knx/capteurs/knx_013.elmt
+++ b/elements/automatisme/knx/capteurs/knx_013.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="34" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="24" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Wind speed sensor</name>
         <name lang="it">Sensore anemometro</name>
@@ -13,8 +13,18 @@
         <input x="1" y="8.5" size="5" rotate="true" text="m/s"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_014.elmt b/elements/automatisme/knx/capteurs/knx_014.elmt
index baed9acb9..434a8a232 100644
--- a/elements/automatisme/knx/capteurs/knx_014.elmt
+++ b/elements/automatisme/knx/capteurs/knx_014.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="34" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="24" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Brightness sensor</name>
         <name lang="it">Sensore di luminosità</name>
@@ -13,8 +13,18 @@
         <input x="9" y="10.5" size="5" rotate="true" text="lx"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_015.elmt b/elements/automatisme/knx/capteurs/knx_015.elmt
index 96c880f41..477567cec 100644
--- a/elements/automatisme/knx/capteurs/knx_015.elmt
+++ b/elements/automatisme/knx/capteurs/knx_015.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="34" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="24" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Movement sensor</name>
         <name lang="it">Sensore infrarosso</name>
@@ -13,8 +13,18 @@
         <input x="4" y="10.5" size="5" rotate="true" text="PIR"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_016.elmt b/elements/automatisme/knx/capteurs/knx_016.elmt
index a0a58f9b4..73322360b 100644
--- a/elements/automatisme/knx/capteurs/knx_016.elmt
+++ b/elements/automatisme/knx/capteurs/knx_016.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="34" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="24" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Current/Voltage sensor</name>
         <name lang="it">Sensore corrente/tensione</name>
@@ -12,8 +12,18 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_017.elmt b/elements/automatisme/knx/capteurs/knx_017.elmt
index a0d0c8656..ed2071ac2 100644
--- a/elements/automatisme/knx/capteurs/knx_017.elmt
+++ b/elements/automatisme/knx/capteurs/knx_017.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Shutter switch</name>
         <name lang="it">Pulsante tapparella</name>
@@ -14,10 +14,20 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <circle x="12" y="7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="1" y2="-7" x2="7" y3="-12" x3="4" y4="-7"/>
         <polygon x4="-6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-6" y2="-12" x2="0" y3="-7" x3="-3" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_018.elmt b/elements/automatisme/knx/capteurs/knx_018.elmt
index 4be819c64..ff06d5548 100644
--- a/elements/automatisme/knx/capteurs/knx_018.elmt
+++ b/elements/automatisme/knx/capteurs/knx_018.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Timer</name>
         <name lang="it">Temporizzatore</name>
@@ -13,8 +13,18 @@
         <input x="9" y="8.5" size="5" rotate="true" text="t"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_019.elmt b/elements/automatisme/knx/capteurs/knx_019.elmt
index 4a3f8bc3e..8b5e129c8 100644
--- a/elements/automatisme/knx/capteurs/knx_019.elmt
+++ b/elements/automatisme/knx/capteurs/knx_019.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Clock switch</name>
         <name lang="it">Contatto a tempo</name>
@@ -13,9 +13,19 @@
         <input x="9" y="8.5" size="5" rotate="true" text="t"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_020.elmt b/elements/automatisme/knx/capteurs/knx_020.elmt
index 2f809bc24..901c89570 100644
--- a/elements/automatisme/knx/capteurs/knx_020.elmt
+++ b/elements/automatisme/knx/capteurs/knx_020.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Thermostat</name>
         <name lang="it">Termostato</name>
@@ -12,9 +12,19 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_026.elmt b/elements/automatisme/knx/capteurs/knx_026.elmt
index d8b6550a8..4be3e313d 100644
--- a/elements/automatisme/knx/capteurs/knx_026.elmt
+++ b/elements/automatisme/knx/capteurs/knx_026.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary input, single</name>
         <name lang="it">Ingresso digitale, 1 via</name>
@@ -13,9 +13,19 @@
         <input x="9" y="8.5" size="5" rotate="true" text="U"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_027.elmt b/elements/automatisme/knx/capteurs/knx_027.elmt
index d241c5ba2..2f51d0d8a 100644
--- a/elements/automatisme/knx/capteurs/knx_027.elmt
+++ b/elements/automatisme/knx/capteurs/knx_027.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary input, 2-fold</name>
         <name lang="it">Ingresso digitale, 2 vie</name>
@@ -13,9 +13,19 @@
         <input x="9" y="8.5" size="5" rotate="true" text="U"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_028.elmt b/elements/automatisme/knx/capteurs/knx_028.elmt
index 0c2c2ffbf..a251d3d3d 100644
--- a/elements/automatisme/knx/capteurs/knx_028.elmt
+++ b/elements/automatisme/knx/capteurs/knx_028.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary input, 4-fold</name>
         <name lang="it">Ingresso digitale, 4 vie</name>
@@ -13,9 +13,19 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_029.elmt b/elements/automatisme/knx/capteurs/knx_029.elmt
index 7552f7453..89560329d 100644
--- a/elements/automatisme/knx/capteurs/knx_029.elmt
+++ b/elements/automatisme/knx/capteurs/knx_029.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary/Analog input, mix</name>
         <name lang="it">Ingresso digitale/analogico, misto</name>
@@ -13,10 +13,20 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="1" x1="-5" y2="1" x2="0" y3="-7" x3="0" y4="-7"/>
         <polygon x4="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-7" y2="-10" x2="7" y3="-13" x3="7" y4="-10"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_030.elmt b/elements/automatisme/knx/capteurs/knx_030.elmt
index bf1ec4ed2..52d3a9bb4 100644
--- a/elements/automatisme/knx/capteurs/knx_030.elmt
+++ b/elements/automatisme/knx/capteurs/knx_030.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary input, general</name>
         <name lang="it">Ingresso digitale, generico</name>
@@ -13,9 +13,19 @@
         <input x="9" y="8.5" size="5" rotate="true" text="U"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_031.elmt b/elements/automatisme/knx/capteurs/knx_031.elmt
index 2da126a3a..7cb8af938 100644
--- a/elements/automatisme/knx/capteurs/knx_031.elmt
+++ b/elements/automatisme/knx/capteurs/knx_031.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Analog input, single</name>
         <name lang="it">Ingresso analogico, 1 via</name>
@@ -13,9 +13,19 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <input x="9" y="8.5" size="5" rotate="true" text="U"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-7" y2="-8" x2="9" y3="-12" x3="9" y4="-8"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_032.elmt b/elements/automatisme/knx/capteurs/knx_032.elmt
index f58b2d328..7c505772c 100644
--- a/elements/automatisme/knx/capteurs/knx_032.elmt
+++ b/elements/automatisme/knx/capteurs/knx_032.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Analog input, 2-fold</name>
         <name lang="it">Ingresso analogico, 2 vie</name>
@@ -13,9 +13,19 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <input x="9" y="8.5" size="5" rotate="true" text="U"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-7" y2="-8" x2="9" y3="-12" x3="9" y4="-8"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_033.elmt b/elements/automatisme/knx/capteurs/knx_033.elmt
index 00b186871..cd45aa8b9 100644
--- a/elements/automatisme/knx/capteurs/knx_033.elmt
+++ b/elements/automatisme/knx/capteurs/knx_033.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Analog input, 4-fold</name>
         <name lang="it">Ingresso analogico, 4 vie</name>
@@ -13,9 +13,19 @@
         <input x="9" y="8.5" size="5" rotate="true" text="U"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-7" y2="-8" x2="9" y3="-12" x3="9" y4="-8"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_034.elmt b/elements/automatisme/knx/capteurs/knx_034.elmt
index 74e2c0c5d..1afae3039 100644
--- a/elements/automatisme/knx/capteurs/knx_034.elmt
+++ b/elements/automatisme/knx/capteurs/knx_034.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Analog input, general</name>
         <name lang="it">Ingresso analogico, generico</name>
@@ -13,9 +13,19 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <input x="9" y="8.5" size="5" rotate="true" text="U"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-7" y2="-8" x2="9" y3="-12" x3="9" y4="-8"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_052.elmt b/elements/automatisme/knx/capteurs/knx_052.elmt
index 542df43ab..0cd57ee42 100644
--- a/elements/automatisme/knx/capteurs/knx_052.elmt
+++ b/elements/automatisme/knx/capteurs/knx_052.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Time switch, 2-fold</name>
         <name lang="it">Temporizzatore, 2 vie</name>
@@ -13,9 +13,19 @@
         <input x="9" y="8.5" size="5" rotate="true" text="t"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_053.elmt b/elements/automatisme/knx/capteurs/knx_053.elmt
index d607613b7..f45227401 100644
--- a/elements/automatisme/knx/capteurs/knx_053.elmt
+++ b/elements/automatisme/knx/capteurs/knx_053.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="35" hotspot_y="20" height="50" type="element" orientation="dyny">
+<definition width="70" version="0.3" hotspot_x="35" hotspot_y="21" height="50" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Sensor (Brightn., PIR), single</name>
         <name lang="it">Sensore (lumin., IR), 1 via</name>
@@ -19,6 +19,16 @@
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="0" y2="24" x2="20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_054.elmt b/elements/automatisme/knx/capteurs/knx_054.elmt
index 81e8fbb52..036955799 100644
--- a/elements/automatisme/knx/capteurs/knx_054.elmt
+++ b/elements/automatisme/knx/capteurs/knx_054.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="35" hotspot_y="20" height="50" type="element" orientation="dyny">
+<definition width="70" version="0.3" hotspot_x="35" hotspot_y="21" height="50" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Sensor (Brightn., PIR), 2-fold</name>
         <name lang="it">Sensore (lumin., IR), 2 vie</name>
@@ -19,6 +19,16 @@
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="0" y2="24" x2="20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-30" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_055.elmt b/elements/automatisme/knx/capteurs/knx_055.elmt
index dc2c9e79b..2215cf230 100644
--- a/elements/automatisme/knx/capteurs/knx_055.elmt
+++ b/elements/automatisme/knx/capteurs/knx_055.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="35" hotspot_y="20" height="50" type="element" orientation="dyny">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="21" height="50" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Sensor (Brightn., PIR), 3-fold</name>
         <name lang="it">Sensore (lumin., IR), 3 vie</name>
@@ -15,9 +15,17 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <input x="-3" y="10.5" size="5" rotate="true" text="lx,PIR"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="0" y2="24" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_058.elmt b/elements/automatisme/knx/capteurs/knx_058.elmt
index e1d528611..d4f541364 100644
--- a/elements/automatisme/knx/capteurs/knx_058.elmt
+++ b/elements/automatisme/knx/capteurs/knx_058.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary Input 3-fold</name>
         <name lang="it">Ingresso digitale, 3 vie</name>
@@ -13,9 +13,19 @@
         <input x="9" y="8.5" size="5" rotate="true" text="U"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_059.elmt b/elements/automatisme/knx/capteurs/knx_059.elmt
index 1561840b5..05c3b09af 100644
--- a/elements/automatisme/knx/capteurs/knx_059.elmt
+++ b/elements/automatisme/knx/capteurs/knx_059.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="34" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="24" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">PIR, single</name>
         <name lang="it">Lumin, IR, 1 via</name>
@@ -14,8 +14,18 @@
         <input x="-3" y="10.5" size="5" rotate="true" text="lx,PIR"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_061.elmt b/elements/automatisme/knx/capteurs/knx_061.elmt
index 62a23987e..a49ad921e 100644
--- a/elements/automatisme/knx/capteurs/knx_061.elmt
+++ b/elements/automatisme/knx/capteurs/knx_061.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Circuit Breaker Alarm</name>
         <name lang="it">Allarme contatto aperto</name>
@@ -9,7 +9,6 @@
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
@@ -17,6 +16,17 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="3" y2="12" x2="6" y3="8" x3="15"/>
         <line length1="1.5" length2="1" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="12" y2="4" x2="10"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_064.elmt b/elements/automatisme/knx/capteurs/knx_064.elmt
index 28666e0f8..b60cf6ebc 100644
--- a/elements/automatisme/knx/capteurs/knx_064.elmt
+++ b/elements/automatisme/knx/capteurs/knx_064.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="55" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="70" version="0.3" hotspot_x="44" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Switch. Act. mod. + PB single</name>
         <name lang="it">Modulo contatto + pulsante</name>
@@ -14,7 +14,19 @@
         <input x="10" y="0.5" size="5" rotate="true" text="1"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-35" y2="0" x2="-30" y3="-3" x3="-20"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-15" y2="0" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-50" y2="0" x2="-40"/>
-        <terminal x="-50" y="0" orientation="w"/>
+        <terminal x="-40" y="10" number="" name="" orientation="w"/>
+        <terminal x="-40" y="0" number="" name="" orientation="w"/>
+        <terminal x="-40" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="21" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-30" y="15" number="" name="" orientation="s"/>
+        <terminal x="-20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-30" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-20" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_067.elmt b/elements/automatisme/knx/capteurs/knx_067.elmt
index 675d60a6c..e3b9a4a74 100644
--- a/elements/automatisme/knx/capteurs/knx_067.elmt
+++ b/elements/automatisme/knx/capteurs/knx_067.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary Input, single</name>
         <name lang="it">Ingresso digitale, 1 via</name>
@@ -8,8 +8,16 @@
     <description>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <input x="9" y="8.5" size="5" rotate="true" text="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-10"/>
         <polygon x4="10" y5="-12" x5="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-4" y2="0" x2="3" y3="-12" x3="3" y4="-12"/>
-        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="-10" y="10" number="" name="" orientation="w"/>
+        <terminal x="-10" y="0" number="" name="" orientation="w"/>
+        <terminal x="-10" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/capteurs/knx_075.elmt b/elements/automatisme/knx/capteurs/knx_075.elmt
index 16114a673..961035ab3 100644
--- a/elements/automatisme/knx/capteurs/knx_075.elmt
+++ b/elements/automatisme/knx/capteurs/knx_075.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary Input, 6-fold</name>
         <name lang="it">Ingresso digitale, 6 vie</name>
@@ -14,8 +14,18 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-12" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-7" y2="0" x2="0" y3="-12" x3="0" y4="-12"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_003.elmt b/elements/automatisme/knx/divers/knx_003.elmt
index 4cc5ed821..2809c1ea3 100644
--- a/elements/automatisme/knx/divers/knx_003.elmt
+++ b/elements/automatisme/knx/divers/knx_003.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="26" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Power supply</name>
         <name lang="it">Alimentatore</name>
@@ -8,11 +8,19 @@
     <description>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="5" x="-0.5" y="-11.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-10"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="6" y2="8" x2="16"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="6" y2="10" x2="16"/>
         <arc width="5" x="-5.5" y="-11.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="-10" y="10" number="" name="" orientation="w"/>
+        <terminal x="-10" y="0" number="" name="" orientation="w"/>
+        <terminal x="-10" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_004.elmt b/elements/automatisme/knx/divers/knx_004.elmt
index 89f36b1dc..0dd58d299 100644
--- a/elements/automatisme/knx/divers/knx_004.elmt
+++ b/elements/automatisme/knx/divers/knx_004.elmt
@@ -1,4 +1,4 @@
-<definition width="30" version="0.3" hotspot_x="26" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="20" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">ملف خانق</name>
         <name lang="de">Drossel</name>
@@ -12,9 +12,9 @@
     <informations></informations>
     <description>
         <rect width="10" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-10"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-5" y2="12" x2="-5"/>
         <rect width="4" x="-7" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="0" y="0" number="" name="" orientation="e"/>
+        <terminal x="-10" y="0" number="" name="" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_005.elmt b/elements/automatisme/knx/divers/knx_005.elmt
index fbcba58c0..bd5e1f058 100644
--- a/elements/automatisme/knx/divers/knx_005.elmt
+++ b/elements/automatisme/knx/divers/knx_005.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Controller</name>
         <name lang="pl">Regulator</name>
@@ -11,7 +11,17 @@
         <input x="-5" y="0.5" size="5" rotate="true" text="≥ 1&#xa; &amp;&#xa;  t"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_006.elmt b/elements/automatisme/knx/divers/knx_006.elmt
index 89714e985..3aee00b0f 100644
--- a/elements/automatisme/knx/divers/knx_006.elmt
+++ b/elements/automatisme/knx/divers/knx_006.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Line coupler</name>
         <name lang="pl">Sprzęgło linii</name>
@@ -9,16 +9,26 @@
         <rect width="10" x="20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <polygon x4="26" y5="-11" x5="26" y6="-12" x6="25" y7="-11" x7="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="24" y2="11" x2="24" y3="12" x3="25" y4="11"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="0" x2="40"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="22" y2="-12" x2="25" y3="-9" x3="28"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="22" y2="12" x2="25" y3="9" x3="28"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <polygon x4="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="8" y2="-4" x2="8" y3="-7" x3="2" y4="-10"/>
         <polygon x4="2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="2" y2="10" x2="2" y3="7" x3="8" y4="4"/>
-        <terminal x="-30" y="0" orientation="w"/>
-        <terminal x="40" y="0" orientation="e"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="30" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="20" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_011.elmt b/elements/automatisme/knx/divers/knx_011.elmt
index eb872d7cc..e2aa3bd8d 100644
--- a/elements/automatisme/knx/divers/knx_011.elmt
+++ b/elements/automatisme/knx/divers/knx_011.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Dimmer</name>
         <name lang="it">Dimmer</name>
@@ -11,11 +11,21 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8" x1="-5" y2="-8" x2="0" y3="-11" x3="10"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="15" y2="-8" x2="10"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <text x="10" y="12" size="6" text="n"/>
         <polygon x4="-5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-5" y2="2" x2="15" y3="-3" x3="15" y4="2"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_021.elmt b/elements/automatisme/knx/divers/knx_021.elmt
index 8fa539b24..133524c3c 100644
--- a/elements/automatisme/knx/divers/knx_021.elmt
+++ b/elements/automatisme/knx/divers/knx_021.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="35" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Serial</name>
         <name lang="it">Interf. seriale</name>
@@ -11,16 +11,26 @@
         <input x="-6" y="10.5" size="5" rotate="true" text="RS232"/>
         <polygon x4="26" y5="-11" x5="26" y6="-12" x6="25" y7="-11" x7="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="24" y2="11" x2="24" y3="12" x3="25" y4="11"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="0" x2="40"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="22" y2="-12" x2="25" y3="-9" x3="28"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="22" y2="12" x2="25" y3="9" x3="28"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
         <text x="-6" y="-6" size="6" text="EIB"/>
-        <terminal x="-30" y="0" orientation="w"/>
-        <terminal x="40" y="0" orientation="e"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="30" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="20" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_022.elmt b/elements/automatisme/knx/divers/knx_022.elmt
index 74fa12e74..d75435a9e 100644
--- a/elements/automatisme/knx/divers/knx_022.elmt
+++ b/elements/automatisme/knx/divers/knx_022.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="35" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">ISDN</name>
         <name lang="it">Interf. ISDN</name>
@@ -11,16 +11,26 @@
         <input x="-3" y="10.5" size="5" rotate="true" text="ISDN"/>
         <polygon x4="26" y5="-11" x5="26" y6="-12" x6="25" y7="-11" x7="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="24" y2="11" x2="24" y3="12" x3="25" y4="11"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="0" x2="40"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="22" y2="-12" x2="25" y3="-9" x3="28"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="22" y2="12" x2="25" y3="9" x3="28"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
         <text x="-6" y="-6" size="6" text="EIB"/>
-        <terminal x="-30" y="0" orientation="w"/>
-        <terminal x="40" y="0" orientation="e"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="30" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="20" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_023.elmt b/elements/automatisme/knx/divers/knx_023.elmt
index 9df16f4c2..406a0dcf5 100644
--- a/elements/automatisme/knx/divers/knx_023.elmt
+++ b/elements/automatisme/knx/divers/knx_023.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="35" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Modem</name>
         <name lang="it">Interf. Modem</name>
@@ -11,16 +11,26 @@
         <input x="-2" y="10.5" size="5" rotate="true" text="TNA"/>
         <polygon x4="26" y5="-11" x5="26" y6="-12" x6="25" y7="-11" x7="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="24" y2="11" x2="24" y3="12" x3="25" y4="11"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="0" x2="40"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="22" y2="-12" x2="25" y3="-9" x3="28"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="22" y2="12" x2="25" y3="9" x3="28"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
         <text x="-6" y="-6" size="6" text="EIB"/>
-        <terminal x="-30" y="0" orientation="w"/>
-        <terminal x="40" y="0" orientation="e"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="30" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="20" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_024.elmt b/elements/automatisme/knx/divers/knx_024.elmt
index 1515ceec3..d56dadc52 100644
--- a/elements/automatisme/knx/divers/knx_024.elmt
+++ b/elements/automatisme/knx/divers/knx_024.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="35" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Fieldbus</name>
         <name lang="it">Bus di campo</name>
@@ -11,16 +11,26 @@
         <input x="2" y="10.5" size="5" rotate="true" text="FB"/>
         <polygon x4="26" y5="-11" x5="26" y6="-12" x6="25" y7="-11" x7="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="24" y2="11" x2="24" y3="12" x3="25" y4="11"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="0" x2="40"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="22" y2="-12" x2="25" y3="-9" x3="28"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="22" y2="12" x2="25" y3="9" x3="28"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
         <text x="-6" y="-6" size="6" text="EIB"/>
-        <terminal x="-30" y="0" orientation="w"/>
-        <terminal x="40" y="0" orientation="e"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="30" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="20" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_025.elmt b/elements/automatisme/knx/divers/knx_025.elmt
index 560af7348..58954dedc 100644
--- a/elements/automatisme/knx/divers/knx_025.elmt
+++ b/elements/automatisme/knx/divers/knx_025.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="35" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">PLC</name>
         <name lang="it">interf. PLC</name>
@@ -11,16 +11,26 @@
         <input x="-1" y="9.5" size="5" rotate="true" text="SPS"/>
         <polygon x4="26" y5="-11" x5="26" y6="-12" x6="25" y7="-11" x7="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="24" y2="11" x2="24" y3="12" x3="25" y4="11"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="0" x2="40"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="22" y2="-12" x2="25" y3="-9" x3="28"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="22" y2="12" x2="25" y3="9" x3="28"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
         <text x="-6" y="-6" size="6" text="EIB"/>
-        <terminal x="-30" y="0" orientation="w"/>
-        <terminal x="40" y="0" orientation="e"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="30" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="20" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_044.elmt b/elements/automatisme/knx/divers/knx_044.elmt
index baa711e00..e9309dad0 100644
--- a/elements/automatisme/knx/divers/knx_044.elmt
+++ b/elements/automatisme/knx/divers/knx_044.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="34" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="24" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">IR Decoder</name>
         <name lang="it">Decoder IR</name>
@@ -12,10 +12,20 @@
         <input x="8" y="8.5" size="5" rotate="true" text="IR"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-6" y2="-15" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-10" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="-7" y2="2" x2="0" y3="-10" x3="0" y4="-10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_046.elmt b/elements/automatisme/knx/divers/knx_046.elmt
index 0b1935178..95de9cbe3 100644
--- a/elements/automatisme/knx/divers/knx_046.elmt
+++ b/elements/automatisme/knx/divers/knx_046.elmt
@@ -1,4 +1,4 @@
-<definition width="90" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="80" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary/binary</name>
         <name lang="it">ingresso digitale, uscita digitale</name>
@@ -16,8 +16,20 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-5" y2="0" x2="0" y3="-3" x3="10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="15" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="50" y="-1" number="" name="" orientation="e"/>
+        <terminal x="50" y="10" number="" name="" orientation="e"/>
+        <terminal x="50" y="-10" number="" name="" orientation="e"/>
+        <terminal x="30" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="40" y="-15" number="" name="" orientation="n"/>
+        <terminal x="30" y="-15" number="" name="" orientation="n"/>
+        <terminal x="40" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_051.elmt b/elements/automatisme/knx/divers/knx_051.elmt
index 6908e1ff9..629d544aa 100644
--- a/elements/automatisme/knx/divers/knx_051.elmt
+++ b/elements/automatisme/knx/divers/knx_051.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="36" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Display</name>
         <name lang="it">Display</name>
@@ -12,8 +12,18 @@
         <input x="-5" y="8.5" size="5" rotate="true" text="8"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_056.elmt b/elements/automatisme/knx/divers/knx_056.elmt
index d448e6fd1..ed2836dbf 100644
--- a/elements/automatisme/knx/divers/knx_056.elmt
+++ b/elements/automatisme/knx/divers/knx_056.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary display</name>
         <name lang="it">Display digitale</name>
@@ -11,13 +11,23 @@
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <input x="9" y="8.5" size="5" rotate="true" text="n"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-6" y2="0" x2="16"/>
         <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="0" y2="5" x2="0" y3="0" x3="10" y4="-5"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="10" y2="5" x2="10"/>
         <line length1="1.5" length2="1" antialias="true" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="4" y2="-11" x2="8"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_060.elmt b/elements/automatisme/knx/divers/knx_060.elmt
index 501c02010..65c58d23d 100644
--- a/elements/automatisme/knx/divers/knx_060.elmt
+++ b/elements/automatisme/knx/divers/knx_060.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="25" hotspot_y="20" height="50" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="15" hotspot_y="21" height="50" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Lock system</name>
         <name lang="it">Sistema di blocco</name>
@@ -11,7 +11,6 @@
         <input x="19" y="-3.5" size="5" rotate="true" text="n"/>
         <input x="12" y="4.5" size="5" rotate="true" text="(=)"/>
         <polygon x4="-4" y5="-11" x5="-4" y6="-12" x6="-5" y7="-11" x7="-6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-6" y2="11" x2="-6" y3="12" x3="-5" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-10"/>
         <polygon x4="17" y5="-10" x5="17" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="3" y2="2" x2="10" y3="-10" x3="10" y4="-10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-8" y2="-12" x2="-5" y3="-9" x3="-2"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-8" y2="12" x2="-5" y3="9" x3="-2"/>
@@ -23,6 +22,15 @@
         <line length1="1.5" length2="1" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="10" y2="16" x2="10"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="10" y2="24" x2="30"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="0" y2="-15" x2="30"/>
-        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="-10" y="10" number="" name="" orientation="w"/>
+        <terminal x="-10" y="0" number="" name="" orientation="w"/>
+        <terminal x="-10" y="-10" number="" name="" orientation="w"/>
+        <terminal x="30" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" number="" name="" orientation="e"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_069.elmt b/elements/automatisme/knx/divers/knx_069.elmt
index 23b735686..bac93f405 100644
--- a/elements/automatisme/knx/divers/knx_069.elmt
+++ b/elements/automatisme/knx/divers/knx_069.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="35" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Gateway</name>
         <name lang="it">Gateway</name>
@@ -11,16 +11,26 @@
         <input x="3" y="10.5" size="5" rotate="true" text="...."/>
         <polygon x4="26" y5="-11" x5="26" y6="-12" x6="25" y7="-11" x7="24" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="24" y2="11" x2="24" y3="12" x3="25" y4="11"/>
         <rect width="10" x="-20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="0" x2="40"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="22" y2="-12" x2="25" y3="-9" x3="28"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="22" y2="12" x2="25" y3="9" x3="28"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
         <text x="-6" y="-6" size="6" text="EIB"/>
-        <terminal x="-30" y="0" orientation="w"/>
-        <terminal x="40" y="0" orientation="e"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="30" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="20" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/divers/knx_070.elmt b/elements/automatisme/knx/divers/knx_070.elmt
index 2081ee866..39f601c11 100644
--- a/elements/automatisme/knx/divers/knx_070.elmt
+++ b/elements/automatisme/knx/divers/knx_070.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Power Supply + Choke</name>
         <name lang="it">Alimentatore + protezione</name>
@@ -9,15 +9,23 @@
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="5" x="-0.5" y="-11.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
         <rect width="10" x="20" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="40" y2="0" x2="30"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="25" y2="12" x2="25"/>
         <rect width="4" x="23" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="6" y2="8" x2="16"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="6" y2="10" x2="16"/>
         <arc width="5" x="-5.5" y="-11.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="40" y="0" orientation="e"/>
+        <terminal x="-10" y="10" number="" name="" orientation="w"/>
+        <terminal x="-10" y="0" number="" name="" orientation="w"/>
+        <terminal x="-10" y="-10" number="" name="" orientation="w"/>
+        <terminal x="30" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" number="" name="" orientation="e"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="20" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="20" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/poussoirs/knx_007.elmt b/elements/automatisme/knx/poussoirs/knx_007.elmt
index 282302c69..4b8960eb2 100644
--- a/elements/automatisme/knx/poussoirs/knx_007.elmt
+++ b/elements/automatisme/knx/poussoirs/knx_007.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Push button, single</name>
         <name lang="it">Pulsante, 1 via</name>
@@ -15,7 +15,17 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/poussoirs/knx_008.elmt b/elements/automatisme/knx/poussoirs/knx_008.elmt
index 71ab07d94..06133a270 100644
--- a/elements/automatisme/knx/poussoirs/knx_008.elmt
+++ b/elements/automatisme/knx/poussoirs/knx_008.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Push button, 2-fold</name>
         <name lang="it">Pulsante, 2 vie</name>
@@ -15,7 +15,17 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/poussoirs/knx_009.elmt b/elements/automatisme/knx/poussoirs/knx_009.elmt
index 304ab921c..b54883d3d 100644
--- a/elements/automatisme/knx/poussoirs/knx_009.elmt
+++ b/elements/automatisme/knx/poussoirs/knx_009.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Push button, 4-fold</name>
         <name lang="it">Pulsante 4 vie</name>
@@ -15,7 +15,17 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/poussoirs/knx_010.elmt b/elements/automatisme/knx/poussoirs/knx_010.elmt
index 9a0490107..458bd18f5 100644
--- a/elements/automatisme/knx/poussoirs/knx_010.elmt
+++ b/elements/automatisme/knx/poussoirs/knx_010.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyny">
+<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Push button, general</name>
         <name lang="it">Pulsante, generico</name>
@@ -15,7 +15,17 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <rect width="30" x="-10" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/recepteurs/knx_043.elmt b/elements/automatisme/knx/recepteurs/knx_043.elmt
index 3cc77557c..5e76c7e90 100644
--- a/elements/automatisme/knx/recepteurs/knx_043.elmt
+++ b/elements/automatisme/knx/recepteurs/knx_043.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="46" hotspot_y="21" height="40" type="element" orientation="dyny">
+<definition width="70" version="0.3" hotspot_x="45" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">IR Receiver</name>
         <name lang="it">Ricevitore IR</name>
@@ -17,6 +17,15 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-40" y2="0" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-40" y="0" orientation="w"/>
+        <terminal x="-40" y="0" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/recepteurs/knx_045.elmt b/elements/automatisme/knx/recepteurs/knx_045.elmt
index 9ecda2ed4..ba71a964d 100644
--- a/elements/automatisme/knx/recepteurs/knx_045.elmt
+++ b/elements/automatisme/knx/recepteurs/knx_045.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="34" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="70" version="0.3" hotspot_x="28" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">IR Receiver/Decoder</name>
         <name lang="it">Ricevitore IR/Decoder</name>
@@ -14,12 +14,20 @@
         <input x="9" y="0.5" size="5" rotate="true" text="n"/>
         <input x="8" y="8.5" size="5" rotate="true" text="IR"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-10" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="-7" y2="2" x2="0" y3="-10" x3="0" y4="-10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="33" y2="0" x2="20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="33" y="0" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/recepteurs/knx_063.elmt b/elements/automatisme/knx/recepteurs/knx_063.elmt
index ea1e26927..d737c378a 100644
--- a/elements/automatisme/knx/recepteurs/knx_063.elmt
+++ b/elements/automatisme/knx/recepteurs/knx_063.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="34" hotspot_y="18" height="40" type="element" orientation="dyny">
+<definition width="70" version="0.3" hotspot_x="28" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">IR-Rec/Dec with 4-fold PB</name>
         <name lang="it">Ric. IR/Decoder, pulsante 4 vie</name>
@@ -16,12 +16,20 @@
         <input x="9" y="9.5" size="5" rotate="true" text="4"/>
         <input x="7" y="-0.5" size="5" rotate="true" text="IR"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="7" y5="-10" x5="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="-7" y2="2" x2="0" y3="-10" x3="0" y4="-10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="33" y2="0" x2="20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="33" y="0" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/recepteurs/knx_074.elmt b/elements/automatisme/knx/recepteurs/knx_074.elmt
index 2317c8485..6058fded2 100644
--- a/elements/automatisme/knx/recepteurs/knx_074.elmt
+++ b/elements/automatisme/knx/recepteurs/knx_074.elmt
@@ -1,4 +1,4 @@
-<definition width="100" version="0.3" hotspot_x="34" hotspot_y="19" height="40" type="element" orientation="dyny">
+<definition width="100" version="0.3" hotspot_x="28" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">Binary Output/IR-Rec.-Dec.</name>
         <name lang="it">Uscita digitale + Ric. IR/Decoder</name>
@@ -18,12 +18,24 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="15" y2="0" x2="10"/>
         <input x="38" y="8.5" size="5" rotate="true" text="IR"/>
         <polygon x4="-14" y5="-11" x5="-14" y6="-12" x6="-15" y7="-11" x7="-16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="-16" y2="11" x2="-16" y3="12" x3="-15" y4="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-20"/>
         <polygon x4="37" y5="-10" x5="37" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="2" x1="23" y2="2" x2="30" y3="-10" x3="30" y4="-10"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-18" y2="-12" x2="-15" y3="-9" x3="-12"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="63" y2="0" x2="50"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="20" y2="-15" x2="50"/>
-        <terminal x="-30" y="0" orientation="w"/>
+        <terminal x="-20" y="10" number="" name="" orientation="w"/>
+        <terminal x="-20" y="0" number="" name="" orientation="w"/>
+        <terminal x="-20" y="-10" number="" name="" orientation="w"/>
+        <terminal x="63" y="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="-15" number="" name="" orientation="n"/>
+        <terminal x="30" y="15" number="" name="" orientation="s"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
+        <terminal x="40" y="-15" number="" name="" orientation="n"/>
+        <terminal x="40" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/automatisme/knx/transmetteurs/knx_042.elmt b/elements/automatisme/knx/transmetteurs/knx_042.elmt
index 6ec2e6939..33b4e1dcb 100644
--- a/elements/automatisme/knx/transmetteurs/knx_042.elmt
+++ b/elements/automatisme/knx/transmetteurs/knx_042.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="46" hotspot_y="21" height="40" type="element" orientation="dyny">
+<definition width="70" version="0.3" hotspot_x="45" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="en">IR Transmitter</name>
         <name lang="it">Trasmettitore IR</name>
@@ -19,6 +19,15 @@
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="9" x1="-18" y2="12" x2="-15" y3="9" x3="-12"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="-15" x2="20"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-40" y2="0" x2="-21"/>
-        <terminal x="-40" y="0" orientation="w"/>
+        <terminal x="-40" y="0" number="" name="" orientation="w"/>
+        <terminal x="20" y="0" number="" name="" orientation="e"/>
+        <terminal x="20" y="10" number="" name="" orientation="e"/>
+        <terminal x="20" y="-10" number="" name="" orientation="e"/>
+        <terminal x="-10" y="15" number="" name="" orientation="s"/>
+        <terminal x="0" y="-15" number="" name="" orientation="n"/>
+        <terminal x="10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-15" number="" name="" orientation="n"/>
+        <terminal x="0" y="15" number="" name="" orientation="s"/>
+        <terminal x="10" y="15" number="" name="" orientation="s"/>
     </description>
 </definition>