diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/alarme.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/alarme.elmt
index aabd36967..f7ae0353e 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/alarme.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/alarme.elmt
@@ -1,34 +1,35 @@
-<definition link_type="simple" hotspot_x="26" width="150" hotspot_y="186" orientation="dyyy" version="0.5" height="190" type="element">
-<uuid uuid="{0F303AEA-4F09-4131-9C0D-E3E419FC6209}"/><names>
+<definition hotspot_x="26" hotspot_y="185" orientation="dyyy" height="190" type="element" link_type="simple" width="150" version="0.5">
+    <uuid uuid="{12f294a8-a786-4695-aca7-ad130fcad19f}"/>
+    <names>
         <name lang="fr">Alarme</name>
     </names>
     <informations>cbh41</informations>
     <description>
-        <rect x="0" y="-85" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="120" height="85"/>
-        <line x2="120" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-15" y2="-15" x1="0"/>
-        <input x="29" y="-34.5" size="7" text="10" tagg="none" rotate="true"/>
-        <input x="-2" y="-53.5" size="7" text="Local" tagg="label" rotate="true"/>
-        <text x="58" y="-18" size="5" text=" kA C"/>
-        <line x2="120" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-45" y2="-45" x1="0"/>
-        <line x2="120" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-65" y2="-65" x1="0"/>
-        <text x="66" y="-32" size="7" text="A"/>
-        <line x2="120" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-170" y2="-170" x1="0"/>
-        <text x="2" y="-69" size="7" text="Alarme"/>
-        <text x="58" y="-2" size="5" text=" mm²"/>
-        <line x2="27" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-139.375" y2="-120.625" x1="27"/>
-        <arc x="-23" y="-120" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" start="0" width="100" angle="90" height="20"/>
-        <arc x="-23" y="-160" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" start="270" width="100" angle="90" height="20"/>
-        <line x2="77" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-149.804" y2="-110.196" x1="77"/>
-        <line x2="60" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-175.19" y2="-142.81" x1="60"/>
-        <line x2="31" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-139.232" y2="-120.768" x1="31"/>
-        <line x2="35" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-139.391" y2="-120.609" x1="35"/>
-        <line x2="102.75" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-130" y2="-130" x1="82.2501"/>
-        <line x2="104" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-140" y2="-148" x1="82"/>
-        <line x2="103" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-120" y2="-114" x1="82"/>
-        <line x2="103" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-135" y2="-138" x1="82"/>
-        <line x2="103" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-125" y2="-121" x1="82"/>
-        <input x="30" y="-20" size="5" text="4.5" tagg="none" rotate="true"/>
-        <input x="28" y="-5" size="5" text="3 G1.5" tagg="none" rotate="true"/>
-        <terminal x="60" y="-180" orientation="n"/>
+        <rect x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="85" antialias="false" y="-85" width="120"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" antialias="false" y2="-15" end1="none" x2="120" length1="1.5" x1="0"/>
+        <input x="29" rotate="true" size="7" text="10" y="-34.5" tagg="none"/>
+        <input x="-2" rotate="true" size="7" text="Local" y="-53.5" tagg="label"/>
+        <text x="58" size="5" text=" kA C" y="-18"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" antialias="false" y2="-45" end1="none" x2="120" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-65" antialias="false" y2="-65" end1="none" x2="120" length1="1.5" x1="0"/>
+        <text x="66" size="7" text="A" y="-32"/>
+        <line end2="none" length2="1.5" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-170" antialias="false" y2="-170" end1="none" x2="120" length1="1.5" x1="0"/>
+        <text x="2" size="7" text="Alarme" y="-69"/>
+        <text x="58" size="5" text=" mm²" y="-2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-139.375" antialias="false" y2="-120.625" end1="none" x2="27" length1="1.5" x1="27"/>
+        <arc x="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="0" y="-120" angle="90" width="100"/>
+        <arc x="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="270" y="-160" angle="90" width="100"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-149.804" antialias="false" y2="-110.196" end1="none" x2="77" length1="1.5" x1="77"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-175.19" antialias="false" y2="-142.81" end1="none" x2="60" length1="1.5" x1="60"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-139.232" antialias="false" y2="-120.768" end1="none" x2="31" length1="1.5" x1="31"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-139.391" antialias="false" y2="-120.609" end1="none" x2="35" length1="1.5" x1="35"/>
+        <line end2="none" length2="1.5" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-130" antialias="false" y2="-130" end1="none" x2="102.75" length1="1.5" x1="82.2501"/>
+        <line end2="none" length2="1.5" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-140" antialias="false" y2="-148" end1="none" x2="104" length1="1.5" x1="82"/>
+        <line end2="none" length2="1.5" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-120" antialias="false" y2="-114" end1="none" x2="103" length1="1.5" x1="82"/>
+        <line end2="none" length2="1.5" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-135" antialias="false" y2="-138" end1="none" x2="103" length1="1.5" x1="82"/>
+        <line end2="none" length2="1.5" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-125" antialias="false" y2="-121" end1="none" x2="103" length1="1.5" x1="82"/>
+        <input x="30" rotate="true" size="5" text="4.5" y="-20" tagg="none"/>
+        <input x="28" rotate="true" size="5" text="3 G1.5" y="-5" tagg="none"/>
+        <terminal x="60" orientation="n" y="-180"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/antenne.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/antenne.elmt
index 7d05d3fea..277bef4de 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/antenne.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/antenne.elmt
@@ -1,28 +1,29 @@
-<definition link_type="simple" hotspot_x="5" width="130" hotspot_y="186" orientation="dyyy" version="0.5" height="190" type="element">
-<uuid uuid="{C161402F-5B53-4FAD-917E-452BEE786066}"/><names>
+<definition hotspot_x="5" hotspot_y="185" orientation="dyyy" height="190" type="element" link_type="simple" width="130" version="0.5">
+    <uuid uuid="{f1d6053f-b817-426f-92c9-e24fa4c2719f}"/>
+    <names>
         <name lang="fr">Antenne</name>
     </names>
     <informations>cbh41</informations>
     <description>
-        <rect x="0" y="-85" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="120" height="85"/>
-        <line x2="120" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-15" y2="-15" x1="0"/>
-        <input x="29" y="-34.5" size="7" text="2" tagg="none" rotate="true"/>
-        <input x="-2" y="-53.5" size="7" text="Coffret" tagg="label" rotate="true"/>
-        <text x="58" y="-18" size="5" text=" kA C"/>
-        <line x2="120" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-45" y2="-45" x1="0"/>
-        <line x2="120" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-65" y2="-65" x1="0"/>
-        <text x="66" y="-30" size="7" text="A"/>
-        <line x2="120" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-170" y2="-170" x1="0"/>
-        <text x="2" y="-69" size="7" text="Antenne"/>
-        <text x="58" y="-2" size="5" text=" mm²"/>
-        <line x2="60" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-176" y2="-161" x1="60"/>
-        <ellipse x="50" y="-158" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="20" height="40"/>
-        <line x2="86" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length1="1.5" length2="1.5" y1="-118" y2="-128" x1="60"/>
-        <rect x="82" y="-132" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4" height="3"/>
-        <ellipse x="48" y="-160" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="24" height="43"/>
-        <rect x="80" y="-133" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2" height="5"/>
-        <input x="30" y="-20" size="5" text="4.5" tagg="none" rotate="true"/>
-        <input x="28" y="-5" size="5" text="3 G 1.5" tagg="none" rotate="true"/>
-        <terminal x="60" y="-180" orientation="n"/>
+        <rect x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="85" antialias="false" y="-85" width="120"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" antialias="false" y2="-15" end1="none" x2="120" length1="1.5" x1="0"/>
+        <input x="29" rotate="true" size="7" text="2" y="-34.5" tagg="none"/>
+        <input x="-2" rotate="true" size="7" text="Coffret" y="-53.5" tagg="label"/>
+        <text x="58" size="5" text=" kA C" y="-18"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" antialias="false" y2="-45" end1="none" x2="120" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-65" antialias="false" y2="-65" end1="none" x2="120" length1="1.5" x1="0"/>
+        <text x="66" size="7" text="A" y="-30"/>
+        <line end2="none" length2="1.5" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-170" antialias="false" y2="-170" end1="none" x2="120" length1="1.5" x1="0"/>
+        <text x="2" size="7" text="Antenne" y="-69"/>
+        <text x="58" size="5" text=" mm²" y="-2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-176" antialias="false" y2="-161" end1="none" x2="60" length1="1.5" x1="60"/>
+        <ellipse x="50" style="line-style:normal;line-weight:thin;filling:none;color:black" height="40" antialias="false" y="-158" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-118" antialias="false" y2="-128" end1="none" x2="86" length1="1.5" x1="60"/>
+        <rect x="82" style="line-style:normal;line-weight:normal;filling:none;color:black" height="3" antialias="false" y="-132" width="4"/>
+        <ellipse x="48" style="line-style:normal;line-weight:normal;filling:none;color:black" height="43" antialias="false" y="-160" width="24"/>
+        <rect x="80" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="false" y="-133" width="2"/>
+        <input x="30" rotate="true" size="5" text="4.5" y="-20" tagg="none"/>
+        <input x="28" rotate="true" size="5" text="3 G 1.5" y="-5" tagg="none"/>
+        <terminal x="60" orientation="n" y="-180"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_chauffage.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_chauffage.elmt
index 21218b4f1..dfbf5b7be 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_chauffage.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_chauffage.elmt
@@ -1,23 +1,25 @@
-<definition width="70" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{FBD750FD-7011-47A6-8CF5-34388B0DCDF7}"/><names>
-        <name lang="ar">جهاز تدفئة</name>
-        <name lang="el">Συσκευή θέρμανσης</name>
-        <name lang="en">Heater</name>
-        <name lang="de">Heizung</name>
-        <name lang="it">Riscaldatore</name>
+<definition hotspot_x="35" hotspot_y="21" orientation="dyyy" height="40" type="element" link_type="simple" width="70" version="0.5">
+    <uuid uuid="{5dac9fa5-d794-4c9c-ba47-afb247c63045}"/>
+    <names>
         <name lang="fr">Appareil de chauffage</name>
         <name lang="pl">Grzejnik elektryczny</name>
         <name lang="cs">Ohřívač, topné těleso</name>
+        <name lang="ar">جهاز تدفئة</name>
+        <name lang="el">Συσκευή θέρμανσης</name>
+        <name lang="it">Riscaldatore</name>
+        <name lang="en">Heater</name>
+        <name lang="de">Heizung</name>
         <name lang="nl">Verwarmer</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="-4" x1="0" y2="-10" x2="0"/>
-        <rect width="15" x="-30" y="-4" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15" x="15" y="-4" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15" x="0" y="-4" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15" x="-15" y="-4" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-14" orientation="n"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" antialias="false" y2="-10" end1="none" x2="0" length1="1.5" x1="0"/>
+        <input x="-7" rotate="true" size="9" text="_" y="11.5" tagg="label"/>
+        <rect x="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" height="17" antialias="false" y="-4" width="15"/>
+        <rect x="15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="17" antialias="false" y="-4" width="15"/>
+        <rect x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="17" antialias="false" y="-4" width="15"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="17" antialias="false" y="-4" width="15"/>
+        <terminal x="0" orientation="n" y="-14"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_chauffage_a_accumulation.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_chauffage_a_accumulation.elmt
index 08198650a..66e238289 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_chauffage_a_accumulation.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_chauffage_a_accumulation.elmt
@@ -1,24 +1,26 @@
-<definition width="70" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{865CFC6D-0157-4E93-B149-29D48273508D}"/><names>
-        <name lang="ar">سخّان بالتراكم</name>
-        <name lang="el">Θερμοσυσσωρευτής</name>
-        <name lang="en">Heater has accumulated</name>
-        <name lang="de">Heizung mit Pufferspeicher</name>
-        <name lang="it">Apparecchio di riscaldamento ad accumulo</name>
+<definition hotspot_x="35" hotspot_y="20" orientation="dyyy" height="40" type="element" link_type="simple" width="70" version="0.5">
+    <uuid uuid="{b45c2f98-8401-4742-bb8f-eafa8c73a742}"/>
+    <names>
         <name lang="fr">Appareil de chauffage a accumulation</name>
         <name lang="pl">Grzejnik elektryczny akumulacyjny</name>
         <name lang="cs">Akumulační ohřívač, topné těleso</name>
+        <name lang="ar">سخّان بالتراكم</name>
+        <name lang="el">Θερμοσυσσωρευτής</name>
+        <name lang="it">Apparecchio di riscaldamento ad accumulo</name>
+        <name lang="en">Heater has accumulated</name>
+        <name lang="de">Heizung mit Pufferspeicher</name>
         <name lang="nl">Verwarming met accumulator (steenkachel)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="66" x="-33" y="-7" antialias="false" height="23" 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="-7" x1="0" y2="-10" x2="0"/>
-        <rect width="15" x="-30" y="-4" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15" x="15" y="-4" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15" x="0" y="-4" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15" x="-15" y="-4" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-14" orientation="n"/>
+        <input x="-8" rotate="true" size="9" text="_" y="14.5" tagg="label"/>
+        <rect x="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" height="23" antialias="false" y="-7" width="66"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" antialias="false" y2="-10" end1="none" x2="0" length1="1.5" x1="0"/>
+        <rect x="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" height="17" antialias="false" y="-4" width="15"/>
+        <rect x="15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="17" antialias="false" y="-4" width="15"/>
+        <rect x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="17" antialias="false" y="-4" width="15"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="17" antialias="false" y="-4" width="15"/>
+        <terminal x="0" orientation="n" y="-14"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_cuisson.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_cuisson.elmt
index d783c52a3..2fa6df786 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_cuisson.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_de_cuisson.elmt
@@ -1,29 +1,31 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="20" height="50" type="element" orientation="dnnn">
-<uuid uuid="{51B71C03-A1CE-4BA8-B3A9-E8B4F4783569}"/><names>
-        <name lang="ar">جهاز طبخ</name>
-        <name lang="el">Μαγειρείο</name>
-        <name lang="en">Cooking Appliance</name>
-        <name lang="de">Kochgerät</name>
-        <name lang="it">Cucina</name>
+<definition hotspot_x="15" hotspot_y="20" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{73db4713-57d8-463d-ba4c-f7d4156370fa}"/>
+    <names>
         <name lang="fr">Appareil de cuisson</name>
         <name lang="pl">Kuchenka</name>
         <name lang="cs">Spotřebič na vaření</name>
+        <name lang="ar">جهاز طبخ</name>
+        <name lang="el">Μαγειρείο</name>
+        <name lang="it">Cucina</name>
+        <name lang="en">Cooking Appliance</name>
+        <name lang="de">Kochgerät</name>
         <name lang="nl">Kook apparaat</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="20.7775" x1="-2.3114" y2="14.7775" x2="3.6885"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="19.0445" x1="-3.822" y2="13.0445" x2="2.1779"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="17.733" x1="-4.2669" y2="12.733" x2="0.733"/>
-        <circle x="-4.4721" y="12.5279" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="8.9442"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="16" x1="-4" y2="13" x2="-1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="21" x1="1" y2="18" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="21.0445" x1="-1" y2="16.0445" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="20" x1="-3" y2="14" x2="3"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-12" y2="24" x2="-12" y3="24" x3="12" y4="0"/>
-        <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="0" y2="0" x2="0"/>
-        <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="-12" y2="5" x2="12"/>
-        <terminal x="0" y="-12" orientation="n"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="20.7775" antialias="false" y2="14.7775" end1="none" x2="3.6885" length1="1.5" x1="-2.3114"/>
+        <input x="-7" rotate="true" size="9" text="_" y="22.5" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="19.0445" antialias="false" y2="13.0445" end1="none" x2="2.1779" length1="1.5" x1="-3.822"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="17.733" antialias="false" y2="12.733" end1="none" x2="0.733" length1="1.5" x1="-4.2669"/>
+        <circle x="-4.4721" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="8.9442" antialias="true" y="12.5279"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="16" antialias="false" y2="13" end1="none" x2="-1" length1="1.5" x1="-4"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="21" antialias="false" y2="18" end1="none" x2="4" length1="1.5" x1="1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="21.0445" antialias="false" y2="16.0445" end1="none" x2="4" length1="1.5" x1="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="20" antialias="false" y2="14" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <polygon y3="24" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="24" x3="12" x2="-12" x4="12" x1="-12" y4="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" antialias="false" y2="0" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" antialias="false" y2="5" end1="none" x2="12" length1="1.5" x1="-12"/>
+        <terminal x="0" orientation="n" y="-12"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_electromenager.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_electromenager.elmt
index 462ca433b..fc5ec3234 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_electromenager.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/appareil_electromenager.elmt
@@ -1,21 +1,23 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{388437EA-29EB-4491-8C97-219CC2E70BC7}"/><names>
-        <name lang="ar">جهاز كهرومنزلي</name>
-        <name lang="el">Ηλεκτρική συσκευή</name>
-        <name lang="en">Appliance</name>
-        <name lang="de">Haushaltsgerät</name>
-        <name lang="it">Apparecchio elettrico</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{a66164c7-7f58-417b-ab73-6fb41c3abe12}"/>
+    <names>
         <name lang="fr">Appareil électroménager</name>
         <name lang="pl">Kuchenka elektryczna</name>
         <name lang="cs">Elektrický spotřebič</name>
+        <name lang="ar">جهاز كهرومنزلي</name>
+        <name lang="el">Ηλεκτρική συσκευή</name>
+        <name lang="it">Apparecchio elettrico</name>
+        <name lang="en">Appliance</name>
+        <name lang="de">Haushaltsgerät</name>
         <name lang="nl">Elektrisch apparaat</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-1"/>
-        <text x="-4" y="14.3333" size="9" text="E"/>
-        <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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="22.5" tagg="label"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <text x="-4" size="9" text="E" y="14.3333"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/armoire_seche_linge.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/armoire_seche_linge.elmt
index 51056cfcf..6ebcfc2b2 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/armoire_seche_linge.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/armoire_seche_linge.elmt
@@ -1,25 +1,27 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{56DAD24F-09FD-440C-9BB2-03CD0AEA39D7}"/><names>
-        <name lang="ar">مُجفّف ملابس</name>
-        <name lang="el">Στεγνωτήριο</name>
-        <name lang="en">Drying cabinet</name>
-        <name lang="de">Trocknungsgerät</name>
-        <name lang="it">Asciugatrice</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{a4d01446-fd3f-414b-adc6-a3fb89e1f9bb}"/>
+    <names>
         <name lang="fr">Armoire sèche-linge</name>
         <name lang="pl">Suszarka</name>
         <name lang="cs">Sušička, sušící skříň</name>
+        <name lang="ar">مُجفّف ملابس</name>
+        <name lang="el">Στεγνωτήριο</name>
+        <name lang="it">Asciugatrice</name>
+        <name lang="en">Drying cabinet</name>
+        <name lang="de">Trocknungsgerät</name>
         <name lang="nl">Droog kast</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="4" x="-7.4982" y="2.5849" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" 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="2.5595" x1="4.9763" y2="6.5595" x2="-5.0236"/>
-        <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.5595" x1="-5.0236" y2="6.5595" x2="4.9763"/>
-        <circle x="-2.5" y="13.5" antialias="true" style="line-style:normal;line-weight:thin;filling:black;color:black" diameter="5"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-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="-13" x1="0" y2="-1" x2="0"/>
-        <arc width="4" x="3.561" y="2.5849" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <arc x="-7.4982" style="line-style:normal;line-weight:normal;filling:none;color:black" height="4" antialias="true" start="-90" y="2.5849" angle="-180" width="4"/>
+        <input x="-8" rotate="true" size="9" text="_" y="21.5" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.5595" antialias="false" y2="6.5595" end1="none" x2="-5.0236" length1="1.5" x1="4.9763"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.5595" antialias="false" y2="6.5595" end1="none" x2="4.9763" length1="1.5" x1="-5.0236"/>
+        <circle x="-2.5" style="line-style:normal;line-weight:thin;filling:black;color:black" diameter="5" antialias="true" y="13.5"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <arc x="3.561" style="line-style:normal;line-weight:normal;filling:none;color:black" height="4" antialias="true" start="90" y="2.5849" angle="-180" width="4"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/arrosage-auto.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/arrosage-auto.elmt
index 8349e63bc..15cde37ad 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/arrosage-auto.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/arrosage-auto.elmt
@@ -1,35 +1,37 @@
-<definition width="130" version="0.3" hotspot_x="6" hotspot_y="185" height="190" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{78929DB6-A880-4FD8-8006-9CD0E1A0F402}"/><names>
-        <name lang="en">self watering</name>
-        <name lang="it">Irrigazione automatica</name>
+<definition hotspot_x="5" hotspot_y="185" orientation="dyyy" height="190" type="element" link_type="simple" width="130" version="0.5">
+    <uuid uuid="{4808cc80-a31f-47b1-9b07-78f57199378d}"/>
+    <names>
         <name lang="fr">Arrosage auto</name>
-        <name lang="de">Sprinkleranlage</name>
         <name lang="pl">Automatyczne podlewanie</name>
         <name lang="cs">Automatické zalévání</name>
-        <name lang="nl">Watersproei automatisch</name>
         <name lang="el">Αυτόματο πότισμα</name>
+        <name lang="it">Irrigazione automatica</name>
+        <name lang="en">self watering</name>
+        <name lang="de">Sprinkleranlage</name>
+        <name lang="nl">Watersproei automatisch</name>
     </names>
     <informations>cbh41</informations>
     <description>
-        <arc width="20" x="61" y="-121" antialias="true" height="20" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="30" x="61" y="-127" antialias="true" height="30" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="35" x="24.5" y="-136" antialias="true" height="30" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="30" x="29" y="-127" antialias="true" height="30" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="35" x="60.5" y="-136" antialias="true" height="30" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="120" x="0" y="-85" antialias="false" height="85" 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="-15" x1="0" y2="-15" x2="120"/>
-        <input x="29" y="-33" size="7" rotate="true" text="10"/>
-        <input x="-2" y="-53.5" size="7" rotate="true" text="Extérieur"/>
-        <text x="42" y="-18" size="5" text="4.5 kA C"/>
-        <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="-45" x1="0" y2="-45" x2="120"/>
-        <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="-65" x1="0" y2="-65" x2="120"/>
-        <text x="66" y="-30" size="7" text="A"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-170" x1="0" y2="-170" x2="120"/>
-        <text x="2" y="-69" size="7" text="Arrosage auto"/>
-        <text x="36" y="-2" size="5" text="3 G 1.5 mm²"/>
-        <rect width="4" x="58" y="-110" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="20" x="39" y="-121" antialias="true" height="20" style="line-style:dotted;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-112" x1="60" y2="-120" x2="60"/>
-        <terminal x="60" y="-180" nameHidden="0" number="" name="" orientation="n"/>
+        <arc x="61" style="line-style:dotted;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="-121" angle="-180" width="20"/>
+        <input x="73" rotate="true" size="9" text="_" y="-179.45" tagg="label"/>
+        <arc x="61" style="line-style:dotted;line-weight:normal;filling:none;color:black" height="30" antialias="true" start="-180" y="-127" angle="-180" width="30"/>
+        <arc x="24.5" style="line-style:dotted;line-weight:normal;filling:none;color:black" height="30" antialias="true" start="-180" y="-136" angle="-180" width="35"/>
+        <arc x="29" style="line-style:dotted;line-weight:normal;filling:none;color:black" height="30" antialias="true" start="-180" y="-127" angle="-180" width="30"/>
+        <arc x="60.5" style="line-style:dotted;line-weight:normal;filling:none;color:black" height="30" antialias="true" start="-180" y="-136" angle="-180" width="35"/>
+        <rect x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="85" antialias="false" y="-85" width="120"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" antialias="false" y2="-15" end1="none" x2="120" length1="1.5" x1="0"/>
+        <input x="29" rotate="true" size="7" text="10" y="-33" tagg="none"/>
+        <input x="-2" rotate="true" size="7" text="Extérieur" y="-53.5" tagg="none"/>
+        <text x="42" size="5" text="4.5 kA C" y="-18"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" antialias="false" y2="-45" end1="none" x2="120" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-65" antialias="false" y2="-65" end1="none" x2="120" length1="1.5" x1="0"/>
+        <text x="66" size="7" text="A" y="-30"/>
+        <line end2="none" length2="1.5" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-170" antialias="false" y2="-170" end1="none" x2="120" length1="1.5" x1="0"/>
+        <text x="2" size="7" text="Arrosage auto" y="-69"/>
+        <text x="36" size="5" text="3 G 1.5 mm²" y="-2"/>
+        <rect x="58" style="line-style:normal;line-weight:normal;filling:none;color:black" height="10" antialias="false" y="-110" width="4"/>
+        <arc x="39" style="line-style:dotted;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="-121" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-112" antialias="false" y2="-120" end1="none" x2="60" length1="1.5" x1="60"/>
+        <terminal x="60" orientation="n" y="-180"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/chauffe-eau.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/chauffe-eau.elmt
index c64510234..13d0702b5 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/chauffe-eau.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/chauffe-eau.elmt
@@ -1,27 +1,29 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="30" height="40" type="element" orientation="dyyy">
-<uuid uuid="{E5D135BD-2F1F-494E-A268-9279B8FB279F}"/><names>
-        <name lang="ar">سخّان ماء</name>
-        <name lang="be">Heißwassergerät</name>
-        <name lang="el">Θερμοσίφωνας</name>
-        <name lang="en">Water heater</name>
-        <name lang="de">Wasserkocher</name>
-        <name lang="it">Scalda acqua</name>
+<definition hotspot_x="16" hotspot_y="25" orientation="dyyy" height="30" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{302a8056-b940-4b06-9b79-39e8de182678}"/>
+    <names>
         <name lang="fr">Chauffe-eau</name>
         <name lang="pl">Ogrzewacz wody</name>
         <name lang="cs">Ohřívač vody</name>
