diff --git a/elements/03relayage/02esclaves/puissance/verrouillage-meca.elmt b/elements/03relayage/02esclaves/puissance/verrouillage-meca.elmt
index b076dbc9a..50cf40d1d 100644
--- a/elements/03relayage/02esclaves/puissance/verrouillage-meca.elmt
+++ b/elements/03relayage/02esclaves/puissance/verrouillage-meca.elmt
@@ -13,7 +13,5 @@
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
         <polygon x4="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="8" y2="-7" x2="18" y3="4" x3="13" y4="-7"/>
-        <terminal x="4" y="0" orientation="w"/>
-        <terminal x="21" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/03relayage/contacts/fin_de_course/fin_course_nc.elmt b/elements/03relayage/contacts/fin_de_course/fin_course_nc.elmt
index f48338ac2..49b6d1fb3 100644
--- a/elements/03relayage/contacts/fin_de_course/fin_course_nc.elmt
+++ b/elements/03relayage/contacts/fin_de_course/fin_course_nc.elmt
@@ -1,4 +1,4 @@
-<definition width="30" version="0.3" hotspot_x="6" hotspot_y="32" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="20" version="0.4" hotspot_x="9" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مفتاح نهاية مشوار (NC)</name>
         <name lang="de">Grenzschalter (NC)</name>
@@ -9,20 +9,18 @@
         <name lang="fr">Fin de course (NF)</name>
         <name lang="pl">Łącznik krańcowy (zestyk rozwierny)</name>
         <name lang="es">Final de carrera (NC)</name>
-        <name lang="cs">Konec vodivého spojení (NC)</name>
         <name lang="nl">Eindschakelaar (NC)</name>
+        <name lang="cs">Konec vodivého spojení (NC)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="0" y="18" size="6" rotate="true" text="_"/>
         <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="_"/>
+        <input x="5.75" y="3" size="9" text="_" tagg="label"/>
         <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="0.529794" y2="-5" x2="-4.41062" y3="-5" x3="3"/>
-        <input x="0" y="-20" size="6" rotate="true" text="_"/>
-        <terminal x="0" y="-21" number="" name="" orientation="n"/>
-        <terminal x="0" y="21" number="" name="" orientation="s"/>
+        <terminal x="0" y="-21" orientation="n"/>
+        <terminal x="0" y="21" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/03relayage/contacts/interrupteurs/bp1-0-2inv.elmt b/elements/03relayage/contacts/interrupteurs/bp1-0-2inv.elmt
index fa11f656e..1628ae242 100644
--- a/elements/03relayage/contacts/interrupteurs/bp1-0-2inv.elmt
+++ b/elements/03relayage/contacts/interrupteurs/bp1-0-2inv.elmt
@@ -1,4 +1,4 @@
-<definition width="80" version="0.3" hotspot_x="42" hotspot_y="42" height="70" type="element" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="43" hotspot_y="30" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="ar">مُبدّل بثلاث وضعيات (1-0-2)</name>
         <name lang="de">Schalter 3-Positionen (1-0-2)</name>
@@ -9,22 +9,22 @@
         <name lang="fr">Interrupteur rotatif 1-0-2 inv</name>
         <name lang="pl">Łącznik obrotowy przełączny z położeniem neutralnym</name>
         <name lang="es">Interruptor 3 posiciones incluso neutro</name>
-        <name lang="cs">Třípolohový přepínač včetně neutrální (1-0-2)</name>
         <name lang="nl">Keuzeschakelaar 3 pos met 0 (1-0-2) (NO/NO)</name>
+        <name lang="cs">Třípolohový přepínač včetně neutrální (1-0-2)</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <input x="-23" y="-30" size="6" rotate="true" text="_"/>
-        <input x="10" y="16" size="6" rotate="true" text="_"/>
-        <input x="19" y="-30" size="6" rotate="true" text="_"/>
+        <input x="-23" y="-30" size="6" rotate="true" text="_" tagg="none"/>
+        <input x="10" y="16" size="6" rotate="true" text="_" tagg="none"/>
+        <input x="19" y="-30" size="6" rotate="true" text="_" tagg="none"/>
         <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="-15" x1="-26" y2="-11" x2="-26"/>
         <polygon style="line-style:dashed;line-weight:thin;filling:none;color:black" x1="0" x2="-15" x3="-16" x4="-17" antialias="false" x5="-20" x6="-21" x7="-22" x8="-25" x9="-26" closed="false" y1="-8" y2="-8" y10="-8" y3="-6" y11="-8" y4="-8" y12="-8" y5="-8" x10="-27" y6="-6" x11="-31" y7="-8" x12="-35" y8="-8" y9="-6"/>
         <text x="-27" y="-17.6667" size="4" text="1-0-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="-15" x1="-16" y2="-11" x2="-16"/>
         <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="-15" x1="-21" y2="-11" x2="-21"/>
         <polygon x4="-32" y5="-13" x5="-32" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-3" x1="-38" y2="-3" x2="-35" y3="-13" x3="-35" y4="-13"/>
