diff --git a/elements/03relayage/moteurs/moteurs/caisson_triphase_etoile.elmt b/elements/03relayage/moteurs/moteurs/caisson_triphase_etoile.elmt
index 2d5d9a7e4..1f31a88cb 100644
--- a/elements/03relayage/moteurs/moteurs/caisson_triphase_etoile.elmt
+++ b/elements/03relayage/moteurs/moteurs/caisson_triphase_etoile.elmt
@@ -1,4 +1,4 @@
-<definition width="90" version="0.3" hotspot_x="30" hotspot_y="40" height="60" type="element" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="29" hotspot_y="40" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">صندوق ثلاثي الأوجه نجمي</name>
         <name lang="el">Κιβώτιο με συνδεσμολογία αστέρα</name>
@@ -6,13 +6,13 @@
         <name lang="it">Collegamento a stella</name>
         <name lang="fr">Caisson triphasé étoile</name>
         <name lang="pl">Grzejnik trójfazowy skojarzony w gwiazdę</name>
-        <name lang="cs">Třífázové topení, hvězdicové</name>
         <name lang="nl">Apparaat 3AC Ster</name>
+        <name lang="cs">Třífázové topení, hvězdicové</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="31.5" y="-4.6666" size="9" rotate="true" text="R_"/>
+        <input x="31.5" y="-4.6666" size="9" rotate="true" text="R_" tagg="label"/>
         <rect width="47" x="-23" y="-34" antialias="false" height="48" style="line-style:dashed;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="16" y2="0" x2="16"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="0" x2="0"/>
diff --git a/elements/03relayage/moteurs/moteurs/caisson_triphase_triangle.elmt b/elements/03relayage/moteurs/moteurs/caisson_triphase_triangle.elmt
index d341da776..c464520e1 100644
--- a/elements/03relayage/moteurs/moteurs/caisson_triphase_triangle.elmt
+++ b/elements/03relayage/moteurs/moteurs/caisson_triphase_triangle.elmt
@@ -1,4 +1,4 @@
-<definition width="90" version="0.3" hotspot_x="30" hotspot_y="40" height="60" type="element" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="28" hotspot_y="39" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">صندوق ثلاثي الأوجه - مثلثي</name>
         <name lang="el">Κιβώτιο με συνδεσμολογία τριγώνου</name>
@@ -6,8 +6,8 @@
         <name lang="it">Collegamento a triangolo</name>
         <name lang="fr">Caisson triphasé triangle</name>
         <name lang="pl">Grzejnik trójfazowy skojarzony w trójkąt</name>
-        <name lang="cs">Třífázové topení, trojúhelníkové</name>
         <name lang="nl">Apparaat 3AC Driehoek</name>
+        <name lang="cs">Třífázové topení, trojúhelníkové</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -18,7 +18,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-8" y2="-30" x2="-16"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-8" 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="-30" x1="-8" y2="10" x2="-8"/>
-        <input x="31.5" y="-4.6666" size="9" rotate="true" text="R_"/>
+        <input x="31.5" y="-4.6666" size="9" rotate="true" text="R_" tagg="label"/>
         <rect width="50" x="-23" y="-34" antialias="false" height="50" style="line-style:dashed;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="-30" x1="24" y2="-30" x2="16"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="8" y2="-30" x2="0"/>
diff --git a/elements/03relayage/moteurs/moteurs/frein.elmt b/elements/03relayage/moteurs/moteurs/frein.elmt
index 5faaca692..5d8c467a5 100644
--- a/elements/03relayage/moteurs/moteurs/frein.elmt
+++ b/elements/03relayage/moteurs/moteurs/frein.elmt
@@ -1,4 +1,4 @@
-<definition width="110" version="0.3" hotspot_x="67" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="80" version="0.4" hotspot_x="38" hotspot_y="30" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مكبح مغناطيسي</name>
         <name lang="el">Μαγνητικό φρένο</name>
@@ -6,8 +6,8 @@
         <name lang="it">Freno elettromagnetico</name>
         <name lang="fr">Frein magnetique Moteur</name>
         <name lang="pl">Hamulec elektromagnetyczny</name>
-        <name lang="cs">Elektromagnetická brzda</name>
         <name lang="nl">Rem Magnetisch</name>
+        <name lang="cs">Elektromagnetická brzda</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -21,16 +21,16 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="28" y="-6" size="6" text="bl"/>
         <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="0" x1="-30.4541" y2="0" x2="-20.5081"/>
         <polygon x4="-36" y5="20" x5="-30" y6="20" x6="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-30" y2="-20" x2="-30" y3="-27" x3="-36" y4="27"/>