+        <name lang="ar">سخّان ماء</name>
+        <name lang="el">Θερμοσίφωνας</name>
+        <name lang="it">Scalda acqua</name>
+        <name lang="en">Water heater</name>
+        <name lang="de">Wasserkocher</name>
         <name lang="nl">Water verwarmer</name>
+        <name lang="be">Heißwassergerät</name>
     </names>
     <informations>EN 60617: 11-16-01</informations>
     <description>
-        <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="-10" y2="-10" x2="0"/>
-        <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="-16" x1="17.5" y2="-4" x2="17.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="-19" x1="12.5" y2="-1" x2="12.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="-18" x1="15" y2="-2" x2="15"/>
-        <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="-16" x1="2.5" y2="-4" x2="2.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="-19" x1="7.5" y2="-1" x2="7.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="-18" x1="5" y2="-2" x2="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="-20" x1="10" y2="0" x2="10"/>
-        <circle x="0" y="-20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="-10" y="-10" orientation="w"/>
+        <input x="3" rotate="true" size="9" text="_" y="-1.5" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-10" end1="none" x2="0" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" antialias="false" y2="-4" end1="none" x2="17.5" length1="1.5" x1="17.5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" antialias="false" y2="-1" end1="none" x2="12.5" length1="1.5" x1="12.5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" antialias="false" y2="-2" end1="none" x2="15" length1="1.5" x1="15"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" antialias="false" y2="-4" end1="none" x2="2.5" length1="1.5" x1="2.5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" antialias="false" y2="-1" end1="none" x2="7.5" length1="1.5" x1="7.5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" antialias="false" y2="-2" end1="none" x2="5" length1="1.5" x1="5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" antialias="false" y2="0" end1="none" x2="10" length1="1.5" x1="10"/>
+        <circle x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" antialias="true" y="-20"/>
+        <terminal x="-10" orientation="w" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/chauffe_eau.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/chauffe_eau.elmt
index 607a63a0b..44cb4f5c3 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/chauffe_eau.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/chauffe_eau.elmt
@@ -1,25 +1,27 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{48A18B2E-4321-4C16-A961-2E983B15838B}"/><names>
-        <name lang="ar">سخّان ماء</name>
-        <name lang="el">Θερμοσίφωνας</name>
-        <name lang="en">Water heater</name>
-        <name lang="de">Wasserkocher</name>
-        <name lang="it">Scalda acqua</name>
+<definition hotspot_x="15" hotspot_y="20" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{1e52bb0a-bb95-4159-90bb-37b54eb9d47b}"/>
+    <names>
         <name lang="fr">Chauffe-eau</name>
         <name lang="pl">Grzejnik wody</name>
         <name lang="cs">Ohřívač vody</name>
+        <name lang="ar">سخّان ماء</name>
+        <name lang="el">Θερμοσίφωνας</name>
+        <name lang="it">Scalda acqua</name>
+        <name lang="en">Water heater</name>
+        <name lang="de">Wasserkocher</name>
         <name lang="nl">Water verwarmer</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="17" x1="-10" y2="17" 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="5" x1="-10" y2="5" 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="14" x1="-11" y2="14" x2="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="8" x1="-11" y2="8" x2="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="11" x1="-12" y2="11" x2="12"/>
-        <circle x="-12.0416" y="-1.0415" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="24.0832"/>
-        <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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-8" rotate="true" size="9" text="_" y="22.5" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17" antialias="false" y2="17" end1="none" x2="10" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" antialias="false" y2="5" end1="none" x2="10" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" antialias="false" y2="14" end1="none" x2="11" length1="1.5" x1="-11"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" antialias="false" y2="8" end1="none" x2="11" length1="1.5" x1="-11"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11" antialias="false" y2="11" end1="none" x2="12" length1="1.5" x1="-12"/>
+        <circle x="-12.0416" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="24.0832" antialias="true" y="-1.0415"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/congelateur.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/congelateur.elmt
index 3e2a07413..2c5506e07 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/congelateur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/congelateur.elmt
@@ -1,32 +1,34 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{AB6C0E71-3831-4128-AE55-B2E4B15BC66D}"/><names>
-        <name lang="ar">مُجمّد</name>
-        <name lang="el">Καταψύκτης</name>
-        <name lang="en">Freezer</name>
-        <name lang="it">Congelatore</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{aad9e838-be61-4c4c-b3f2-abfd86009da4}"/>
+    <names>
         <name lang="fr">Congélateur</name>
-        <name lang="de">Gefriergerät</name>
         <name lang="pl">Zamrażarka</name>
         <name lang="cs">Mraznička, mrazák, mrazicí skříň</name>
+        <name lang="ar">مُجمّد</name>
+        <name lang="el">Καταψύκτης</name>
+        <name lang="it">Congelatore</name>
+        <name lang="en">Freezer</name>
+        <name lang="de">Gefriergerät</name>
         <name lang="nl">Vriezer</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="17" x1="-2" y2="13" x2="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="12" x1="5" y2="8" x2="9"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-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="13" x1="-2" y2="17" x2="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="8" x1="5" y2="12" x2="9"/>
-        <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="-9" y2="8" x2="-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="15" x1="-3" y2="15" x2="3"/>
-        <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="4" y2="10" 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="8" x1="-9" y2="12" x2="-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="12" x1="0" y2="18" x2="0"/>
-        <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="7" x1="7" y2="13" x2="7"/>
-        <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="-10" y2="10" x2="-4"/>
-        <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="7" x1="-7" y2="13" x2="-7"/>
-        <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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-8" rotate="true" size="9" text="_" y="20.5" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17" antialias="false" y2="13" end1="none" x2="2" length1="1.5" x1="-2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" antialias="false" y2="8" end1="none" x2="9" length1="1.5" x1="5"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" antialias="false" y2="17" end1="none" x2="2" length1="1.5" x1="-2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" antialias="false" y2="12" end1="none" x2="9" length1="1.5" x1="5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" antialias="false" y2="8" end1="none" x2="-5" length1="1.5" x1="-9"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" antialias="false" y2="15" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="false" y2="10" end1="none" x2="10" length1="1.5" x1="4"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" antialias="false" y2="12" end1="none" x2="-5" length1="1.5" x1="-9"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" antialias="false" y2="18" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" antialias="false" y2="13" end1="none" x2="7" length1="1.5" x1="7"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="false" y2="10" end1="none" x2="-4" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" antialias="false" y2="13" end1="none" x2="-7" length1="1.5" x1="-7"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/convecteur.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/convecteur.elmt
index 50f3828b8..fe7de0ceb 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/convecteur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/convecteur.elmt
@@ -1,26 +1,28 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{8A66932A-982E-424D-B3C9-D67A4D54FA8B}"/><names>
-        <name lang="ar">مُشعّ كهربائي</name>
-        <name lang="de">Heizkörper</name>
+<definition hotspot_x="15" hotspot_y="19" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{d01b4bfb-a6a6-4f6b-82fd-4591d25d5a6b}"/>
+    <names>
         <name lang="ru">Эл. конвектор</name>
-        <name lang="pt">Irradiador eléctrico</name>
-        <name lang="el">Θερμοπομπός</name>
-        <name lang="en">Electric convector</name>
-        <name lang="it">Termo-convettore</name>
         <name lang="fr">Radiateur électrique</name>
         <name lang="pl">Grzejnik konwekcyjny</name>
-        <name lang="es">Radiador eléctrico</name>
         <name lang="cs">Elektrické topné těleso</name>
+        <name lang="ar">مُشعّ كهربائي</name>
+        <name lang="el">Θερμοπομπός</name>
+        <name lang="pt">Irradiador eléctrico</name>
+        <name lang="it">Termo-convettore</name>
+        <name lang="de">Heizkörper</name>
+        <name lang="en">Electric convector</name>
+        <name lang="es">Radiador eléctrico</name>
         <name lang="nl">Elektrische luchtverwarmer</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-12" y2="15" x2="-12" y3="15" x3="12" y4="0"/>
-        <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="0" y2="0" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.5" x1="-12" y2="4.5" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="-12" y2="3" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="1.5" x1="-12" y2="1.5" x2="12"/>
-        <terminal x="0" y="-12" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="13.5" tagg="label"/>
+        <polygon y3="15" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="15" x3="12" x2="-12" x4="12" x1="-12" y4="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" antialias="false" y2="0" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.5" antialias="false" y2="4.5" end1="none" x2="12" length1="1.5" x1="-12"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" antialias="false" y2="3" end1="none" x2="12" length1="1.5" x1="-12"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="1.5" antialias="false" y2="1.5" end1="none" x2="12" length1="1.5" x1="-12"/>
+        <terminal x="0" orientation="n" y="-12"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/cuisiniere_electrique.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/cuisiniere_electrique.elmt
index ae39c3653..c7b0db91e 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/cuisiniere_electrique.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/cuisiniere_electrique.elmt
@@ -1,24 +1,26 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{8088E4B8-D725-4207-B883-A4C081A69437}"/><names>
-        <name lang="ar">مطبخ كهربائي</name>
-        <name lang="el">Ηλεκτρικό μαγειρείο</name>
-        <name lang="en">Electric cooker</name>
-        <name lang="de">Kochfeld</name>
-        <name lang="it">Piastra elettrica</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{328a6a45-6782-40fe-976f-2960d238be80}"/>
+    <names>
         <name lang="fr">Cuisiniere electrique</name>
         <name lang="pl">Kuchenka elektryczna</name>
         <name lang="cs">Elektrický sporák</name>
+        <name lang="ar">مطبخ كهربائي</name>
+        <name lang="el">Ηλεκτρικό μαγειρείο</name>
+        <name lang="it">Piastra elettrica</name>
+        <name lang="en">Electric cooker</name>
+        <name lang="de">Kochfeld</name>
         <name lang="nl">Elektrisch kooktoestel</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <circle x="-9.1622" y="12.8377" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-1"/>
-        <circle x="2.8377" y="12.8377" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245"/>
-        <circle x="-9.1622" y="2.8377" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245"/>
-        <circle x="2.8377" y="2.8377" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245"/>
-        <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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="22.5" tagg="label"/>
+        <circle x="-9.1622" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245" antialias="true" y="12.8377"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <circle x="2.8377" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245" antialias="true" y="12.8377"/>
+        <circle x="-9.1622" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245" antialias="true" y="2.8377"/>
+        <circle x="2.8377" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245" antialias="true" y="2.8377"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/four.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/four.elmt
index 91035cfc4..dddd219f4 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/four.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/four.elmt
@@ -1,25 +1,27 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{73A79A17-DAA1-4B99-AEB4-BAB0D17E575E}"/><names>
-        <name lang="ar">فرن</name>
-        <name lang="de">Elektrischer Ofen</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{24de92b9-da33-4723-a25f-b469e974b691}"/>
+    <names>
         <name lang="ru">Духовой шкаф</name>
-        <name lang="pt">Forno eléctrico</name>
-        <name lang="el">Ηλεκτρικός φούρνος</name>
-        <name lang="en">Electric oven</name>
-        <name lang="it">Forno elettrico</name>
         <name lang="fr">Four électrique</name>
         <name lang="pl">Piekarnik elektryczny</name>
-        <name lang="es">Horno eléctrico</name>
         <name lang="cs">Elektrická kamna</name>
+        <name lang="ar">فرن</name>
+        <name lang="el">Ηλεκτρικός φούρνος</name>
+        <name lang="pt">Forno eléctrico</name>
+        <name lang="it">Forno elettrico</name>
+        <name lang="de">Elektrischer Ofen</name>
+        <name lang="en">Electric oven</name>
+        <name lang="es">Horno eléctrico</name>
         <name lang="nl">Elektrische oven</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <circle x="-3.1622" y="12.8377" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245"/>
-        <rect width="24" x="-12" y="-1" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="23.5" tagg="label"/>
+        <circle x="-3.1622" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6.3245" antialias="true" y="12.8377"/>
+        <rect x="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" height="6" antialias="false" y="-1" width="24"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/four_micro_onde.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/four_micro_onde.elmt
index 9b6a1f840..612be1071 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/four_micro_onde.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/four_micro_onde.elmt
@@ -1,29 +1,31 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{A2D61DEE-356B-4749-8A9B-D438DF430F0B}"/><names>
-        <name lang="ar">فرن ميكرو موجي</name>
-        <name lang="el">Φούρνος μικροκυμάτων</name>
-        <name lang="en">Microwave oven</name>
-        <name lang="de">Mikrowellenofen</name>
-        <name lang="it">Forno micro-onde</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{daa27a36-4169-47ff-bf20-c97197bb71a7}"/>
+    <names>
         <name lang="fr">Four à micro-ondes</name>
         <name lang="pl">Kuchenka mikrofalowa</name>
         <name lang="cs">Mikrovlnná trouba</name>
+        <name lang="ar">فرن ميكرو موجي</name>
+        <name lang="el">Φούρνος μικροκυμάτων</name>
+        <name lang="it">Forno micro-onde</name>
+        <name lang="en">Microwave oven</name>
+        <name lang="de">Mikrowellenofen</name>
         <name lang="nl">Magnetron</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.1054" x1="-12" y2="22.8945" x2="-12" y3="22.8945" x3="12" y4="-1.1054"/>
-        <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="-5" y2="10" x2="5"/>
-        <arc width="5" x="3" y="5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <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="13" x1="-5" y2="18" x2="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="9" x1="-5" y2="14" x2="5"/>
-        <arc width="5" x="-8" y="5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="5" x="3" y="12.8945" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="5" x="3" y="9" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="5" x="-8" y="12.8945" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="5" x="-8" y="9" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="24.55" tagg="label"/>
+        <polygon y3="22.8945" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.1054" antialias="false" y2="22.8945" x3="12" x2="-12" x4="12" x1="-12" y4="-1.1054"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" antialias="false" y2="10" end1="none" x2="5" length1="1.5" x1="-5"/>
+        <arc x="3" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="true" start="0" y="5" angle="-90" width="5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" antialias="false" y2="18" end1="none" x2="5" length1="1.5" x1="-5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" antialias="false" y2="14" end1="none" x2="5" length1="1.5" x1="-5"/>
+        <arc x="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="true" start="-180" y="5" angle="-90" width="5"/>
+        <arc x="3" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="true" start="0" y="12.8945" angle="-90" width="5"/>
+        <arc x="3" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="true" start="0" y="9" angle="-90" width="5"/>
+        <arc x="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="true" start="-180" y="12.8945" angle="-90" width="5"/>
+        <arc x="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="true" start="-180" y="9" angle="-90" width="5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/hotte_aspirante_filtrante.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/hotte_aspirante_filtrante.elmt
index 0ba0a4ae3..fc9bd46d7 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/hotte_aspirante_filtrante.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/hotte_aspirante_filtrante.elmt
@@ -1,28 +1,30 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{C6B6A85A-CFC0-409F-AE24-1A70B347BB6D}"/><names>
-        <name lang="ar">شفّاط  بمرشّح</name>
-        <name lang="el">Απορροφητήρας</name>
-        <name lang="en">Cooker Hood filter</name>
-        <name lang="de">Dunstabzugshaube</name>
-        <name lang="it">Cappa aspirante/filtrante</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{b1c5c048-eb0e-46aa-b702-1ffb87912346}"/>
+    <names>
         <name lang="fr">Hotte aspirante filtrante</name>
         <name lang="pl">Okap z wentylatorem i filtrem</name>
         <name lang="cs">Odsávač par s filtrem</name>
+        <name lang="ar">شفّاط  بمرشّح</name>
+        <name lang="el">Απορροφητήρας</name>
+        <name lang="it">Cappa aspirante/filtrante</name>
+        <name lang="en">Cooker Hood filter</name>
+        <name lang="de">Dunstabzugshaube</name>
         <name lang="nl">Afzuigkap</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-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="23" x1="0" y2="17" x2="0"/>
-        <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="6" y2="6" x2="6"/>
-        <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="-6" y2="6" x2="-6"/>
-        <rect width="24" x="-12" y="-1" antialias="false" height="7" 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="-13" x1="0" y2="-1" x2="0"/>
-        <arc width="4" x="-7.4982" y="0.5849" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <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="0.5595" x1="4.9763" y2="4.5595" x2="-5.0236"/>
-        <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="0.5595" x1="-5.0236" y2="4.5595" x2="4.9763"/>
-        <arc width="4" x="3.561" y="0.5849" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <input x="-7" rotate="true" size="9" text="_" y="25.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" antialias="false" y2="17" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" antialias="false" y2="6" end1="none" x2="6" length1="1.5" x1="6"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" antialias="false" y2="6" end1="none" x2="-6" length1="1.5" x1="-6"/>
+        <rect x="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" height="7" antialias="false" y="-1" width="24"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <arc x="-7.4982" style="line-style:normal;line-weight:normal;filling:none;color:black" height="4" antialias="true" start="-90" y="0.5849" angle="-180" width="4"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.5595" antialias="true" y2="4.5595" end1="none" x2="-5.0236" length1="1.5" x1="4.9763"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.5595" antialias="true" y2="4.5595" end1="none" x2="4.9763" length1="1.5" x1="-5.0236"/>
+        <arc x="3.561" style="line-style:normal;line-weight:normal;filling:none;color:black" height="4" antialias="true" start="90" y="0.5849" angle="-180" width="4"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_linge.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_linge.elmt
index eb09053af..ba196de84 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_linge.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_linge.elmt
@@ -1,32 +1,34 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{BDA2EC77-2FAD-46B5-A120-4195EB10A653}"/><names>
-        <name lang="ar">غسّالة ملابس</name>
-        <name lang="de">Waschmaschine</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{3d189366-0810-4bd9-8eee-5f5683a21b00}"/>
+    <names>
         <name lang="ru">Стиральная машина</name>
-        <name lang="pt">Máquina de lavar roupa</name>
-        <name lang="el">Πλυντήριο</name>
-        <name lang="en">Washer</name>
-        <name lang="it">Lavatrice</name>
         <name lang="fr">Lave-linge</name>
         <name lang="pl">Pralka</name>
-        <name lang="es">Lavarropas</name>
         <name lang="cs">Pračka</name>
+        <name lang="ar">غسّالة ملابس</name>
+        <name lang="el">Πλυντήριο</name>
+        <name lang="pt">Máquina de lavar roupa</name>
+        <name lang="it">Lavatrice</name>
+        <name lang="de">Waschmaschine</name>
+        <name lang="en">Washer</name>
+        <name lang="es">Lavarropas</name>
         <name lang="nl">Wasmachine</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14.7775" x1="-2.3114" y2="8.7774" x2="3.6885"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13.0445" x1="-3.822" y2="7.0444" x2="2.1779"/>
-        <circle x="-9" y="2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="11.733" x1="-4.2669" y2="6.7329" x2="0.733"/>
-        <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="-13" x1="0" y2="-1" x2="0"/>
-        <circle x="-4.4721" y="6.5278" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="8.9442"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.9999" x1="-4" y2="6.9999" x2="-0.9999"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15" x1="1" y2="12" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15.0445" x1="-0.9999" y2="10.0445" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14" x1="-3" y2="7.9999" x2="3"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14.7775" antialias="false" y2="8.7774" end1="none" x2="3.6885" length1="1.5" x1="-2.3114"/>
+        <input x="-7" rotate="true" size="9" text="_" y="25.55" tagg="label"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13.0445" antialias="false" y2="7.0444" end1="none" x2="2.1779" length1="1.5" x1="-3.822"/>
+        <circle x="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="18" antialias="true" y="2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="11.733" antialias="false" y2="6.7329" end1="none" x2="0.733" length1="1.5" x1="-4.2669"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <circle x="-4.4721" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="8.9442" antialias="true" y="6.5278"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.9999" antialias="false" y2="6.9999" end1="none" x2="-0.9999" length1="1.5" x1="-4"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15" antialias="false" y2="12" end1="none" x2="4" length1="1.5" x1="1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15.0445" antialias="false" y2="10.0445" end1="none" x2="4" length1="1.5" x1="-0.9999"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14" antialias="false" y2="7.9999" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_vaiselle.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_vaiselle.elmt
index f120fb576..448df27c4 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_vaiselle.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_vaiselle.elmt
@@ -1,26 +1,28 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="50" type="element" orientation="dnnn">
-<uuid uuid="{08B3DBE0-4802-44D6-BF0E-27A6DEEFE1E3}"/><names>
-        <name lang="ar">غسّالة أواني</name>
-        <name lang="de">Geschirrspüler</name>
+<definition hotspot_x="15" hotspot_y="20" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{8e5d1c1a-60e2-4ee1-bea2-d6a971c3239f}"/>
+    <names>
         <name lang="ru">Посудомоечная машина</name>
-        <name lang="pt">Máquina de lavar louça</name>
-        <name lang="el">Πλυντήριο πιάτων</name>
-        <name lang="en">Dishwasher</name>
-        <name lang="it">Lavastoviglie</name>
         <name lang="fr">Lave-vaisselle</name>
         <name lang="pl">Zmywarka</name>
-        <name lang="es">Lavavajillas</name>
         <name lang="cs">Myčka na nádobí</name>
+        <name lang="ar">غسّالة أواني</name>
+        <name lang="el">Πλυντήριο πιάτων</name>
+        <name lang="pt">Máquina de lavar louça</name>
+        <name lang="it">Lavastoviglie</name>
+        <name lang="de">Geschirrspüler</name>
+        <name lang="en">Dishwasher</name>
+        <name lang="es">Lavavajillas</name>
         <name lang="nl">Afwasmachine</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-12" y2="24" x2="-12" y3="24" x3="12" y4="0"/>
-        <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="0" y2="0" x2="0"/>
-        <circle x="-8" y="6" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="16"/>
-        <circle x="-6" y="8" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4" x1="-12" y2="4" x2="12"/>
-        <terminal x="0" y="-12" orientation="n"/>
+        <polygon y3="24" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="24" x3="12" x2="-12" x4="12" x1="-12" y4="0"/>
+        <input x="-7" rotate="true" size="9" text="_" y="20.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" antialias="false" y2="0" end1="none" x2="0" length1="1.5" x1="0"/>
+        <circle x="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="16" antialias="true" y="6"/>
+        <circle x="-6" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="12" antialias="true" y="8"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4" antialias="false" y2="4" end1="none" x2="12" length1="1.5" x1="-12"/>
+        <terminal x="0" orientation="n" y="-12"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_vaisselles.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_vaisselles.elmt
index 7b4b71f82..8c7b088c6 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_vaisselles.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave_vaisselles.elmt
@@ -1,31 +1,33 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{46852540-B76B-4074-8E10-CE35AB9BFEBA}"/><names>
-        <name lang="ar">غسّالة أواني</name>
-        <name lang="el">Πλυντήριο πιάτων</name>
-        <name lang="en">Dishwasher</name>
-        <name lang="de">Geschirrspüler</name>
-        <name lang="it">Lava piatti</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{01663f22-18c4-4a5d-acdc-f061d942fa90}"/>
+    <names>
         <name lang="fr">Lave vaisselles</name>
         <name lang="pl">Zmywarka</name>
         <name lang="cs">Myčka na nádobí</name>
+        <name lang="ar">غسّالة أواني</name>
+        <name lang="el">Πλυντήριο πιάτων</name>
+        <name lang="it">Lava piatti</name>
+        <name lang="en">Dishwasher</name>
+        <name lang="de">Geschirrspüler</name>
         <name lang="nl">Afwasmachine</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="-1" x1="12" y2="23" x2="-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="-1" x1="-12" y2="23" x2="12"/>
