diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret-urgence_no.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret-urgence_no.elmt
index 0b2bacb46..ac179c0a9 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret-urgence_no.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret-urgence_no.elmt
@@ -1,15 +1,15 @@
-<definition width="30" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dnny">
+<definition orientation="dyyy" height="50" hotspot_y="24" version="0.5" type="element" width="30" hotspot_x="22" link_type="master">
     <names>
-        <name lang="ar">زرّ توقف طارئ (NF)</name>
-        <name lang="de">Pilzdrucktaster Schliesser</name>
-        <name lang="ru">Кнопка (НР)</name>
-        <name lang="en">Push-button</name>
-        <name lang="fr">Arret d'urgence (NF)</name>
-        <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
-        <name lang="es">Pulsador</name>
-        <name lang="cs">Nouzové zastavení</name>
         <name lang="it">Arresto d'emergenza</name>
         <name lang="nl">Noodstop drukknop (NO)</name>
+        <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
+        <name lang="ru">Кнопка (НР)</name>
+        <name lang="fr">Arret d'urgence (NF)</name>
+        <name lang="ar">زرّ توقف طارئ (NF)</name>
+        <name lang="en">Push-button</name>
+        <name lang="es">Pulsador</name>
+        <name lang="cs">Nouzové zastavení</name>
+        <name lang="de">Pilzdrucktaster Schliesser</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -17,15 +17,15 @@
     <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:thin;filling:none;color:black" y1="-2" x1="-10.25" y2="0" x2="-7.25"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0"/>
-        <arc width="8" x="-17.25" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:thin;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="-20" x1="0" y2="-10" 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="-2" x1="-10.25" y2="0" x2="-10.25"/>
-        <input x="2.75" y="3" size="9" text="_" tagg="label"/>
-        <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="-5" x1="-13.25" y2="5" x2="-13.25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-13.25" y2="0" x2="-3.25"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <line length1="1.5" x1="-10.25" antialias="true" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-7.25" end2="none" y2="0" y1="-2"/>
+        <polygon y3="20" x1="-5" antialias="true" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" y2="10" x3="0" y1="-10"/>
+        <arc height="10" x="-17.25" y="-5" width="8" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
+        <line length1="1.5" x1="0" antialias="false" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" end2="none" y2="-10" y1="-20"/>
+        <line length1="1.5" x1="-10.25" antialias="false" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-10.25" end2="none" y2="0" y1="-2"/>
+        <input x="2.75" y="3" text="_" tagg="label" size="9"/>
+        <line length1="1.5" x1="-13.25" antialias="false" length2="1.5" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-13.25" end2="none" y2="5" y1="-5"/>
+        <line length1="1.5" x1="-13.25" antialias="false" length2="1.5" end1="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" x2="-3.25" end2="none" y2="0" y1="0"/>
+        <terminal orientation="n" x="0" y="-20"/>
+        <terminal orientation="s" x="0" y="20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_deverrouillage_a_cle.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_deverrouillage_a_cle.elmt
index 75f11d480..a20cc5a43 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_deverrouillage_a_cle.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_deverrouillage_a_cle.elmt
@@ -1,32 +1,32 @@
-<definition width="40" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dnny">
+<definition width="40" orientation="dyyy" version="0.5" height="50" hotspot_y="24" type="element" hotspot_x="30" link_type="master">
     <names>
         <name lang="ar">زرّ توقف طوارئ - فتح بمفتاح</name>
-        <name lang="en">Emergency stop key release</name>
         <name lang="de">Pilzdrucktaster Öffner mit Schlüsselentriegelung</name>
-        <name lang="fr">Arrêt d'urgence - Déverrouillage à clé</name>
+        <name lang="en">Emergency stop key release</name>
+        <name lang="it">Arresto d'emergenza con sblocco a chiave</name>
         <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
         <name lang="cs">Nouzové zastavení - uvolnění klíče</name>
-        <name lang="it">Arresto d'emergenza con sblocco a chiave</name>
         <name lang="nl">Noodstop sleutelreset (NC)</name>
+        <name lang="fr">Arrêt d'urgence - Déverrouillage à clé</name>
     </names>
     <kindInformations>
-        <kindInformation show="1" name="type">commutator</kindInformation>
+        <kindInformation name="type" show="1">commutator</kindInformation>
     </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="4" x="-13" y="-3" antialias="false" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon x4="-16.0364" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-0.190821" x1="-18.0364" y2="3.80918" x2="-19.0364" y3="3.80918" x3="-15.0364" y4="-0.190821"/>
-        <polygon x4="-6" y5="0" x5="-9" antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="3" y2="0" x2="-2" y3="3" x3="-4" y4="0"/>
-        <circle x="-19.25" y="-4.4318" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="4.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-13" y2="0" x2="-22"/>
-        <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="-5" x1="-22" y2="5" x2="-22"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0"/>
-        <arc width="8" x="-26" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:thin;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="-9" x1="0" y2="-9" 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="-20" x1="0" y2="-9" x2="0"/>
-        <input x="8.5" y="2.3333" size="9" text="AU_"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <rect antialias="false" width="4" y="-3" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black" x="-13"/>
+        <polygon x1="-18.0364" antialias="true" y3="3.80918" x4="-16.0364" y2="3.80918" y4="-0.190821" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-0.190821" x2="-19.0364" closed="false" x3="-15.0364"/>
+        <polygon x1="3" antialias="false" y3="3" x5="-9" x4="-6" y5="0" y2="0" y4="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x2="-2" closed="false" x3="-4"/>
+        <circle antialias="true" y="-4.4318" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="4.5" x="-19.25"/>
+        <line x1="-13" antialias="false" length1="1.5" end2="none" y2="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" y1="0" x2="-22" length2="1.5"/>
+        <line x1="-22" antialias="false" length1="1.5" end2="none" y2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" y1="-5" x2="-22" length2="1.5"/>
+        <polygon x1="5" antialias="true" y3="20" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x2="0" closed="false" x3="0"/>
+        <arc antialias="true" width="8" y="-5" height="10" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" x="-26" angle="-180"/>
+        <line x1="0" antialias="false" length1="1.5" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" y1="-9" x2="6" length2="1.5"/>
+        <line x1="0" antialias="false" length1="1.5" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" y1="-20" x2="0" length2="1.5"/>
+        <input tagg="label" y="2.3333" size="9" text="AU_" x="8.5"/>
+        <terminal orientation="n" y="-20" x="0"/>
+        <terminal orientation="s" y="20" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_tourner_deverouiller.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_tourner_deverouiller.elmt
index 26253dd44..c600d6b27 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_tourner_deverouiller.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_tourner_deverouiller.elmt
@@ -1,13 +1,13 @@
-<definition width="40" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dnny">
+<definition width="40" type="element" version="0.5" height="50" hotspot_y="24" hotspot_x="30" link_type="master" orientation="dyyy">
     <names>
-        <name lang="ar">زرّ توقف طارئ - فتح بالدوران</name>
-        <name lang="en">Emergency turn stop deverouiller</name>
-        <name lang="de">Pilzdrucktaster Öffner mit Drehentriegelung</name>
         <name lang="fr">Arrêt d'urgence - Tourner déverrouiller</name>
         <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
+        <name lang="nl">Noodstop drukknop met draaireset</name>
+        <name lang="ar">زرّ توقف طارئ - فتح بالدوران</name>
         <name lang="cs">Nouzové zastavení - obrácení uvolnění</name>
         <name lang="it">Arresto d'emergenza con sblocco a rotazione</name>