-        <input x="-15" y="11" size="6" rotate="true" text="_"/>
+        <input x="-15" y="11" size="6" rotate="true" text="_" tagg="none"/>
         <line 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="40" y2="-20" x2="40"/>
         <line 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="40" y2="20" x2="-20"/>
-        <input x="-65" y="1.5" size="9" text="_"/>
+        <input x="-65" y="1.5" size="9" text="_" tagg="label"/>
         <line 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="-13" 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="-20" x1="-20" y2="20" x2="-20"/>
         <circle x="7.5" y="-22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <text x="-14" y="-6" size="6" text="rd"/>
-        <terminal x="-10" y="-22" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="10" y="-22" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="30" y="-22" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-22" orientation="n"/>
+        <terminal x="10" y="-22" orientation="n"/>
+        <terminal x="30" y="-22" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/03relayage/moteurs/moteurs/frein_electro.elmt b/elements/03relayage/moteurs/moteurs/frein_electro.elmt
index c819a97b4..66d5749b5 100644
--- a/elements/03relayage/moteurs/moteurs/frein_electro.elmt
+++ b/elements/03relayage/moteurs/moteurs/frein_electro.elmt
@@ -1,4 +1,4 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="70" type="element" orientation="dyyy">
+<definition width="30" version="0.4" hotspot_x="14" hotspot_y="28" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مكبح كهروميكانيكي</name>
         <name lang="el">Ηλεκτρομηχανικό φρένο</name>
@@ -6,8 +6,8 @@
         <name lang="it">Freno elettromeccanico</name>
         <name lang="fr">Frein electromecanique</name>
         <name lang="pl"> Hamulec elektromechaniczny</name>
-        <name lang="cs">Elektromechanická brzda</name>
         <name lang="nl">Rem mechanisch</name>
+        <name lang="cs">Elektromechanická brzda</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -16,6 +16,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line 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="1" 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="-23" x1="-7" y2="26" x2="-7"/>
         <polygon x4="0" y5="27" x5="-7" y6="27" x6="-10" y7="-23" x7="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23" x1="-10" y2="-23" x2="-7" y3="-13" x3="0" y4="17"/>
+        <input x="-31" y="-1" size="9" rotate="true" text="_" tagg="label"/>
         <terminal x="10" y="-10" orientation="e"/>
         <terminal x="10" y="10" orientation="e"/>
     </description>
diff --git a/elements/03relayage/moteurs/moteurs/frein_magnetique.elmt b/elements/03relayage/moteurs/moteurs/frein_magnetique.elmt
index df8274ddd..ca3e669d4 100644
--- a/elements/03relayage/moteurs/moteurs/frein_magnetique.elmt
+++ b/elements/03relayage/moteurs/moteurs/frein_magnetique.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="40" hotspot_y="35" height="70" type="element" orientation="dnny">
+<definition width="60" version="0.4" hotspot_x="41" hotspot_y="30" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مكبح مغناطيسي</name>
         <name lang="el">Μαγνητικό φρένο</name>
@@ -6,21 +6,21 @@
         <name lang="it">Freno elettromagnetico</name>
         <name lang="fr">Frein magnetique</name>
         <name lang="pl">Hamulec elektromagnetyczny</name>
-        <name lang="cs">Elektromagnetická brzda</name>
         <name lang="nl">Rem Magnetic</name>
+        <name lang="cs">Elektromagnetická brzda</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:dashed;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="0" x2="-14"/>
         <polygon x4="-36" y5="20" x5="-30" y6="20" x6="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-30" y2="-20" x2="-30" y3="-27" x3="-36" y4="27"/>
-        <input x="4" y="20" size="6" rotate="true" text="_"/>
-        <input x="4" y="-22" size="6" rotate="true" text="_"/>
+        <input x="4" y="20" size="6" rotate="true" text="_" tagg="none"/>
+        <input x="4" y="-22" size="6" rotate="true" text="_" tagg="none"/>
         <line 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="0" y2="-8" 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="0" y2="21" 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="8" x1="14" y2="-8" x2="14"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-14" y2="8" x2="14"/>
-        <input x="20" y="2.6666" size="9" text="_"/>
+        <input x="20" y="2.6666" size="9" text="_" tagg="label"/>
         <line 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="14" y2="-8" x2="-14"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-14" y2="8" x2="-14"/>
         <terminal x="0" y="-20" orientation="n"/>