-        <circle x="-9" y="2" antialias="true" style="line-style:normal;line-weight:normal;filling:white;color:black" diameter="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14.7775" x1="-2.3114" y2="8.7774" x2="3.6885"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13.0445" x1="-3.822" y2="7.0444" x2="2.1779"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="11.733" x1="-4.2669" y2="6.7329" x2="0.733"/>
-        <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="-13" x1="0" y2="-1" x2="0"/>
-        <circle x="-4.4721" y="6.5278" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="8.9442"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.9999" x1="-4" y2="6.9999" x2="-0.9999"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15" x1="1" y2="12" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15.0445" x1="-0.9999" y2="10.0445" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14" x1="-3" y2="7.9999" x2="3"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="23.5" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" end1="none" x2="-12" length1="1.5" x1="12"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" end1="none" x2="12" length1="1.5" x1="-12"/>
+        <circle x="-9" style="line-style:normal;line-weight:normal;filling:white;color:black" diameter="18" antialias="true" y="2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14.7775" antialias="false" y2="8.7774" end1="none" x2="3.6885" length1="1.5" x1="-2.3114"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13.0445" antialias="false" y2="7.0444" end1="none" x2="2.1779" length1="1.5" x1="-3.822"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="11.733" antialias="false" y2="6.7329" end1="none" x2="0.733" length1="1.5" x1="-4.2669"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <circle x="-4.4721" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="8.9442" antialias="true" y="6.5278"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.9999" antialias="false" y2="6.9999" end1="none" x2="-0.9999" length1="1.5" x1="-4"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15" antialias="false" y2="12" end1="none" x2="4" length1="1.5" x1="1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15.0445" antialias="false" y2="10.0445" end1="none" x2="4" length1="1.5" x1="-0.9999"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14" antialias="false" y2="7.9999" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/oven.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/oven.elmt
index 4e0c0bbe5..c2121af44 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/oven.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/oven.elmt
@@ -1,23 +1,25 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnyn">
-<uuid uuid="{9D277A6C-3E54-4D19-99DF-803173E47FFD}"/><names>
-        <name lang="de">Elektrobackofen</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{80ea845b-b805-4331-918c-b364f92e7126}"/>
+    <names>
         <name lang="ru">Печь</name>
-        <name lang="el">Φούρνος</name>
-        <name lang="en">Oven</name>
-        <name lang="it">Forno</name>
         <name lang="fr">Four</name>
         <name lang="pl">Piekarnik elektryczny</name>
-        <name lang="es">Horno</name>
         <name lang="cs">Elektrická pec</name>
+        <name lang="el">Φούρνος</name>
+        <name lang="it">Forno</name>
+        <name lang="de">Elektrobackofen</name>
+        <name lang="en">Oven</name>
+        <name lang="es">Horno</name>
         <name lang="nl">Elektrische Oven</name>
     </names>
     <informations>Author: Jonas Stein
 </informations>
     <description>
-        <rect width="18" x="-9" y="3" antialias="false" height="2" style="line-style:normal;line-weight:none;filling:black;color:white"/>
-        <rect width="18" x="-9" y="18" antialias="false" height="2" style="line-style:normal;line-weight:none;filling:black;color:white"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="23.5" tagg="label"/>
+        <rect x="-9" style="line-style:normal;line-weight:none;filling:black;color:white" height="2" antialias="false" y="3" width="18"/>
+        <rect x="-9" style="line-style:normal;line-weight:none;filling:black;color:white" height="2" antialias="false" y="18" width="18"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/plancher_chauffant.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/plancher_chauffant.elmt
index 49192884c..f876627f9 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/plancher_chauffant.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/plancher_chauffant.elmt
@@ -1,27 +1,28 @@
-<definition hotspot_y="17" width="30" height="40" hotspot_x="15" type="element" version="0.5" orientation="dyyy" link_type="simple">
-<uuid uuid="{D4855A4E-E229-4E36-ABDC-6A1D9134B211}"/><names>
-        <name lang="en">Heated floor</name>
+<definition hotspot_x="15" hotspot_y="17" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{27760c1c-8675-4175-835d-26dda2492cdb}"/>
+    <names>
         <name lang="fr">Plancher chauffant</name>
+        <name lang="en">Heated floor</name>
     </names>
     <informations></informations>
     <description>
-        <arc x="5.56627" width="5.47791" height="3.75" angle="180" style="line-style:normal;line-weight:thin;filling:none;color:black" start="270" y="5.625" antialias="true"/>
-        <arc x="5.56627" width="6.84739" height="6.25" angle="180" style="line-style:normal;line-weight:thin;filling:none;color:black" start="270" y="4.375" antialias="true"/>
-        <arc x="-10.1827" width="6.84739" height="3.75" angle="-179" style="line-style:normal;line-weight:thin;filling:none;color:black" start="270" y="10.625" antialias="true"/>
-        <line y1="14.375" end1="none" y2="14.375" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="9.6747" length2="1.5" end2="none" x1="-7.58072" antialias="false" length1="1.5"/>
-        <line y1="4.375" end1="none" y2="4.375" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="9.40081" length2="1.5" end2="none" x1="-8.12851" antialias="false" length1="1.5"/>
-        <line y1="5.625" end1="none" y2="5.625" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="8.30522" length2="1.5" end2="none" x1="-8.12851" antialias="false" length1="1.5"/>
-        <line y1="9.375" end1="none" y2="9.375" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="8.30522" length2="1.5" end2="none" x1="-8.30305" antialias="false" length1="1.5"/>
-        <line y1="10.625" end1="none" y2="10.625" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="9.40081" length2="1.5" end2="none" x1="-7.58072" antialias="false" length1="1.5"/>
-        <line y1="15.625" end1="none" y2="15.625" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="9.6747" length2="1.5" end2="none" x1="-8.12851" antialias="false" length1="1.5"/>
-        <arc x="-11.5522" width="8.21687" height="6.25" angle="-179" style="line-style:normal;line-weight:thin;filling:none;color:black" start="270" y="9.375" antialias="true"/>
-        <line y1="1.875" end1="none" y2="18.125" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-5.38955" length2="1.5" end2="none" x1="-5.38955" antialias="false" length1="1.5"/>
-        <line y1="1.71053" end1="none" y2="18.2895" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0.0883568" length2="1.5" end2="none" x1="0.0883568" antialias="false" length1="1.5"/>
-        <line y1="1.71053" end1="none" y2="18.2895" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="5.56627" length2="1.5" end2="none" x1="5.56627" antialias="false" length1="1.5"/>
-        <line y1="5.625" end1="none" y2="4.375" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-8.12851" length2="1.5" end2="none" x1="-8.12851" antialias="false" length1="1.5"/>
-        <line y1="1.875" end1="none" y2="-8.125" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0.0883568" length2="1.5" end2="none" x1="0.0883568" antialias="false" length1="1.5"/>
-        <input x="11.0442" tagg="label" text="" rotate="true" y="11.25" size="7"/>
-        <input x="7" tagg="label" text="_" rotate="true" y="-11" size="9"/>
-        <terminal x="0.0883568" y="-9.375" orientation="n"/>
+        <arc x="5.56627" style="line-style:normal;line-weight:thin;filling:none;color:black" height="3.75" antialias="true" start="270" y="5.625" angle="180" width="5.47791"/>
+        <arc x="5.56627" style="line-style:normal;line-weight:thin;filling:none;color:black" height="6.25" antialias="true" start="270" y="4.375" angle="180" width="6.84739"/>
+        <arc x="-10.1827" style="line-style:normal;line-weight:thin;filling:none;color:black" height="3.75" antialias="true" start="270" y="10.625" angle="-179" width="6.84739"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14.375" antialias="false" y2="14.375" end1="none" x2="9.6747" length1="1.5" x1="-7.58072"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.375" antialias="false" y2="4.375" end1="none" x2="9.40081" length1="1.5" x1="-8.12851"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.625" antialias="false" y2="5.625" end1="none" x2="8.30522" length1="1.5" x1="-8.12851"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.375" antialias="false" y2="9.375" end1="none" x2="8.30522" length1="1.5" x1="-8.30305"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10.625" antialias="false" y2="10.625" end1="none" x2="9.40081" length1="1.5" x1="-7.58072"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15.625" antialias="false" y2="15.625" end1="none" x2="9.6747" length1="1.5" x1="-8.12851"/>
+        <arc x="-11.5522" style="line-style:normal;line-weight:thin;filling:none;color:black" height="6.25" antialias="true" start="270" y="9.375" angle="-179" width="8.21687"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.875" antialias="false" y2="18.125" end1="none" x2="-5.38955" length1="1.5" x1="-5.38955"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.71053" antialias="false" y2="18.2895" end1="none" x2="0.0883568" length1="1.5" x1="0.0883568"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.71053" antialias="false" y2="18.2895" end1="none" x2="5.56627" length1="1.5" x1="5.56627"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.625" antialias="false" y2="4.375" end1="none" x2="-8.12851" length1="1.5" x1="-8.12851"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.875" antialias="false" y2="-8.125" end1="none" x2="0.0883568" length1="1.5" x1="0.0883568"/>
+        <input x="11.0442" rotate="true" size="7" text="" y="11.25" tagg="label"/>
+        <input x="-8" rotate="true" size="9" text="_" y="17.5" tagg="label"/>
+        <terminal x="0.0883568" orientation="n" y="-9.375"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/plaque_cuisson.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/plaque_cuisson.elmt
index bd3fe5811..6a2b10de0 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/plaque_cuisson.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/plaque_cuisson.elmt
@@ -1,27 +1,29 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{5D7C0AE2-59A9-46F2-BDD6-DC450D0C5DAF}"/><names>
-        <name lang="ar">لوحة طبخ</name>
-        <name lang="de">Herdplatte</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{8a85a876-2de4-4742-a2e2-3b5692a8a884}"/>
+    <names>
         <name lang="ru">Эл. плита</name>
-        <name lang="pt">Placa de fogão</name>
-        <name lang="el">Κεραμική εστία</name>
-        <name lang="en">Solid plate</name>
-        <name lang="it">Fornelli</name>
         <name lang="fr">Plaque de cuisson</name>
         <name lang="pl">Kuchenka elektryczna</name>
-        <name lang="es">Placa de cocina</name>
         <name lang="cs">Deska na vaření</name>
+        <name lang="ar">لوحة طبخ</name>
+        <name lang="el">Κεραμική εστία</name>
+        <name lang="pt">Placa de fogão</name>
+        <name lang="it">Fornelli</name>
+        <name lang="de">Herdplatte</name>
+        <name lang="en">Solid plate</name>
+        <name lang="es">Placa de cocina</name>
         <name lang="nl">Inductieplaat</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-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="-13" x1="0" y2="-1" x2="0"/>
-        <circle x="-8.5" y="13.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="7"/>
-        <circle x="0.5" y="12.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="9"/>
-        <circle x="-9.5" y="2.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="9"/>
-        <circle x="1.5" y="3.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="7"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-8" rotate="true" size="9" text="_" y="23.5" tagg="label"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <circle x="-8.5" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="7" antialias="true" y="13.5"/>
+        <circle x="0.5" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="9" antialias="true" y="12.5"/>
+        <circle x="-9.5" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="9" antialias="true" y="2.5"/>
+        <circle x="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="7" antialias="true" y="3.5"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/radiateur.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/radiateur.elmt
index 0a0e67be9..c9677e34f 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/radiateur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/radiateur.elmt
@@ -1,23 +1,25 @@
-<definition width="70" version="0.3" hotspot_x="35" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{1A621B20-D261-48FA-8B57-12457E488C23}"/><names>
-        <name lang="ar">مشعاع</name>
-        <name lang="el">Θερμοσυσσωρευτής</name>
-        <name lang="en">Radiator</name>
-        <name lang="de">Heizkörper</name>
-        <name lang="it">Termoconvettore</name>
+<definition hotspot_x="35" hotspot_y="20" orientation="dyyy" height="40" type="element" link_type="simple" width="70" version="0.5">
+    <uuid uuid="{5757a88b-afec-4b6d-bc89-fa7e178647b3}"/>
+    <names>
         <name lang="fr">Radiateur</name>
         <name lang="pl">Wymiennik ciepła</name>
         <name lang="cs">Topné těleso</name>
+        <name lang="ar">مشعاع</name>
+        <name lang="el">Θερμοσυσσωρευτής</name>
+        <name lang="it">Termoconvettore</name>
+        <name lang="en">Radiator</name>
+        <name lang="de">Heizkörper</name>
         <name lang="nl">Elektrische radiator</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="11" x="-31" y="-5" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="66" x="-33" y="11" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="66" x="-33" y="6" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="66" x="-33" y="-7" antialias="false" height="23" 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="-7" x1="0" y2="-10" x2="0"/>
-        <terminal x="0" y="-14" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="18.5" tagg="label"/>
+        <rect x="-31" style="line-style:normal;line-weight:normal;filling:none;color:black" height="3" antialias="false" y="-5" width="11"/>
+        <rect x="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="false" y="11" width="66"/>
+        <rect x="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" height="10" antialias="false" y="6" width="66"/>
+        <rect x="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" height="23" antialias="false" y="-7" width="66"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" antialias="false" y2="-10" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-14"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/radiateur_soufflant_seche_cheveux.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/radiateur_soufflant_seche_cheveux.elmt
index 4ecb8c344..d3e4208ee 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/radiateur_soufflant_seche_cheveux.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/radiateur_soufflant_seche_cheveux.elmt
@@ -1,28 +1,30 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{B4ECC45A-5CC1-4D0B-8864-33DFA0881F9E}"/><names>
-        <name lang="ar">مشعاع نافخ - مجفف شعر</name>
-        <name lang="el">Στεγνωτήρας μαλλιών</name>
-        <name lang="en">Fan heater hairdryer</name>
-        <name lang="de">Gebläseheizkörper</name>
-        <name lang="it">Asciuga capelli</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{aa2050b3-27ff-4536-857f-739dc255b21b}"/>
+    <names>
         <name lang="fr">Radiateur soufflant sèche cheveux</name>
         <name lang="pl">Suszarka do włosów</name>
         <name lang="cs">Vysoušeč vlasů, fén na vlasy</name>
+        <name lang="ar">مشعاع نافخ - مجفف شعر</name>
+        <name lang="el">Στεγνωτήρας μαλλιών</name>
+        <name lang="it">Asciuga capelli</name>
+        <name lang="en">Fan heater hairdryer</name>
+        <name lang="de">Gebläseheizkörper</name>
         <name lang="nl">Ventilator verwarmer</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="4" x="-7.4982" y="12.585" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" 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="12.5596" x1="4.9763" y2="16.5596" x2="-5.0236"/>
-        <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.5596" x1="-5.0236" y2="16.5596" x2="4.9763"/>
-        <arc width="4" x="3.561" y="12.585" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="6" x="-12" y="-1" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="6" y="-1" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="0" y="-1" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="-6" y="-1" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="23.5" tagg="label"/>
+        <arc x="-7.4982" style="line-style:normal;line-weight:normal;filling:none;color:black" height="4" antialias="true" start="-90" y="12.585" angle="-180" width="4"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12.5596" antialias="false" y2="16.5596" end1="none" x2="-5.0236" length1="1.5" x1="4.9763"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12.5596" antialias="false" y2="16.5596" end1="none" x2="4.9763" length1="1.5" x1="-5.0236"/>
+        <arc x="3.561" style="line-style:normal;line-weight:normal;filling:none;color:black" height="4" antialias="true" start="90" y="12.585" angle="-180" width="4"/>
+        <rect x="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" height="6" antialias="false" y="-1" width="6"/>
+        <rect x="6" style="line-style:normal;line-weight:normal;filling:none;color:black" height="6" antialias="false" y="-1" width="6"/>
+        <rect x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="6" antialias="false" y="-1" width="6"/>
+        <rect x="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" height="6" antialias="false" y="-1" width="6"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/refrigerateur.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/refrigerateur.elmt
index 27fb61b9a..5d27b5772 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/refrigerateur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/refrigerateur.elmt
@@ -1,24 +1,26 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{3A7A6915-DA09-44ED-B953-DFF91B20CDA8}"/><names>
-        <name lang="ar">ثلاّجة</name>
-        <name lang="el">Ψυγείο</name>
-        <name lang="en">Refrigerator</name>
-        <name lang="de">Kühlschrank</name>
-        <name lang="it">Frigorifero</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{215eb294-b6e4-4e38-b829-6a0191685030}"/>
+    <names>
         <name lang="fr">Réfrigérateur</name>
         <name lang="pl">Chłodziarka</name>
         <name lang="cs">Lednička, chladnička</name>
+        <name lang="ar">ثلاّجة</name>
+        <name lang="el">Ψυγείο</name>
+        <name lang="it">Frigorifero</name>
+        <name lang="en">Refrigerator</name>
+        <name lang="de">Kühlschrank</name>
         <name lang="nl">Koelkast</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-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="13" x1="-2" y2="9" x2="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="9" x1="-2" y2="13" x2="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="11" x1="-3" y2="11" x2="3"/>
-        <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="0" y2="14" x2="0"/>
-        <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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="23.5" tagg="label"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" antialias="false" y2="9" end1="none" x2="2" length1="1.5" x1="-2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" antialias="false" y2="13" end1="none" x2="2" length1="1.5" x1="-2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11" antialias="false" y2="11" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" antialias="false" y2="14" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/refrigerateur_avec_partie_conglateur.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/refrigerateur_avec_partie_conglateur.elmt
index a1208616b..1ea8e0409 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/refrigerateur_avec_partie_conglateur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/refrigerateur_avec_partie_conglateur.elmt
@@ -1,37 +1,39 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{8E608BA0-2347-4B7E-A33F-D6AEF54716EB}"/><names>
-        <name lang="ar">ثلاّجة بجزء للتجميد</name>
-        <name lang="el">Ψυγειοκαταψύκτης</name>
-        <name lang="en">Refrigerator with freezer</name>
-        <name lang="de">Kühlschrank mit Gefrierfach</name>
-        <name lang="it">Frigorifero / congelatore</name>
+<definition hotspot_x="15" hotspot_y="21" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{3bce18a5-88d7-4f9d-aec5-de714ee49718}"/>
+    <names>
         <name lang="fr">Réfrigérateur avec partie congélateur</name>
         <name lang="pl">Chłodziarka z zamrażarką</name>
         <name lang="cs">Lednička s mrazákem</name>
+        <name lang="ar">ثلاّجة بجزء للتجميد</name>
+        <name lang="el">Ψυγειοκαταψύκτης</name>
+        <name lang="it">Frigorifero / congelatore</name>
+        <name lang="en">Refrigerator with freezer</name>
+        <name lang="de">Kühlschrank mit Gefrierfach</name>
         <name lang="nl">Koelkast met vriezer</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="4" x1="6" y2="2" x2="8"/>
-        <rect width="24" x="-12" y="-1" antialias="false" height="8" 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="2" x1="6" y2="4" x2="8"/>
-        <polygon x4="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-12" y2="23" x2="-12" y3="23" x3="12" y4="-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="3" x1="5" y2="3" x2="9"/>
-        <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="4" x1="-8" y2="2" x2="-6"/>
-        <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="1" x1="7" y2="5" x2="7"/>
-        <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="-8" y2="4" x2="-6"/>
-        <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="3" x1="-9" y2="3" x2="-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="1" x1="-7" y2="5" x2="-7"/>
-        <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="4" x1="-1" y2="2" x2="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="18" x1="-2" y2="14" x2="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="-1" y2="4" x2="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="14" x1="-2" y2="18" x2="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="3" x1="-2.0593" y2="3" x2="1.9406"/>
-        <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="16" x1="-3" y2="16" x2="3"/>
-        <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="1" x1="0" y2="5" x2="0"/>
-        <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="13" x1="0" y2="19" x2="0"/>
-        <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="-13" x1="0" y2="-1" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" antialias="false" y2="2" end1="none" x2="8" length1="1.5" x1="6"/>
+        <input x="-7" rotate="true" size="9" text="_" y="22.5" tagg="label"/>
+        <rect x="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" height="8" antialias="false" y="-1" width="24"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" antialias="false" y2="4" end1="none" x2="8" length1="1.5" x1="6"/>
+        <polygon y3="23" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" antialias="false" y2="23" x3="12" x2="-12" x4="12" x1="-12" y4="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" antialias="false" y2="3" end1="none" x2="9" length1="1.5" x1="5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" antialias="false" y2="2" end1="none" x2="-6" length1="1.5" x1="-8"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" antialias="false" y2="5" end1="none" x2="7" length1="1.5" x1="7"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" antialias="false" y2="4" end1="none" x2="-6" length1="1.5" x1="-8"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" antialias="false" y2="3" end1="none" x2="-5" length1="1.5" x1="-9"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" antialias="false" y2="5" end1="none" x2="-7" length1="1.5" x1="-7"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" antialias="false" y2="2" end1="none" x2="1" length1="1.5" x1="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" antialias="false" y2="14" end1="none" x2="2" length1="1.5" x1="-2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" antialias="false" y2="4" end1="none" x2="1" length1="1.5" x1="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" antialias="false" y2="18" end1="none" x2="2" length1="1.5" x1="-2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" antialias="false" y2="3" end1="none" x2="1.9406" length1="1.5" x1="-2.0593"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="16" antialias="false" y2="16" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" antialias="false" y2="5" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" antialias="false" y2="19" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-1" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/ventilateur.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/ventilateur.elmt
index 7971e48c1..f2bca892a 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/ventilateur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/ventilateur.elmt
@@ -1,21 +1,23 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="30" height="40" type="element" orientation="dyyy">
-<uuid uuid="{615953F5-7CE7-4092-B3DA-3FC83AFF7943}"/><names>
-        <name lang="ar">مروحة</name>
-        <name lang="de">Lüfter</name>
-        <name lang="el">Ανεμιστήρας</name>
-        <name lang="en">Fan</name>
-        <name lang="it">Ventilatore</name>
+<definition hotspot_x="16" hotspot_y="25" orientation="dyyy" height="30" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{f708f28c-ccc6-4992-9f5b-ca0164930877}"/>
+    <names>
         <name lang="fr">Ventilateur</name>
         <name lang="pl">Wentylator</name>
         <name lang="cs">Větrák</name>
+        <name lang="ar">مروحة</name>
+        <name lang="el">Ανεμιστήρας</name>
+        <name lang="it">Ventilatore</name>
+        <name lang="de">Lüfter</name>
+        <name lang="en">Fan</name>
         <name lang="nl">Ventilator</name>
     </names>
     <informations>EN 60617: 11-16-02</informations>
     <description>
-        <rect width="20" x="0" y="-20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="7" x="3" y="-12.25" antialias="true" height="4.5" 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="-10" x1="-10" y2="-10" x2="0"/>
-        <ellipse width="7" x="10" y="-12.25" antialias="true" height="4.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-10" y="-10" orientation="w"/>
+        <input x="3" rotate="true" size="9" text="_" y="2.5" tagg="label"/>
+        <rect x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="false" y="-20" width="20"/>
+        <ellipse x="3" style="line-style:normal;line-weight:normal;filling:none;color:black" height="4.5" antialias="true" y="-12.25" width="7"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-10" end1="none" x2="0" length1="1.5" x1="-10"/>
+        <ellipse x="10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="4.5" antialias="true" y="-12.25" width="7"/>
+        <terminal x="-10" orientation="w" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/2_electrical_sockets_11-13-02_en60617.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/2_electrical_sockets_11-13-02_en60617.elmt
index 452232e00..9ba7f582c 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/2_electrical_sockets_11-13-02_en60617.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/2_electrical_sockets_11-13-02_en60617.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="50" type="element" orientation="dyyy">
-<uuid uuid="{736A128C-D0FD-4498-B882-73517CD02174}"/><names>
-        <name lang="ar">قاعدة مقبس تيّار (2) (EN 60617 11-13=01)</name>
-        <name lang="de">Mehrfachsteckdose (2) (EN 60617 11-13-01)</name>
-        <name lang="el">Ρευματοδότης διπλός</name>
-        <name lang="en">2 electrical socket (EN 60617 11-13-01)</name>
-        <name lang="it">Presa multipla 2x (EN 60617 11-13-01)</name>
+<definition hotspot_x="16" hotspot_y="19" orientation="dyyy" height="50" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{2b315cff-241a-44a6-b789-76322bb451ac}"/>
+    <names>
         <name lang="fr">Socle de prise de courant (2)  (EN 60617 11-13-01)</name>
         <name lang="pl">Gniazdo dwubiegunowe (EN 60617: 11-13-01)</name>
         <name lang="cs">Vícenásobná elektrická zásuvka (2) (EN 60617 11-13-01)</name>
