diff --git a/elements/02protections/disjoncteurs/fa4203_disjoncteur_ligne_3p_n_contact_aux.elmt b/elements/02protections/disjoncteurs/fa4203_disjoncteur_ligne_3p_n_contact_aux.elmt
index d27809927..d2bb8d745 100644
--- a/elements/02protections/disjoncteurs/fa4203_disjoncteur_ligne_3p_n_contact_aux.elmt
+++ b/elements/02protections/disjoncteurs/fa4203_disjoncteur_ligne_3p_n_contact_aux.elmt
@@ -1,9 +1,10 @@
-<definition width="130" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy" link_type="master">
+<definition width="110" version="0.4" hotspot_x="16" hotspot_y="6" height="50" link_type="master" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 3P+N mit Hilfskontakte</name>
         <name lang="en">Feeder circuit-breaker 3P+N with auxiliary contact</name>
-        <name lang="fr">Disjoncteur de ligne 3P+N avec contacts auxiliaire</name>
         <name lang="it">Relè termico 3P+N con contatto ausiliario</name>
+        <name lang="fr">Disjoncteur de ligne 3P+N avec contacts auxiliaire</name>
+        <name lang="pl">Wyłącznik nadprądowy czterobiegunowy z zestykami pomocniczymi</name>
         <name lang="cs">Jistič vedení 3P+N s pomocnými kontakty</name>
     </names>
     <kindInformations>
@@ -41,7 +42,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="68" y="9" size="6" rotation="270" text="N1"/>
         <text x="69" y="41" size="6" rotation="270" text="N2"/>
         <text x="13" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9"  text="_" tagg="label"/>
+        <input x="-26" y="-5.5" size="9" text="_" tagg="label"/>
         <text x="13" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="56" y2="12" x2="64"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-1.45829" y2="21" x2="83.2464"/>
@@ -53,13 +54,13 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="71" y2="13" x2="67"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="80" y2="10" x2="84"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="60" y2="29" x2="60"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="40" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="40" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="60" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="60" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
+        <terminal x="40" y="0" orientation="n"/>
+        <terminal x="40" y="40" orientation="s"/>
+        <terminal x="60" y="0" orientation="n"/>
+        <terminal x="60" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4204_disjoncteur_ligne_3p_contact_aux.elmt b/elements/02protections/disjoncteurs/fa4204_disjoncteur_ligne_3p_contact_aux.elmt
index 501060792..d1c954e99 100644
--- a/elements/02protections/disjoncteurs/fa4204_disjoncteur_ligne_3p_contact_aux.elmt
+++ b/elements/02protections/disjoncteurs/fa4204_disjoncteur_ligne_3p_contact_aux.elmt
@@ -1,9 +1,10 @@
-<definition width="110" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy" link_type="master">
+<definition width="90" version="0.4" hotspot_x="16" hotspot_y="6" height="50" link_type="master" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 3P und Hilfskontakte</name>
         <name lang="en">Feeder circuit-breaker 3P and auxiliary contact</name>
-        <name lang="fr">Disjoncteur de ligne 3p et contacts auxiliaire</name>
         <name lang="it">Relè termico 3P con contatto ausiliario</name>
+        <name lang="fr">Disjoncteur de ligne 3p et contacts auxiliaire</name>
+        <name lang="pl">Wyłącznik nadprądowy trójbiegunowy z zestykami pomocniczymi</name>
         <name lang="cs">Jistič vedení 3P a pomocné kontakty</name>
     </names>
     <kindInformations>
@@ -37,7 +38,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="58" y="8" size="6" rotation="270" text="13"/>
         <text x="33" y="3" size="6" rotation="270" text="3"/>
         <text x="13" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9"  text="_" tagg="label"/>
+        <input x="-26" y="-5.5" size="9" text="_" tagg="label"/>
         <text x="13" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-1.58136" y2="21" x2="61.3797"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="31" x2="0"/>