diff --git a/elements/03relayage/moteurs/moteurs/module-de-frein.elmt b/elements/03relayage/moteurs/moteurs/module-de-frein.elmt
index 3c85ef1db..223875826 100644
--- a/elements/03relayage/moteurs/moteurs/module-de-frein.elmt
+++ b/elements/03relayage/moteurs/moteurs/module-de-frein.elmt
@@ -1,4 +1,4 @@
-<definition width="110" version="0.3" hotspot_x="25" hotspot_y="27" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="110" version="0.4" hotspot_x="25" hotspot_y="27" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مكبح مغناطيسي</name>
         <name lang="el">Μαγνητικό φρένο</name>
@@ -6,8 +6,8 @@
         <name lang="it">Freno elettromagnetico</name>
         <name lang="fr">Frein magnetique Moteur</name>
         <name lang="pl">Prostownik do hamulca</name>
-        <name lang="cs">Elektromagnetická brzda</name>
         <name lang="nl">Rem elektromagnetisch</name>
+        <name lang="cs">Elektromagnetická brzda</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -26,7 +26,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="8" y="-6" size="6" text="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="-20" x1="27" y2="-20" x2="13"/>
         <text x="28" y="-6" size="6" text="3"/>
-        <input x="-15" y="6" size="6" rotate="true" text="_"/>
+        <input x="-15" y="6" size="6" rotate="true" text="_" tagg="label"/>
         <line 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="80" y2="-20" x2="80"/>
         <line 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="80" 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="-20" x1="-13" y2="-20" x2="-20"/>
@@ -38,10 +38,10 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line 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="46" y2="5" x2="59"/>
         <line 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="46" y2="5" x2="40"/>
         <line 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="60" y2="5" x2="63"/>
-        <terminal x="-10" y="-22" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="10" y="-22" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="30" y="-22" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="50" y="-22" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="70" y="-22" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-10" y="-22" orientation="n"/>
+        <terminal x="10" y="-22" orientation="n"/>
+        <terminal x="30" y="-22" orientation="n"/>
+        <terminal x="50" y="-22" orientation="n"/>
+        <terminal x="70" y="-22" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/03relayage/moteurs/moteurs/moteur.elmt b/elements/03relayage/moteurs/moteurs/moteur.elmt
index ceb32741e..bfea65259 100644
--- a/elements/03relayage/moteurs/moteurs/moteur.elmt
+++ b/elements/03relayage/moteurs/moteurs/moteur.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.3" hotspot_x="15" hotspot_y="25" height="40" type="element" orientation="dnnn">
+<definition width="30" version="0.4" hotspot_x="15" hotspot_y="25" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">محرّك</name>
         <name lang="de">Motor</name>
@@ -10,13 +10,13 @@
         <name lang="fr">Moteur</name>
         <name lang="pl">Silnik</name>
         <name lang="es">Motor</name>
-        <name lang="cs">Motor</name>
         <name lang="nl">Motor</name>
+        <name lang="cs">Motor</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="18" y="0" size="9" rotate="true" text="M_"/>
+        <input x="18" y="0" size="9" rotate="true" text="M_" tagg="label"/>
         <circle x="-10.5" y="-10.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="21"/>
         <circle x="-13" y="-13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="26"/>
         <line 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"/>
diff --git a/elements/03relayage/moteurs/moteurs/moteur_dc.elmt b/elements/03relayage/moteurs/moteurs/moteur_dc.elmt
index 81954ca64..d83f4a22b 100644
--- a/elements/03relayage/moteurs/moteurs/moteur_dc.elmt
+++ b/elements/03relayage/moteurs/moteurs/moteur_dc.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="20" hotspot_y="35" height="70" type="element" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="20" hotspot_y="35" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">محرّك تيّار مستمرّ</name>
         <name lang="de">Gleichstrom Motor</name>
@@ -10,8 +10,8 @@
         <name lang="fr">Moteur à courant continu</name>
         <name lang="pl">Silnik prądu stałego</name>
         <name lang="es">Motor de corriente continuo</name>
-        <name lang="cs">Motor na stejnosměrný proud</name>
         <name lang="nl">Motor DC</name>
+        <name lang="cs">Motor na stejnosměrný proud</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -26,7 +26,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line 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.5" 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="-18" 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="14.5" x1="-5" y2="18" x2="-5"/>
-        <input x="20" y="5" size="9" text="M_"/>
+        <input x="20" y="5" size="9" text="M_" tagg="label"/>
         <terminal x="0" y="-30" orientation="n"/>
         <terminal x="0" y="30" orientation="s"/>
     </description>