+        <name lang="ar">قاعدة مقبس تيّار (2) (EN 60617 11-13=01)</name>
+        <name lang="el">Ρευματοδότης διπλός</name>
+        <name lang="it">Presa multipla 2x (EN 60617 11-13-01)</name>
+        <name lang="de">Mehrfachsteckdose (2) (EN 60617 11-13-01)</name>
+        <name lang="en">2 electrical socket (EN 60617 11-13-01)</name>
         <name lang="nl">Wandcontactdoos (2) (EN 60617 11-13-01)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="20" x="-10" y="6.5" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="6" x1="0" y2="-9" x2="0"/>
-        <text x="11" y="7" size="7" text="2"/>
-        <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="6" x1="9" y2="12" x2="1"/>
-        <terminal x="0" y="-14" orientation="n"/>
+        <input x="3" rotate="true" size="9" text="_" y="-9.45" tagg="label"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="6.5" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" antialias="false" y2="-9" end1="none" x2="0" length1="1.5" x1="0"/>
+        <text x="11" size="7" text="2" y="7"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" antialias="true" y2="12" end1="none" x2="1" length1="1.5" x1="9"/>
+        <terminal x="0" orientation="n" y="-14"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/3_electrical_sockets_11-13-02_en60617.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/3_electrical_sockets_11-13-02_en60617.elmt
index 70c88516e..fa4ca5ef8 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/3_electrical_sockets_11-13-02_en60617.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/3_electrical_sockets_11-13-02_en60617.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="50" type="element" orientation="dyyy">
-<uuid uuid="{1CF0DD85-78AF-4D2C-83DC-2A78CB532583}"/><names>
-        <name lang="ar">قاعدة قابس تيّار (3) (EN 60617 11-13-02)</name>
-        <name lang="de">Mehrfachsteckdose (3) (EN 60617 11-13-02)</name>
-        <name lang="el">Ρευματοδότης τριπλός</name>
-        <name lang="en">3 electrical sockets (EN 60617 11-13-02)</name>
-        <name lang="it">Presa multipla 3x (EN 60617 11-13-01)</name>
+<definition hotspot_x="16" hotspot_y="18" orientation="dyyy" height="50" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{d1d21866-8a16-4cd8-a11f-709c4ac22856}"/>
+    <names>
         <name lang="fr">Socle de prise de courant (3)  (EN 60617 11-13-02)</name>
         <name lang="pl">Gniazdo trójbiegunowe (EN 60617: 11-13-02)</name>
         <name lang="cs">Vícenásobná elektrická zásuvka (3) (EN 60617 11-13-01)</name>
+        <name lang="ar">قاعدة قابس تيّار (3) (EN 60617 11-13-02)</name>
+        <name lang="el">Ρευματοδότης τριπλός</name>
+        <name lang="it">Presa multipla 3x (EN 60617 11-13-01)</name>
+        <name lang="de">Mehrfachsteckdose (3) (EN 60617 11-13-02)</name>
+        <name lang="en">3 electrical sockets (EN 60617 11-13-02)</name>
         <name lang="nl">Wandcontactdoos (3) (EN 60617 11-13-01)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="20" x="-10" y="7.5" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="7" x1="0" y2="-8" x2="0"/>
-        <text x="11" y="7" size="7" text="3"/>
-        <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="9" x1="10" y2="15" x2="2"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <input x="3" rotate="true" size="9" text="_" y="-9.45" tagg="label"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="7.5" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" antialias="false" y2="-8" end1="none" x2="0" length1="1.5" x1="0"/>
+        <text x="11" size="7" text="3" y="7"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" antialias="true" y2="15" end1="none" x2="2" length1="1.5" x1="10"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir.elmt
index 802a22c81..91612253a 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir.elmt
@@ -1,19 +1,21 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{1216EC4B-66F9-4924-AA62-D1680CD7324C}"/><names>
-        <name lang="ar">زرّ ضاغط</name>
-        <name lang="de">Drucktaster</name>
-        <name lang="el">Μπουτόν</name>
-        <name lang="en">Push button</name>
-        <name lang="it">Pulsante</name>
+<definition hotspot_x="9" hotspot_y="16" orientation="dyyy" height="30" type="element" link_type="simple" width="20" version="0.5">
+    <uuid uuid="{49b15ea7-8bc5-4faf-aba6-717f8118d80e}"/>
+    <names>
         <name lang="fr">Bouton-poussoir</name>
         <name lang="pl">Przycisk</name>
         <name lang="cs">Tlačítko</name>
+        <name lang="ar">زرّ ضاغط</name>
+        <name lang="el">Μπουτόν</name>
+        <name lang="it">Pulsante</name>
+        <name lang="de">Drucktaster</name>
+        <name lang="en">Push button</name>
         <name lang="nl">Drukknop</name>
     </names>
     <informations>EN 60617: 11-14-10</informations>
     <description>
-        <circle x="-7.5" y="-7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15"/>
-        <circle x="-4.25" y="-4.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.5"/>
-        <terminal x="0" y="-8" orientation="n"/>
+        <circle x="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="true" y="-7.5"/>
+        <input x="8" rotate="true" size="9" text="_" y="-9.45" tagg="label"/>
+        <circle x="-4.25" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.5" antialias="true" y="-4.25"/>
+        <terminal x="0" orientation="n" y="-8"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir_lumineux.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir_lumineux.elmt
index 2a2af5482..b0b6b2daf 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir_lumineux.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir_lumineux.elmt
@@ -1,21 +1,23 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{A5FD3C83-D6AD-4CB6-AC13-FB0DC98703ED}"/><names>
-        <name lang="ar">زرّ ضاغط مُضيئ</name>
-        <name lang="de">Drucktaster beleuchtet</name>
-        <name lang="en">Push-button with indicator lamp</name>
+<definition hotspot_x="9" hotspot_y="16" orientation="dyyy" height="30" type="element" link_type="simple" width="20" version="0.5">
+    <uuid uuid="{123ce7c9-9be0-43ad-a8b3-096c074d036d}"/>
+    <names>
         <name lang="fr">Bouton-poussoir lumineux</name>
         <name lang="pl">Przycisk podświetlony</name>
         <name lang="cs">Podsvícené tlačítko</name>
-        <name lang="it">Pulsante luminoso</name>
-        <name lang="nl">Drukknop met lamp</name>
+        <name lang="ar">زرّ ضاغط مُضيئ</name>
         <name lang="el">Μπουτόν φωτιζόμενο</name>
+        <name lang="it">Pulsante luminoso</name>
+        <name lang="de">Drucktaster beleuchtet</name>
+        <name lang="en">Push-button with indicator lamp</name>
+        <name lang="nl">Drukknop met lamp</name>
     </names>
     <informations>EN 60617: 11-14-11</informations>
     <description>
-        <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="3" x1="-3" y2="-3" x2="3"/>
-        <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="-3" x1="-3" y2="3" x2="3"/>
-        <circle x="-7.5" y="-7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15"/>
-        <circle x="-4.25" y="-4.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.5"/>
-        <terminal x="0" y="-8" orientation="n"/>
+        <input x="6" rotate="true" size="9" text="_" y="-10.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" antialias="false" y2="-3" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" antialias="false" y2="3" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <circle x="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="true" y="-7.5"/>
+        <circle x="-4.25" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.5" antialias="true" y="-4.25"/>
+        <terminal x="0" orientation="n" y="-8"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir_protege.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir_protege.elmt
index fbb7672d7..41aa21dc7 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir_protege.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/bouton_poussoir_protege.elmt
@@ -1,24 +1,26 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="50" type="element" orientation="dyyy">
-<uuid uuid="{FD066063-3572-4588-8FCC-44D6C2C40995}"/><names>
-        <name lang="ar">زرّ ضاغط محمي</name>
-        <name lang="de">Drucktaster geschützt</name>
-        <name lang="el">Μπουτόν, προστατευμένο</name>
-        <name lang="en">Push-button protected</name>
-        <name lang="it">Pulsante, protetto meccanicamente</name>
+<definition hotspot_x="13" hotspot_y="12" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{753d26b4-3ccc-448c-97f5-fd3885bf8083}"/>
+    <names>
         <name lang="fr">Bouton-poussoir, protégé</name>
         <name lang="pl">Przycisk chroniony</name>
         <name lang="cs">Chráněné tlačítko</name>
+        <name lang="ar">زرّ ضاغط محمي</name>
+        <name lang="el">Μπουτόν, προστατευμένο</name>
+        <name lang="it">Pulsante, protetto meccanicamente</name>
+        <name lang="de">Drucktaster geschützt</name>
+        <name lang="en">Push-button protected</name>
         <name lang="nl">Drukknop beschermd</name>
     </names>
     <informations>EN 60617: 11-14-12</informations>
     <description>
-        <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="18" x1="5" y2="23" x2="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="-2" x1="5" y2="-7" x2="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="-2" x1="5" y2="-2" 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="18" x1="5" y2="18" 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="-2" x1="10" y2="18" x2="10"/>
-        <circle x="-7.5" y="0.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15"/>
-        <circle x="-4.25" y="3.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.5"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <input x="13" rotate="true" size="9" text="_" y="5.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" antialias="false" y2="23" end1="none" x2="5" length1="1.5" x1="5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" antialias="false" y2="-7" end1="none" x2="5" length1="1.5" x1="5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" antialias="false" y2="-2" end1="none" x2="10" length1="1.5" x1="5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" antialias="false" y2="18" end1="none" x2="10" length1="1.5" x1="5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" antialias="false" y2="18" end1="none" x2="10" length1="1.5" x1="10"/>
+        <circle x="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="15" antialias="true" y="0.5"/>
+        <circle x="-4.25" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8.5" antialias="true" y="3.75"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/coffret_de_repartition1.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/coffret_de_repartition1.elmt
index f84c15af0..927e7a5cd 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/coffret_de_repartition1.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/coffret_de_repartition1.elmt
@@ -1,28 +1,30 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="35" height="90" type="element" orientation="dyyy">
-<uuid uuid="{E7FF98AC-35A5-4303-B8EA-BF2D11D3B05B}"/><names>
-        <name lang="ar">مربع توزيع ب4 قنوات</name>
-        <name lang="de">Verteiler mit 4 Strängen</name>
-        <name lang="el">Κουτί διανομής 4 γραμμών</name>
-        <name lang="en">Assembly</name>
-        <name lang="it">Scatola di derivazione a 4 linee</name>
+<definition hotspot_x="14" hotspot_y="30" orientation="dyyy" height="80" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{f3a4f1a8-15c1-42d3-a478-ab336dba08ea}"/>
+    <names>
         <name lang="fr">Coffret de répartition avec 4 canalisations</name>
         <name lang="pl">Rozdzielnica</name>
         <name lang="cs">Rozvodna</name>
+        <name lang="ar">مربع توزيع ب4 قنوات</name>
+        <name lang="el">Κουτί διανομής 4 γραμμών</name>
+        <name lang="it">Scatola di derivazione a 4 linee</name>
+        <name lang="de">Verteiler mit 4 Strängen</name>
+        <name lang="en">Assembly</name>
         <name lang="nl">Verdeler</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="10" x="0" y="-25" antialias="false" height="70" 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="10" x1="-10" y2="10" x2="0"/>
-        <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="40" x1="10" y2="40" 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="20" x1="10" y2="20" 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="10" 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="-20" x1="10" y2="-20" x2="20"/>
-        <terminal x="20" y="20" orientation="e"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="20" y="-20" orientation="e"/>
-        <terminal x="-10" y="10" orientation="w"/>
-        <terminal x="20" y="40" orientation="e"/>
+        <input x="3" rotate="true" size="9" text="_" y="-39.45" tagg="label"/>
+        <rect x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="70" antialias="false" y="-25" width="10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="false" y2="10" end1="none" x2="0" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" antialias="false" y2="40" end1="none" x2="20" length1="1.5" x1="10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" antialias="false" y2="20" end1="none" x2="20" length1="1.5" x1="10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="20" length1="1.5" x1="10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" antialias="false" y2="-20" end1="none" x2="20" length1="1.5" x1="10"/>
+        <terminal x="-10" orientation="w" y="10"/>
+        <terminal x="20" orientation="e" y="40"/>
+        <terminal x="20" orientation="e" y="20"/>
+        <terminal x="20" orientation="e" y="0"/>
+        <terminal x="20" orientation="e" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/coffret_de_repartition2.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/coffret_de_repartition2.elmt
index 865041228..017c377fb 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/coffret_de_repartition2.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/coffret_de_repartition2.elmt
@@ -1,30 +1,32 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="35" height="90" type="element" orientation="dyyy">
-<uuid uuid="{8EB2870E-A524-4720-ADA6-350DF62A5EFF}"/><names>
-        <name lang="ar">صندوق توزيع</name>
-        <name lang="el">Κουτί διανομής</name>
-        <name lang="en">Assembly</name>
-        <name lang="de">Verteiler mit 4 Strängen</name>
-        <name lang="it">Scatola di derivazione</name>
+<definition hotspot_x="14" hotspot_y="30" orientation="dyyy" height="80" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{f86c2d2f-8a01-4868-9d1e-1c3422895206}"/>
+    <names>
         <name lang="fr">Coffret de repartition</name>
         <name lang="pl">Rozdzielnica</name>
         <name lang="cs">Rozvodna</name>
+        <name lang="ar">صندوق توزيع</name>
+        <name lang="el">Κουτί διανομής</name>
+        <name lang="it">Scatola di derivazione</name>
+        <name lang="en">Assembly</name>
+        <name lang="de">Verteiler mit 4 Strängen</name>
         <name lang="nl">Verdeler</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="-25" x1="-1" y2="45" x2="-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="-25" x1="1" y2="45" x2="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="-25" x1="0" y2="45" x2="0"/>
-        <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="-10" y2="10" x2="0"/>
-        <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="40" x1="0" y2="40" 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="20" x1="0" y2="20" 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="0" 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="-20" x1="0" y2="-20" x2="10"/>
-        <terminal x="10" y="20" orientation="e"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="-20" orientation="e"/>
-        <terminal x="-10" y="10" orientation="w"/>
-        <terminal x="10" y="40" orientation="e"/>
+        <input x="-7" rotate="true" size="9" text="_" y="-39.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" antialias="false" y2="45" end1="none" x2="-1" length1="1.5" x1="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" antialias="false" y2="45" end1="none" x2="1" length1="1.5" x1="1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" antialias="false" y2="45" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="false" y2="10" end1="none" x2="0" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" antialias="false" y2="40" end1="none" x2="10" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" antialias="false" y2="20" end1="none" x2="10" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="10" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" antialias="false" y2="-20" end1="none" x2="10" length1="1.5" x1="0"/>
+        <terminal x="10" orientation="e" y="20"/>
+        <terminal x="10" orientation="e" y="0"/>
+        <terminal x="10" orientation="e" y="-20"/>
+        <terminal x="-10" orientation="w" y="10"/>
+        <terminal x="10" orientation="e" y="40"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/commutateur_pour_va_et_vient.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/commutateur_pour_va_et_vient.elmt
index c1881f969..029ad43e8 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/commutateur_pour_va_et_vient.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/commutateur_pour_va_et_vient.elmt
@@ -1,25 +1,27 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="40" type="element" orientation="dyyy">
-<uuid uuid="{3BD56152-7FBD-4E52-AFB4-131EB70D0E37}"/><names>
-        <name lang="ar">مُبدّل وسط سلّم</name>
-        <name lang="de">Kreuzschalter
-</name>
-        <name lang="el">Διακόπτης εναλλαγής μεσαίος</name>
-        <name lang="en">Intermediate switch
-</name>
-        <name lang="it">Invertitore</name>
+<definition hotspot_x="15" hotspot_y="15" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{5f86f892-3287-45b4-b8fa-10c1e88bf0c8}"/>
+    <names>
         <name lang="fr">Commutateur intermédiaire pour va-et-vient
 </name>
         <name lang="pl">Łącznik krzyżowy</name>
         <name lang="cs">Křížový přepínač</name>
+        <name lang="ar">مُبدّل وسط سلّم</name>
+        <name lang="el">Διακόπτης εναλλαγής μεσαίος</name>
+        <name lang="it">Invertitore</name>
+        <name lang="de">Kreuzschalter
+</name>
+        <name lang="en">Intermediate switch
+</name>
         <name lang="nl">Kruisschakelaar</name>
     </names>
     <informations>EN 60617: 11-14-07</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="-2" y2="20" x2="-9" y3="18" x3="-12"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="2" y2="20" x2="9" y3="18" x3="12"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-2" y2="-11" x2="-9" y3="-9" x3="-12"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="2" y2="-11" x2="9" y3="-9" x3="12"/>
-        <circle x="-5" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <input x="-2" rotate="true" size="9" text="_" y="-24.45" tagg="label"/>
+        <polygon y3="18" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="true" closed="false" y2="20" x3="-12" x2="-9" x1="-2"/>
+        <polygon y3="18" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="true" closed="false" y2="20" x3="12" x2="9" x1="2"/>
+        <polygon y3="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" closed="false" y2="-11" x3="-12" x2="-9" x1="-2"/>
+        <polygon y3="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" closed="false" y2="-11" x3="12" x2="9" x1="2"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="0"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/commutateur_unipolaire.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/commutateur_unipolaire.elmt
index 26f0e4161..d7e0f2890 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/commutateur_unipolaire.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/commutateur_unipolaire.elmt
@@ -1,20 +1,22 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{D1442560-82A2-4142-AD83-35FFA084AC9B}"/><names>
-        <name lang="ar">مُبدّل وحيد القطبية</name>
-        <name lang="de">Serienschalter einpolig</name>
-        <name lang="en">Two pole switch
-</name>
-        <name lang="it">Commutatore unipolare</name>
+<definition hotspot_x="15" hotspot_y="15" orientation="dyyy" height="30" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{44001fa9-7cba-4e01-866f-b76c04d4a8de}"/>
+    <names>
         <name lang="fr">Commutateur unipolaire</name>
         <name lang="pl">Łącznik grupowy</name>
         <name lang="cs">Sériový přepínač, jednopólový</name>
+        <name lang="ar">مُبدّل وحيد القطبية</name>
+        <name lang="it">Commutatore unipolare</name>
+        <name lang="de">Serienschalter einpolig</name>
+        <name lang="en">Two pole switch
+</name>
         <name lang="nl">Serieschakelaar</name>
     </names>
     <informations>EN 60617: 11-14-05</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-2" y2="-11" x2="-9" y3="-9" x3="-12"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="2" y2="-11" x2="9" y3="-9" x3="12"/>
-        <circle x="-5" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <polygon y3="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" closed="false" y2="-11" x3="-12" x2="-9" x1="-2"/>
+        <input x="3" rotate="true" size="9" text="_" y="4.55" tagg="label"/>
+        <polygon y3="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" closed="false" y2="-11" x3="12" x2="9" x1="2"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="0"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/connecteur.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/connecteur.elmt
index 761dbf5f4..3e52873ed 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/connecteur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/connecteur.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="5" height="30" type="element" orientation="dyyy">
-<uuid uuid="{70147BEE-0D80-42D0-88FE-C4E8D3100DD6}"/><names>
-        <name lang="ar">رابط</name>
-        <name lang="el">Σύνδεσμος</name>
-        <name lang="en">Connector</name>
-        <name lang="de">Stecker</name>
-        <name lang="it">Connettore</name>
+<definition hotspot_x="14" hotspot_y="10" orientation="dyyy" height="20" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{2bb8880f-16ae-4a25-b20b-49c4ea1afc07}"/>
+    <names>
         <name lang="fr">Connecteur</name>
         <name lang="pl">Złącze</name>
         <name lang="cs">Spojka</name>
+        <name lang="ar">رابط</name>
+        <name lang="el">Σύνδεσμος</name>
+        <name lang="it">Connettore</name>
+        <name lang="en">Connector</name>
+        <name lang="de">Stecker</name>
         <name lang="nl">Connector</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="10" y2="10" 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="10" x1="-10" y2="10" x2="0"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="0" y2="5" x2="10" y3="15" x3="10" y4="10"/>
-        <terminal x="-10" y="10" orientation="w"/>
-        <terminal x="20" y="10" orientation="e"/>
+        <input x="10" rotate="true" size="9" text="_" y="6.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="20" length1="1.5" x1="10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="0" length1="1.5" x1="-10"/>
+        <polygon y3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" closed="false" y2="-5" x3="10" x2="10" x4="0" x1="0" y4="0"/>
+        <terminal x="-10" orientation="w" y="0"/>
+        <terminal x="20" orientation="e" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/covered_isolated_ground_receptacle_11-13-0x_en60617.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/covered_isolated_ground_receptacle_11-13-0x_en60617.elmt
index f336d46a0..4e08460db 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/covered_isolated_ground_receptacle_11-13-0x_en60617.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/covered_isolated_ground_receptacle_11-13-0x_en60617.elmt
@@ -1,23 +1,25 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="50" type="element" orientation="dyyy">
-<uuid uuid="{E66F76BD-1BE8-4E30-9FA1-A836A9201DE1}"/><names>
-        <name lang="ar">قاعدة قابس تيّار (قدرة) بغطاء عازل  (EN 60617 11-13-0x)</name>
-        <name lang="de">Schutzkontaktsteckdose mit Abdeckung (EN 60617 11-13-0x)</name>
-        <name lang="el">Πρίζα με αγωγό προστασίας και κάλυμμα</name>
-        <name lang="en">covered isolated ground receptacle with  (EN 60617 11-13-0x)</name>
-        <name lang="it">Presa di corrente con contatto di protezione e coperchio (EN 60617 11-13-0x)</name>
+<definition hotspot_x="25" hotspot_y="16" orientation="dyyy" height="50" type="element" link_type="simple" width="50" version="0.5">
+    <uuid uuid="{061a6c63-7639-4196-bfde-674a4d040958}"/>
+    <names>
         <name lang="fr">Socle de prise de courant (puissance) avec volet d'obturation (EN 60617 11-13-0x)</name>
         <name lang="pl">Gniazdo wtykowe ze stykiem ochronnym i z pokrywą</name>
         <name lang="cs">Krytá izolovaná zásuvka (EN 60617 11-13-0x)</name>
+        <name lang="ar">قاعدة قابس تيّار (قدرة) بغطاء عازل  (EN 60617 11-13-0x)</name>
+        <name lang="el">Πρίζα με αγωγό προστασίας και κάλυμμα</name>
+        <name lang="it">Presa di corrente con contatto di protezione e coperchio (EN 60617 11-13-0x)</name>
+        <name lang="de">Schutzkontaktsteckdose mit Abdeckung (EN 60617 11-13-0x)</name>
+        <name lang="en">covered isolated ground receptacle with  (EN 60617 11-13-0x)</name>
         <name lang="nl">contactdoos randaarde deksel</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="20" x1="20" y2="20" x2="10"/>
-        <arc width="20" x="-10" y="9.5" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="8" x1="0" y2="-7" x2="0"/>
-        <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="9" x1="-10" y2="9" 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="20" x1="-10" y2="20" x2="-20"/>
-        <terminal x="0" y="-10" orientation="n"/>
+        <input x="5" rotate="true" size="9" text="_" y="-5.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" antialias="false" y2="20" end1="none" x2="10" length1="1.5" x1="20"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="9.5" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" antialias="false" y2="-7" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" antialias="false" y2="9" end1="none" x2="10" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" antialias="false" y2="20" end1="none" x2="-20" length1="1.5" x1="-10"/>
+        <terminal x="0" orientation="n" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/eclairage1.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/eclairage1.elmt
index a0e24371b..d7b46e0d0 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/eclairage1.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/eclairage1.elmt
@@ -1,20 +1,22 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="30" type="element" orientation="dnny">
-<uuid uuid="{6816209E-9558-4E17-92D2-9E4E09BCD36B}"/><names>
-        <name lang="ar">نقطة إنتظار لجهاز إضاءة حائطي</name>
-        <name lang="de">Leuchtenauslaß auf Putz</name>
-        <name lang="en">Lighting outlet on wall The symbol is shown with wiring from the left</name>
-        <name lang="it">Punto luce a parete. Il segno è rappresentato con conduttura proveniente da sinistra.</name>
+<definition hotspot_x="17" hotspot_y="25" orientation="dyyy" height="30" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{8bd4db15-5b0a-4e46-bf7c-18d1c58aa7d2}"/>
+    <names>
         <name lang="fr">Point d'attente d'appareil d'éclairage en applique murale</name>
         <name lang="pl">Kinkiet</name>
         <name lang="cs">Zásuvka osvětlení na zdi Symbol je zobrazen s vedením zleva</name>