-        <name lang="nl">Noodstop drukknop met draaireset</name>
+        <name lang="en">Emergency turn stop deverouiller</name>
+        <name lang="de">Pilzdrucktaster Öffner mit Drehentriegelung</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -15,16 +15,16 @@
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="-6" y5="0" x5="-10" antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="3" y2="0" x2="-2" y3="3" x3="-4" y4="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-13" y2="0" x2="-22"/>
-        <rect width="3" x="-13" y="-3" antialias="false" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon x4="-19" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-5" x1="-13" y2="-5" x2="-16" y3="5" x3="-16" y4="5"/>
-        <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="-5" x1="-22" y2="5" x2="-22"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0"/>
-        <arc width="8" x="-26" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:thin;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="-9" x1="0" y2="-9" 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="-20" x1="0" y2="-9" x2="0"/>
-        <input x="8.5" y="2.3333" size="9" text="AU_"/>
+        <polygon closed="false" y3="3" x4="-6" y1="0" x5="-10" y5="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" x1="3" y2="0" x3="-4" antialias="false" x2="-2" y4="0"/>
+        <line y1="0" length2="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" x1="-13" y2="0" end2="none" antialias="false" end1="none" x2="-22" length1="1.5"/>
+        <rect width="3" x="-13" y="-3" style="line-style:normal;line-weight:thin;filling:none;color:black" height="6" antialias="false"/>
+        <polygon closed="false" y3="5" x4="-19" y1="-5" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-13" y2="-5" x3="-16" antialias="false" x2="-16" y4="5"/>
+        <line y1="-5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-22" y2="5" end2="none" antialias="false" end1="none" x2="-22" length1="1.5"/>
+        <polygon closed="false" y3="20" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" y2="10" x3="0" antialias="true" x2="0"/>
+        <arc width="8" x="-26" y="-5" angle="-180" style="line-style:normal;line-weight:thin;filling:none;color:black" height="10" antialias="true" start="-90"/>
+        <line y1="-9" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y2="-9" end2="none" antialias="false" end1="none" x2="6" length1="1.5"/>
+        <line y1="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y2="-9" end2="none" antialias="false" end1="none" x2="0" length1="1.5"/>
+        <input x="8.5" y="2.3333" size="9" text="AU_" tagg="label"/>
         <terminal x="0" y="-20" orientation="n"/>
         <terminal x="0" y="20" orientation="s"/>
     </description>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_verrou.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_verrou.elmt
index 8bed60c91..d27878590 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_verrou.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/arret_urgence_verrou.elmt
@@ -1,14 +1,14 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dyyy">
+<definition link_type="master" type="element" width="30" hotspot_y="31" height="60" orientation="dyyy" version="0.5" hotspot_x="17">
     <names>
+        <name lang="pl">Łącznik przyciskowy, odblokowywany kluczykiem (przycisk bezpieczeństwa)</name>
+        <name lang="nl">Noodstop grendel</name>
+        <name lang="fr">Arrêt d'urgence (VERROU)</name>
+        <name lang="es">Paro de emergencia</name>
+        <name lang="it">Arresto d'emergenza</name>
+        <name lang="de">Pilzdrucktaster Öffner mit Schlüsselentriegelung</name>
+        <name lang="cs">Nouzové zastavení (POJITSKA)</name>
         <name lang="ar">زرّ توقيف طوارئ (بقفل)</name>
         <name lang="en">Emergency stop (LATCH)</name>
-        <name lang="de">Pilzdrucktaster Öffner mit Schlüsselentriegelung</name>
-        <name lang="fr">Arrêt d'urgence (VERROU)</name>
-        <name lang="pl">Łącznik przyciskowy, odblokowywany kluczykiem (przycisk bezpieczeństwa)</name>
-        <name lang="es">Paro de emergencia</name>
-        <name lang="cs">Nouzové zastavení (POJITSKA)</name>
-        <name lang="it">Arresto d'emergenza</name>
-        <name lang="nl">Noodstop grendel</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -16,19 +16,19 @@
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="-5.5" y5="6.3333" x5="-5.5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="6.3333" x1="-6.5" y2="8.3333" x2="-7.5" y3="8.3333" x3="-4.5" y4="6.3333"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="5.3333" x1="-3" y2="5.3333" x2="-5"/>
-        <circle x="-7" y="4.3333" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-1.6666" x1="-3" y2="5.3333" x2="-3"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11.6667" x1="4.875" y2="8.3333" x2="-0.125" y3="18.3333" x3="-0.125"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.6666" x1="-4.125" y2="-1.6666" x2="-1.125"/>
-        <arc width="8" x="-11.125" y="-6.6666" antialias="true" height="10" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-88" angle="-184"/>
-        <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.6666" x1="-4.125" y2="-1.6666" x2="-4.125"/>
-        <line 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.6667" x1="-0.125" y2="-10.6667" x2="5.875"/>
-        <line 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.6667" x1="-0.125" y2="-10.6667" x2="-0.125"/>
-        <input x="6" y="1" size="9" text="_" tagg="label"/>
-        <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="-6.6666" x1="-7" y2="3.3333" x2="-7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-1.6666" x1="-7" y2="-1.6666" x2="3"/>
+        <polygon y2="8.3333" x5="-5.5" x2="-7.5" y3="8.3333" x4="-5.5" y4="6.3333" y1="6.3333" x3="-4.5" y5="6.3333" x1="-6.5" closed="false" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false"/>
+        <line y2="5.3333" x2="-5" length2="1.5" end1="none" y1="5.3333" length1="1.5" x1="-3" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="false"/>
+        <circle x="-7" diameter="2" y="4.3333" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true"/>
+        <line y2="5.3333" x2="-3" length2="1.5" end1="none" y1="-1.6666" length1="1.5" x1="-3" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="false"/>
+        <polygon y2="8.3333" x2="-0.125" y3="18.3333" y1="-11.6667" x3="-0.125" x1="4.875" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true"/>
+        <line y2="-1.6666" x2="-1.125" length2="1.5" end1="none" y1="-3.6666" length1="1.5" x1="-4.125" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true"/>
+        <arc x="-11.125" width="8" angle="-184" start="-88" height="10" y="-6.6666" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true"/>
+        <line y2="-1.6666" x2="-4.125" length2="1.5" end1="none" y1="-3.6666" length1="1.5" x1="-4.125" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false"/>
+        <line y2="-10.6667" x2="5.875" length2="1.5" end1="none" y1="-10.6667" length1="1.5" x1="-0.125" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <line y2="-10.6667" x2="-0.125" length2="1.5" end1="none" y1="-21.6667" length1="1.5" x1="-0.125" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
+        <input tagg="label" x="6" size="9" text="_" y="1"/>
+        <line y2="3.3333" x2="-7" length2="1.5" end1="none" y1="-6.6666" length1="1.5" x1="-7" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false"/>
+        <line y2="-1.6666" x2="3" length2="1.5" end1="none" y1="-1.6666" length1="1.5" x1="-7" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="false"/>
         <terminal x="-0.125" y="-22.6667" orientation="n"/>
         <terminal x="-0.125" y="19.3333" orientation="s"/>
     </description>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au.elmt
index 0a3aca05f..b7c99fb0e 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au.elmt
@@ -1,33 +1,33 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="dnny">
+<definition type="element" link_type="master" width="30" version="0.5" height="50" hotspot_x="17" hotspot_y="24" orientation="dyyy">
     <names>
-        <name lang="ar">زرّ توقف طارئ (NC)</name>
-        <name lang="de">Pilzdrucktaster Öffner</name>
+        <name lang="fr">Arrêt d'urgence (NF)</name>
         <name lang="ru">Аварийный стоп</name>
-        <name lang="pt">Paragem de emergência (NC)</name>
+        <name lang="nl">Noodstop drukknop (NC)</name>
+        <name lang="ar">زرّ توقف طارئ (NC)</name>
         <name lang="en">Emergency stop (NC)</name>
         <name lang="it">Arresto d'emergenza</name>
-        <name lang="fr">Arrêt d'urgence (NF)</name>
         <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
-        <name lang="es">Parada de emergencia (NC)</name>
+        <name lang="de">Pilzdrucktaster Öffner</name>
+        <name lang="pt">Paragem de emergência (NC)</name>
         <name lang="cs">Nouzové zastavení</name>