@@ -46,11 +47,11 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="60" y2="12" x2="66"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="51" y2="13" x2="47"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="60" y2="10" x2="64"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="40" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="40" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
+        <terminal x="40" y="0" orientation="n"/>
+        <terminal x="40" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4205_disjoncteur_ligne_3p.elmt b/elements/02protections/disjoncteurs/fa4205_disjoncteur_ligne_3p.elmt
index c601b6f7d..7185f838b 100644
--- a/elements/02protections/disjoncteurs/fa4205_disjoncteur_ligne_3p.elmt
+++ b/elements/02protections/disjoncteurs/fa4205_disjoncteur_ligne_3p.elmt
@@ -1,14 +1,12 @@
-<definition width="90" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="16" hotspot_y="5" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 3P </name>
         <name lang="en">Feeder circuit-breaker 3P</name>
-        <name lang="fr">Disjoncteur de ligne 3p</name>
         <name lang="it">Relè termico 3P</name>
+        <name lang="fr">Disjoncteur de ligne 3p</name>
+        <name lang="pl">Wyłącznik nadprądowy trójbiegunowy</name>
         <name lang="cs">Jistič vedení 3P</name>
     </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
@@ -31,15 +29,15 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="49" y="3" size="6" rotation="270" text="5"/>
         <text x="33" y="3" size="6" rotation="270" text="3"/>
         <text x="13" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9" text="Q"/>
+        <input x="-26" y="-5.5" size="9" text="Q" tagg="none"/>
         <text x="13" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-2.09128" y2="21" x2="37.9321"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="31" x2="0"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="40" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="40" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
+        <terminal x="40" y="0" orientation="n"/>
+        <terminal x="40" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4206_disjoncteur_ligne_2p_n_contact_aux.elmt b/elements/02protections/disjoncteurs/fa4206_disjoncteur_ligne_2p_n_contact_aux.elmt
index 3f978c7b0..58ba573e4 100644
--- a/elements/02protections/disjoncteurs/fa4206_disjoncteur_ligne_2p_n_contact_aux.elmt
+++ b/elements/02protections/disjoncteurs/fa4206_disjoncteur_ligne_2p_n_contact_aux.elmt
@@ -1,9 +1,10 @@
-<definition width="110" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy" link_type="master">
+<definition width="90" version="0.4" hotspot_x="16" hotspot_y="6" height="50" link_type="master" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 2P+N mit Hilfskontakte</name>
         <name lang="en">Feeder circuit-breaker 2P+N with auxiliary contact</name>
-        <name lang="fr">Disjoncteur de ligne 2P+N avec contacts auxiliaire</name>
         <name lang="it">Relè termico 2P+N con contatti ausiliari</name>
+        <name lang="fr">Disjoncteur de ligne 2P+N avec contacts auxiliaire</name>
+        <name lang="pl">Wyłącznik nadprądowy trójbiegunowy z zestykami pomocniczymi</name>
         <name lang="cs">Jistič vedení 2P+N s pomocnými kontakty</name>
     </names>
     <kindInformations>
@@ -34,7 +35,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="48" y="9" size="6" rotation="270" text="N1"/>
         <text x="49" y="41" size="6" rotation="270" text="N2"/>
         <text x="13" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9"  text="_" tagg="label"/>
+        <input x="-26" y="-5.5" size="9" text="_" tagg="label"/>
         <text x="13" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="36" y2="12" x2="44"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-0.923505" y2="21" x2="60.667"/>
@@ -46,11 +47,11 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="51" y2="13" x2="47"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="60" y2="10" x2="64"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="40" y2="29" x2="40"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="40" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="40" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
+        <terminal x="40" y="0" orientation="n"/>
+        <terminal x="40" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4207_disjoncteur_ligne_2p_contact_aux.elmt b/elements/02protections/disjoncteurs/fa4207_disjoncteur_ligne_2p_contact_aux.elmt
index 212620af4..41234806a 100644
--- a/elements/02protections/disjoncteurs/fa4207_disjoncteur_ligne_2p_contact_aux.elmt
+++ b/elements/02protections/disjoncteurs/fa4207_disjoncteur_ligne_2p_contact_aux.elmt
@@ -1,9 +1,10 @@
-<definition width="90" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy" link_type="master">
+<definition width="70" version="0.4" hotspot_x="16" hotspot_y="6" height="50" link_type="master" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 2P mit Hilfskontakte</name>
         <name lang="en">Feeder circuit-breaker 2P with auxiliary contact</name>