diff --git a/elements/03relayage/moteurs/moteurs/moteur_serie_dc.elmt b/elements/03relayage/moteurs/moteurs/moteur_serie_dc.elmt
index 83ba9a5cb..a8c1a3264 100644
--- a/elements/03relayage/moteurs/moteurs/moteur_serie_dc.elmt
+++ b/elements/03relayage/moteurs/moteurs/moteur_serie_dc.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="25" hotspot_y="35" height="70" type="element" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="24" hotspot_y="38" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">محرّك توالي مستمرّ</name>
         <name lang="el">Σειριακό μοτέρ συνεχούς</name>
@@ -6,8 +6,8 @@
         <name lang="it">Motore CC</name>
         <name lang="fr">Moteur série,DC</name>
         <name lang="pl">Silnik szeregowy prądu stałego</name>
-        <name lang="cs">Sériový elektromotor, stejnosměrný proud</name>
         <name lang="nl">Motor DC Serie</name>
+        <name lang="cs">Sériový elektromotor, stejnosměrný proud</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -23,7 +23,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="-4" y="7" size="8" text="M"/>
         <arc width="7" x="16.5" y="-9" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
         <arc width="7" x="16.5" y="-4" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="19" y="16.5" size="9" text="M_"/>
+        <input x="19" y="16.5" size="9" text="M_" tagg="label"/>
         <arc width="7" x="16.5" y="-14" antialias="true" height="5" 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="-29" x1="20" y2="-19" x2="20"/>
         <terminal x="20" y="-30" orientation="n"/>
diff --git a/elements/03relayage/moteurs/moteurs/moteur_serie_mono.elmt b/elements/03relayage/moteurs/moteurs/moteur_serie_mono.elmt
index b16d0fc6c..771029729 100644
--- a/elements/03relayage/moteurs/moteurs/moteur_serie_mono.elmt
+++ b/elements/03relayage/moteurs/moteurs/moteur_serie_mono.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="25" hotspot_y="45" height="80" type="element" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="24" hotspot_y="48" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">محرّك توالي أحادي الوجه</name>
         <name lang="el">Σειριακό μοτέρ, μονοφασικό</name>
@@ -6,8 +6,8 @@
         <name lang="it">Motore serie, monofase</name>
         <name lang="fr">Moteur série, monophasé</name>
         <name lang="pl">Silnik jednofazowy szeregowy</name>
-        <name lang="cs">Sériový elektromotor, jednofázový</name>
         <name lang="nl">Motor serie 1fase</name>
+        <name lang="cs">Sériový elektromotor, jednofázový</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -20,7 +20,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="-4" y="7" size="8" text="M"/>
         <arc width="7" x="16.5" y="-19" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
         <arc width="7" x="16.5" y="-14" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="18" y="15" size="9" text="M_"/>
+        <input x="18" y="15" size="9" text="M_" tagg="label"/>
         <arc width="7" x="16.5" y="-24" antialias="true" height="5" 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="-39" x1="20" y2="-29" x2="20"/>
         <terminal x="20" y="-40" orientation="n"/>
diff --git a/elements/03relayage/moteurs/moteurs/moteur_serie_tri.elmt b/elements/03relayage/moteurs/moteurs/moteur_serie_tri.elmt
index 7a6cf8b29..232823347 100644
--- a/elements/03relayage/moteurs/moteurs/moteur_serie_tri.elmt
+++ b/elements/03relayage/moteurs/moteurs/moteur_serie_tri.elmt
@@ -1,4 +1,4 @@
-<definition width="70" version="0.3" hotspot_x="25" hotspot_y="45" height="80" type="element" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="29" hotspot_y="46" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">محرّك توالي ثلاثي الأوجه</name>
         <name lang="el">Σειριακό μοτέρ, τριφασικό</name>
@@ -6,8 +6,8 @@
         <name lang="it">Motore serie, trifase</name>
         <name lang="fr">Moteur série, triphasé</name>
         <name lang="pl">Silnik trójfazowy szeregowy</name>
-        <name lang="cs">Sériový elektromotor, třífázový</name>
         <name lang="nl">Draaistroommotor Serie 3fasen</name>
+        <name lang="cs">Sériový elektromotor, třífázový</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -27,7 +27,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <arc width="7" x="16.5" y="-14" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
         <arc width="7" x="-3.5" y="-14" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
         <arc width="7" x="-23.5" y="-14" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="18" y="15" size="9" text="M_"/>
+        <input x="18" y="15" size="9" text="M_" tagg="label"/>
         <arc width="7" x="16.5" y="-24" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
         <arc width="7" x="-3.5" y="-24" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
         <arc width="7" x="-23.5" y="-24" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