-        <name lang="nl">Noodstop drukknop (NC)</name>
+        <name lang="es">Parada de emergencia (NC)</name>
     </names>
     <kindInformations>
-        <kindInformation show="1" name="type">commutator</kindInformation>
+        <kindInformation name="type" show="1">commutator</kindInformation>
     </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="0"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-2" x1="-4" y2="0" x2="-1"/>
-        <arc width="8" x="-11" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:thin;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:thin;filling:none;color:black" y1="-2" x1="-4" y2="0" 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="-9" x1="0" y2="-9" 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="-20" x1="0" y2="-9" x2="0"/>
-        <input x="5.75" y="3" size="9" text="_" tagg="label"/>
-        <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="-5" x1="-7" y2="5" x2="-7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-7" y2="0" x2="3"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <polygon y1="-10" x2="0" x3="0" antialias="true" x1="5" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y2="10" y3="20"/>
+        <line end1="none" end2="none" y1="-2" x2="-1" antialias="true" x1="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="0" length2="1.5"/>
+        <arc y="-5" antialias="true" width="8" start="-90" style="line-style:normal;line-weight:thin;filling:none;color:black" x="-11" height="10" angle="-180"/>
+        <line end1="none" end2="none" y1="-2" x2="-4" antialias="false" x1="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="0" length2="1.5"/>
+        <line end1="none" end2="none" y1="-9" x2="6" antialias="false" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-9" length2="1.5"/>
+        <line end1="none" end2="none" y1="-20" x2="0" antialias="false" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-9" length2="1.5"/>
+        <input y="3" x="5.75" text="_" size="9" tagg="label"/>
+        <line end1="none" end2="none" y1="-5" x2="-7" antialias="false" x1="-7" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="5" length2="1.5"/>
+        <line end1="none" end2="none" y1="0" x2="3" antialias="false" x1="-7" style="line-style:dashed;line-weight:thin;filling:none;color:black" length1="1.5" y2="0" length2="1.5"/>
+        <terminal y="-20" x="0" orientation="n"/>
+        <terminal y="20" x="0" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au_cable1.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au_cable1.elmt
index 576dae655..b9eaee31d 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au_cable1.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au_cable1.elmt
@@ -1,33 +1,28 @@
-<definition width="90" version="0.4" hotspot_x="3" hotspot_y="34" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="30" hotspot_x="2" orientation="dyyy" height="50" hotspot_y="33" type="element" version="0.5" link_type="master">
     <names>
-        <name lang="en">Emergency stop trip switches 2NC</name>
-        <name lang="de">Taster 2 Öffner</name>
-        <name lang="fr">Arret d'urgence cable 2NC</name>
-        <name lang="pl">Wyłącznik bezpieczeństwa</name>
         <name lang="it">Arresto d'emergenza a cavo 2NC</name>
+        <name lang="de">Taster 2 Öffner</name>
+        <name lang="en">Emergency stop trip switches 2NC</name>
+        <name lang="fr">Arret d'urgence cable 2NC</name>
         <name lang="cs">Bezpečnostní přepínače 2NC</name>
+        <name lang="pl">Wyłącznik bezpieczeństwa</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
     </kindInformations>
     <informations></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="-12" x1="3" y2="-10" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12" x1="3" y2="-10" x2="6"/>
-        <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="0" y2="-5" x2="0"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-19" x1="65" y2="1" x2="60" y3="11" x3="60"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-10" x1="3.78232" y2="-10" x2="62.9025"/>
-        <line 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="60" y2="-18" x2="66"/>
-        <line 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="60" y2="-18" x2="60"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-19" x1="25" y2="1" x2="20" y3="11" x3="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="20" y2="-18" x2="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="-29" x1="20" y2="-18" x2="20"/>
-        <input x="69" y="-6.5" size="9" text="_" tagg="none"/>
-        <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="2" y2="-4" x2="2"/>
-        <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="-10" x1="2.40361" y2="-10" x2="5.62006"/>
-        <terminal x="20" y="-29" orientation="n"/>
-        <terminal x="20" y="11" orientation="s"/>
-        <terminal x="60" y="-29" orientation="n"/>
-        <terminal x="60" y="11" orientation="s"/>
+        <line end2="none" x1="3" y2="-10" length1="1.5" y1="-12" antialias="false" length2="1.5" x2="2" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line end2="none" x1="3" y2="-10" length1="1.5" y1="-12" antialias="true" length2="1.5" x2="6" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line end2="none" x1="0" y2="-5" length1="1.5" y1="-15" antialias="false" length2="1.5" x2="0" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <polygon closed="false" x3="20" x1="25" y2="1" y3="11" y1="-19" antialias="true" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" x1="20" y2="-18" length1="1.5" y1="-18" antialias="false" length2="1.5" x2="26" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" x1="20" y2="-18" length1="1.5" y1="-29" antialias="false" length2="1.5" x2="20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" x1="2" y2="-4" length1="1.5" y1="-16" antialias="false" length2="1.5" x2="2" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line end2="none" x1="2.40361" y2="-10" length1="1.5" y1="-10" antialias="false" length2="1.5" x2="5.62006" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line end2="none" x1="2" y2="-10" length1="1.5" y1="-10" antialias="false" length2="1.5" x2="22" end1="none" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
+        <input rotate="true" tagg="label" x="30" y="-8" text="_" size="9"/>
+        <terminal orientation="n" x="20" y="-29"/>
+        <terminal orientation="s" x="20" y="11"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au_cable2.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au_cable2.elmt
deleted file mode 100644
index 50f390730..000000000
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/au_cable2.elmt
+++ /dev/null
@@ -1,32 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="3" hotspot_y="34" height="50" type="element" ic="true" orientation="dyyy">
-    <names>
-        <name lang="en">Emergency stop trip switches NC+NO</name>
-        <name lang="de">Taster Öffner/Schliesser</name>
-        <name lang="fr">Arret d'urgence cable NC+NO</name>
-        <name lang="pl">Wyłącznik bezpieczeństwa</name>
-        <name lang="it">Arresto d'emergenza a cavo NC+NO</name>
-        <name lang="cs">Bezpečnostní přepínače NC+NO</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="type">commutator</kindInformation>
-    </kindInformations>
-    <informations></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="-12" x1="3" y2="-10" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12" x1="3" y2="-10" x2="6"/>
-        <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="0" y2="-5" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="-10" x1="3.78232" y2="-10" x2="62.9025"/>
-        <line 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="60" y2="-18" x2="60"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-19" x1="25" y2="1" x2="20" y3="11" x3="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="20" y2="-18" x2="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="-29" x1="20" y2="-18" x2="20"/>
-        <input x="69" y="-6.5" size="9" text="_" tagg="none"/>
-        <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="2" y2="-4" x2="2"/>
-        <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="-10" x1="2.40361" y2="-10" x2="5.62006"/>
-        <polygon x4="52" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="11" x1="60" y2="0" x2="60" y3="-19" x3="52" y4="-19"/>
-        <terminal x="20" y="-29" orientation="n"/>
-        <terminal x="20" y="11" orientation="s"/>
-        <terminal x="60" y="-29" orientation="n"/>
-        <terminal x="60" y="11" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/contact_012.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/contact_012.elmt
index a61dd567d..41c76b19a 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/contact_012.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/contact_012.elmt
@@ -1,14 +1,14 @@
-<definition width="50" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dyyy">
+<definition width="30" hotspot_y="24" type="element" hotspot_x="15" height="50" version="0.5" orientation="dyyy" link_type="master">
     <names>
-        <name lang="ar">زرّ ضاغط</name>
-        <name lang="el">Μπουτόν, φωτειζόμενο</name>
-        <name lang="en">Push-button</name>
         <name lang="de">Drucktaster Schliesser beleuchtet</name>