-        <input x="15" y="-6.3333" size="9" text="_"/>
+        <input x="15" y="-6.3333" size="9" text="_" tagg="label"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="0" y2="-2" x2="0"/>
         <circle x="-1" y="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="2"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="-10" y2="-16" x2="-10"/>
diff --git a/examples/affuteuse_250h.qet b/examples/affuteuse_250h.qet
index 1992c2841..fb3d624bc 100644
--- a/examples/affuteuse_250h.qet
+++ b/examples/affuteuse_250h.qet
@@ -1003,26 +1003,30 @@ Created by potrace 1.10, written by Peter Selinger 2001-2011
     <newdiagrams>
         <border displayrows="true" cols="17" displaycols="true" colsize="60" rows="8" rowsize="80"/>
         <inset title="" folio="%id/%total" author="" filename="" date="null"/>
-        <conductors num="_" vertirotatetext="270" type="multi" horizrotatetext="0" numsize="7"/>
+        <conductors num="_" vertirotatetext="270" displaytext="1" type="multi" horizrotatetext="0" numsize="7" onetextperfolio="0"/>
         <report label="%f-%l%c"/>
-        <xref powerprefix="" displayhas="contacts" showpowerctc="fasle" delayprefix=""/>
+        <xrefs>
+            <xref snapto="label" switchprefix="" powerprefix="" displayhas="contacts" type="protection" showpowerctc="false" delayprefix=""/>
+            <xref snapto="bottom" switchprefix="" powerprefix="" displayhas="cross" type="coil" showpowerctc="false" delayprefix=""/>
+        </xrefs>
+        <conductors_autonums/>
     </newdiagrams>
     <diagram title="page de garde" displayrows="true" version="0.4" cols="17" folio="%id/%total" displaycols="true" height="660" colsize="60" order="1" rows="8" author="TDP" filename="250 H" titleblocktemplate="DIN_A4_copy" date="20140310" rowsize="80">
         <properties>
-            <property name="date2" show="1"></property>
-            <property name="label1" show="1"></property>
-            <property name="title" show="1"></property>
-            <property name="label2" show="1"></property>
-            <property name="label3" show="1"></property>
-            <property name="label4" show="1"></property>
-            <property name="label5" show="1"></property>
-            <property name="dessin" show="1"></property>
-            <property name="control" show="1"></property>
-            <property name="rev" show="1"></property>
-            <property name="aprouv" show="1"></property>
-            <property name="filename" show="1"></property>
-            <property name="date" show="1"></property>
-            <property name="date1" show="1"></property>
+            <property name="date2" show="1"/>
+            <property name="label1" show="1"/>
+            <property name="title" show="1"/>
+            <property name="label2" show="1"/>
+            <property name="label3" show="1"/>
+            <property name="label4" show="1"/>
+            <property name="label5" show="1"/>
+            <property name="dessin" show="1"/>
+            <property name="control" show="1"/>
+            <property name="rev" show="1"/>
+            <property name="aprouv" show="1"/>
+            <property name="filename" show="1"/>
+            <property name="date" show="1"/>
+            <property name="date1" show="1"/>
         </properties>
         <defaultconductor num="_" vertirotatetext="270" type="multi" horizrotatetext="0" numsize="7"/>
         <elements>
@@ -1087,10 +1091,10 @@ Created by potrace 1.10, written by Peter Selinger 2001-2011
             <property name="label3" show="1">250 H</property>
             <property name="label4" show="1">QE01</property>
             <property name="label5" show="1">*</property>
-            <property name="dessin" show="1"></property>
-            <property name="control" show="1"></property>
+            <property name="dessin" show="1"/>
+            <property name="control" show="1"/>
             <property name="rev" show="1">1</property>
-            <property name="aprouv" show="1"></property>
+            <property name="aprouv" show="1"/>
         </properties>
         <defaultconductor num="" vertirotatetext="270" type="multi" horizrotatetext="0" numsize="7"/>
         <autonum>