diff --git a/elements/03relayage/moteurs/moteurs/moteur_tri.elmt b/elements/03relayage/moteurs/moteurs/moteur_tri.elmt
index 1bef85820..cd7c573fe 100644
--- a/elements/03relayage/moteurs/moteurs/moteur_tri.elmt
+++ b/elements/03relayage/moteurs/moteurs/moteur_tri.elmt
@@ -1,4 +1,4 @@
-<definition width="90" version="0.3" hotspot_x="24" hotspot_y="28" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="24" hotspot_y="28" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">محرّك ثلاثي الأوجه</name>
         <name lang="de">Drehstrom Motor</name>
@@ -9,8 +9,8 @@
         <name lang="fr">Moteur triphasé</name>
         <name lang="pl">Silnik trójfazowy</name>
         <name lang="es">Motor trifásico</name>
-        <name lang="cs">Trojfázový motor</name>
         <name lang="nl">Draaistroommotor</name>
+        <name lang="cs">Trojfázový motor</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -20,7 +20,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="24" y="-15" size="4" text="W1"/>
         <text x="4" y="-16" size="4" text="V1"/>
         <text x="-6" y="8" size="11" text="M"/>
-        <input x="40" y="10.5" size="9" text="M_"/>
+        <input x="40" y="10.5" size="9" text="M_" tagg="label"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22" x1="0" y2="-7" x2="0"/>
         <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-22" x1="-20" y2="-12" x2="-20" y3="-3" x3="-11"/>
         <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-22" x1="20" y2="-12" x2="20" y3="-3" x3="11"/>
@@ -32,9 +32,9 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="-8" y="18" size="9" text="3"/>
         <arc width="4" x="0" y="11.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
         <arc width="4" x="4" y="11.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="-20" y="-22" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="-22" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="-23" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="20" nameHidden="1" number="" name="" orientation="n"/>
+        <terminal x="-20" y="-22" orientation="n"/>
+        <terminal x="20" y="-22" orientation="n"/>
+        <terminal x="0" y="-23" orientation="n"/>
+        <terminal x="20" y="20" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/03relayage/moteurs/moteurs/moteur_tri_2.elmt b/elements/03relayage/moteurs/moteurs/moteur_tri_2.elmt
index 62a39e0a9..772b32398 100644
--- a/elements/03relayage/moteurs/moteurs/moteur_tri_2.elmt
+++ b/elements/03relayage/moteurs/moteurs/moteur_tri_2.elmt
@@ -1,4 +1,4 @@
-<definition width="90" version="0.3" hotspot_x="53" hotspot_y="28" height="70" type="element" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="28" hotspot_y="28" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">محرّك ثلاثي الأوجه</name>
         <name lang="de">Drehstrom Motor</name>
@@ -9,8 +9,8 @@
         <name lang="fr">Moteur triphasé</name>
         <name lang="pl">Silnik trójfazowy</name>
         <name lang="es">Motor trifásico</name>
-        <name lang="cs">Trojfázový motor</name>
         <name lang="nl">Draaistroommotor</name>
+        <name lang="cs">Trojfázový motor</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -22,7 +22,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <arc width="9" x="-9" y="21" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="180"/>
         <text x="-10.25" y="18" size="18" text="M"/>
         <ellipse width="46" x="-23" y="-5" antialias="true" height="42" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-51" y="15.5" size="9" text="M_"/>
+        <input x="-51" y="15.5" size="9" text="M_" tagg="label"/>
         <line 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="-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="-19.6172" x1="20" y2="5.08526" 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="-19.6" x1="-20" y2="5.06667" x2="-20"/>
diff --git a/elements/03relayage/moteurs/moteurs/moteur_tri_de.elmt b/elements/03relayage/moteurs/moteurs/moteur_tri_de.elmt
index ad31f3ba4..930985633 100644
--- a/elements/03relayage/moteurs/moteurs/moteur_tri_de.elmt
+++ b/elements/03relayage/moteurs/moteurs/moteur_tri_de.elmt
@@ -1,4 +1,4 @@
-<definition width="100" version="0.3" hotspot_x="24" hotspot_y="35" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="24" hotspot_y="35" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">محرّك سداسي الأوجه</name>
         <name lang="de">6-Phasen Motor</name>
@@ -9,8 +9,8 @@
         <name lang="fr">Moteur triphasé (double enroulement)</name>
         <name lang="pl">Silnik trójfazowy</name>
         <name lang="es">Motor de seis fases</name>
-        <name lang="cs">Šestifázový motor</name>
         <name lang="nl">DraaistroomMotor 3 fasen 6 aansluitingen</name>
+        <name lang="cs">Šestifázový motor</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -25,7 +25,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="4" y="28" size="4" text="V2"/>
         <line 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="30" x2="0"/>
         <text x="-6" y="0" size="11" text="M"/>