-        <name lang="it">Pulsante luminoso</name>
+        <name lang="el">Μπουτόν, φωτειζόμενο</name>
         <name lang="fr">Bouton poussoir</name>
-        <name lang="pl">Łącznik przyciskowy podświetlony  z powrotem samoczynnym</name>
+        <name lang="en">Push-button</name>
         <name lang="cs">Tlačítko</name>
         <name lang="nl">Drukknop met lamp (NO)</name>
+        <name lang="it">Pulsante luminoso</name>
+        <name lang="pl">Łącznik przyciskowy podświetlony  z powrotem samoczynnym</name>
+        <name lang="ar">زرّ ضاغط</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -16,15 +16,15 @@
     <informations>Author: The QElectroTech team&#xd;
 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:thin;filling:none;color:black" y1="0" x1="-5" y2="0" x2="7"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="4" x1="0" y2="4" x2="-3" y3="-4" x3="-3" y4="-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="2" x1="-11" y2="-2" x2="-7"/>
-        <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="-2" x1="-11" y2="2" x2="-7"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="10" y2="10" x2="10" y3="-10" x3="4"/>
-        <circle x="-12.75" y="-3.75" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="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="-20" x1="10" y2="-9" x2="10"/>
-        <input x="15" y="1.5" size="9" text="_" tagg="label"/>
-        <terminal x="10" y="-20" orientation="n"/>
-        <terminal x="10" y="20" orientation="s"/>
+        <line y1="0" length1="1.5" y2="0" antialias="false" x1="-5" end1="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" x2="7"/>
+        <polygon y4="-4" y1="4" closed="false" y2="4" antialias="true" x3="-3" y3="-4" x4="0" x1="0" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-3"/>
+        <line y1="2" length1="1.5" y2="-2" antialias="false" x1="-11" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" x2="-7"/>
+        <line y1="-2" length1="1.5" y2="2" antialias="false" x1="-11" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" end2="none" x2="-7"/>
+        <polygon y1="20" closed="false" y2="10" antialias="true" x3="4" y3="-10" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10"/>
+        <circle antialias="true" diameter="7.5" y="-3.75" style="line-style:normal;line-weight:thin;filling:none;color:black" x="-12.75"/>
+        <line y1="-20" length1="1.5" y2="-9" antialias="false" x1="10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" end2="none" x2="10"/>
+        <input size="9" y="1.5" text="_" tagg="label" x="15"/>
+        <terminal y="-20" orientation="n" x="10"/>
+        <terminal y="20" orientation="s" x="10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/poussoir.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/poussoir.elmt
index 19a8a22c1..0bc0c165b 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/poussoir.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/poussoir.elmt
@@ -1,17 +1,17 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny">
+<definition link_type="master" height="60" hotspot_y="29" version="0.5" type="element" hotspot_x="14" orientation="dyyy" width="20">
     <names>
         <name lang="ar">زرّ ضاغط</name>
-        <name lang="de">Drucktaster Schliesser</name>
-        <name lang="ru">Кнопка (НР)</name>
         <name lang="pt">Botão de pressão (NA)</name>
-        <name lang="el">Μπουτόν, ανοικτή επαφή</name>
+        <name lang="fr">Bouton poussoir</name>
+        <name lang="de">Drucktaster Schliesser</name>
         <name lang="en">Push-button</name>
         <name lang="it">Pulsante (NA)</name>
-        <name lang="fr">Bouton poussoir</name>
+        <name lang="ru">Кнопка (НР)</name>
+        <name lang="nl">Drukknop (NO)</name>
         <name lang="pl">Łącznik przyciskowy z powrotem samoczynnym</name>
         <name lang="es">Pulsador</name>
         <name lang="cs">Tlačítko</name>
-        <name lang="nl">Drukknop (NO)</name>
+        <name lang="el">Μπουτόν, ανοικτή επαφή</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -19,11 +19,11 @@
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="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="-20" x1="0" y2="-10" x2="0"/>
-        <input x="2.75" y="3" size="9" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="-3"/>
-        <polygon x4="-7" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-5" x1="-7" y2="-5" x2="-10" y3="5" x3="-10" y4="5"/>
+        <polygon x2="0" closed="false" x1="-5" x3="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" y3="20" y1="-10" antialias="true"/>
+        <line x2="0" x1="0" end2="none" length1="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" y2="-10" y1="-20" antialias="false"/>
+        <input x="2.75" tagg="label" y="3" text="_" size="9"/>
+        <line x2="-3" x1="-10" end2="none" length1="1.5" end1="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5" y2="0" y1="0" antialias="false"/>
+        <polygon x2="-10" y4="5" closed="false" x1="-7" x3="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-5" y3="5" x4="-7" y1="-5" antialias="false"/>
         <terminal x="0" y="-21" orientation="n"/>
         <terminal x="0" y="21" orientation="s"/>
     </description>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/poussoir_nf.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/poussoir_nf.elmt
index a00138b6f..0d29f7450 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/poussoir_nf.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/poussoir_nf.elmt
@@ -1,17 +1,17 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnny">
+<definition width="20" height="60" hotspot_y="29" type="element" link_type="master" orientation="dyyy" version="0.5" hotspot_x="12">
     <names>
+        <name lang="it">Pulsante (NC)</name>
+        <name lang="pl">Łącznik przyciskowy z powrotem samoczynnym</name>
+        <name lang="cs">Tlačítko (NC)</name>
         <name lang="ar">زرّ ضاغط (NC)</name>
         <name lang="de">Drucktaster Öffner</name>
         <name lang="ru">Кнопка (НЗ)</name>
-        <name lang="pt">Botão de pressão (NC)</name>
+        <name lang="es">Pulsador (NC)</name>
+        <name lang="nl">Drukknop (NC)</name>
+        <name lang="fr">Bouton poussoir (NF)</name>
         <name lang="el">Μπουτόν, κλειστή επαφή</name>
         <name lang="en">Push-button (NC)</name>
-        <name lang="it">Pulsante (NC)</name>
-        <name lang="fr">Bouton poussoir (NF)</name>
-        <name lang="pl">Łącznik przyciskowy z powrotem samoczynnym</name>
-        <name lang="es">Pulsador (NC)</name>
-        <name lang="cs">Tlačítko (NC)</name>
-        <name lang="nl">Drukknop (NC)</name>
+        <name lang="pt">Botão de pressão (NC)</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -19,13 +19,13 @@
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="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="-9" 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="-20" x1="0" y2="-9" x2="0"/>
-        <input x="5.75" y="3" size="9" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="3"/>
-        <polygon x4="-7" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-5" x1="-7" y2="-5" x2="-10" y3="5" x3="-10" y4="5"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <polygon x2="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="20" y2="10" x1="5" y1="-10" x3="0" closed="false"/>
+        <line end2="none" end1="none" length2="1.5" x2="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-9" length1="1.5" x1="0" y1="-9"/>
+        <line end2="none" end1="none" length2="1.5" x2="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-9" length1="1.5" x1="0" y1="-20"/>
+        <input y="3" text="_" size="9" tagg="label" x="5.75"/>
+        <line end2="none" end1="none" length2="1.5" x2="3" antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="0" length1="1.5" x1="-10" y1="0"/>
+        <polygon x4="-7" x2="-10" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" y3="5" y4="5" y2="-5" x1="-7" y1="-5" x3="-10" closed="false"/>
+        <terminal y="-21" orientation="n" x="0"/>
+        <terminal y="21" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/tirette.elmt b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/tirette.elmt
index 129708b69..712917602 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/tirette.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/tirette.elmt
@@ -1,16 +1,16 @@
-<definition width="40" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny">
+<definition orientation="dyyy" link_type="master" type="element" hotspot_y="29" height="60" width="20" hotspot_x="8" version="0.5">
     <names>
-        <name lang="ar">مفتاح بسحّاب</name>
-        <name lang="de">Zugschalter</name>
         <name lang="ru">Кнопка (НР)</name>