-        <name lang="fr">Disjoncteur de ligne 2P avec contacts auxiliaire</name>
         <name lang="it">Relè termico 2P con contatti ausiliari</name>
+        <name lang="fr">Disjoncteur de ligne 2P avec contacts auxiliaire</name>
+        <name lang="pl">Wyłącznik nadprądowy dwubiegunowy z zestykami pomocniczymi</name>
         <name lang="cs">Jistič vedení 2P s pomocnými kontakty</name>
     </names>
     <kindInformations>
@@ -30,7 +31,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="38" y="8" size="6" rotation="270" text="13"/>
         <text x="28" y="3" size="6" rotation="270" text="3"/>
         <text x="13" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9"  text="_" tagg="label"/>
+        <input x="-26" y="-5.5" size="9" text="_" tagg="label"/>
         <text x="13" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-0.987162" y2="21" x2="41.736"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="31" x2="0"/>
@@ -39,9 +40,9 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="40" y2="12" x2="46"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="31" y2="13" x2="27"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="40" y2="10" x2="44"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4208_disjoncteur_ligne_2p.elmt b/elements/02protections/disjoncteurs/fa4208_disjoncteur_ligne_2p.elmt
index d9d593db1..adca4032f 100644
--- a/elements/02protections/disjoncteurs/fa4208_disjoncteur_ligne_2p.elmt
+++ b/elements/02protections/disjoncteurs/fa4208_disjoncteur_ligne_2p.elmt
@@ -1,14 +1,12 @@
-<definition width="70" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="16" hotspot_y="5" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 2P</name>
         <name lang="en">Feeder circuit-breaker 2P </name>
-        <name lang="fr">Disjoncteur de ligne 2P</name>
         <name lang="it">Relè termico 2P</name>
+        <name lang="fr">Disjoncteur de ligne 2P</name>
+        <name lang="pl">Wyłącznik nadprądowy dwubiebunowy</name>
         <name lang="cs">Jistič vedení 2P</name>
     </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
@@ -24,13 +22,13 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="29" y="40" size="6" rotation="270" text="4"/>
         <text x="29" y="3" size="6" rotation="270" text="3"/>
         <text x="13" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9" text="Q"/>
+        <input x="-26" y="-5.5" size="9" text="Q" tagg="none"/>
         <text x="13" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-1.74734" y2="21" x2="17.5595"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="31" x2="0"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4209_disjoncteur_ligne_1p_n_contact_aux.elmt b/elements/02protections/disjoncteurs/fa4209_disjoncteur_ligne_1p_n_contact_aux.elmt
index 2e0f432a6..aaf1c7f5e 100644
--- a/elements/02protections/disjoncteurs/fa4209_disjoncteur_ligne_1p_n_contact_aux.elmt
+++ b/elements/02protections/disjoncteurs/fa4209_disjoncteur_ligne_1p_n_contact_aux.elmt
@@ -1,9 +1,10 @@
-<definition width="90" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy" link_type="master">
+<definition width="70" version="0.4" hotspot_x="16" hotspot_y="6" height="50" link_type="master" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 1P+N mit Hilfskontakte</name>
         <name lang="en">Feeder circuit-breaker 1P+N with auxiliary contact</name>
-        <name lang="fr">Disjoncteur de ligne 1P+N avec contacts auxiliaire</name>
         <name lang="it">Relè termico 1P+N con contatti ausiliari</name>
+        <name lang="fr">Disjoncteur de ligne 1P+N avec contacts auxiliaire</name>
+        <name lang="pl">Wyłącznik nadprądowy dwubiegunowy</name>
         <name lang="cs">Jistič vedení 1P+N s pomocnými kontakty</name>
     </names>
     <kindInformations>
@@ -28,7 +29,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="8" y="4" size="6" rotation="270" text="1"/>
         <text x="28" y="9" size="6" rotation="270" text="N1"/>
         <text x="29" y="41" size="6" rotation="270" text="N2"/>