-        <input x="50" y="0.5" size="9" text="M_"/>
+        <input x="50" y="0.5" size="9" text="M_" tagg="label"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-15" x2="0"/>
         <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="-20" y2="-20" x2="-20" y3="-11" x3="-11"/>
         <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="20" y2="-20" x2="20" y3="-11" x3="11"/>
@@ -38,12 +38,12 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line 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="23" y2="9" x2="25"/>
         <text x="-8" y="11" size="9" text="3"/>
         <arc width="4" x="0" y="4.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <terminal x="-20" y="30" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="30" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="-20" y="-30" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="-30" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="-31" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="30" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="24" y="0" nameHidden="1" number="" name="" orientation="n"/>
+        <terminal x="-20" y="30" orientation="s"/>
+        <terminal x="20" y="30" orientation="s"/>
+        <terminal x="-20" y="-30" orientation="n"/>
+        <terminal x="20" y="-30" orientation="n"/>
+        <terminal x="0" y="-31" orientation="n"/>
+        <terminal x="0" y="30" orientation="s"/>
+        <terminal x="24" y="0" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/03relayage/moteurs/moteurs/resistance_chauffante.elmt b/elements/03relayage/moteurs/moteurs/resistance_chauffante.elmt
index 5f702e12a..fe641efcb 100644
--- a/elements/03relayage/moteurs/moteurs/resistance_chauffante.elmt
+++ b/elements/03relayage/moteurs/moteurs/resistance_chauffante.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="20" height="40" type="element" orientation="ynnd">
+<definition width="50" version="0.4" hotspot_x="25" hotspot_y="10" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مقاومة تسخين</name>
         <name lang="el">Αντίσταση θέρμανσης</name>
@@ -6,20 +6,20 @@
         <name lang="it">Resistenza di riscaldamento</name>
         <name lang="fr">Résistance chauffante</name>
         <name lang="pl">Grzejnik rezystancyjny</name>
-        <name lang="cs">Vytápěcí odpor</name>
         <name lang="nl">Verwarmingsweerstand</name>
+        <name lang="cs">Vytápěcí odpor</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="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="6" x1="-5" y2="14" x2="-5"/>
-        <rect width="20" x="-10" y="6" 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="6" x1="5" y2="14" 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="6" x1="0" y2="14" x2="0"/>
-        <input x="-10.5" y="0.3333" size="9" rotate="true" text="R_"/>
-        <terminal x="-21" y="10" orientation="w"/>
-        <terminal x="21" y="10" orientation="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="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="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="-4" x1="-5" y2="4" x2="-5"/>
+        <rect width="20" x="-10" y="-4" 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="-4" x1="5" y2="4" 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="-4" x1="0" y2="4" x2="0"/>
+        <input x="-10.5" y="-9.6667" size="9" rotate="true" text="R_" tagg="label"/>
+        <terminal x="-21" y="0" orientation="w"/>
+        <terminal x="21" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/03relayage/moteurs/moteurs/resistances-chauffantes.elmt b/elements/03relayage/moteurs/moteurs/resistances-chauffantes.elmt
index 250ee5db1..cc6237d0b 100644
--- a/elements/03relayage/moteurs/moteurs/resistances-chauffantes.elmt
+++ b/elements/03relayage/moteurs/moteurs/resistances-chauffantes.elmt
@@ -1,4 +1,4 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny">
+<definition width="20" version="0.4" hotspot_x="10" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مقاومة تسخين</name>
         <name lang="el">Αντίσταση θέρμανσης</name>
@@ -6,8 +6,8 @@
         <name lang="it">Resistenza di riscaldamento</name>
         <name lang="fr">Resistances chauffantes</name>
         <name lang="pl">Grzejnik</name>
-        <name lang="cs">Vytápěcí odpory</name>
         <name lang="nl">Verwarmingsweerstand</name>
+        <name lang="cs">Vytápěcí odpory</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -21,6 +21,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line 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="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="-10" x1="4" 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="-10" x1="-4" y2="10" x2="-4"/>
+        <input x="17" y="0" size="9" rotate="true" text="_" tagg="label"/>
         <terminal x="0" y="-21" orientation="n"/>
         <terminal x="0" y="21" orientation="s"/>
     </description>
diff --git a/elements/03relayage/moteurs/moteurs/surpresseur_mono.elmt b/elements/03relayage/moteurs/moteurs/surpresseur_mono.elmt
index e4e8a414a..379fde328 100644
--- a/elements/03relayage/moteurs/moteurs/surpresseur_mono.elmt
+++ b/elements/03relayage/moteurs/moteurs/surpresseur_mono.elmt
@@ -1,20 +1,20 @@
-<definition width="50" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="20" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">معزّز ضغط</name>
         <name lang="en">Booster</name>