+        <name lang="ar">نقطة إنتظار لجهاز إضاءة حائطي</name>
+        <name lang="it">Punto luce a parete. Il segno è rappresentato con conduttura proveniente da sinistra.</name>
+        <name lang="de">Leuchtenauslaß auf Putz</name>
+        <name lang="en">Lighting outlet on wall The symbol is shown with wiring from the left</name>
         <name lang="nl">aansluitdoos in wand</name>
     </names>
     <informations>EN 60617: 11-15-02</informations>
     <description>
-        <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="-10" y2="-10" 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="-21" x1="17" y2="1" x2="17"/>
-        <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="-17.03" x1="17.03" y2="-2.97" x2="2.97"/>
-        <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="-17.03" x1="2.97" y2="-2.97" x2="17.03"/>
-        <terminal x="-10" y="-10" orientation="w"/>
+        <input x="-13" rotate="true" size="9" text="_" y="-21.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-10" end1="none" x2="10" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21" antialias="false" y2="1" end1="none" x2="17" length1="1.5" x1="17"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.03" antialias="false" y2="-2.97" end1="none" x2="2.97" length1="1.5" x1="17.03"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.03" antialias="false" y2="-2.97" end1="none" x2="17.03" length1="1.5" x1="2.97"/>
+        <terminal x="-10" orientation="w" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/eclairage2.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/eclairage2.elmt
index 4e8c25ad6..e240a761d 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/eclairage2.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/eclairage2.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="30" type="element" orientation="dnny">
-<uuid uuid="{35EC168F-4295-463B-812A-496613F70599}"/><names>
-        <name lang="ar">نقطة إنتظار لجهاز إضاءة</name>
-        <name lang="de">Leuchtenauslaß
-</name>
-        <name lang="en">Lighting outlet position
-</name>
-        <name lang="it">Punto luce</name>
+<definition hotspot_x="17" hotspot_y="0" orientation="dyyy" height="20" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{0dbc7739-3ef1-454d-984b-5356728b511b}"/>
+    <names>
         <name lang="fr">Point d'attente d'appareil d'éclairage
 </name>
         <name lang="pl">Wypust oświetleniowy</name>
         <name lang="cs">Umístění zásuvky osvětlení</name>
+        <name lang="ar">نقطة إنتظار لجهاز إضاءة</name>
+        <name lang="it">Punto luce</name>
+        <name lang="de">Leuchtenauslaß
+</name>
+        <name lang="en">Lighting outlet position
+</name>
         <name lang="nl">aansluitdoos licht</name>
     </names>
     <informations>EN 60617: 11-15-01</informations>
     <description>
-        <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="-10" y2="-10" 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="-17.03" x1="17.03" y2="-2.97" x2="2.97"/>
-        <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="-17.03" x1="2.97" y2="-2.97" x2="17.03"/>
-        <terminal x="-10" y="-10" orientation="w"/>
+        <input x="-12" rotate="true" size="9" text="_" y="-1.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="false" y2="10" end1="none" x2="10" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" antialias="false" y2="17.03" end1="none" x2="2.97" length1="1.5" x1="17.03"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.97" antialias="false" y2="17.03" end1="none" x2="17.03" length1="1.5" x1="2.97"/>
+        <terminal x="-10" orientation="w" y="10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/electrical_socket_11-13-01_en60617.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/electrical_socket_11-13-01_en60617.elmt
index 07bae3a7d..b1b8c12e1 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/electrical_socket_11-13-01_en60617.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/electrical_socket_11-13-01_en60617.elmt
@@ -1,20 +1,22 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="50" type="element" orientation="dyyy">
-<uuid uuid="{1DB59A64-5122-4A5E-A1B7-6AFA5F461049}"/><names>
-        <name lang="ar">قاعدة قابس تيّار (قدرة ) , رمز عام  (EN 60617 11-13-01)</name>
-        <name lang="de">Steckdose allgemein (EN 60617 11-13-01)</name>
-        <name lang="el">Ρευματοδότης  (EN 60617: 11-13-01)</name>
-        <name lang="en">electrical socket (EN 60617 11-13-01)</name>
-        <name lang="it">Presa di corrente (EN 60617 11-13-01)</name>
+<definition hotspot_x="15" hotspot_y="18" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{b3158290-ee31-4b4e-8aec-83e20e09498a}"/>
+    <names>
         <name lang="fr">Socle de prise de courant (puissance), symbole general (EN 60617 11-13-01)</name>
         <name lang="pl">Gniazdo wtykowe (EN 60617: 11-13-01)</name>
         <name lang="cs">Elektrická zásuvka, obecný symbol (EN 60617 11-13-01)</name>
+        <name lang="ar">قاعدة قابس تيّار (قدرة ) , رمز عام  (EN 60617 11-13-01)</name>
+        <name lang="el">Ρευματοδότης  (EN 60617: 11-13-01)</name>
+        <name lang="it">Presa di corrente (EN 60617 11-13-01)</name>
+        <name lang="de">Steckdose allgemein (EN 60617 11-13-01)</name>
+        <name lang="en">electrical socket (EN 60617 11-13-01)</name>
         <name lang="nl">wandcontactdoos algemeen (EN 60617 11-13-01)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="20" x="-10" y="7.5" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="7" x1="0" y2="-8" x2="0"/>
-        <terminal x="0" y="-13" orientation="n"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="7.5" angle="-180" width="20"/>
+        <input x="3" rotate="true" size="9" text="_" y="-4.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" antialias="false" y2="-8" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-13"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/gache_electrique.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/gache_electrique.elmt
index 71e832a64..e268c260b 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/gache_electrique.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/gache_electrique.elmt
@@ -1,21 +1,23 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="30" height="30" type="element" orientation="dyyy">
-<uuid uuid="{E126F40D-33EB-4477-A330-111A5694D464}"/><names>
-        <name lang="ar">قفل كهربائي</name>
-        <name lang="de">Türöffner</name>
-        <name lang="el">Ηλεκτρική κλειδαριά</name>
-        <name lang="en">Electric lock</name>
-        <name lang="it">Serratura elettrica</name>
+<definition hotspot_x="15" hotspot_y="6" orientation="dyyy" height="20" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{c008c558-6460-4fae-81d0-4bbe68ceb2ca}"/>
+    <names>
         <name lang="fr">Gâche électrique</name>
         <name lang="pl">Zamek elektryczny</name>
         <name lang="cs">Elektrický zámek</name>
+        <name lang="ar">قفل كهربائي</name>
+        <name lang="el">Ηλεκτρική κλειδαριά</name>
+        <name lang="it">Serratura elettrica</name>
+        <name lang="de">Türöffner</name>
+        <name lang="en">Electric lock</name>
         <name lang="nl">Electrisch slot</name>
     </names>
     <informations>EN 60617: 11-16-04</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="10" y2="-10" x2="20" y3="-20" x3="10"/>
-        <rect width="20" x="-10" y="-20" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="5" x="-5" y="-16.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="5" x="0" y="-16.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <input x="-10" rotate="true" size="9" text="_" y="10.55" tagg="label"/>
+        <polygon y3="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="true" y2="10" x3="10" x2="20" x1="10"/>
+        <rect x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="10" antialias="false" y="0" width="20"/>
+        <arc x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="true" start="-180" y="3.5" angle="-180" width="5"/>
+        <arc x="0" style="line-style:normal;line-weight:normal;filling:none;color:black" height="5" antialias="true" start="-180" y="3.5" angle="-180" width="5"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/horloge_pointage.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/horloge_pointage.elmt
index 6e9f8debe..79f2ad369 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/horloge_pointage.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/horloge_pointage.elmt
@@ -1,21 +1,23 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{DFD6D2E6-67C7-43A5-82F8-631BE76937F8}"/><names>
-        <name lang="ar">ساعة تسجيل</name>
-        <name lang="de">Zeiterfassungsgerät</name>
-        <name lang="en">Time clock Time recorder</name>
-        <name lang="it">Orologio segna tempo</name>
+<definition hotspot_x="15" hotspot_y="26" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{d421de61-3a13-47ec-826e-f58dc87255d5}"/>
+    <names>
         <name lang="fr">Horloge de pointage, Enregistreur horaire</name>
         <name lang="pl">Zegar kontrolny</name>
         <name lang="cs">Docházkové kontrolní hodiny</name>
+        <name lang="ar">ساعة تسجيل</name>
+        <name lang="it">Orologio segna tempo</name>
+        <name lang="de">Zeiterfassungsgerät</name>
+        <name lang="en">Time clock Time recorder</name>
         <name lang="nl">Tijdrecorder klok</name>
     </names>
     <informations>EN 60617: 11-16-03</informations>
     <description>
-        <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="-5" y2="0" x2="0"/>
-        <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="0" y2="0" x2="0"/>
-        <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="-13" x1="-7" y2="-13" x2="7"/>
-        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
-        <rect width="20" x="-10" y="-20" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="10.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="0" length1="1.5" x1="-5"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" antialias="false" y2="0" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-13" end1="none" x2="7" length1="1.5" x1="-7"/>
+        <circle x="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14" antialias="true" y="-7"/>
+        <rect x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="30" antialias="false" y="-20" width="20"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interphone.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interphone.elmt
index e527c82e9..8b33a7453 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interphone.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interphone.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.3" hotspot_x="15" hotspot_y="30" height="40" type="element" orientation="dyyy">
-<uuid uuid="{DD57B677-2F58-420A-9850-A3277A22E344}"/><names>
-        <name lang="ar">هاتف داخلي</name>
-        <name lang="el">Ενδοεπικοινωνία</name>
-        <name lang="en">Audio intercommunication equipment</name>
-        <name lang="de">Gegensprechanlage</name>
-        <name lang="it">Interfono, citofono</name>
+<definition hotspot_x="7" hotspot_y="26" orientation="dyyy" height="30" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{9ec26e5f-e34e-4096-9e4b-f774ecde3649}"/>
+    <names>
         <name lang="fr">interphone</name>
         <name lang="pl">Domofon</name>
         <name lang="cs">Domácí telefon</name>
+        <name lang="ar">هاتف داخلي</name>
+        <name lang="el">Ενδοεπικοινωνία</name>
+        <name lang="it">Interfono, citofono</name>
+        <name lang="en">Audio intercommunication equipment</name>
+        <name lang="de">Gegensprechanlage</name>
         <name lang="nl">Audio communicatie</name>
     </names>
     <informations>EN 60617: 11-16-05</informations>
     <description>
-        <line length1="1" length2="1" antialias="false" end1="triangle" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-10" x1="20" y2="-10" 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="-6" x1="15" y2="-1" x2="24"/>
-        <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="-14" x1="15" y2="-19" x2="24"/>
-        <rect width="4" x="11" y="-14" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-5" y="-20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="10" y="-20" orientation="n"/>
+        <line end2="triangle" length2="1" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-10" antialias="false" y2="-10" end1="triangle" x2="30" length1="1" x1="20"/>
+        <input x="1" rotate="true" size="9" text="_" y="0.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" antialias="true" y2="-1" end1="none" x2="24" length1="1.5" x1="15"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" antialias="true" y2="-19" end1="none" x2="24" length1="1.5" x1="15"/>
+        <rect x="11" style="line-style:normal;line-weight:normal;filling:none;color:black" height="8" antialias="false" y="-14" width="4"/>
+        <rect x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="false" y="-20" width="30"/>
+        <terminal x="10" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur.elmt
index 6d4a4a560..2faec7743 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur.elmt
@@ -1,19 +1,21 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{AF737DA8-BBE0-47A0-8A2A-9EAD1BDF0E88}"/><names>
-        <name lang="ar">مفتاح</name>
-        <name lang="de">Schalter</name>
-        <name lang="el">Διακόπτης</name>
-        <name lang="en"> Switch</name>
-        <name lang="it">Interruttore</name>
+<definition hotspot_x="8" hotspot_y="15" orientation="dyyy" height="30" type="element" link_type="simple" width="20" version="0.5">
+    <uuid uuid="{df5f5a4a-4a6f-49fc-9bd9-c91f22eb7113}"/>
+    <names>
         <name lang="fr">Interrupteur,</name>
         <name lang="pl">Łącznik, symbol ogólny</name>
         <name lang="cs">Spínač</name>
+        <name lang="ar">مفتاح</name>
+        <name lang="el">Διακόπτης</name>
+        <name lang="it">Interruttore</name>
+        <name lang="de">Schalter</name>
+        <name lang="en"> Switch</name>
         <name lang="nl">Schakelaar</name>
     </names>
     <informations>EN 60617: 11-14-01</informations>
     <description>
-        <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="0" x1="2" y2="-11" x2="9"/>
-        <circle x="-5" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" y2="-11" end1="none" x2="9" length1="1.5" x1="2"/>
+        <input x="3" rotate="true" size="9" text="_" y="2.55" tagg="label"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="0"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_a_lampe_temoin.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_a_lampe_temoin.elmt
index be23aa62d..c6bfba062 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_a_lampe_temoin.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_a_lampe_temoin.elmt
@@ -1,24 +1,26 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{B4E1CBB3-5173-40EA-AE8A-1900AC92432A}"/><names>
-        <name lang="ar">مفتاح بمُؤشر ضوئي</name>
-        <name lang="de">Schalter mit Kontrolleuchte
-</name>
-        <name lang="el">Διακόπτης φωτιζόμενος</name>
-        <name lang="en">Switch with pilot light
-</name>
-        <name lang="it">Interruttore con lampada spia</name>
+<definition hotspot_x="8" hotspot_y="15" orientation="dyyy" height="30" type="element" link_type="simple" width="20" version="0.5">
+    <uuid uuid="{7a08ba8c-4628-4bf5-b2bb-898b4a32a81b}"/>
+    <names>
         <name lang="fr">Interrupteur à lampe témoin
 </name>
         <name lang="pl">Łącznik podświetlany</name>
         <name lang="cs">Spínač s kontrolním světlem</name>
+        <name lang="ar">مفتاح بمُؤشر ضوئي</name>
+        <name lang="el">Διακόπτης φωτιζόμενος</name>
+        <name lang="it">Interruttore con lampada spia</name>
+        <name lang="de">Schalter mit Kontrolleuchte
+</name>
+        <name lang="en">Switch with pilot light
+</name>
         <name lang="nl">Schakelaar met lamp</name>
     </names>
     <informations>EN 60617: 11-14-02</informations>
     <description>
-        <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="8" x1="-3" y2="2" x2="3"/>
-        <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="8" x1="3" y2="2" x2="-3"/>
-        <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="0" x1="2" y2="-11" x2="9"/>
-        <circle x="-5" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" antialias="true" y2="2" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <input x="5" rotate="true" size="9" text="_" y="2.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" antialias="true" y2="2" end1="none" x2="-3" length1="1.5" x1="3"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" y2="-11" end1="none" x2="9" length1="1.5" x1="2"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="0"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_a_temps_de_fermeture_limite.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_a_temps_de_fermeture_limite.elmt
index bca1ed6a7..3ea05c501 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_a_temps_de_fermeture_limite.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_a_temps_de_fermeture_limite.elmt
@@ -1,23 +1,25 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{FC0009F2-D2BA-4B98-B7BB-25D44EFFACD3}"/><names>
-        <name lang="ar">مفتاح بزمن غلق محدود أحادي القطب</name>
-        <name lang="de">Zeitschalter einpolig
-</name>
-        <name lang="en"> Period limiting switch, single pole
-</name>
-        <name lang="it">Interruttore unipolare a tempo di chiusura limitato</name>
+<definition hotspot_x="11" hotspot_y="16" orientation="dyyy" height="30" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{1cca41c5-8f21-4c3d-80ef-946193713c58}"/>
+    <names>
         <name lang="fr">Interrupteur à temps de fermeture limité,
 unipolaire
 </name>
         <name lang="pl">Łącznik z ograniczonym czasem zamknięcia</name>
         <name lang="cs">Jednopólový časový spínač</name>
+        <name lang="ar">مفتاح بزمن غلق محدود أحادي القطب</name>
+        <name lang="it">Interruttore unipolare a tempo di chiusura limitato</name>
+        <name lang="de">Zeitschalter einpolig
+</name>
+        <name lang="en"> Period limiting switch, single pole
+</name>
         <name lang="nl">Schakelaar tijd</name>
     </names>
     <informations>EN 60617: 11-14-03</informations>
     <description>
-        <text x="8" y="-3" size="5" text="t"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="2" y2="-11" x2="9" y3="-9" x3="12"/>
-        <circle x="-5" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <input x="5" rotate="true" size="9" text="_" y="1.55" tagg="label"/>
+        <text x="8" size="5" text="t" y="-3"/>
+        <polygon y3="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" closed="false" y2="-11" x3="12" x2="9" x1="2"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="0"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_bipolaire.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_bipolaire.elmt
index 1bdb1ae70..0c8de908e 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_bipolaire.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_bipolaire.elmt
@@ -1,23 +1,25 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{192E371D-DAD2-4B30-A096-DD6F14C858DA}"/><names>
-        <name lang="ar">مفتاح ثنائي القطبيّة</name>
-        <name lang="de">Schalter 2-polig
-</name>
-        <name lang="el">Διπλός Διακόπτης</name>
-        <name lang="en">Two pole switch
-</name>
-        <name lang="it">Interruttore bipolare</name>
+<definition hotspot_x="11" hotspot_y="15" orientation="dyyy" height="30" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{1e8a6846-8411-4c75-94b6-b322e159f6d8}"/>
+    <names>
         <name lang="fr">Interrupteur, bipolaire
 </name>
         <name lang="pl">Łącznik dwubiegunowy</name>
         <name lang="cs">Dvoupólový spínač</name>
+        <name lang="ar">مفتاح ثنائي القطبيّة</name>
+        <name lang="el">Διπλός Διακόπτης</name>
+        <name lang="it">Interruttore bipolare</name>
+        <name lang="de">Schalter 2-polig
+</name>
+        <name lang="en">Two pole switch
+</name>
         <name lang="nl">Schakelaar (2)</name>
     </names>
     <informations>EN 60617: 11-14-04</informations>
     <description>
-        <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="7" y2="-6" x2="10"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="2" y2="-11" x2="9" y3="-9" x3="12"/>
-        <circle x="-5" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <input x="5" rotate="true" size="9" text="_" y="3.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" antialias="false" y2="-6" end1="none" x2="10" length1="1.5" x1="7"/>
+        <polygon y3="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" closed="false" y2="-11" x3="12" x2="9" x1="2"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="0"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_fin_de_course.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_fin_de_course.elmt
index b21bc8ee8..c4f786733 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_fin_de_course.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_fin_de_course.elmt
@@ -1,21 +1,23 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{4A6FEBF8-4571-497C-9DC0-1F7EAC807FD1}"/><names>
-        <name lang="ar">مفتاح نهاية مشوار</name>
-        <name lang="el">Τερματικός διακόπτης</name>
-        <name lang="en">Limit switch</name>
-        <name lang="de">Endschalter</name>
-        <name lang="it">Interruttore fine corsa</name>
+<definition hotspot_x="7" hotspot_y="16" orientation="dyyy" height="30" type="element" link_type="simple" width="20" version="0.5">
+    <uuid uuid="{0c564c48-bd72-4d4a-965c-ed9086012af8}"/>
+    <names>
         <name lang="fr">Interrupteur fin de course</name>
         <name lang="pl">Łącznik krańcowy</name>
         <name lang="cs">Koncový spínač</name>
+        <name lang="ar">مفتاح نهاية مشوار</name>
+        <name lang="el">Τερματικός διακόπτης</name>
+        <name lang="it">Interruttore fine corsa</name>
+        <name lang="en">Limit switch</name>
+        <name lang="de">Endschalter</name>
         <name lang="nl">Eindschakelaar</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="0" x1="2" y2="-9" x2="8"/>
-        <circle x="7.75" y="-12.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5"/>
-        <circle x="-5" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" y2="-9" end1="none" x2="8" length1="1.5" x1="2"/>
+        <input x="5" rotate="true" size="9" text="_" y="1.55" tagg="label"/>
+        <circle x="7.75" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5" antialias="true" y="-12.75"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="0"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_gradateur.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_gradateur.elmt
index 5613a158f..600eeb225 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_gradateur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_gradateur.elmt
@@ -1,20 +1,22 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{94F1602F-5AB6-4FFB-83C2-166FFD9D89C2}"/><names>
-        <name lang="ar">مفتاح حاكم جهد</name>
-        <name lang="de">Dimmer</name>
-        <name lang="el">Ρυθμιζόμενος διακόπτης (dimmer)</name>
-        <name lang="en">Dimmer</name>
-        <name lang="it">Variatore (dimmer)</name>
+<definition hotspot_x="8" hotspot_y="14" orientation="dyyy" height="30" type="element" link_type="simple" width="20" version="0.5">
+    <uuid uuid="{145515ad-34a2-4366-85de-131d4a0ce6fb}"/>
+    <names>
         <name lang="fr">Interrupteur gradateur</name>
         <name lang="pl">Ściemniacz</name>
         <name lang="cs">Reostat</name>
+        <name lang="ar">مفتاح حاكم جهد</name>
+        <name lang="el">Ρυθμιζόμενος διακόπτης (dimmer)</name>
+        <name lang="it">Variatore (dimmer)</name>
+        <name lang="de">Dimmer</name>
+        <name lang="en">Dimmer</name>
         <name lang="nl">Dimmer</name>
     </names>
     <informations>EN 60617: 11-14-08</informations>
     <description>
-        <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="0" x1="2" y2="-9" x2="8"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-3" x1="0" y2="-3" x2="9" y3="-7" x3="9" y4="-3"/>
-        <circle x="-5" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <input x="4" rotate="true" size="9" text="_" y="0.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" y2="-9" end1="none" x2="8" length1="1.5" x1="2"/>
+        <polygon y3="-7" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" antialias="true" closed="false" y2="-3" x3="9" x2="9" x4="0" x1="0" y4="-3"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="0"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_horaire.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_horaire.elmt
index fe31f9522..c7ffe26bb 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_horaire.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_horaire.elmt
@@ -1,26 +1,28 @@
-<definition width="70" version="0.3" hotspot_x="15" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{FFB6AF27-4DC1-47F7-8B5F-AAE72EC6B341}"/><names>
-        <name lang="ar">مفتاح زمني</name>
-        <name lang="de">Schaltuhr
-</name>
-        <name lang="el">Χρονοδιακόπτης</name>
-        <name lang="en">Time switch
-</name>
-        <name lang="it">Interruttore orario</name>
+<definition hotspot_x="15" hotspot_y="26" orientation="dyyy" height="40" type="element" link_type="simple" width="70" version="0.5">
+    <uuid uuid="{28f0b616-c54a-4dd1-b341-ea9ddff8abb5}"/>
+    <names>
         <name lang="fr">Interrupteur horaire
 </name>
         <name lang="pl">Łącznik zegarowy</name>
         <name lang="cs">Časový spínač - spínací hodiny</name>
+        <name lang="ar">مفتاح زمني</name>
+        <name lang="el">Χρονοδιακόπτης</name>
+        <name lang="it">Interruttore orario</name>
+        <name lang="de">Schaltuhr
+</name>
+        <name lang="en">Time switch
+</name>
         <name lang="nl">Schakelklok</name>
     </names>
     <informations>PN-EN 60617: 11-14-14</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="42" y2="-5" x2="37" y3="-2" x3="23"/>
-        <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="23" y2="-5" x2="18"/>
-        <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="0" y2="-5" x2="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="-10" x1="5" y2="-5" x2="5"/>
-        <rect width="60" x="-10" y="-20" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-2" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14"/>
-        <terminal x="20" y="-20" orientation="n"/>
+        <input x="11" rotate="true" size="9" text="_" y="10.55" tagg="label"/>
+        <polygon y3="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" antialias="true" closed="false" y2="-5" x3="23" x2="37" x1="42"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" antialias="false" y2="-5" end1="none" x2="18" length1="1.5" x1="23"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" antialias="false" y2="-5" end1="none" x2="5" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-5" end1="none" x2="5" length1="1.5" x1="5"/>
+        <rect x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="30" antialias="false" y="-20" width="60"/>
+        <circle x="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="14" antialias="true" y="-12"/>
+        <terminal x="20" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_tripolaire.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_tripolaire.elmt
index dda8ed82e..443d9ae52 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_tripolaire.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_tripolaire.elmt
@@ -1,22 +1,24 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="15" height="20" type="element" orientation="dyyy">
-<uuid uuid="{C57448C5-CADB-4F7D-8923-C6ACB142A502}"/><names>
-        <name lang="ar">مفتاح ثلاثي الأقطاب</name>
-        <name lang="el">Τριπλός διακόπτης</name>
-        <name lang="en">Switch 3 pole</name>
-        <name lang="de">Schalter 3-polig</name>
-        <name lang="it">Interruttore tripolare</name>
+<definition hotspot_x="5" hotspot_y="13" orientation="dyyy" height="20" type="element" link_type="simple" width="20" version="0.5">
+    <uuid uuid="{2d125d1b-fe2f-4b0b-abac-9f1183011797}"/>
+    <names>
         <name lang="fr">Interrupteur tripolaire</name>
         <name lang="pl">Łącznik trójbiegunowy</name>
         <name lang="cs">Třípólový spínač</name>