-        <name lang="el">Μπουτόν</name>
-        <name lang="en">Pull switch</name>
-        <name lang="it">Pulsante a tirante</name>
-        <name lang="fr">Tirette</name>
         <name lang="pl">Łącznik przyciskowy z powrotem samoczynnym</name>
-        <name lang="es">Pulsador</name>
         <name lang="cs">Stiskací vypínač</name>
+        <name lang="fr">Tirette</name>
+        <name lang="es">Pulsador</name>
+        <name lang="it">Pulsante a tirante</name>
+        <name lang="de">Zugschalter</name>
+        <name lang="en">Pull switch</name>
         <name lang="nl">fout symbool</name>
+        <name lang="ar">مفتاح بسحّاب</name>
+        <name lang="el">Μπουτόν</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -18,14 +18,14 @@
     <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:thin;filling:none;color:black" y1="0" x1="-2" y2="0" x2="8"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="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="-20" x1="0" y2="-10" x2="0"/>
-        <input x="12" y="3" size="9" text="_" tagg="label"/>
-        <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="-5" x1="9" y2="5" x2="9"/>
-        <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="-5" x1="6" y2="-5" x2="9"/>
-        <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="5" x1="6" y2="5" x2="9"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <line length1="1.5" end2="none" x1="-2" y1="0" antialias="false" x2="8" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" y2="0" length2="1.5"/>
+        <polygon y3="20" closed="false" x1="-5" y1="-10" antialias="true" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="0" y2="10"/>
+        <line length1="1.5" end2="none" x1="0" y1="-20" antialias="false" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" y2="-10" length2="1.5"/>
+        <input text="_" size="9" y="3" x="12" tagg="label"/>
+        <line length1="1.5" end2="none" x1="9" y1="-5" antialias="false" x2="9" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" y2="5" length2="1.5"/>
+        <line length1="1.5" end2="none" x1="6" y1="-5" antialias="false" x2="9" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" y2="-5" length2="1.5"/>
+        <line length1="1.5" end2="none" x1="6" y1="5" antialias="false" x2="9" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" y2="5" length2="1.5"/>
+        <terminal orientation="n" y="-21" x="0"/>
+        <terminal orientation="s" y="21" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_01.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_01.elmt
index 6c7e75376..84272f5e6 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_01.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_01.elmt
@@ -1,15 +1,15 @@
-<definition width="70" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" ic="true" orientation="dyyy">
+<definition orientation="dyyy" height="50" link_type="master" version="0.5" type="element" hotspot_x="13" width="50" hotspot_y="24">
     <names>
-        <name lang="ar">محدد بوضعين محمي بقفل, سحب المفتاح إلى اليسار </name>
-        <name lang="el">Διακόπτης επιλογής 2 θέσεων, αφαίρεση κλειδιού στην αριστερή θέση</name>
         <name lang="en">Selector switch 2-position stay put, key withdrawal from LH</name>
-        <name lang="de">Schliesser 1-polig 2 Stellungen Schlüssel betätigt rastend</name>
         <name lang="it">Selettore a chiave, 2 posizioni stabili, estrazione chiave a SX</name>