+        <name lang="it">Compressore</name>
         <name lang="fr">Surpresseur</name>
         <name lang="pl">Maszyna dodawcza</name>
-        <name lang="cs">Regulátor napětí</name>
-        <name lang="it">Compressore</name>
         <name lang="nl">Compressor</name>
+        <name lang="cs">Regulátor napětí</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="18" y="3.3333" size="9" text="_"/>
-        <line 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.2031" x1="12.9375" y2="9" x2="-10.4062"/>
-        <line 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.2187" x1="12.4688" y2="-9.4687" x2="-10.0312"/>
         <circle x="-14.1598" y="-14.1598" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="28.3196"/>
+        <input x="18" y="3.3333" size="9" text="_" tagg="label"/>
+        <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="5.2031" x1="12.9375" y2="9" x2="-10.4062"/>
+        <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="-5.2187" x1="12.4688" y2="-9.4687" x2="-10.0312"/>
         <terminal x="0" y="-19.0681" orientation="n"/>
         <terminal x="0" y="18.9247" orientation="s"/>
     </description>
diff --git a/elements/03relayage/moteurs/moteurs/variateur.elmt b/elements/03relayage/moteurs/moteurs/variateur.elmt
index b69e54945..3ce9ac7e6 100644
--- a/elements/03relayage/moteurs/moteurs/variateur.elmt
+++ b/elements/03relayage/moteurs/moteurs/variateur.elmt
@@ -1,12 +1,12 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn">
+<definition width="50" version="0.4" hotspot_x="25" hotspot_y="15" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مغيّر</name>
         <name lang="en">Drive</name>
+        <name lang="it">Regolatore</name>
         <name lang="fr">Variateur</name>
         <name lang="pl">Regulator</name>
-        <name lang="cs">Regulátor</name>
-        <name lang="it">Regolatore</name>
         <name lang="nl">Regelbaar</name>
+        <name lang="cs">Regulátor</name>
     </names>
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
@@ -16,6 +16,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line 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="-21" y2="0" x2="-10"/>
         <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
         <text x="-6" y="2.6666" size="6" text="Var"/>
+        <input x="13" y="-9" size="9" rotate="true" text="_" tagg="label"/>
         <terminal x="-21" y="0" orientation="w"/>
         <terminal x="21" y="0" orientation="e"/>
     </description>
diff --git a/elements/03relayage/moteurs/moteurs/ventilateur_coffret.elmt b/elements/03relayage/moteurs/moteurs/ventilateur_coffret.elmt
index fd91e97cb..dd4e9f803 100644
--- a/elements/03relayage/moteurs/moteurs/ventilateur_coffret.elmt
+++ b/elements/03relayage/moteurs/moteurs/ventilateur_coffret.elmt
@@ -1,24 +1,24 @@
-<definition width="90" version="0.3" hotspot_x="0" hotspot_y="0" height="60" type="element" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="20" hotspot_y="35" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مروحة خزانة</name>
         <name lang="de">Ventilator</name>
         <name lang="en">Fan cabinet</name>
+        <name lang="it">Ventilatore</name>
         <name lang="fr">Ventilateur coffret</name>
         <name lang="pl">Wentylator</name>
-        <name lang="cs">Ventilátor</name>
-        <name lang="it">Ventilatore</name>
         <name lang="nl">Kast ventilator</name>
+        <name lang="cs">Ventilátor</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <circle x="9.3431" y="24.3431" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="11.3137"/>
-        <circle x="19.3432" y="24.3431" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="11.3137"/>
-        <input x="38" y="32.6667" size="10" rotate="true" text="VMC"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="20" y2="45" 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="20" y2="14" x2="20"/>
-        <circle x="5" y="15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="30"/>
-        <terminal x="20" y="0" orientation="n"/>
-        <terminal x="20" y="60" orientation="s"/>
+        <circle x="-10.6569" y="-5.6569" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="11.3137"/>
+        <circle x="-0.6568" y="-5.6569" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="11.3137"/>
+        <input x="18" y="2.6667" size="10" rotate="true" text="VMC" tagg="label"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="0" y2="15" 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="-30" x1="0" y2="-16" x2="0"/>
+        <circle x="-15" y="-15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="30"/>
+        <terminal x="0" y="-30" orientation="n"/>
+        <terminal x="0" y="30" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/061bornes/borne_2.elmt b/elements/061bornes/borne_2.elmt
index e26029a7c..78e91ddec 100644
--- a/elements/061bornes/borne_2.elmt
+++ b/elements/061bornes/borne_2.elmt
@@ -19,6 +19,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line 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="-3" x2="0"/>
         <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="0" x1="10" y2="0" x2="3"/>