+        <name lang="ar">مفتاح ثلاثي الأقطاب</name>
+        <name lang="el">Τριπλός διακόπτης</name>
+        <name lang="it">Interruttore tripolare</name>
+        <name lang="en">Switch 3 pole</name>
+        <name lang="de">Schalter 3-polig</name>
         <name lang="nl">Schakelaar (3)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="-6" x1="6" y2="-4" x2="8"/>
-        <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="8" y2="-6" x2="10"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-2" x1="2" y2="-10" x2="10" y3="-8" x3="12"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="0" y="-3" orientation="n"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" antialias="false" y2="-4" end1="none" x2="8" length1="1.5" x1="6"/>
+        <input x="0" rotate="true" size="9" text="_" y="-0.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" antialias="false" y2="-6" end1="none" x2="10" length1="1.5" x1="8"/>
+        <polygon y3="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" antialias="false" closed="false" y2="-10" x3="12" x2="10" x1="2"/>
+        <circle x="-2.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" antialias="true" y="-2.5"/>
+        <terminal x="0" orientation="n" y="-3"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire.elmt
index c9aec1112..2475eb0bf 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire.elmt
@@ -1,20 +1,22 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="15" height="20" type="element" orientation="dyyy">
-<uuid uuid="{70370297-7A6F-4C7B-9C8D-73F103CF54C7}"/><names>
-        <name lang="ar">مفتاح أحادي القطب</name>
-        <name lang="el">Μονός διακόπτης</name>
-        <name lang="en">Single pole switch</name>
-        <name lang="de">Schalter 1-polig</name>
-        <name lang="it">Interruttore unipolare</name>
+<definition hotspot_x="5" hotspot_y="13" orientation="dyyy" height="20" type="element" link_type="simple" width="20" version="0.5">
+    <uuid uuid="{be8a74c2-bddf-4195-aca2-9dba86970110}"/>
+    <names>
         <name lang="fr">Interrupteur unipolaire</name>
         <name lang="pl">Łącznik jednobiegunowy</name>
         <name lang="cs">Jednopólový spínač</name>
+        <name lang="ar">مفتاح أحادي القطب</name>
+        <name lang="el">Μονός διακόπτης</name>
+        <name lang="it">Interruttore unipolare</name>
+        <name lang="en">Single pole switch</name>
+        <name lang="de">Schalter 1-polig</name>
         <name lang="nl">Schakelaar (1)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-2" x1="2" y2="-10" x2="10" y3="-8" x3="12"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="0" y="-3" orientation="n"/>
+        <polygon y3="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" antialias="false" closed="false" y2="-10" x3="12" x2="10" x1="2"/>
+        <input x="2" rotate="true" size="9" text="_" y="-2.45" tagg="label"/>
+        <circle x="-2.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5" antialias="true" y="-2.5"/>
+        <terminal x="0" orientation="n" y="-3"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire_a_tirette.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire_a_tirette.elmt
index d2d4f6495..a18fcea60 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire_a_tirette.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire_a_tirette.elmt
@@ -1,20 +1,22 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="15" height="30" type="element" orientation="dyyy">
-<uuid uuid="{06AED867-365C-4EFF-A14D-5FD51C3E269C}"/><names>
-        <name lang="ar">مفتاح أحادي القطب بسحّاب</name>
-        <name lang="de">Schalter 1-polig mit Zugschnur</name>
-        <name lang="el">Διακόπτης έλξης με κορδόνι</name>
-        <name lang="en">Pull-cord single pole switch</name>
-        <name lang="it">Interruttore unipolare a tirante</name>
+<definition hotspot_x="11" hotspot_y="15" orientation="dyyy" height="30" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{f00baca5-dcd0-41cd-8361-018bb7df074c}"/>
+    <names>
         <name lang="fr">Interrupteur unipolaire à tirette</name>
         <name lang="pl">Łącznik pociągany</name>
         <name lang="cs">Tahací jednopólový vypínač</name>
+        <name lang="ar">مفتاح أحادي القطب بسحّاب</name>
+        <name lang="el">Διακόπτης έλξης με κορδόνι</name>
+        <name lang="it">Interruttore unipolare a tirante</name>
+        <name lang="de">Schalter 1-polig mit Zugschnur</name>
+        <name lang="en">Pull-cord single pole switch</name>
         <name lang="nl">Schakelaar met trekkoord</name>
     </names>
     <informations>EN 60617: 11-14-09</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="2" y2="-11" x2="9" y3="-9" x3="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="9" y2="-5" x2="9"/>
-        <circle x="-5" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="0" orientation="n"/>
+        <input x="3" rotate="true" size="9" text="_" y="1.55" tagg="label"/>
+        <polygon y3="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="true" closed="false" y2="-11" x3="12" x2="9" x1="2"/>
+        <line end2="simple" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" antialias="false" y2="-5" end1="none" x2="9" length1="1.5" x1="9"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="0"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire_va_et_vient.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire_va_et_vient.elmt
index 868ab3487..3c54834c6 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire_va_et_vient.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/interrupteur_unipolaire_va_et_vient.elmt
@@ -1,23 +1,25 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="15" height="50" type="element" orientation="dyyy">
-<uuid uuid="{5699D1A1-AF0F-4454-9603-09EAB65FA789}"/><names>
-        <name lang="ar">مفتاح أحادي القطب (مبدّل طرف سلم)</name>
-        <name lang="de">Serienschalter 1-polig
-</name>
-        <name lang="el">Διακόπτης εναλλαγής (αλέ-ρετούρ)</name>
-        <name lang="en">Two-way single pole switch
-</name>
-        <name lang="it">Deviatore unipolare</name>
+<definition hotspot_x="15" hotspot_y="5" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{e8b0f573-7432-48a1-8a5e-df59cf14c61c}"/>
+    <names>
         <name lang="fr">Interrupteur unipolaire va-et-vient
 </name>
         <name lang="pl">Łącznik schodowy</name>
         <name lang="cs">Schodišťový jednopólový vypínač</name>
+        <name lang="ar">مفتاح أحادي القطب (مبدّل طرف سلم)</name>
+        <name lang="el">Διακόπτης εναλλαγής (αλέ-ρετούρ)</name>
+        <name lang="it">Deviatore unipolare</name>
+        <name lang="de">Serienschalter 1-polig
+</name>
+        <name lang="en">Two-way single pole switch
+</name>
         <name lang="nl">Serieschakelaar (1)</name>
     </names>
     <informations>EN 60617: 11-14-06</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-2" y2="30" x2="-9" y3="28" x3="-12"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="2" y2="-1" x2="9" y3="1" x3="12"/>
-        <circle x="-5" y="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <terminal x="0" y="10" orientation="n"/>
+        <input x="5" rotate="true" size="9" text="_" y="13.55" tagg="label"/>
+        <polygon y3="28" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" antialias="true" closed="false" y2="30" x3="-12" x2="-9" x1="-2"/>
+        <polygon y3="1" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="true" closed="false" y2="-1" x3="12" x2="9" x1="2"/>
+        <circle x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10" antialias="true" y="10"/>
+        <terminal x="0" orientation="n" y="10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/isolated_ground_receptacle_11-13-04_en60617.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/isolated_ground_receptacle_11-13-04_en60617.elmt
index 6d9a2371d..2ff108582 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/isolated_ground_receptacle_11-13-04_en60617.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/isolated_ground_receptacle_11-13-04_en60617.elmt
@@ -1,21 +1,23 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="50" type="element" orientation="dyyy">
-<uuid uuid="{76AC9E0E-B499-43E7-9E44-6F6F96562AC0}"/><names>
-        <name lang="ar">قاعدة قابس تيّار (قدرة) بحماية  (EN 60617 11-13-04)</name>
-        <name lang="de">Schutzkontaktsteckdose allgemein (EN 60617 11-13-04)</name>
-        <name lang="el">Πρίζα με αγωγό προστασίας</name>
-        <name lang="en">isolated ground receptacle (EN 60617 11-13-04)</name>
-        <name lang="it">Presa con contatto per conduttore di protezione</name>
+<definition hotspot_x="15" hotspot_y="15" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{c76f16d8-944c-4856-a957-3779ed09180e}"/>
+    <names>
         <name lang="fr">Socle de prise de courant (puissance) avec contact pour conducteur de protection (EN 60617 11-13-04)</name>
         <name lang="pl">Gniazdo pojedyncze ze stykiem ochronnym (EN 60617: 11-13-04)</name>
         <name lang="cs">Zdířková zásuvka s ochranným kontaktem</name>
+        <name lang="ar">قاعدة قابس تيّار (قدرة) بحماية  (EN 60617 11-13-04)</name>
+        <name lang="el">Πρίζα με αγωγό προστασίας</name>
+        <name lang="it">Presa con contatto per conduttore di protezione</name>
+        <name lang="de">Schutzkontaktsteckdose allgemein (EN 60617 11-13-04)</name>
+        <name lang="en">isolated ground receptacle (EN 60617 11-13-04)</name>
         <name lang="nl">Wandcontactdoos randaarde</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <arc width="20" x="-10" y="10.5" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="10" x1="0" y2="-5" x2="0"/>
-        <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="-10" y2="10" x2="10"/>
-        <terminal x="0" y="-10" orientation="n"/>
+        <input x="8" rotate="true" size="9" text="_" y="-4.45" tagg="label"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="10.5" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="false" y2="-5" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="false" y2="10" end1="none" x2="10" length1="1.5" x1="-10"/>
+        <terminal x="0" orientation="n" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/lampe_a_fluorescence.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/lampe_a_fluorescence.elmt
index 5ad6f4981..9eb557289 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/lampe_a_fluorescence.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/lampe_a_fluorescence.elmt
@@ -1,20 +1,22 @@
-<definition width="70" version="0.3" hotspot_x="5" hotspot_y="20" height="20" type="element" orientation="dyyy">
-<uuid uuid="{F311AB97-04E8-4BCC-A287-F31CFF811D6F}"/><names>
-        <name lang="ar">مصباح فليوريسنت</name>
-        <name lang="de">Leuchtstofflampe</name>
-        <name lang="el">Λάμπα φθορισμού</name>
-        <name lang="en"> Fluorescent lamp</name>
-        <name lang="it">Lampada fluorescente, segno generale</name>
+<definition hotspot_x="35" hotspot_y="8" orientation="dyyy" height="20" type="element" link_type="simple" width="70" version="0.5">
+    <uuid uuid="{216019da-3a0d-4079-babb-b89e3b2d7ba0}"/>
+    <names>
         <name lang="fr">Lampe à fluorescence</name>
         <name lang="pl">Świetlówka</name>
         <name lang="cs">Zářivka</name>
+        <name lang="ar">مصباح فليوريسنت</name>
+        <name lang="el">Λάμπα φθορισμού</name>
+        <name lang="it">Lampada fluorescente, segno generale</name>
+        <name lang="de">Leuchtstofflampe</name>
+        <name lang="en"> Fluorescent lamp</name>
         <name lang="nl">TL lamp</name>
     </names>
     <informations>EN 60617: 11-15-04</informations>
     <description>
-        <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="-13" x1="0" y2="-7" x2="0"/>
-        <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="-13" x1="60" y2="-7" x2="60"/>
-        <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="0" y2="-10" x2="60"/>
-        <terminal x="30" y="-10" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="-9.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" antialias="false" y2="3" end1="none" x2="-30" length1="1.5" x1="-30"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" antialias="false" y2="3" end1="none" x2="30" length1="1.5" x1="30"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="30" length1="1.5" x1="-30"/>
+        <terminal x="0" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/luminaire3.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/luminaire3.elmt
index 887d6cbfe..e18007182 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/luminaire3.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/luminaire3.elmt
@@ -1,26 +1,28 @@
-<definition width="70" version="0.3" hotspot_x="5" hotspot_y="20" height="40" type="element" orientation="dyyy">
-<uuid uuid="{9E600111-EC91-4B02-AE84-E3EEB4CF9034}"/><names>
-        <name lang="ar">جهاز إضاءة بثلاث مصابيح فليورسنت</name>
-        <name lang="de">Leuchte mit drei Leuchtstofflampen
-</name>
-        <name lang="el">Φωτιστικό με 3 λάμπες φθορισμού</name>
-        <name lang="en"> Luminaire with three fluorescent
-tubes
-</name>
-        <name lang="it">Lampada a tre tubi fluorescenti</name>
+<definition hotspot_x="5" hotspot_y="15" orientation="dyyy" height="30" type="element" link_type="simple" width="70" version="0.5">
+    <uuid uuid="{c36a7cb4-e5c0-40fb-ad24-a6b556daa745}"/>
+    <names>
         <name lang="fr">Luminaire à trois tubes fluorescents
 </name>
         <name lang="pl">Oprawa zawierająca 3 świetlówki</name>
         <name lang="cs">Světlo se třemi zářivkami</name>
+        <name lang="ar">جهاز إضاءة بثلاث مصابيح فليورسنت</name>
+        <name lang="el">Φωτιστικό με 3 λάμπες φθορισμού</name>
+        <name lang="it">Lampada a tre tubi fluorescenti</name>
+        <name lang="de">Leuchte mit drei Leuchtstofflampen
+</name>
+        <name lang="en"> Luminaire with three fluorescent
+tubes
+</name>
         <name lang="nl">TL lamp 3 buizen</name>
     </names>
     <informations>EN 60617: 11-15-05</informations>
     <description>
-        <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="-13" x1="0" y2="13" x2="0"/>
-        <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="-13" x1="60" y2="13" x2="60"/>
-        <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="0" y2="-10" x2="60"/>
-        <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="0" y2="0" x2="60"/>
-        <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="0" y2="10" x2="60"/>
-        <terminal x="30" y="-10" orientation="n"/>
+        <input x="23" rotate="true" size="9" text="_" y="6.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="13" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="13" end1="none" x2="60" length1="1.5" x1="60"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-10" end1="none" x2="60" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="60" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="false" y2="10" end1="none" x2="60" length1="1.5" x1="0"/>
+        <terminal x="30" orientation="n" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/luminaire5.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/luminaire5.elmt
index 35d8f92e9..1ce929ba9 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/luminaire5.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/luminaire5.elmt
@@ -1,26 +1,28 @@
-<definition width="70" version="0.3" hotspot_x="5" hotspot_y="20" height="30" type="element" orientation="dyyy">
-<uuid uuid="{A065C653-18F4-47C6-8BC0-CBD907F8C277}"/><names>
-        <name lang="ar">جهاز إضاءة ب5 مصابيح فليورسنت</name>
-        <name lang="de">Leuchte mit 5 Leuchtstofflampen
-</name>
-        <name lang="el">Φωτιστικό με 5 λάμπες φθορισμού</name>
-        <name lang="en"> Luminaire with five fluorescent
-tubes
-</name>
-        <name lang="it">Lampada a 5 tubi fluorescenti</name>
+<definition hotspot_x="5" hotspot_y="8" orientation="dyyy" height="20" type="element" link_type="simple" width="70" version="0.5">
+    <uuid uuid="{69b9d074-e803-4715-a800-01e45bf78258}"/>
+    <names>
         <name lang="fr">Luminaire à cinq tubes fluorescents
 </name>
         <name lang="pl">Świetlówka</name>
         <name lang="cs">Světlo s pěti zářivkami</name>
+        <name lang="ar">جهاز إضاءة ب5 مصابيح فليورسنت</name>
+        <name lang="el">Φωτιστικό με 5 λάμπες φθορισμού</name>
+        <name lang="it">Lampada a 5 tubi fluorescenti</name>
+        <name lang="de">Leuchte mit 5 Leuchtstofflampen
+</name>
+        <name lang="en"> Luminaire with five fluorescent
+tubes
+</name>
         <name lang="nl">TL met x buizen</name>
     </names>
     <informations>EN 60617: 11-15-06</informations>
     <description>
-        <input x="30" y="-4.5" size="5" rotate="true" text="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="3" x1="27" y2="-3" x2="33"/>
-        <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="-3" x1="0" y2="3" x2="0"/>
-        <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="-3" x1="60" y2="3" x2="60"/>
-        <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="0" y2="0" x2="60"/>
-        <terminal x="30" y="0" orientation="n"/>
+        <input x="3" rotate="true" size="9" text="_" y="5.55" tagg="label"/>
+        <input x="30" rotate="true" size="5" text="5" y="-4.5" tagg="none"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" antialias="false" y2="-3" end1="none" x2="33" length1="1.5" x1="27"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" antialias="false" y2="3" end1="none" x2="0" length1="1.5" x1="0"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" antialias="false" y2="3" end1="none" x2="60" length1="1.5" x1="60"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="60" length1="1.5" x1="0"/>
+        <terminal x="30" orientation="n" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/minuterie.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/minuterie.elmt
index f867a17a5..3ef74cf6b 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/minuterie.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/minuterie.elmt
@@ -1,19 +1,21 @@
-<definition width="50" version="0.3" hotspot_x="15" hotspot_y="30" height="40" type="element" orientation="dyyy">
-<uuid uuid="{C20F31ED-7B0F-49A1-953F-F36179CE90A2}"/><names>
-        <name lang="ar">مُؤقت</name>
-        <name lang="de">Zeitrelais</name>
-        <name lang="el">Χρονικό</name>
-        <name lang="en">timer</name>
-        <name lang="it">Temporizzatore</name>
+<definition hotspot_x="15" hotspot_y="26" orientation="dyyy" height="30" type="element" link_type="simple" width="50" version="0.5">
+    <uuid uuid="{797eade4-d986-465f-942c-594d7e1f0f71}"/>
+    <names>
         <name lang="fr">Minuterie</name>
         <name lang="pl">Datownik czasu</name>
         <name lang="cs">Časový spínač</name>
+        <name lang="ar">مُؤقت</name>
+        <name lang="el">Χρονικό</name>
+        <name lang="it">Temporizzatore</name>
+        <name lang="de">Zeitrelais</name>
+        <name lang="en">timer</name>
         <name lang="nl">Tijdrelais</name>
     </names>
     <informations>EN 60617: 11-14-13</informations>
     <description>
-        <text x="8" y="-6" size="9" text="t"/>
-        <rect width="40" x="-10" y="-20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="10" y="-20" orientation="n"/>
+        <text x="8" size="9" text="t" y="-6"/>
+        <input x="3" rotate="true" size="9" text="_" y="0.55" tagg="label"/>
+        <rect x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="false" y="-20" width="40"/>
+        <terminal x="10" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/moteur.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/moteur.elmt
index 09864909a..f22c2ea3f 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/moteur.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/moteur.elmt
@@ -1,19 +1,21 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="50" type="element" orientation="dyyy">
-<uuid uuid="{060F549F-FF8A-4BB3-A609-8BCCCBC18F2C}"/><names>
-        <name lang="ar">مُحرّك</name>
-        <name lang="de">Motor</name>
-        <name lang="el">Ηλεκτροκινητήρας</name>
-        <name lang="en">Motor</name>
-        <name lang="it">Motore</name>
+<definition hotspot_x="15" hotspot_y="29" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{1f94c11a-7cb5-4796-8076-9d8b89ff2fb8}"/>
+    <names>
         <name lang="fr">Moteur</name>
         <name lang="pl">Silnik</name>
         <name lang="cs">Motor</name>
+        <name lang="ar">مُحرّك</name>
+        <name lang="el">Ηλεκτροκινητήρας</name>
+        <name lang="it">Motore</name>
+        <name lang="de">Motor</name>
+        <name lang="en">Motor</name>
         <name lang="nl">Motor</name>
     </names>
     <informations>EN 60617: 06-04-01</informations>
     <description>
-        <circle x="-12" y="-20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="24"/>
-        <text x="-5" y="-4" size="9" text="M"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <circle x="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="24" antialias="true" y="-20"/>
+        <input x="13" rotate="true" size="9" text="_" y="-4.45" tagg="label"/>
+        <text x="-5" size="9" text="M" y="-4"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/moteur_pas_a_pas.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/moteur_pas_a_pas.elmt
index ece475b27..207d10b5e 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/moteur_pas_a_pas.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/moteur_pas_a_pas.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="35" height="50" type="element" orientation="dyyy">
-<uuid uuid="{28CF94E8-505F-4ADD-83DE-D03438C867DB}"/><names>
-        <name lang="ar">مُحرّك خطوة-خطوة</name>
-        <name lang="de">Schrittmotor</name>
-        <name lang="el">Βηματικός κινητήρας</name>
-        <name lang="en">Stepping motor</name>
-        <name lang="it">Motore passo-passo</name>
+<definition hotspot_x="15" hotspot_y="29" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{7f6e837b-6407-44ed-9768-4f3f852c5463}"/>
+    <names>
         <name lang="fr">Moteur pas à pas</name>
         <name lang="pl">Silnik krokowy</name>
         <name lang="cs">Krokový motor</name>
+        <name lang="ar">مُحرّك خطوة-خطوة</name>
+        <name lang="el">Βηματικός κινητήρας</name>
+        <name lang="it">Motore passo-passo</name>
+        <name lang="de">Schrittmotor</name>
+        <name lang="en">Stepping motor</name>
         <name lang="nl">Stappenmotor</name>
     </names>
     <informations>EN 60617: 06-04-03</informations>
     <description>
-        <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="-3" x1="6" y2="-6" x2="6"/>
-        <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="-3" x1="-6" y2="-1" x2="-6"/>
-        <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="-3" x1="-6" y2="-3" x2="6"/>
-        <circle x="-12" y="-20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="24"/>
-        <text x="-4.5" y="-6" size="8" text="M"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="2.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" antialias="false" y2="-6" end1="none" x2="6" length1="1.5" x1="6"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" antialias="false" y2="-1" end1="none" x2="-6" length1="1.5" x1="-6"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" antialias="false" y2="-3" end1="none" x2="6" length1="1.5" x1="-6"/>
+        <circle x="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="24" antialias="true" y="-20"/>
+        <text x="-4.5" size="8" text="M" y="-6"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc.elmt
index 580e2da7e..63816549a 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc.elmt
@@ -1,26 +1,28 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="40" type="element" orientation="dnnn">
-<uuid uuid="{34029D33-F39A-4304-A0A6-7CEC7AD41A9F}"/><names>
-        <name lang="ar">مقبس</name>
-        <name lang="de">Steckdose</name>
+<definition hotspot_x="15" hotspot_y="30" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{88583090-190d-4c45-975c-97f89386c179}"/>
+    <names>
         <name lang="ru">Розетка</name>
-        <name lang="pt">Tomada</name>
-        <name lang="el">Πρίζα</name>
-        <name lang="en">Outlet</name>
-        <name lang="it">Presa</name>
         <name lang="fr">Prise</name>
         <name lang="pl">Gniazdo wtyczkowe</name>
-        <name lang="es">Enchufe</name>
         <name lang="cs">Zásuvka</name>
+        <name lang="ar">مقبس</name>
+        <name lang="el">Πρίζα</name>
+        <name lang="pt">Tomada</name>
+        <name lang="it">Presa</name>
+        <name lang="de">Steckdose</name>
+        <name lang="en">Outlet</name>
+        <name lang="es">Enchufe</name>
         <name lang="nl">Contactdoos</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <circle x="-13" y="-13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="26"/>
-        <circle x="-9" y="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6"/>
-        <circle x="3" y="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6"/>
-        <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="-13" x1="0" y2="-20" x2="0"/>
-        <circle x="-2.5" y="-8.5" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="5"/>
-        <terminal x="0" y="-21" orientation="n"/>
+        <input x="-7" rotate="true" size="9" text="_" y="12.55" tagg="label"/>
+        <circle x="-13" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="26" antialias="true" y="-13"/>
+        <circle x="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6" antialias="true" y="-1"/>
+        <circle x="3" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6" antialias="true" y="-1"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="false" y2="-20" end1="none" x2="0" length1="1.5" x1="0"/>
+        <circle x="-2.5" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="5" antialias="true" y="-8.5"/>
+        <terminal x="0" orientation="n" y="-21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc1.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc1.elmt
index 00759dddf..57c70891c 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc1.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc1.elmt
@@ -1,20 +1,22 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
-<uuid uuid="{7EF0BAC3-7A8A-4626-985B-6E80B982AA05}"/><names>
-        <name lang="ar">قاعدة مقبس تيّار بحماية</name>
-        <name lang="de">Schutzkontaktsteckdose</name>
-        <name lang="el">Ρευματοδότης με προστασία</name>
-        <name lang="en">Socket outlet (power) with protective contact</name>
-        <name lang="it">Presa con contatto per conduttore di protezione</name>
+<definition hotspot_x="15" hotspot_y="26" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{13761e82-bc6a-4fff-a6c7-89f3ea893b12}"/>
+    <names>
         <name lang="fr">Socle de prise de courant avec protection</name>
         <name lang="pl">Gniazdo pojedyncze ze stykiem ochronnym</name>
         <name lang="cs">Zdířková zásuvka s ochranným kontaktem</name>