-        <input x="-26" y="-5.5" size="9"  text="_" tagg="label"/>
+        <input x="-26" y="-5.5" size="9" text="_" tagg="label"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="16" y2="12" x2="24"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-2" y2="21" x2="40.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="24" x1="20" y2="15" x2="20"/>
@@ -39,9 +40,9 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="31" y2="13" x2="27"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="40" y2="10" x2="44"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="20" y2="29" x2="20"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4210_disjoncteur_ligne_1p_contact_aux.elmt b/elements/02protections/disjoncteurs/fa4210_disjoncteur_ligne_1p_contact_aux.elmt
index 48022e4b9..8626552c3 100644
--- a/elements/02protections/disjoncteurs/fa4210_disjoncteur_ligne_1p_contact_aux.elmt
+++ b/elements/02protections/disjoncteurs/fa4210_disjoncteur_ligne_1p_contact_aux.elmt
@@ -1,9 +1,10 @@
-<definition width="70" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy" link_type="master">
+<definition width="50" version="0.4" hotspot_x="16" hotspot_y="6" height="50" link_type="master" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 1P+N </name>
         <name lang="en">Feeder circuit-breaker 1P+N </name>
-        <name lang="fr">Disjoncteur de ligne 1P+N </name>
         <name lang="it">Relè termico 1P+N con contatti ausiliari</name>
+        <name lang="fr">Disjoncteur de ligne 1P+N </name>
+        <name lang="pl">Wyłącznik nadprądowy jednobiegunowy z zestykami pomocniczymi</name>
         <name lang="cs">Jistič vedení 1P+N</name>
     </names>
     <kindInformations>
@@ -23,7 +24,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="28" y="7" size="6" rotation="270" text="21"/>
         <text x="18" y="8" size="6" rotation="270" text="13"/>
         <text x="8" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9"  text="_" tagg="label"/>
+        <input x="-26" y="-5.5" size="9" text="_" tagg="label"/>
         <text x="8" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-1" y2="21" x2="20"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="31" x2="0"/>
@@ -32,7 +33,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="20" y2="12" x2="26"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="11" y2="13" x2="7"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="29" x1="20" y2="10" x2="24"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4211_disjoncteur_ligne_1p.elmt b/elements/02protections/disjoncteurs/fa4211_disjoncteur_ligne_1p.elmt
index 44d4a6e8c..27d45ecd9 100644
--- a/elements/02protections/disjoncteurs/fa4211_disjoncteur_ligne_1p.elmt
+++ b/elements/02protections/disjoncteurs/fa4211_disjoncteur_ligne_1p.elmt
@@ -1,14 +1,12 @@
-<definition width="50" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="30" version="0.4" hotspot_x="16" hotspot_y="5" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 1P</name>
         <name lang="en">Feeder circuit-breaker 1P</name>
-        <name lang="fr">Disjoncteur de ligne 1P</name>
         <name lang="it">Relè termico 1P</name>
+        <name lang="fr">Disjoncteur de ligne 1P</name>
+        <name lang="pl">Wyłącznik nadprądowy jednobiegunowy</name>
         <name lang="cs">Jistič vedení 1P</name>
     </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
@@ -17,10 +15,10 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="-7" y2="30" x2="0"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="10" x2="0"/>
         <text x="8" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9" text="Q"/>
+        <input x="-26" y="-5.5" size="9" text="Q" tagg="none"/>
         <text x="8" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="31" x2="0"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4214_disjoncteur_ligne_3p_n.elmt b/elements/02protections/disjoncteurs/fa4214_disjoncteur_ligne_3p_n.elmt
index e151023e5..1a4ebc31a 100644
--- a/elements/02protections/disjoncteurs/fa4214_disjoncteur_ligne_3p_n.elmt
+++ b/elements/02protections/disjoncteurs/fa4214_disjoncteur_ligne_3p_n.elmt
@@ -1,14 +1,12 @@
-<definition width="110" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="90" version="0.4" hotspot_x="16" hotspot_y="5" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 3P+N</name>
         <name lang="en">Feeder circuit-breaker 3P+N</name>
-        <name lang="fr">Disjoncteur de ligne 3P+N</name>
         <name lang="it">Relè termico 3P+N</name>
+        <name lang="fr">Disjoncteur de ligne 3P+N</name>
+        <name lang="pl">Wyłącznik nadprądowy czterobiegunowy</name>
         <name lang="cs">Jistič vedení 3P+N</name>
     </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