+        <input x="3" y="-12" size="9" rotate="true" text="_" tagg="label"/>
         <terminal x="0" y="-10" orientation="n"/>
         <terminal x="0" y="10" orientation="s"/>
         <terminal x="10" y="0" orientation="e"/>
diff --git a/elements/061bornes/borne_3.elmt b/elements/061bornes/borne_3.elmt
index 81c59acbb..8c82bf2e7 100644
--- a/elements/061bornes/borne_3.elmt
+++ b/elements/061bornes/borne_3.elmt
@@ -18,6 +18,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line 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="-3" x2="0"/>
         <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="0" x1="-3" y2="0" x2="-10"/>
+        <input x="3" y="-8" size="9" rotate="true" text="_" tagg="label"/>
         <terminal x="0" y="-10" orientation="n"/>
         <terminal x="-10" y="0" orientation="w"/>
     </description>
diff --git a/elements/061bornes/borne_5.elmt b/elements/061bornes/borne_5.elmt
index 577950088..db8f23ebe 100644
--- a/elements/061bornes/borne_5.elmt
+++ b/elements/061bornes/borne_5.elmt
@@ -20,6 +20,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line 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="-3" x2="0"/>
         <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="0" x1="10" y2="0" x2="3"/>
+        <input x="1" y="-10" size="9" rotate="true" text="_" tagg="label"/>
         <terminal x="0" y="-10" orientation="n"/>
         <terminal x="0" y="10" orientation="s"/>
         <terminal x="10" y="0" orientation="e"/>
diff --git a/elements/061bornes/borne_continuite.elmt b/elements/061bornes/borne_continuite.elmt
index c065cda05..0ffe93def 100644
--- a/elements/061bornes/borne_continuite.elmt
+++ b/elements/061bornes/borne_continuite.elmt
@@ -1,4 +1,4 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy" link_type="terminal">
+<definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="30" link_type="terminal" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">طرف توصيل</name>
         <name lang="de">Klemmblock</name>
@@ -9,14 +9,14 @@
         <name lang="fr">Borne continuité</name>
         <name lang="pl">Zacisk</name>
         <name lang="es">Terminal de unión</name>
-        <name lang="cs">Spojovací svorka</name>
         <name lang="nl">klem doorgang</name>
+        <name lang="cs">Spojovací svorka</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="5" y="8" size="7" text="_"/>
-        <input x="5" y="-5" size="10" text="_"/>
+        <input x="5" y="8" size="7" text="_" tagg="none"/>
+        <input x="5" y="-5" size="10" text="_" tagg="label"/>
         <line 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="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="-10" x1="0" y2="-3" x2="0"/>
         <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
diff --git a/elements/061bornes/borne_finale.elmt b/elements/061bornes/borne_finale.elmt
index dd196ad35..bf4dbf371 100644
--- a/elements/061bornes/borne_finale.elmt
+++ b/elements/061bornes/borne_finale.elmt
@@ -1,4 +1,4 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
+<definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">طرف نهائي</name>
         <name lang="de">Endklemme</name>
@@ -9,14 +9,14 @@
         <name lang="fr">Borne finale</name>
         <name lang="pl">Zacisk</name>
         <name lang="es">Punto de unión</name>
-        <name lang="cs">Koncová svorka</name>
         <name lang="nl">Klem eind</name>
+        <name lang="cs">Koncová svorka</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="5" y="8" size="7" text="_"/>
-        <input x="5" y="-5" size="10" text="_"/>
+        <input x="5" y="8" size="7" text="_" tagg="none"/>
+        <input x="5" y="-5" size="10" text="_" tagg="label"/>
         <line 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="-3" x2="0"/>
         <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="-10" orientation="n"/>
diff --git a/elements/061bornes/bornedouble.elmt b/elements/061bornes/bornedouble.elmt
index 15694fff8..ceb6ea354 100644
--- a/elements/061bornes/bornedouble.elmt
+++ b/elements/061bornes/bornedouble.elmt
@@ -17,7 +17,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <input x="3" y="6.5" size="7" text="_" tagg="none"/>
         <circle x="-2.5" y="6.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <input x="3" y="-2.5" size="7" text="_" tagg="none"/>
+        <input x="3" y="-2.5" size="7" text="_" tagg="label"/>
         <line 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="0" y2="12" 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="0" y2="-3" x2="0"/>
         <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>