+        <name lang="ar">قاعدة مقبس تيّار بحماية</name>
+        <name lang="el">Ρευματοδότης με προστασία</name>
+        <name lang="it">Presa con contatto per conduttore di protezione</name>
+        <name lang="de">Schutzkontaktsteckdose</name>
+        <name lang="en">Socket outlet (power) with protective contact</name>
         <name lang="nl">Contactdoos met beschermingscontact</name>
     </names>
     <informations>EN 60617: 11-13-04</informations>
     <description>
-        <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="-10" y2="-10" x2="10"/>
-        <arc width="20" x="-10" y="-10" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="-10" x1="0" y2="-20" x2="0"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <input x="3" rotate="true" size="9" text="_" y="-19.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-10" end1="none" x2="10" length1="1.5" x1="-10"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="-10" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-20" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc2.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc2.elmt
index 4f3c6f5a7..c7789daee 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc2.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc2.elmt
@@ -1,19 +1,21 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
-<uuid uuid="{7B36264B-6165-43EB-8B8B-C8F83C683F60}"/><names>
-        <name lang="ar">قاعدة مقبس تيّار (رمز عام)</name>
-        <name lang="de">Steckdose</name>
-        <name lang="el">Ρευματοδότης απλός</name>
-        <name lang="en">Socket outlet (power), general symbol</name>
-        <name lang="it">Presa, segno grafico generale</name>
+<definition hotspot_x="15" hotspot_y="26" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{6c18a57b-7d55-4c7d-935e-6042aa1e6344}"/>
+    <names>
         <name lang="fr">Socle de prise de courant</name>
         <name lang="pl">Gniazdo pojedyncze</name>
         <name lang="cs">Zásuvka, obecný symbol</name>
+        <name lang="ar">قاعدة مقبس تيّار (رمز عام)</name>
+        <name lang="el">Ρευματοδότης απλός</name>
+        <name lang="it">Presa, segno grafico generale</name>
+        <name lang="de">Steckdose</name>
+        <name lang="en">Socket outlet (power), general symbol</name>
         <name lang="nl">Contactdoos</name>
     </names>
     <informations>EN 60617: 11-13-01</informations>
     <description>
-        <arc width="20" x="-10" y="-10" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="-10" x1="0" y2="-20" x2="0"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="-10" angle="-180" width="20"/>
+        <input x="-1" rotate="true" size="9" text="_" y="-20.5" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-20" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc3.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc3.elmt
index a081bfe5b..16e1d9e57 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc3.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc3.elmt
@@ -1,24 +1,26 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
-<uuid uuid="{D2E92D4B-9032-437C-B211-5F9F72AADFB6}"/><names>
+<definition hotspot_x="15" hotspot_y="25" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{b120205f-3bc7-4f09-b934-663a8e91c48c}"/>
+    <names>
+        <name lang="fr">Socle pour plusieurs prises de courant</name>
+        <name lang="pl">Gniazdo potrójne</name>
+        <name lang="cs">Vícezdířková zásuvka</name>
         <name lang="ar">قاعدة لعدّة مقابس تيّار</name>
-        <name lang="de">Mehrfachsteckdose</name>
         <name lang="el">Ρευματοδότης 3πλος</name>
+        <name lang="it">Presa multipla</name>
+        <name lang="de">Mehrfachsteckdose</name>
         <name lang="en">Multiple socket outlet (power)
  The symbol is shown with three
 outlets.
 </name>
-        <name lang="it">Presa multipla</name>
-        <name lang="fr">Socle pour plusieurs prises de courant</name>
-        <name lang="pl">Gniazdo potrójne</name>
-        <name lang="cs">Vícezdířková zásuvka</name>
         <name lang="nl">Wandcontactdoos (3)</name>
     </names>
     <informations>EN 60617: 11-13-02</informations>
     <description>
-        <input x="4" y="-14.5" size="5" rotate="true" text="3"/>
-        <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="-6" x1="2" y2="-12" x2="7"/>
-        <arc width="20" x="-10" y="-9" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="-10" x1="0" y2="-20" x2="0"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <input x="-1" rotate="true" size="9" text="_" y="-26.5" tagg="label"/>
+        <input x="4" rotate="true" size="5" text="3" y="-14.5" tagg="none"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" antialias="true" y2="-12" end1="none" x2="7" length1="1.5" x1="2"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="-9" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-20" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc4.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc4.elmt
index 2331e7c88..09607264e 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc4.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc4.elmt
@@ -1,24 +1,26 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
-<uuid uuid="{FEE73D3D-4BE8-46CE-BFA3-735B0EFD963A}"/><names>
+<definition hotspot_x="15" hotspot_y="26" orientation="dyyy" height="30" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{b06252dc-49b5-494f-9e7c-9f0ac3261eb9}"/>
+    <names>
+        <name lang="fr">Socle de prise pour terminal de télécommunication</name>
+        <name lang="pl">Gniazdo teletechniczne</name>
+        <name lang="cs">Zásuvka pro telekomunikace, obecný symbol</name>
         <name lang="ar">قاعدة مقبس لطرفية إتّصال</name>
-        <name lang="de">Fernmeldesteckdose allgemein</name>
         <name lang="el">Πρίζα τηλεφώνου</name>
+        <name lang="it">Presa per telecomunicazioni, segno grafico generale</name>
+        <name lang="de">Fernmeldesteckdose allgemein</name>
         <name lang="en">Socket outlet (telecommunica-
 tions), general symbol
 Designations in accordance with
 </name>
-        <name lang="it">Presa per telecomunicazioni, segno grafico generale</name>
-        <name lang="fr">Socle de prise pour terminal de télécommunication</name>
-        <name lang="pl">Gniazdo teletechniczne</name>
-        <name lang="cs">Zásuvka pro telekomunikace, obecný symbol</name>
         <name lang="nl">contactdoos telecommunicatie</name>
     </names>
     <informations>EN 60617: 11-13-09</informations>
     <description>
-        <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="10" 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="-10" x1="-10" 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="-10" x1="-10" y2="-10" 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="-10" x1="0" y2="-20" x2="0"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="0" end1="none" x2="10" length1="1.5" x1="10"/>
+        <input x="0" rotate="true" size="9" text="_" y="-22.5" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="0" end1="none" x2="-10" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-10" end1="none" x2="10" length1="1.5" x1="-10"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-20" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc5.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc5.elmt
index 193ea652f..628890337 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc5.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc5.elmt
@@ -1,20 +1,22 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="40" type="element" orientation="dyyy">
-<uuid uuid="{8A802162-61BA-4853-88C7-0D0D8F3E3B76}"/><names>
-        <name lang="ar">قاعدة مقبس تيّار (قدرة) بمفتاح أحادي القطب</name>
-        <name lang="de">Steckdose schaltbar</name>
-        <name lang="el">Πρίζα και διακόπτης</name>
-        <name lang="en">Socket outlet (power) single-pole switch with</name>
-        <name lang="it">Presa con interruttore unipolare</name>
+<definition hotspot_x="15" hotspot_y="26" orientation="dyyy" height="40" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{f4e7b0ae-afa4-4184-bed6-696e3b3e4891}"/>
+    <names>
         <name lang="fr">Socle de prise de courant (puissance) avec interrupteur unipolaire</name>
         <name lang="pl">Gniazdo pojedyncze z łącznikiem</name>
         <name lang="cs">Zásuvka, jednopólový spínač, odpojitelná</name>
+        <name lang="ar">قاعدة مقبس تيّار (قدرة) بمفتاح أحادي القطب</name>
+        <name lang="el">Πρίζα και διακόπτης</name>
+        <name lang="it">Presa con interruttore unipolare</name>
+        <name lang="de">Steckdose schaltbar</name>
+        <name lang="en">Socket outlet (power) single-pole switch with</name>
         <name lang="nl">wandcontactdoos, schakelend</name>
     </names>
     <informations>EN 60617: 11-13-06</informations>
     <description>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="0" y2="-18" x2="8" y3="-16" x3="10"/>
-        <arc width="20" x="-10" y="-10" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="-10" x1="0" y2="-20" x2="0"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <polygon y3="-16" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" closed="false" y2="-18" x3="10" x2="8" x1="0"/>
+        <input x="12" rotate="true" size="9" text="_" y="-16.45" tagg="label"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="-10" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-20" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc6.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc6.elmt
index 6dc337af8..74b0f57a0 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc6.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc6.elmt
@@ -1,21 +1,23 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="25" height="40" type="element" orientation="dyyy">
-<uuid uuid="{8B4E39F0-D500-470C-B545-EA77E542F75F}"/><names>
-        <name lang="ar">قاعدة مقبس تيّار (قدرة) مع  قفل</name>
-        <name lang="de">Steckdose mit Abdeckung</name>
-        <name lang="el">Ρευματοδότης με κάλυμα</name>
-        <name lang="en">Socket outlet (power) with shutter</name>
-        <name lang="it">Presa con schermo interno</name>
+<definition hotspot_x="25" hotspot_y="26" orientation="dyyy" height="40" type="element" link_type="simple" width="50" version="0.5">
+    <uuid uuid="{6e0129f6-3a81-48ca-b8d0-ab9ee4983d14}"/>
+    <names>
         <name lang="fr">Socle de prise de courant (puissance) avec volet d'obturation</name>
         <name lang="pl">Gniazdo z pokrywą</name>
         <name lang="cs">Zásuvka se zakrytím</name>
+        <name lang="ar">قاعدة مقبس تيّار (قدرة) مع  قفل</name>
+        <name lang="el">Ρευματοδότης με κάλυμα</name>
+        <name lang="it">Presa con schermo interno</name>
+        <name lang="de">Steckdose mit Abdeckung</name>
+        <name lang="en">Socket outlet (power) with shutter</name>
         <name lang="nl">Wandcontactdoos met klep</name>
     </names>
     <informations>EN 60617: 11-13-05</informations>
     <description>
-        <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="-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="10" y2="0" x2="19"/>
-        <arc width="20" x="-10" y="-10" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="-10" x1="0" y2="-20" x2="0"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <input x="4" rotate="true" size="9" text="_" y="-16.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="-11" length1="1.5" x1="-20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" antialias="false" y2="0" end1="none" x2="19" length1="1.5" x1="10"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="-10" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-20" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc7.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc7.elmt
index d627a372e..37a13801b 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc7.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/pc7.elmt
@@ -1,21 +1,23 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dyyy">
-<uuid uuid="{9F51D499-D817-4E35-BED6-A7E81FF39285}"/><names>
-        <name lang="ar">قاعدة مقبس تيّار (قدرة) مع محوّل عزل</name>
-        <name lang="de">Steckdose mit Trenntrafo</name>
-        <name lang="el">Ρευματοδότης με μετασχημαστιστή απομόνωσης</name>
-        <name lang="en"> Socket outlet (power) with isolating transformer</name>
-        <name lang="it">Presa con trasformatore d’isolamento</name>
+<definition hotspot_x="15" hotspot_y="26" orientation="dyyy" height="50" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{3845b80f-07c8-4ea0-be06-c3f164ab5915}"/>
+    <names>
         <name lang="fr">Socle de prise de courant (puissance) avec
 transformateur de séparation</name>
         <name lang="pl">Gniazdo z transformatorem separacyjnym</name>
         <name lang="cs">Zásuvka s oddělovacím transformátorem</name>
+        <name lang="ar">قاعدة مقبس تيّار (قدرة) مع محوّل عزل</name>
+        <name lang="el">Ρευματοδότης με μετασχημαστιστή απομόνωσης</name>
+        <name lang="it">Presa con trasformatore d’isolamento</name>
+        <name lang="de">Steckdose mit Trenntrafo</name>
+        <name lang="en"> Socket outlet (power) with isolating transformer</name>
         <name lang="nl">wandcontactdoos met transformator</name>
     </names>
     <informations>EN 60617: 11-13-08</informations>
     <description>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <arc width="20" x="-10" y="0" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" 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="-10" x1="0" y2="-20" x2="0"/>
-        <terminal x="0" y="-20" orientation="n"/>
+        <input x="5" rotate="true" size="9" text="_" y="-15.45" tagg="label"/>
+        <circle x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" antialias="true" y="-10"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-180" y="0" angle="-180" width="20"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" antialias="false" y2="-20" end1="none" x2="0" length1="1.5" x1="0"/>
+        <terminal x="0" orientation="n" y="-20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/point_eclairage_1.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/point_eclairage_1.elmt
index 183f2216c..daf306925 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/point_eclairage_1.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/point_eclairage_1.elmt
@@ -1,20 +1,22 @@
-<definition width="30" version="0.3" hotspot_x="20" hotspot_y="25" height="30" type="element" orientation="dnny">
-<uuid uuid="{C5966DDB-B3E9-4837-AAC9-8864A878D201}"/><names>
-        <name lang="ar">جهاز إنارة للسلامة بدائرة خاصة</name>
-        <name lang="de">Vorschaltgerät für Notbeleuchtung</name>
-        <name lang="el">Φωτιστικό ασφαλείας, σε ειδικό κύκλωμα</name>
-        <name lang="en">Emmergency Lighting luminaire on special circuit</name>
-        <name lang="it">Apparecchio di illuminazione di emergenza su circuito speciale</name>
+<definition hotspot_x="0" hotspot_y="0" orientation="dyyy" height="20" type="element" link_type="simple" width="20" version="0.5">
+    <uuid uuid="{59cc726b-c4ca-4451-a756-d807751773fa}"/>
+    <names>
         <name lang="fr">Appareil d'éclairage de sécurité sur circuit spécial</name>
         <name lang="pl">Oświetlenie ewakuacyjne</name>
         <name lang="cs">Nouzová světla se samostatným okruhem</name>
+        <name lang="ar">جهاز إنارة للسلامة بدائرة خاصة</name>
+        <name lang="el">Φωτιστικό ασφαλείας, σε ειδικό κύκλωμα</name>
+        <name lang="it">Apparecchio di illuminazione di emergenza su circuito speciale</name>
+        <name lang="de">Vorschaltgerät für Notbeleuchtung</name>
+        <name lang="en">Emmergency Lighting luminaire on special circuit</name>
         <name lang="nl">Noodlamp op speciaal circuit</name>
     </names>
     <informations>EN 60617: 11-15-011</informations>
     <description>
-        <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="-18" y2="-18" x2="-2"/>
-        <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="-18" x1="-18" y2="-2" x2="-2"/>
-        <circle x="-11.5" y="-11.5" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="3"/>
-        <terminal x="-10" y="-10" orientation="w"/>
+        <input x="3" rotate="true" size="9" text="_" y="14.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" antialias="false" y2="2" end1="none" x2="18" length1="1.5" x1="2"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" antialias="true" y2="18" end1="none" x2="18" length1="1.5" x1="2"/>
+        <circle x="8.5" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="3" antialias="true" y="8.5"/>
+        <terminal x="10" orientation="w" y="10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/point_eclairage_2.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/point_eclairage_2.elmt
index e7a1437b6..f9120fd3c 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/point_eclairage_2.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/point_eclairage_2.elmt
@@ -1,21 +1,23 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="30" type="element" orientation="dnny">
-<uuid uuid="{25C38E8D-2DF8-4918-98F3-16F6127DDC5F}"/><names>
-        <name lang="ar">وحدة إضاءة مستقلّة للسلامة</name>
-        <name lang="de">Sicherheitsleuchte mit eingebauter Stromversorgung</name>
-        <name lang="el">Αυτόνομο φωτιστικό ασφαλείας</name>
-        <name lang="en">Self-containned emmergency lighting luminaire</name>
-        <name lang="it">Apparecchio autonomo per illuminazione di emergenza</name>
+<definition hotspot_x="16" hotspot_y="25" orientation="dyyy" height="30" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{40ab86d3-9221-4764-b93d-11c1a43ba82d}"/>
+    <names>
         <name lang="fr">Bloc autonome d'éclairage de sécurité</name>
         <name lang="pl">Oświetlenie ewakuacyjne autonomiczne</name>
         <name lang="cs">Bezpečnostní světla se zabudovanou dodávkou elektrického proudu</name>
+        <name lang="ar">وحدة إضاءة مستقلّة للسلامة</name>
+        <name lang="el">Αυτόνομο φωτιστικό ασφαλείας</name>
+        <name lang="it">Apparecchio autonomo per illuminazione di emergenza</name>
+        <name lang="de">Sicherheitsleuchte mit eingebauter Stromversorgung</name>
+        <name lang="en">Self-containned emmergency lighting luminaire</name>
         <name lang="nl">Noodlamp automatisch met accu</name>
     </names>
     <informations>EN 60617: 11-15-12</informations>
     <description>
-        <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="-2" x1="-8" y2="-18" x2="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="-18" x1="-8" y2="-2" x2="8"/>
-        <rect width="20" x="-10" y="-20" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-1.5" y="-11.5" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="3"/>
-        <terminal x="-10" y="-10" orientation="w"/>
+        <input x="-7" rotate="true" size="9" text="_" y="0.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" antialias="true" y2="-18" end1="none" x2="8" length1="1.5" x1="-8"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" antialias="true" y2="-2" end1="none" x2="8" length1="1.5" x1="-8"/>
+        <rect x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="false" y="-20" width="20"/>
+        <circle x="-1.5" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="3" antialias="true" y="-11.5"/>
+        <terminal x="-10" orientation="w" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_1.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_1.elmt
index 58123eb00..3e013bce8 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_1.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_1.elmt
@@ -1,21 +1,23 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="30" type="element" orientation="dnny">
-<uuid uuid="{2E8167A0-42A0-4934-9910-ECA73AC3B581}"/><names>
-        <name lang="ar">عاكس</name>
-        <name lang="de">Scheinwerfer</name>
-        <name lang="el">Προβολέας</name>
-        <name lang="en">Projector</name>
-        <name lang="it">Faro</name>
+<definition hotspot_x="16" hotspot_y="25" orientation="dyyy" height="30" type="element" link_type="simple" width="30" version="0.5">
+    <uuid uuid="{740a8bd2-bb22-4f31-a3d1-49b566fabd97}"/>
+    <names>
         <name lang="fr">Projecteur</name>
         <name lang="pl">Projektor, symbol ogólny</name>
         <name lang="cs">Světlomet</name>
+        <name lang="ar">عاكس</name>
+        <name lang="el">Προβολέας</name>
+        <name lang="it">Faro</name>
+        <name lang="de">Scheinwerfer</name>
+        <name lang="en">Projector</name>
         <name lang="nl">Projector</name>
     </names>
     <informations>EN 60617: 11-15-07</informations>
     <description>
-        <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="-13" x1="-3" y2="-7" x2="3"/>
-        <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="-7" x1="-3" y2="-13" x2="3"/>
-        <circle x="-4.5" y="-14.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="9"/>
-        <arc width="20" x="-10" y="-20" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <terminal x="-10" y="-10" orientation="w"/>
+        <input x="8" rotate="true" size="9" text="_" y="-9.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="true" y2="-7" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" antialias="true" y2="-13" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <circle x="-4.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="9" antialias="true" y="-14.5"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-90" y="-20" angle="-180" width="20"/>
+        <terminal x="-10" orientation="w" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_2.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_2.elmt
index 8ab840be9..d5ee2cc38 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_2.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_2.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.3" hotspot_x="20" hotspot_y="25" height="30" type="element" orientation="dyyy">
-<uuid uuid="{6FB48C10-D262-4377-8051-59C274247622}"/><names>
-        <name lang="ar">عاكس بشعاع قليل التباعد</name>
-        <name lang="de">Punktleuchte</name>
-        <name lang="en">Slightly divergent beam projector</name>
+<definition hotspot_x="16" hotspot_y="25" orientation="dyyy" height="30" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{cb5b515b-073d-4f32-8be0-f958565ad13d}"/>
+    <names>
         <name lang="fr">Projecteur à faisceau peu divergent</name>
         <name lang="pl">Projektor o świetle skupionym</name>
         <name lang="cs">Bodová světla</name>
+        <name lang="ar">عاكس بشعاع قليل التباعد</name>
         <name lang="it">Faro a fascio stretto</name>
+        <name lang="de">Punktleuchte</name>
+        <name lang="en">Slightly divergent beam projector</name>
         <name lang="nl">Spotlamp</name>
     </names>
     <informations>EN 60617: 11-15-08</informations>
     <description>
-        <line length1="1.5" length2="2" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-7" x1="8" y2="-7" x2="20"/>
-        <line length1="1.5" length2="2" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-13" x1="8" y2="-13" 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="-13" x1="-3" y2="-7" x2="3"/>
-        <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="-7" x1="-3" y2="-13" x2="3"/>
-        <circle x="-4.5" y="-14.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="9"/>
-        <arc width="20" x="-10" y="-20" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <terminal x="-10" y="-10" orientation="w"/>
+        <line end2="triangle" length2="2" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-7" antialias="false" y2="-7" end1="none" x2="20" length1="1.5" x1="8"/>
+        <input x="28" rotate="true" size="9" text="_" y="-9.45" tagg="label"/>
+        <line end2="triangle" length2="2" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-13" antialias="false" y2="-13" end1="none" x2="20" length1="1.5" x1="8"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="true" y2="-7" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" antialias="true" y2="-13" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <circle x="-4.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="9" antialias="true" y="-14.5"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-90" y="-20" angle="-180" width="20"/>
+        <terminal x="-10" orientation="w" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_3.elmt b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_3.elmt
index 244103f04..5e0e5f4ac 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_3.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/30_architectural/projecteur_3.elmt
@@ -1,23 +1,25 @@
-<definition width="50" version="0.3" hotspot_x="20" hotspot_y="30" height="40" type="element" orientation="dyyy">
-<uuid uuid="{BE3F9D20-9681-4B37-B684-3EFD3E7F16F9}"/><names>
-        <name lang="ar">عاكس إضاءة</name>
-        <name lang="de">Punktleuchte</name>
-        <name lang="en">Floodlight</name>
+<definition hotspot_x="16" hotspot_y="30" orientation="dyyy" height="40" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{bdb122e8-6852-4125-9ae1-4d804f5b1c61}"/>
+    <names>
         <name lang="fr">Projecteur d'illumination</name>
         <name lang="pl">Projektor o świetle rozproszonym</name>
         <name lang="cs">Bodová světla</name>
-        <name lang="it">Faro a fascio largo</name>
-        <name lang="nl">Schijnwerper</name>
+        <name lang="ar">عاكس إضاءة</name>
         <name lang="el">Προβολέας</name>
+        <name lang="it">Faro a fascio largo</name>
+        <name lang="de">Punktleuchte</name>
+        <name lang="en">Floodlight</name>
+        <name lang="nl">Schijnwerper</name>
     </names>
     <informations>EN 60617: 11-15-09</informations>
     <description>
-        <line length1="2" length2="1.5" antialias="false" end1="triangle" end2="none" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="4" x1="19" y2="-7" x2="8"/>
-        <line length1="1.5" length2="2" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-13" x1="8" y2="-24" x2="19"/>
-        <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="-13" x1="-3" y2="-7" x2="3"/>
-        <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="-7" x1="-3" y2="-13" x2="3"/>
-        <circle x="-4.5" y="-14.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="9"/>
-        <arc width="20" x="-10" y="-20" antialias="true" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <terminal x="-10" y="-10" orientation="w"/>
+        <input x="19" rotate="true" size="9" text="_" y="-11.45" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="4" antialias="false" y2="-7" end1="triangle" x2="8" length1="2" x1="19"/>
+        <line end2="triangle" length2="2" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-13" antialias="false" y2="-24" end1="none" x2="19" length1="1.5" x1="8"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" antialias="true" y2="-7" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" antialias="true" y2="-13" end1="none" x2="3" length1="1.5" x1="-3"/>
+        <circle x="-4.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="9" antialias="true" y="-14.5"/>
+        <arc x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="true" start="-90" y="-20" angle="-180" width="20"/>
+        <terminal x="-10" orientation="w" y="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/ampereheuremetre.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/ampereheuremetre.elmt
index df8777650..b8980f53b 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/ampereheuremetre.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/ampereheuremetre.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{B6E50A54-9AE7-4B6E-A88D-B1A74397D5AC}"/><names>
-        <name lang="ar">أمبيرساعة متر </name>
-        <name lang="de">Amperestundenzähler</name>
-        <name lang="el">Μετρητής κατανάλωσης, Αμπερώρια (Ah)</name>
-        <name lang="en">Ampere Hour Meter</name>
-        <name lang="it">Misuratore di Ah</name>
+<definition hotspot_x="20" hotspot_y="28" orientation="dyyy" height="50" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{5e1e28e4-14ed-4b4a-83e3-d7ead96987a8}"/>
+    <names>
         <name lang="fr">Ampèreheuremètre</name>
         <name lang="pl">Licznik amperogodzin</name>
         <name lang="cs">Ampérmetr</name>