@@ -35,20 +33,20 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="68" y="9" size="6" rotation="270" text="N1"/>
         <text x="69" y="41" size="6" rotation="270" text="N2"/>
         <text x="13" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9" text="_"/>
+        <input x="-26" y="-5.5" size="9" text="_" tagg="none"/>
         <text x="13" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="56" y2="12" x2="64"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-1" y2="21" x2="59.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="24" x1="60" y2="15" x2="60"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="31" x2="0"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="60" y2="29" x2="60"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="40" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="40" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="60" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="60" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
+        <terminal x="40" y="0" orientation="n"/>
+        <terminal x="40" y="40" orientation="s"/>
+        <terminal x="60" y="0" orientation="n"/>
+        <terminal x="60" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4215_disjoncteur_ligne_2p_n.elmt b/elements/02protections/disjoncteurs/fa4215_disjoncteur_ligne_2p_n.elmt
index e451bf53f..d4841713e 100644
--- a/elements/02protections/disjoncteurs/fa4215_disjoncteur_ligne_2p_n.elmt
+++ b/elements/02protections/disjoncteurs/fa4215_disjoncteur_ligne_2p_n.elmt
@@ -1,14 +1,12 @@
-<definition width="90" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="16" hotspot_y="5" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 2P+N</name>
         <name lang="en">Feeder circuit-breaker 2P+N </name>
-        <name lang="fr">Disjoncteur de ligne 2P+N</name>
         <name lang="it">Relè termico 2P+N</name>
+        <name lang="fr">Disjoncteur de ligne 2P+N</name>
+        <name lang="pl">Wyłącznik nadprądowy trójbiegunowy</name>
         <name lang="cs">Jistič vedení 2P+N</name>
     </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
@@ -27,18 +25,18 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="33" y="3" size="6" rotation="270" text="3"/>
         <text x="48" y="9" size="6" rotation="270" text="N1"/>
         <text x="13" y="40" size="6" rotation="270" text="2"/>
-        <input x="-26" y="-5.5" size="9" text="_"/>
+        <input x="-26" y="-5.5" size="9" text="_" tagg="none"/>
         <text x="13" y="3" size="6" rotation="270" text="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="36" y2="12" x2="44"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="21" x1="-2" y2="21" x2="17"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="40" y2="15" x2="40"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="31" x2="0"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="40" y2="29" x2="40"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="40" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="40" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
+        <terminal x="40" y="0" orientation="n"/>
+        <terminal x="40" y="40" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/02protections/disjoncteurs/fa4216_disjoncteur_ligne_1p_n.elmt b/elements/02protections/disjoncteurs/fa4216_disjoncteur_ligne_1p_n.elmt
index 787b33a37..3b6cff9ef 100644
--- a/elements/02protections/disjoncteurs/fa4216_disjoncteur_ligne_1p_n.elmt
+++ b/elements/02protections/disjoncteurs/fa4216_disjoncteur_ligne_1p_n.elmt
@@ -1,14 +1,12 @@
-<definition width="70" version="0.4" hotspot_x="32" hotspot_y="23" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="16" hotspot_y="5" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
         <name lang="de">Leitungsschalter 1P+N</name>
         <name lang="en">Feeder circuit-breaker 1P+N</name>
-        <name lang="fr">Disjoncteur de ligne 1P+N</name>
         <name lang="it">Relè termico 1P+N</name>
+        <name lang="fr">Disjoncteur de ligne 1P+N</name>
+        <name lang="pl">Wyłącznik nadprądowy dwubiegunowy</name>
         <name lang="cs">Jistič vedení 1P+N</name>
     </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
@@ -22,14 +20,14 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
         <text x="12" y="4" size="6" rotation="270" text="1"/>
         <text x="28" y="9" size="6" rotation="270" text="N1"/>
         <text x="29" y="41" size="6" rotation="270" text="N2"/>
-        <input x="-26" y="-5.5" size="9" text="_"/>
+        <input x="-26" y="-5.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:normal;filling:none;color:black" y1="12" x1="16" y2="12" x2="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="24" x1="20" y2="15" x2="20"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="31" x2="0"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="20" y2="29" x2="20"/>
-        <terminal x="0" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="40" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="20" y="40" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="40" orientation="s"/>
     </description>
 </definition>