-        <name lang="fr">Bouton tournant 2 positions fixes, retrait de la clé à gauche</name>
-        <name lang="pl">Łącznik obrotowy przełączny, uruchamiany kluczykiem, z kluczykiem wyjmowanym w lewym położeniu</name>
+        <name lang="el">Διακόπτης επιλογής 2 θέσεων, αφαίρεση κλειδιού στην αριστερή θέση</name>
+        <name lang="nl">2 positie sleutelschakelaar(vergrendelt in stand 2 (NO)</name>
+        <name lang="ar">محدد بوضعين محمي بقفل, سحب المفتاح إلى اليسار </name>
         <name lang="es">switch selector_01 posición fija con llave LH</name>
         <name lang="cs">Otočný přepínač s 2 pevnými polohami, uvedený do provozu klíčkem, zleva</name>
-        <name lang="nl">2 positie sleutelschakelaar(vergrendelt in stand 2 (NO)</name>
+        <name lang="fr">Bouton tournant 2 positions fixes, retrait de la clé à gauche</name>
+        <name lang="pl">Łącznik obrotowy przełączny, uruchamiany kluczykiem, z kluczykiem wyjmowanym w lewym położeniu</name>
+        <name lang="de">Schliesser 1-polig 2 Stellungen Schlüssel betätigt rastend</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -17,21 +17,21 @@
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="30" y2="10" x2="30" y3="-10" x3="24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="30" y2="-9" x2="30"/>
-        <polygon x4="8" antialias="true" style="line-style:normal;line-weight:thin;filling:black;color:black" y1="-7" x1="8" y2="-5" x2="7" y3="-5" x3="9" y4="-7"/>
-        <input x="35" y="2.5" size="9" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-6" y2="0" x2="11"/>
-        <circle x="7.5" y="-7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="3" x1="13" y2="-3" x2="17"/>
-        <text x="6" y="-9" size="4" text="1"/>
-        <polygon x4="-6" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="-8" y2="4" x2="-9" y3="4" x3="-5" y4="0"/>
-        <polygon x4="22" y5="0" x5="27" antialias="true" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="15" y2="0" x2="18" y3="3" x3="20" y4="0"/>
-        <circle x="-9.2361" y="-4.236" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="4.4721"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="13" y2="-3" x2="9"/>
-        <polygon x4="3" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="4" x1="-3" y2="4" x2="0" y3="-4" x3="0" y4="-4"/>
-        <text x="17" y="-9" size="4" text="2"/>
-        <terminal x="30" y="-20" orientation="n"/>
-        <terminal x="30" y="20" orientation="s"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y3="-10" y2="10" closed="false" x2="30" x3="24" x1="30" y1="20"/>
+        <line length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" y2="-9" x2="30" x1="30" y1="-20" length2="1.5"/>
+        <polygon x4="8" style="line-style:normal;line-weight:thin;filling:black;color:black" antialias="true" y3="-5" y2="-5" x2="7" y4="-7" x3="9" x1="8" y1="-7"/>
+        <input tagg="label" size="9" text="_" x="35" y="2.5"/>
+        <line length1="1.5" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="false" end1="none" y2="0" x2="11" x1="-6" y1="0" length2="1.5"/>
+        <circle diameter="1" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="7.5" y="-7.5"/>
+        <line length1="1.5" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="true" end1="none" y2="-3" x2="17" x1="13" y1="3" length2="1.5"/>
+        <text size="4" text="1" x="6" y="-9"/>
+        <polygon x4="-6" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" y3="4" y2="4" closed="false" x2="-9" y4="0" x3="-5" x1="-8" y1="0"/>
+        <polygon x4="22" x5="27" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="true" y3="3" y2="0" y5="0" closed="false" x2="18" y4="0" x3="20" x1="15" y1="0"/>
+        <circle diameter="4.4721" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" x="-9.2361" y="-4.236"/>
+        <line length1="1.5" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" end1="none" y2="-3" x2="9" x1="13" y1="3" length2="1.5"/>
+        <polygon x4="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y3="-4" y2="4" closed="false" x2="0" y4="-4" x3="0" x1="-3" y1="4"/>
+        <text size="4" text="2" x="17" y="-9"/>
+        <terminal orientation="n" x="30" y="-20"/>
+        <terminal orientation="s" x="30" y="20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_02.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_02.elmt
index 2b7167dde..32bbe03f0 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_02.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/bouton_tournant_02.elmt
@@ -1,14 +1,14 @@
-<definition width="70" version="0.3" hotspot_x="13" hotspot_y="25" height="50" type="element" ic="true" orientation="dyyy">
+<definition hotspot_x="11" hotspot_y="24" orientation="dyyy" type="element" width="50" height="50" version="0.5" link_type="master">
     <names>
-        <name lang="ar">مُحدّد دوار بوضعين ثابتين محمي بقفل, إخراج المفتاح إلى اليسار</name>
-        <name lang="el">Διακόπτης επιλογής 2 θέσεων, αφαίρεση κλειδιού στην αριστερή θέση</name>
-        <name lang="en">Selector switch 2-position stay put, key withdrawal from LH</name>
         <name lang="de">Öffner 1-polig 2 Stellungen Schlüssel betätigt rastend</name>
-        <name lang="it">Selettore a chiave, 2 posizioni stabili, estrazione chiave a SX</name>
-        <name lang="fr">Bouton tournant 2 positions fixes, retrait de la clé à gauche</name>
-        <name lang="pl">Łącznik obrotowy przełączny, uruchamiany kluczykiem</name>
         <name lang="es">switch selector_02 posición fija con llave LH</name>
+        <name lang="fr">Bouton tournant 2 positions fixes, retrait de la clé à gauche</name>
+        <name lang="it">Selettore a chiave, 2 posizioni stabili, estrazione chiave a SX</name>
         <name lang="cs">Otočný přepínač s 2 pevnými polohami, uvedený do provozu klíčkem, zleva</name>
+        <name lang="ar">مُحدّد دوار بوضعين ثابتين محمي بقفل, إخراج المفتاح إلى اليسار</name>
+        <name lang="en">Selector switch 2-position stay put, key withdrawal from LH</name>
+        <name lang="pl">Łącznik obrotowy przełączny, uruchamiany kluczykiem</name>
+        <name lang="el">Διακόπτης επιλογής 2 θέσεων, αφαίρεση κλειδιού στην αριστερή θέση</name>
         <name lang="nl">2 positie sleutelschakelaar(vergrendelt in stand 2 (NC)</name>
     </names>
     <kindInformations>
@@ -17,20 +17,20 @@
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="30" y2="10" x2="30" y3="-10" x3="36"/>
-        <polygon x4="8" antialias="true" style="line-style:normal;line-weight:thin;filling:black;color:black" y1="-7" x1="8" y2="-5" x2="7" y3="-5" x3="9" y4="-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="-9" x1="30" y2="-9" x2="37"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-6" 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="-20" x1="30" y2="-9" x2="30"/>
-        <circle x="7.5" y="-7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
+        <polygon y1="20" y3="-10" x3="36" antialias="true" x2="30" y2="10" x1="30" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon y1="-7" y3="-5" x3="9" y4="-7" antialias="true" x2="7" y2="-5" x1="8" x4="8" style="line-style:normal;line-weight:thin;filling:black;color:black"/>
+        <line y1="-9" length1="1.5" antialias="false" x2="37" y2="-9" x1="30" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <line y1="0" length1="1.5" antialias="false" x2="11" y2="0" x1="-6" end2="none" end1="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <line y1="-20" length1="1.5" antialias="false" x2="30" y2="-9" x1="30" end2="none" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <circle x="7.5" y="-7.5" antialias="true" diameter="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <input x="39" y="2.5" size="9" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="3" x1="13" y2="-3" x2="17"/>
+        <line y1="3" length1="1.5" antialias="true" x2="17" y2="-3" x1="13" end2="none" end1="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" length2="1.5"/>
         <text x="6" y="-9" size="4" text="1"/>
-        <polygon x4="-6" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="-8" y2="4" x2="-9" y3="4" x3="-5" y4="0"/>
-        <polygon x4="22" y5="0" x5="33" antialias="true" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="15" y2="0" x2="18" y3="3" x3="20" y4="0"/>
-        <circle x="-9.2361" y="-4.236" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="4.4721"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="13" y2="-3" x2="9"/>
-        <polygon x4="3" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="4" x1="-3" y2="4" x2="0" y3="-4" x3="0" y4="-4"/>
+        <polygon y1="0" y3="4" x3="-5" y4="0" antialias="true" x2="-9" y2="4" x1="-8" x4="-6" closed="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <polygon y1="0" y3="3" x3="20" y4="0" antialias="true" x2="18" y2="0" x1="15" x4="22" x5="33" closed="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" y5="0"/>
+        <circle x="-9.2361" y="-4.236" antialias="true" diameter="4.4721" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <line y1="3" length1="1.5" antialias="true" x2="9" y2="-3" x1="13" end2="none" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <polygon y1="4" y3="-4" x3="0" y4="-4" antialias="false" x2="0" y2="4" x1="-3" x4="3" closed="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
         <text x="17" y="-9" size="4" text="2"/>
         <terminal x="30" y="-20" orientation="n"/>
         <terminal x="30" y="20" orientation="s"/>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commut_2_position_fixe.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commut_2_position_fixe.elmt
index d08ef1898..2897edd0e 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commut_2_position_fixe.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commut_2_position_fixe.elmt
@@ -1,14 +1,14 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="25" height="50" type="element" orientation="dnny">
+<definition type="element" hotspot_y="29" link_type="master" orientation="dyyy" hotspot_x="34" version="0.5" height="60" width="40">
     <names>
-        <name lang="ar">بدّال بوضعين و بمفتاح</name>
-        <name lang="el">Διακόπτης 2 θέσεων</name>
-        <name lang="de">Drehschalter ein/aus</name>
-        <name lang="en">2 position switch</name>
-        <name lang="it">Selettore a 2 posizioni stabili</name>
         <name lang="fr">Commutateur a 2 positions à clé</name>
+        <name lang="en">2 position switch</name>
+        <name lang="de">Drehschalter ein/aus</name>
+        <name lang="ar">بدّال بوضعين و بمفتاح</name>
+        <name lang="nl">keuzeschakelaar 2 pos (NO)</name>
+        <name lang="el">Διακόπτης 2 θέσεων</name>
         <name lang="pl">Łącznik obrotowy napędzany kluczykiem</name>
         <name lang="cs">Klíčový spínač - 2 polohy</name>
-        <name lang="nl">keuzeschakelaar 2 pos (NO)</name>
+        <name lang="it">Selettore a 2 posizioni stabili</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -16,16 +16,16 @@
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-12" y="-6.6666" size="4" text="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="5" x1="-15" y2="-5" x2="-10"/>
-        <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="-5" x1="-20" y2="5" x2="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-3" y2="0" x2="-27"/>
-        <text x="-22" y="-6.6666" size="4" text="0"/>
-        <polygon x4="-30" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-5" x1="-24" y2="-5" x2="-27" y3="5" x3="-27" y4="5"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="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="-20" x1="0" y2="-10" x2="0"/>
-        <input x="6.5" y="2.3333" size="9" text="_" tagg="label"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <text text="1" y="-6.6666" size="4" x="-12"/>
+        <line y2="-5" end1="none" length2="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="false" y1="5" x1="-15" x2="-10" end2="none" length1="1.5"/>
+        <line y2="5" end1="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y1="-5" x1="-20" x2="-15" end2="none" length1="1.5"/>
+        <line y2="0" end1="none" length2="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="false" y1="0" x1="-3" x2="-27" end2="none" length1="1.5"/>
+        <text text="0" y="-6.6666" size="4" x="-22"/>
+        <polygon y2="-5" style="line-style:normal;line-weight:thin;filling:none;color:black" x3="-27" antialias="false" closed="false" y1="-5" x4="-30" y4="5" x1="-24" x2="-27" y3="5"/>
+        <polygon y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="0" antialias="true" closed="false" y1="-10" x1="-5" x2="0" y3="20"/>
+        <line y2="-10" end1="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="-20" x1="0" x2="0" end2="none" length1="1.5"/>
+        <input text="_" y="2.3333" tagg="label" size="9" x="6.5"/>
+        <terminal y="-21" orientation="n" x="0"/>
+        <terminal y="21" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur_2_positions_a_cle.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur_2_positions_a_cle.elmt
index 0e077003f..92ca29c61 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur_2_positions_a_cle.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur_2_positions_a_cle.elmt
@@ -1,33 +1,33 @@
-<definition width="60" version="0.3" hotspot_x="35" hotspot_y="25" height="50" type="element" orientation="dnny">
+<definition width="40" orientation="dyyy" type="element" height="60" hotspot_x="34" hotspot_y="29" link_type="master" version="0.5">
     <names>
-        <name lang="ar">بدّال بوضعين و بمفتاح</name>
-        <name lang="el">Διακόπτης 2 θέσεων, με κλειδί</name>
-        <name lang="en">2 position key switch</name>
-        <name lang="de">Schlüsselschalter 1-polig ein/aus</name>
-        <name lang="it">Selettore a chiave, 2 posizioni stabili</name>
-        <name lang="fr">Commutateur a 2 positions à clé</name>
         <name lang="pl">Łącznik obrotowy napędzany kluczykiem</name>
+        <name lang="el">Διακόπτης 2 θέσεων, με κλειδί</name>
+        <name lang="de">Schlüsselschalter 1-polig ein/aus</name>
+        <name lang="en">2 position key switch</name>
+        <name lang="fr">Commutateur a 2 positions à clé</name>
+        <name lang="it">Selettore a chiave, 2 posizioni stabili</name>
+        <name lang="ar">بدّال بوضعين و بمفتاح</name>
         <name lang="cs">Klíčový spínač - 2 polohy</name>
         <name lang="nl">sleutelschakelaar 2 pos (NO)</name>
     </names>
     <kindInformations>
-        <kindInformation show="1" name="type">commutator</kindInformation>
+        <kindInformation name="type" show="1">commutator</kindInformation>
     </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-12" y="-6.6666" size="4" text="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="5" x1="-15" y2="-5" x2="-10"/>
-        <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="-5" x1="-20" y2="5" x2="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-3" y2="0" x2="-27"/>
-        <text x="-22" y="-6.6666" size="4" text="0"/>
-        <polygon x4="-13.9826" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-12.9725" x1="-15.9826" y2="-8.97236" x2="-16.9826" y3="-8.97236" x3="-12.9826" y4="-12.9725"/>
-        <polygon x4="-30" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-5" x1="-24" y2="-5" x2="-27" y3="5" x3="-27" y4="5"/>
-        <circle x="-17.25" y="-17.25" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="4.5"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="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="-20" x1="0" y2="-10" x2="0"/>
-        <input x="6.5" y="2.3333" size="9" text="_" tagg="label"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <text text="1" x="-12" y="-6.6666" size="4"/>
+        <line length1="1.5" end2="none" length2="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="false" y1="5" x2="-10" end1="none" y2="-5" x1="-15"/>
+        <line length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y1="-5" x2="-15" end1="none" y2="5" x1="-20"/>
+        <line length1="1.5" end2="none" length2="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="false" y1="0" x2="-27" end1="none" y2="0" x1="-3"/>
+        <text text="0" x="-22" y="-6.6666" size="4"/>
+        <polygon y4="-12.9725" closed="false" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" y1="-12.9725" x2="-16.9826" x4="-13.9826" y3="-8.97236" x3="-12.9826" y2="-8.97236" x1="-15.9826"/>
+        <polygon y4="5" closed="false" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y1="-5" x2="-27" x4="-30" y3="5" x3="-27" y2="-5" x1="-24"/>
+        <circle diameter="4.5" style="line-style:normal;line-weight:thin;filling:none;color:black" x="-17.25" antialias="true" y="-17.25"/>
+        <polygon closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y1="-10" x2="0" y3="20" x3="0" y2="10" x1="-5"/>
+        <line length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="-20" x2="0" end1="none" y2="-10" x1="0"/>
+        <input tagg="label" text="_" x="6.5" y="2.3333" size="9"/>
+        <terminal orientation="n" x="0" y="-21"/>
+        <terminal orientation="s" x="0" y="21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_001.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_001.elmt
index d9f863cef..01608787d 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_001.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_001.elmt
@@ -1,32 +1,32 @@
-<definition width="60" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dyyy">
+<definition type="element" version="0.5" orientation="dyyy" height="50" hotspot_y="24" hotspot_x="15" width="40" link_type="master">
     <names>
-        <name lang="ar">مفتاح دوّار بوضعين</name>
-        <name lang="el">Διακόπτης 2 θέσεων</name>
-        <name lang="en">Switch 2 positions</name>
         <name lang="de">Drehschalter 1-polig Schliesser ein/aus</name>
+        <name lang="pl">Łącznik obrotowy przełączny</name>
+        <name lang="nl">keuzeschakelaar 2 pos (NO)</name>
         <name lang="it">Selettore a 2 posizioni stabili</name>
         <name lang="fr">Interrupteur rotatif</name>
-        <name lang="pl">Łącznik obrotowy przełączny</name>
         <name lang="cs">Otočný spínač - 2 polohy</name>
-        <name lang="nl">keuzeschakelaar 2 pos (NO)</name>
+        <name lang="el">Διακόπτης 2 θέσεων</name>
+        <name lang="en">Switch 2 positions</name>
+        <name lang="ar">مفتاح دوّار بوضعين</name>
     </names>
     <kindInformations>
-        <kindInformation show="1" name="type">commutator</kindInformation>
+        <kindInformation name="type" show="1">commutator</kindInformation>
     </kindInformations>
     <informations>Author: The QElectroTech team&#xd;
 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:dashed;line-weight:thin;filling:none;color:black" y1="3" x1="3" y2="-3" x2="7"/>
-        <text x="-4" y="-5" size="4" text="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-10" y2="0" x2="0"/>
-        <polygon x4="12" y5="0" x5="17" antialias="true" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="5" y2="0" x2="8" y3="3" x3="10" y4="0"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="3" y2="-3" x2="-1"/>
-        <polygon x4="-7" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="4" x1="-13" y2="4" x2="-10" y3="-4" x3="-10" y4="-4"/>
-        <text x="7" y="-5" size="4" text="2"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="20" y2="10" x2="20" y3="-10" x3="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="-20" x1="20" y2="-9" x2="20"/>
-        <input x="25" y="1" size="9" text="_" tagg="label"/>
-        <terminal x="20" y="-20" orientation="n"/>
-        <terminal x="20" y="20" orientation="s"/>
+        <line x2="7" y2="-3" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" x1="3" end2="none" length2="1.5" antialias="true" y1="3"/>
+        <text y="-5" size="4" text="1" x="-4"/>
+        <line x2="0" y2="0" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" end1="none" x1="-10" end2="none" length2="1.5" antialias="false" y1="0"/>
+        <polygon x2="8" y2="0" y3="3" x3="10" closed="false" x4="12" style="line-style:dashed;line-weight:thin;filling:none;color:black" x5="17" x1="5" antialias="true" y1="0" y4="0" y5="0"/>
+        <line x2="-1" y2="-3" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" x1="3" end2="none" length2="1.5" antialias="true" y1="3"/>
+        <polygon x2="-10" y2="4" y3="-4" x3="-10" closed="false" x4="-7" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-13" antialias="false" y1="4" y4="-4"/>
+        <text y="-5" size="4" text="2" x="7"/>
+        <polygon x2="20" y2="10" y3="-10" x3="14" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" antialias="true" y1="20"/>
+        <line x2="20" y2="-9" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" end2="none" length2="1.5" antialias="false" y1="-20"/>
+        <input y="1" size="9" text="_" x="25" tagg="label"/>
+        <terminal y="-20" orientation="n" x="20"/>
+        <terminal y="20" orientation="s" x="20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_002.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_002.elmt
index adbd8d618..5f243d974 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_002.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_002.elmt
@@ -1,33 +1,33 @@
-<definition width="60" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dyyy">
+<definition hotspot_y="24" width="40" orientation="dyyy" type="element" hotspot_x="21" height="50" link_type="master" version="0.5">
     <names>
-        <name lang="ar">مفتاح دوّار بوضعين</name>
-        <name lang="el">Διακόπτης 2 θέσεων</name>
-        <name lang="en">Switch 2 positions</name>
         <name lang="de">Drehschalter 1-polig Öffner ein/aus</name>
         <name lang="it">Selettore a 2 posizioni stabili</name>
-        <name lang="fr">Interrupteur rotatif</name>
         <name lang="pl">Łącznik obrotowy przełączny</name>
-        <name lang="cs">Otočný spínač - 2 polohy</name>
+        <name lang="fr">Interrupteur rotatif</name>
         <name lang="nl">keuzeschakelaar 2 pos (NC)</name>
+        <name lang="el">Διακόπτης 2 θέσεων</name>
+        <name lang="cs">Otočný spínač - 2 polohy</name>
+        <name lang="ar">مفتاح دوّار بوضعين</name>
+        <name lang="en">Switch 2 positions</name>
     </names>
     <kindInformations>
-        <kindInformation show="1" name="type">commutator</kindInformation>
+        <kindInformation name="type" show="1">commutator</kindInformation>
     </kindInformations>
     <informations>Author: The QElectroTech team&#xd;
 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:dashed;line-weight:thin;filling:none;color:black" y1="3" x1="-2" y2="-3" x2="2"/>
-        <text x="-9" y="-5" size="4" text="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-15" y2="0" x2="-5"/>
-        <polygon x4="7" y5="0" x5="12" antialias="true" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="0" y2="0" x2="3" y3="3" x3="5" y4="0"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="-2" y2="-3" x2="-6"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="15" y2="10" x2="10" y3="20" x3="10"/>
-        <polygon x4="-12" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="4" x1="-18" y2="4" x2="-15" y3="-4" x3="-15" y4="-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="-9" x1="10" y2="-9" x2="16"/>
-        <text x="2" y="-5" size="4" 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="10" y2="-9" x2="10"/>
-        <input x="21" y="1" size="8" text="_" tagg="label"/>
-        <terminal x="10" y="-20" orientation="n"/>
-        <terminal x="10" y="20" orientation="s"/>
+        <line length1="1.5" y1="3" length2="1.5" y2="-3" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="true" end2="none" end1="none" x1="-2" x2="2"/>
+        <text text="1" y="-5" size="4" x="-9"/>
+        <line length1="1.5" y1="0" length2="1.5" y2="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="false" end2="none" end1="none" x1="-15" x2="-5"/>
+        <polygon x5="12" y5="0" y3="3" y1="0" x3="5" x4="7" y2="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" antialias="true" closed="false" y4="0" x1="0" x2="3"/>
+        <line length1="1.5" y1="3" length2="1.5" y2="-3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" end2="none" end1="none" x1="-2" x2="-6"/>
+        <polygon y3="20" y1="-10" x3="10" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" closed="false" x1="15" x2="10"/>
+        <polygon y3="-4" y1="4" x3="-15" x4="-12" y2="4" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" closed="false" y4="-4" x1="-18" x2="-15"/>
+        <line length1="1.5" y1="-9" length2="1.5" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end2="none" end1="none" x1="10" x2="16"/>
+        <text text="2" y="-5" size="4" x="2"/>
+        <line length1="1.5" y1="-20" length2="1.5" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end2="none" end1="none" x1="10" x2="10"/>
+        <input tagg="label" text="_" y="1" size="8" x="21"/>
+        <terminal orientation="n" y="-20" x="10"/>
+        <terminal orientation="s" y="20" x="10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_008.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_008.elmt
index 45a4f2a30..2bffd8197 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_008.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/contact_008.elmt
@@ -1,14 +1,14 @@
-<definition width="70" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dyyy">
+<definition type="element" hotspot_x="13" hotspot_y="24" orientation="dyyy" width="50" height="50" version="0.5" link_type="master">
     <names>
-        <name lang="ar">مفتاح دوّار بوضعين</name>
-        <name lang="el">Διακόπτης 2 θέσεων, με επαναφορά</name>
-        <name lang="en">Switch 2 positions</name>
-        <name lang="de">Drehschalter 1-polig Schliesser ein/aus Schlüsselbetätigung tastend</name>
         <name lang="it">Selettore a 2 posizioni stabili</name>
-        <name lang="fr">Interrupteur rotatif 1-0-2</name>
         <name lang="pl">Łącznik obrotowy przełączny, uruchamiany kluczykiem z samoczynnym powrotem</name>
         <name lang="cs">Otočný spínač - 2 polohy</name>
         <name lang="nl">keuzeschakelaar 2 pos terugverend (NO)</name>
+        <name lang="de">Drehschalter 1-polig Schliesser ein/aus Schlüsselbetätigung tastend</name>
+        <name lang="ar">مفتاح دوّار بوضعين</name>
+        <name lang="en">Switch 2 positions</name>
+        <name lang="el">Διακόπτης 2 θέσεων, με επαναφορά</name>
+        <name lang="fr">Interrupteur rotatif 1-0-2</name>
     </names>
     <kindInformations>
         <kindInformation show="1" name="type">commutator</kindInformation>
@@ -16,20 +16,20 @@
     <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="0.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-4" x1="15" y2="-4" x2="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-6" y2="0" x2="11"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="3" x1="13" y2="-3" x2="17"/>
-        <text x="6" y="-5" size="4" text="1"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="30" y2="10" x2="30" y3="-10" x3="24"/>
-        <polygon x4="-6" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="-8" y2="4" x2="-9" y3="4" x3="-5" y4="0"/>
-        <polygon x4="22" y5="0" x5="27" antialias="true" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="15" y2="0" x2="18" y3="3" x3="20" y4="0"/>
-        <circle x="-9.2361" y="-4.236" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="4.4721"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="13" 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="-20" x1="30" y2="-9" x2="30"/>
-        <polygon x4="3" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="4" x1="-3" y2="4" x2="0" y3="-4" x3="0" y4="-4"/>
-        <input x="35" y="1.5" size="9" text="_" tagg="label"/>
-        <text x="17" y="-5" size="4" text="2"/>
-        <terminal x="30" y="-20" orientation="n"/>
-        <terminal x="30" y="20" orientation="s"/>
+        <line antialias="false" end1="none" x1="15" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="11" end2="simple" y2="-4" y1="-4" length2="0.5"/>
+        <line antialias="false" end1="none" x1="-6" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" x2="11" end2="none" y2="0" y1="0" length2="1.5"/>
+        <line antialias="true" end1="none" x1="13" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" x2="17" end2="none" y2="-3" y1="3" length2="1.5"/>
+        <text size="4" text="1" y="-5" x="6"/>
+        <polygon antialias="true" closed="false" x1="30" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" y2="10" x3="24" y1="20" y3="-10"/>
+        <polygon antialias="true" closed="false" y4="0" x1="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-9" y2="4" x3="-5" x4="-6" y1="0" y3="4"/>
+        <polygon antialias="true" x5="27" closed="false" y4="0" x1="15" style="line-style:dashed;line-weight:thin;filling:none;color:black" x2="18" y2="0" x3="20" x4="22" y5="0" y1="0" y3="3"/>
+        <circle antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-4.236" x="-9.2361" diameter="4.4721"/>
+        <line antialias="true" end1="none" x1="13" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="9" end2="none" y2="-3" y1="3" length2="1.5"/>
+        <line antialias="false" end1="none" x1="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="30" end2="none" y2="-9" y1="-20" length2="1.5"/>
+        <polygon antialias="false" closed="false" y4="-4" x1="-3" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="0" y2="4" x3="0" x4="3" y1="4" y3="-4"/>
+        <input size="9" text="_" y="1.5" x="35" tagg="label"/>
+        <text size="4" text="2" y="-5" x="17"/>
+        <terminal y="-20" orientation="n" x="30"/>
+        <terminal y="20" orientation="s" x="30"/>
     </description>
 </definition>