+        <name lang="ar">أمبيرساعة متر </name>
+        <name lang="el">Μετρητής κατανάλωσης, Αμπερώρια (Ah)</name>
+        <name lang="it">Misuratore di Ah</name>
+        <name lang="de">Amperestundenzähler</name>
+        <name lang="en">Ampere Hour Meter</name>
         <name lang="nl">Ampere uur meter</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-8" y="2.3333" size="9" text="Ah"/>
-        <rect width="30" x="-15" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-19" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-23" orientation="n"/>
-        <terminal x="0" y="15" orientation="s"/>
+        <input x="18" rotate="true" size="9" text="_" y="-4.45" tagg="label"/>
+        <text x="-8" size="9" text="Ah" y="2.3333"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="22" antialias="false" y="-11" width="30"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="8" antialias="false" y="-19" width="30"/>
+        <terminal x="0" orientation="n" y="-23"/>
+        <terminal x="0" orientation="s" y="15"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_220v_monophase.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_220v_monophase.elmt
index c6f104029..81999725b 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_220v_monophase.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_220v_monophase.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="60" type="element" orientation="dyyy">
-<uuid uuid="{797AACFD-A82D-4EE4-9A15-851842EBA8B3}"/><names>
-        <name lang="ar">عدّاد أحادي الوجه 220V </name>
-        <name lang="el">Μονοφασικός μετρητής</name>
-        <name lang="en">220V single phase meter</name>
-        <name lang="de">Zähler einphasig</name>
-        <name lang="it">Contatore monofase 230V</name>
+<definition hotspot_x="20" hotspot_y="35" orientation="dyyy" height="60" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{2c8aab42-6ee3-426d-b3f8-77111f7601f1}"/>
+    <names>
         <name lang="fr">Compteur 220V monophase</name>
         <name lang="pl">Licznik jednofazowy</name>
         <name lang="cs">Jednofázové počítadlo 220V</name>
+        <name lang="ar">عدّاد أحادي الوجه 220V </name>
+        <name lang="el">Μονοφασικός μετρητής</name>
+        <name lang="it">Contatore monofase 230V</name>
+        <name lang="en">220V single phase meter</name>
+        <name lang="de">Zähler einphasig</name>
         <name lang="nl">KWh meter 230V</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="20" x="-10" y="5" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="-10" y="-20" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-25" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-29" orientation="n"/>
-        <terminal x="0" y="18" orientation="s"/>
+        <input x="18" rotate="true" size="9" text="_" y="-14.45" tagg="label"/>
+        <rect x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="9" antialias="false" y="5" width="20"/>
+        <rect x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="8" antialias="false" y="-20" width="20"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="30" antialias="false" y="-25" width="30"/>
+        <terminal x="0" orientation="n" y="-29"/>
+        <terminal x="0" orientation="s" y="18"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_energie.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_energie.elmt
index 718a2ee7c..084bec92e 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_energie.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_energie.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.3" hotspot_x="15" hotspot_y="5" height="50" type="element" orientation="dyyy">
-<uuid uuid="{4B96B453-FD4B-4A3F-9827-BD3EF06F20AE}"/><names>
-        <name lang="ar">عدّاد طاقة</name>
-        <name lang="el">Μετρητής ενέργειας, Κιλοβατώρες (KWh)</name>
-        <name lang="en">Energy meter</name>
-        <name lang="de">Energiezähler</name>
-        <name lang="it">Misuratore di Kwh</name>
+<definition hotspot_x="10" hotspot_y="4" orientation="dyyy" height="50" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{089ac832-39e1-4946-b990-54f6436748cb}"/>
+    <names>
         <name lang="fr">Compteur d’énergie</name>
         <name lang="pl">Licznik energii</name>
         <name lang="cs">Počítadlo energie</name>
+        <name lang="ar">عدّاد طاقة</name>
+        <name lang="el">Μετρητής ενέργειας, Κιλοβατώρες (KWh)</name>
+        <name lang="it">Misuratore di Kwh</name>
+        <name lang="en">Energy meter</name>
+        <name lang="de">Energiezähler</name>
         <name lang="nl">Energiemeter</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <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="26"/>
-        <rect width="32" x="-6" y="0" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-4" y="30" size="10" text="kWh"/>
-        <terminal x="0" y="40" orientation="s"/>
-        <terminal x="20" y="40" orientation="s"/>
+        <input x="28" rotate="true" size="9" text="_" y="15.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" antialias="false" y2="10" end1="none" x2="26" length1="1.5" x1="-6"/>
+        <rect x="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" height="40" antialias="false" y="0" width="32"/>
+        <text x="-4" size="10" text="kWh" y="30"/>
+        <terminal x="20" orientation="s" y="40"/>
+        <terminal x="0" orientation="s" y="40"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_energie_active_a_depassement_de_puissance.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_energie_active_a_depassement_de_puissance.elmt
index 065d48a8e..335db6bf7 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_energie_active_a_depassement_de_puissance.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_energie_active_a_depassement_de_puissance.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{9437AAFB-FC3E-4622-B8B6-4CE69B4A7C67}"/><names>
-        <name lang="ar">عدّاد طاقة فعّالة مع تجاوز قدرة</name>
-        <name lang="de">Überverbrauchszähler, Spitzenzähler&#xd;</name>
-        <name lang="en"> Excess watt-hour meter&#xd;</name>
-        <name lang="it">Contatore di energia attiva a supero di potenza</name>
+<definition hotspot_x="20" hotspot_y="29" orientation="dyyy" height="50" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{fecbdbdd-a4ec-4304-9c7a-1c3927385a23}"/>
+    <names>
         <name lang="fr">Compteur à énergie active à dépassement de puissance</name>
         <name lang="pl">Licznik watogodzin szczytowy</name>
         <name lang="cs">Počítadlo překročení spotřeby watthodin</name>
+        <name lang="ar">عدّاد طاقة فعّالة مع تجاوز قدرة</name>
+        <name lang="it">Contatore di energia attiva a supero di potenza</name>
+        <name lang="de">Überverbrauchszähler, Spitzenzähler&#xd;</name>
+        <name lang="en"> Excess watt-hour meter&#xd;</name>
         <name lang="nl">Overcapaciteit teller</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-10" y="7" size="9" text="P &gt;"/>
-        <text x="-10" y="-3" size="9" text="Wh"/>
-        <rect width="30" x="-15" y="-12" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-20" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-24" orientation="n"/>
-        <terminal x="0" y="14" orientation="s"/>
+        <input x="18" rotate="true" size="9" text="_" y="-9.45" tagg="label"/>
+        <text x="-10" size="9" text="P >" y="7"/>
+        <text x="-10" size="9" text="Wh" y="-3"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="22" antialias="false" y="-12" width="30"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="8" antialias="false" y="-20" width="30"/>
+        <terminal x="0" orientation="s" y="14"/>
+        <terminal x="0" orientation="n" y="-24"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_horaire.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_horaire.elmt
index c8a904e76..64e1b37ae 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_horaire.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_horaire.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{976A09EF-5B5D-4C2C-9AE6-4BA387BBA586}"/><names>
-        <name lang="ar">عدّاد زمني</name>
-        <name lang="de">Betriebsstundenzähler</name>
-        <name lang="el">Ωρόμετρο</name>
-        <name lang="en">Hour counter</name>
-        <name lang="it">Conta tempo</name>
+<definition hotspot_x="20" hotspot_y="28" orientation="dyyy" height="50" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{8054da18-8ba7-409e-8cf4-0e57a026884c}"/>
+    <names>
         <name lang="fr">Compteur horaire</name>
         <name lang="pl">Licznik godzin</name>
         <name lang="cs">Počítadlo hodin</name>
+        <name lang="ar">عدّاد زمني</name>
+        <name lang="el">Ωρόμετρο</name>
+        <name lang="it">Conta tempo</name>
+        <name lang="de">Betriebsstundenzähler</name>
+        <name lang="en">Hour counter</name>
         <name lang="nl">Bedrijfsurenteller</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-3" y="2.3333" size="9" text="h"/>
-        <rect width="30" x="-15" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-19" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-23" orientation="n"/>
-        <terminal x="0" y="15" orientation="s"/>
+        <text x="-3" size="9" text="h" y="2.3333"/>
+        <input x="18" rotate="true" size="9" text="_" y="-9.45" tagg="label"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="22" antialias="false" y="-11" width="30"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="8" antialias="false" y="-19" width="30"/>
+        <terminal x="0" orientation="n" y="-23"/>
+        <terminal x="0" orientation="s" y="15"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_horaire_08-04-03_en60617.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_horaire_08-04-03_en60617.elmt
index d913ee8ba..ee607ce00 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_horaire_08-04-03_en60617.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/compteur_horaire_08-04-03_en60617.elmt
@@ -1,22 +1,24 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{981C911E-5F3F-44B6-ADA9-7DE80E8B264C}"/><names>
-        <name lang="ar">عدّاد زمني(en_60617)</name>
-        <name lang="de">Betriebsstundenzähler (en_60617)</name>
-        <name lang="el">Ωρόμετρο (en_60617)</name>
-        <name lang="en">Hour counter(en_60617) </name>
-        <name lang="it">Conta tempo (en_60617)</name>
+<definition hotspot_x="25" hotspot_y="39" orientation="dyyy" height="80" type="element" link_type="simple" width="50" version="0.5">
+    <uuid uuid="{96afc420-bb94-4d94-ac13-4612d30b5353}"/>
+    <names>
         <name lang="fr">Compteur horaire (en_60617)</name>
         <name lang="pl">Licznik godzin (en_60617)</name>
         <name lang="cs">Počítadlo hodin (en_60617)</name>
+        <name lang="ar">عدّاد زمني(en_60617)</name>
+        <name lang="el">Ωρόμετρο (en_60617)</name>
+        <name lang="it">Conta tempo (en_60617)</name>
+        <name lang="de">Betriebsstundenzähler (en_60617)</name>
+        <name lang="en">Hour counter(en_60617) </name>
         <name lang="nl">Bedrijfsurenteller (en_60617)</name>
     </names>
     <informations>https://github.com/jonasstein/qelectrotech-symbols
 EN 60617</informations>
     <description>
-        <text x="-4" y="12" size="9" text="h"/>
-        <rect width="40" x="-20" y="-10" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="40" x="-20" y="-30" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-34" orientation="n"/>
-        <terminal x="0" y="34" orientation="s"/>
+        <text x="-4" size="9" text="h" y="12"/>
+        <input x="23" rotate="true" size="9" text="_" y="0.55" tagg="label"/>
+        <rect x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="40" antialias="false" y="-10" width="40"/>
+        <rect x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="false" y="-30" width="40"/>
+        <terminal x="0" orientation="n" y="-34"/>
+        <terminal x="0" orientation="s" y="34"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/varh_08-04-15_en60617.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/varh_08-04-15_en60617.elmt
index cf4e5934d..fca03a0e8 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/varh_08-04-15_en60617.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/varh_08-04-15_en60617.elmt
@@ -1,21 +1,23 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{47843D2B-D454-46F6-9CE4-CD3B59FF7A69}"/><names>
-        <name lang="de">Blindverbrauchszähler</name>
-        <name lang="el">Μετρητής αέργου ισχύος (βαρόμετρο)</name>
-        <name lang="en">reactive energy meter</name>
-        <name lang="it">Misuratore di varh</name>
+<definition hotspot_x="20" hotspot_y="34" orientation="dyyy" height="60" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{8ba6d821-3dde-4f7f-94af-ee121aa648b4}"/>
+    <names>
         <name lang="fr">Varheuremètre</name>
         <name lang="pl">Licznik warogodzin</name>
         <name lang="cs">Měřič hodin jalového výkonu (varhodin)</name>
+        <name lang="el">Μετρητής αέργου ισχύος (βαρόμετρο)</name>
+        <name lang="it">Misuratore di varh</name>
+        <name lang="de">Blindverbrauchszähler</name>
+        <name lang="en">reactive energy meter</name>
         <name lang="nl">VAr energie meter</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="30" x="-15" y="-14" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-22" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-12" y="4" size="8" text="varh"/>
-        <terminal x="0" y="-27" orientation="n"/>
-        <terminal x="0" y="17" orientation="s"/>
+        <input x="18" rotate="true" size="9" text="_" y="-9.45" tagg="label"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="26" antialias="false" y="-14" width="30"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="8" antialias="false" y="-22" width="30"/>
+        <text x="-12" size="8" text="varh" y="4"/>
+        <terminal x="0" orientation="s" y="17"/>
+        <terminal x="0" orientation="n" y="-27"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/varheuremetre.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/varheuremetre.elmt
index af191145d..de695fc11 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/varheuremetre.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/varheuremetre.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{BA4C8CE2-F830-4387-B3FD-9C93B7A845D9}"/><names>
-        <name lang="ar">عدّد طاقة تفاعليّة - فارساعة متر-</name>
-        <name lang="el">Μετρητής, Βαρώρια</name>
-        <name lang="en">Var hour meter</name>
-        <name lang="de">Blindverbrauchszähler</name>
-        <name lang="it">Misuratore di varh</name>
+<definition hotspot_x="19" hotspot_y="28" orientation="dyyy" height="50" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{dbc25a11-2aa2-4522-8150-d80a620d6fcc}"/>
+    <names>
         <name lang="fr">Varheuremètre</name>
         <name lang="pl">Licznik warogodzin</name>
         <name lang="cs">Počítadlo varhodin</name>
+        <name lang="ar">عدّد طاقة تفاعليّة - فارساعة متر-</name>
+        <name lang="el">Μετρητής, Βαρώρια</name>
+        <name lang="it">Misuratore di varh</name>
+        <name lang="en">Var hour meter</name>
+        <name lang="de">Blindverbrauchszähler</name>
         <name lang="nl">VAr energie meter</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-13" y="2.3333" size="9" text="Varh"/>
-        <rect width="30" x="-15" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-19" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-23" orientation="n"/>
-        <terminal x="0" y="15" orientation="s"/>
+        <text x="-13" size="9" text="Varh" y="2.3333"/>
+        <input x="18" rotate="true" size="9" text="_" y="-4.45" tagg="label"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="22" antialias="false" y="-11" width="30"/>
+        <rect x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" height="8" antialias="false" y="-19" width="30"/>
+        <terminal x="0" orientation="s" y="15"/>
+        <terminal x="0" orientation="n" y="-23"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/wattheuremetre.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/wattheuremetre.elmt
index 21e193f5a..97c6c08eb 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/wattheuremetre.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/wattheuremetre.elmt
@@ -1,21 +1,23 @@
-<definition width="50" version="0.3" hotspot_x="15" hotspot_y="5" height="60" type="element" orientation="dyyy">
-<uuid uuid="{B2D38EA8-7E24-4087-A416-4BCBA9483D1B}"/><names>
-        <name lang="ar">عدّاد طاقة فعّالة - وات ساعة متر -</name>
-        <name lang="de">Wattstundenzähler</name>
-        <name lang="el">Μετρητής βατ/ώρα</name>
-        <name lang="en">Watt hour meter</name>
-        <name lang="it">Misuratore di Wh</name>
+<definition hotspot_x="10" hotspot_y="4" orientation="dyyy" height="60" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{5139fc3f-3211-400d-bdcb-3027fe390173}"/>
+    <names>
         <name lang="fr">Compteur d'énergie active Wattheuremètre</name>
         <name lang="pl">Licznik watogodzin</name>
         <name lang="cs">Počítadlo watthodin</name>
+        <name lang="ar">عدّاد طاقة فعّالة - وات ساعة متر -</name>
+        <name lang="el">Μετρητής βατ/ώρα</name>
+        <name lang="it">Misuratore di Wh</name>
+        <name lang="de">Wattstundenzähler</name>
+        <name lang="en">Watt hour meter</name>
         <name lang="nl">Watt uur meter</name>
     </names>
     <informations>EN 60617: 08-04-03</informations>
     <description>
-        <rect width="32" x="-6" y="0" antialias="false" height="50" 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="14" x1="-6" y2="14" x2="26"/>
-        <text x="0" y="35" size="10" text="Wh"/>
-        <terminal x="0" y="50" orientation="s"/>
-        <terminal x="20" y="50" orientation="s"/>
+        <rect x="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" height="50" antialias="false" y="0" width="32"/>
+        <input x="27" rotate="true" size="9" text="_" y="28.55" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" antialias="false" y2="14" end1="none" x2="26" length1="1.5" x1="-6"/>
+        <text x="0" size="10" text="Wh" y="35"/>
+        <terminal x="20" orientation="s" y="50"/>
+        <terminal x="0" orientation="s" y="50"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/40_meters/wattheuremetre_08-04-03_en60617.elmt b/elements/10_electric/11_singlepole/500_home_installation/40_meters/wattheuremetre_08-04-03_en60617.elmt
index 209a890c7..e693d5daf 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/40_meters/wattheuremetre_08-04-03_en60617.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/40_meters/wattheuremetre_08-04-03_en60617.elmt
@@ -1,21 +1,23 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{67E8881A-D54D-4FFE-B41D-2D9028C13BBB}"/><names>
-        <name lang="ar">عدّاد طاقة فعّالة - وات ساعة متر -(en_60617) </name>
-        <name lang="de">Wattstundenzähler (EN 60617)</name>
-        <name lang="en">Watt hour meter (en_60617)</name>
+<definition hotspot_x="25" hotspot_y="39" orientation="dyyy" height="80" type="element" link_type="simple" width="50" version="0.5">
+    <uuid uuid="{a9c50e8b-7862-4ade-b94a-0dc63c0deaa7}"/>
+    <names>
         <name lang="fr">Compteur d'énergie active Wattheuremètre (en_60617)</name>
         <name lang="pl">Licznik watogodzin (en_60617)</name>
         <name lang="cs">Počítadlo watthodin(en_60617) </name>
+        <name lang="ar">عدّاد طاقة فعّالة - وات ساعة متر -(en_60617) </name>
         <name lang="it">Misuratore di Wh (en_60617)</name>
+        <name lang="de">Wattstundenzähler (EN 60617)</name>
+        <name lang="en">Watt hour meter (en_60617)</name>
         <name lang="nl">Watt uur meter (en_60617)</name>
     </names>
     <informations>https://github.com/jonasstein/qelectrotech-symbols
 EN 60617</informations>
     <description>
-        <text x="-10" y="12" size="9" text="Wh"/>
-        <rect width="40" x="-20" y="-10" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="40" x="-20" y="-30" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-34" orientation="n"/>
-        <terminal x="0" y="34" orientation="s"/>
+        <input x="23" rotate="true" size="9" text="_" y="0.55" tagg="label"/>
+        <text x="-10" size="9" text="Wh" y="12"/>
+        <rect x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="40" antialias="false" y="-10" width="40"/>
+        <rect x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" antialias="false" y="-30" width="40"/>
+        <terminal x="0" orientation="n" y="-34"/>
+        <terminal x="0" orientation="s" y="34"/>
     </description>
 </definition>
diff --git a/elements/20_logic/20_grafcet/21_iso_sfc/31_transitions/transfunc.elmt b/elements/20_logic/20_grafcet/21_iso_sfc/31_transitions/transfunc.elmt
index 7cc822c29..a6b6371cb 100644
--- a/elements/20_logic/20_grafcet/21_iso_sfc/31_transitions/transfunc.elmt
+++ b/elements/20_logic/20_grafcet/21_iso_sfc/31_transitions/transfunc.elmt
@@ -1,15 +1,16 @@
-<definition width="170" version="0.4" hotspot_x="5" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{4968BF82-CB4A-430E-8F3F-780924DEE1D0}"/><names>
-        <name lang="ar">مستمرّ</name>
-        <name lang="de">Aktion</name>
-        <name lang="pt">continuo</name>
-        <name lang="el">Συνέχεια</name>
-        <name lang="en">trans bool function</name>
-        <name lang="it">Continua</name>
+<definition hotspot_x="4" hotspot_y="10" orientation="dyyy" height="20" type="element" link_type="simple" width="170" version="0.5">
+    <uuid uuid="{23916380-0e43-4857-a367-ad7663bc8b09}"/>
+    <names>
         <name lang="fr">Action normal</name>
         <name lang="pl">Działanie</name>
-        <name lang="nl">bool functie</name>
         <name lang="cs">Čin</name>
+        <name lang="ar">مستمرّ</name>
+        <name lang="el">Συνέχεια</name>
+        <name lang="pt">continuo</name>
+        <name lang="it">Continua</name>
+        <name lang="de">Aktion</name>
+        <name lang="en">trans bool function</name>
+        <name lang="nl">bool functie</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license
@@ -17,11 +18,11 @@ License: see http://qelectrotech.org/wiki/doc/elements_license
 
 </informations>
     <description>
-        <input x="25" y="0" size="5" rotate="true" text="boolean function"/>
-        <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="25" y2="5" x2="25"/>
-        <rect width="150" x="5" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="2" y="0" size="7" rotate="true" text="T00"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="160" y="0" nameHidden="96" number="" name="" orientation="e"/>
+        <input x="25" rotate="true" size="5" text="boolean function" y="0" tagg="label"/>
+        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" antialias="false" y2="5" end1="none" x2="25" length1="1.5" x1="25"/>
+        <rect x="5" style="line-style:normal;line-weight:normal;filling:none;color:black" height="10" antialias="false" y="-5" width="150"/>
+        <input x="2" rotate="true" size="7" text="T00" y="0" tagg="none"/>
+        <terminal x="0" orientation="w" y="0"/>
+        <terminal x="160" orientation="e" y="0"/>
     </description>
 </definition>
diff --git a/elements/20_logic/20_grafcet/21_iso_sfc/31_transitions/transition.elmt b/elements/20_logic/20_grafcet/21_iso_sfc/31_transitions/transition.elmt
index cd66ad1b6..e4fda7d45 100644
--- a/elements/20_logic/20_grafcet/21_iso_sfc/31_transitions/transition.elmt
+++ b/elements/20_logic/20_grafcet/21_iso_sfc/31_transitions/transition.elmt
@@ -1,26 +1,27 @@
-<definition width="60" version="0.4" hotspot_x="20" hotspot_y="21" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{4A030AC0-E127-4969-B24A-ED1CAA0BE7F9}"/><names>
-        <name lang="ar">إنتقاليّة</name>
-        <name lang="de">Übergang</name>
-        <name lang="pt">transição</name>
-        <name lang="el">Μετάβαση</name>
-        <name lang="en">transition</name>
-        <name lang="it">Transizione</name>
+<definition hotspot_x="19" hotspot_y="9" orientation="dyyy" height="20" type="element" link_type="simple" width="40" version="0.5">
+    <uuid uuid="{884e45af-b571-4157-9d2b-3b2aeb1ed1bb}"/>
+    <names>
         <name lang="fr">transition</name>
         <name lang="pl">Tranzycja</name>
+        <name lang="cs">Přechod</name>
+        <name lang="ar">إنتقاليّة</name>
+        <name lang="el">Μετάβαση</name>
+        <name lang="pt">transição</name>
+        <name lang="it">Transizione</name>
+        <name lang="de">Übergang</name>
+        <name lang="en">transition</name>
         <name lang="es">transición</name>
         <name lang="nl">Overgang</name>
-        <name lang="cs">Přechod</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="26" x="-13" y="-2" antialias="false" height="4" style="line-style:normal;line-weight:thin;filling:black;color:black"/>
-        <input x="9" y="-7" size="5" rotate="true" text="T###"/>
-        <input x="9" y="7" size="5" rotate="true" text="_"/>
-        <terminal x="0" y="5" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="0" y="-5" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="13" y="0" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="-13" y="0" nameHidden="0" number="" name="" orientation="w"/>
+        <rect x="-13" style="line-style:normal;line-weight:thin;filling:black;color:black" height="4" antialias="false" y="-2" width="26"/>
+        <input x="9" rotate="true" size="5" text="T###" y="-7" tagg="none"/>
+        <input x="9" rotate="true" size="5" text="_" y="7" tagg="label"/>
+        <terminal x="0" orientation="s" y="5"/>
+        <terminal x="0" orientation="n" y="-5"/>
+        <terminal x="13" orientation="e" y="0"/>
+        <terminal x="-13" orientation="w" y="0"/>
     </description>
 </definition>