@@ -2733,18 +2737,18 @@ Created by potrace 1.10, written by Peter Selinger 2001-2011
         <properties>
             <property name="date2" show="1">2005</property>
             <property name="label1" show="1">SDST IL:</property>
-            <property name="title" show="1"></property>
+            <property name="title" show="1"/>
             <property name="label2" show="1">SDST AD:</property>
             <property name="label3" show="1">250 H</property>
             <property name="label4" show="1">QE01</property>
             <property name="label5" show="1">*</property>
-            <property name="dessin" show="1"></property>
-            <property name="control" show="1"></property>
+            <property name="dessin" show="1"/>
+            <property name="control" show="1"/>
             <property name="rev" show="1">1</property>
-            <property name="aprouv" show="1"></property>
-            <property name="filename" show="1"></property>
-            <property name="date" show="1"></property>
-            <property name="date1" show="1"></property>
+            <property name="aprouv" show="1"/>
+            <property name="filename" show="1"/>
+            <property name="date" show="1"/>
+            <property name="date1" show="1"/>
         </properties>
         <defaultconductor num="_" vertirotatetext="270" type="multi" horizrotatetext="0" numsize="7"/>
         <autonum>
@@ -3564,10 +3568,10 @@ Created by potrace 1.10, written by Peter Selinger 2001-2011
             <property name="label3" show="1">250 H</property>
             <property name="label4" show="1">QE01</property>
             <property name="label5" show="1">*</property>
-            <property name="dessin" show="1"></property>
-            <property name="control" show="1"></property>
+            <property name="dessin" show="1"/>
+            <property name="control" show="1"/>
             <property name="rev" show="1">1</property>
-            <property name="aprouv" show="1"></property>
+            <property name="aprouv" show="1"/>
             <property name="date1" show="1">2014</property>
         </properties>
         <defaultconductor num="_" vertirotatetext="270" type="multi" horizrotatetext="0" numsize="7"/>
@@ -4694,10 +4698,10 @@ Created by potrace 1.10, written by Peter Selinger 2001-2011
             <property name="label3" show="1">250 H</property>
             <property name="label4" show="1">Crouzet </property>
             <property name="label5" show="1">NTR 800D</property>
-            <property name="dessin" show="1"></property>
-            <property name="control" show="1"></property>
+            <property name="dessin" show="1"/>
+            <property name="control" show="1"/>
             <property name="rev" show="1">1</property>
-            <property name="aprouv" show="1"></property>
+            <property name="aprouv" show="1"/>
         </properties>
         <defaultconductor num="_" vertirotatetext="270" type="multi" horizrotatetext="0" numsize="7"/>
         <images>
@@ -5477,6 +5481,39 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
                                     <name lang="cs">Jednoduché spojení</name>
                                 </names>
                                 <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+                                <kindInformations>
+                                    <kindInformation name="state" show="1">NO</kindInformation>
+                                    <kindInformation name="number" show="1">1</kindInformation>
+                                    <kindInformation name="type" show="1">simple</kindInformation>
+                                    <kindInformation name="tempoType" show="0"/>
+                                </kindInformations>
+                                <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"/>
+                                    <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:normal;filling:none;color:black" y1="-20" x1="0" y2="-10" x2="0"/>
+                                    <terminal x="0" y="-20" orientation="n"/>
+                                    <terminal x="0" y="20" orientation="s"/>
+                                </description>
+                            </definition>
+                        </element>
+                        <element name="con_simple-20141030125830.elmt">
+                            <definition width="30" version="0.3" hotspot_x="10" hotspot_y="25" height="50" link_type="slave" type="element" orientation="dnny">
+                                <names>
+                                    <name lang="ar">مُلامس بسيط (NO)</name>
+                                    <name lang="de">Kontakt Einfach</name>
+                                    <name lang="ru">Проктой контакт (НР)</name>
+                                    <name lang="pt">Contacto simples (NO)</name>
+                                    <name lang="el">Απλή επαφή, ανοικτή</name>
+                                    <name lang="en">Simple contact</name>
+                                    <name lang="it">Contatto semplice (NO)</name>
+                                    <name lang="fr">Contact simple</name>
+                                    <name lang="pl">Zestyk zwierny</name>
+                                    <name lang="es">Contactor simple</name>
+                                    <name lang="cs">Jednoduché spojení</name>
+                                    <name lang="nl">contact enkel</name>
+                                </names>
+                                <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
                                 <kindInformations>
                                     <kindInformation name="state" show="1">NO</kindInformation>