Tag version 0.5 beta

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/tags/0.5b@4230 bfdf4180-ca20-0410-9c96-a3a8aa849046
Change displayedVersion
2025-12-20 08:10:52 +01:00 · 2015-10-04 08:30:13 +00:00 · 2015-10-04 08:24:45 +00:00 · 2015-10-04 07:48:33 +00:00 · 2015-10-03 18:47:51 +00:00 · 2015-10-03 18:05:25 +00:00
3169 changed files with 192367 additions and 136903 deletions
--- a/4
+++ b/4
@@ -6,7 +6,7 @@ In the official collection, there are now 2298 elements, and 376 catégoris for
 * A menu has been added, allowing you to change the application language.
 * we added a summary creation tool.
 * Added button "export the nomenclature" transforms data from diagrams to CSV file for spreadsheet.
- Arun wrote a detailed manual and quality in English.
+ Arun wrote a detailed manual in English.
 * New tools have been added, they can create mechanical connections and draw cabinets, desks, junction boxes, or areas on the schematic (line tool, rectangle, ellipse, polygon type: respect for style dashes).
 * An aid in positioning cross, drawing, was added.
 * The locked state images and basic forms (basic shapes) is now stored in the project.
@@ -20,7 +20,7 @@ When the action save, save as, the status bar displays the name and path of the
 Qet is now able to come to load a style sheet (stylesheet) directly from the conf directory.
 * A DXF export has been added, the entire project folios can be exported in this format.
 * Added reports folio, Cross references.
-* Added a variable font size on the text of conductors.
+* Added a variable font size for text of conductors.
 * Added new properties to all conductors at the same potential, even through referrals.
 * When several conductors have the same value potential equalization, it is not useful to display on all conductors.
 * Added button to activates the automatic connection of the conductors of the element when moving it.
--- a/dev_doc/ID_of_QUndoCommand.txt
+++ b/dev_doc/ID_of_QUndoCommand.txt
@@ -0,0 +1,6 @@
 ChangeElementInformationCommand  = 1
 LinkElementCommand = 2
 ItemResizerCommand = 3
 ChangeShapeStyleCommand = 4
 QetShapeGeometryCommand = 5
 QPropertyUndoCommand = 10 000
--- a/elements/10_electric/10_allpole/100_sheet_referencing/01previous_folio.elmt
+++ b/elements/10_electric/10_allpole/100_sheet_referencing/01previous_folio.elmt
@@ -1,8 +1,9 @@
 <definition width="70" version="0.3" hotspot_x="49" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy"
 link_type="previous_report">
-    <names>
+<uuid uuid="{F549BEFB-F0CF-44ED-A948-F6F796BFB421}"/><names>
        <name lang="ru">Предыдущая страница</name>
        <name lang="ar">الصفحة السابقة</name>
-        <name lang="de">Vorherige Seite</name>
+        <name lang="de">Vorherige Folie</name>
        <name lang="el">Προηγούμενη σελίδα</name>
        <name lang="en">Previous folio</name>
        <name lang="it">Foglio precedente</name>
--- a/elements/10_electric/10_allpole/100_sheet_referencing/02next_folio.elmt
+++ b/elements/10_electric/10_allpole/100_sheet_referencing/02next_folio.elmt
@@ -1,8 +1,9 @@
 <definition width="40" version="0.3" hotspot_x="18" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy"
 link_type="next_report">
-    <names>
+<uuid uuid="{717352A1-F3C7-49C7-9A06-51620AB5CA00}"/><names>
        <name lang="ru">Следующая страница</name>
        <name lang="ar">الصفحة التالية</name>
-        <name lang="de">Nächste Seite</name>
+        <name lang="de">Nächste Folie</name>
        <name lang="el">Επόμενη σελίδα</name>
        <name lang="en">Next folio</name>
        <name lang="it">Foglio successivo</name>
--- a/elements/10_electric/10_allpole/100_sheet_referencing/qet_directory
+++ b/elements/10_electric/10_allpole/100_sheet_referencing/qet_directory
@@ -1,11 +1,12 @@
 <qet-directory>
    <names>
        <name lang="ru">Точки разрыва</name>
        <name lang="ar">إحالات</name>
        <name lang="cs">Výstupy</name>
-        <name lang="de">Abbruchstellen</name>
+        <name lang="de">Folienverweise</name>
        <name lang="el">Αναφορές σελίδας</name>
        <name lang="en">Sheet referencing</name>
-        <name lang="fr">Renvois de folio</name>
+        <name lang="fr">Reports de folio</name>
        <name lang="it">Riferimenti</name>
        <name lang="pl">Odsyłacze</name>
        <name lang="es">Referencias</name>
--- a/elements/10_electric/10_allpole/110_network_supplies/ground1.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/ground1.elmt
@@ -1,23 +1,26 @@
-<definition width="30" version="0.4" hotspot_x="16" hotspot_y="24" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="50" hotspot_y="29" type="element">
    <uuid uuid="{75d4e5ef-6080-4118-9eab-afb53220b9ef}"/>
    <names>
        <name lang="en">Ground</name>
        <name lang="ro">Masă</name>
        <name lang="ar">هيكل معدني</name>
        <name lang="de">Masse</name>
        <name lang="ru">Шасси</name>
        <name lang="pt">Massa</name>
        <name lang="it">Massa</name>
        <name lang="fr">Masse</name>
        <name lang="pl">Masa</name>
        <name lang="es">Masa</name>
        <name lang="cs">Kostra</name>
        <name lang="nl">Massa</name>
        <name lang="el">Γείωση</name>
        <name lang="de">Masse</name>
        <name lang="cs">Kostra</name>
        <name lang="pl">Masa</name>
        <name lang="ro">Masă</name>
        <name lang="it">Massa</name>
        <name lang="en">Ground</name>
        <name lang="ar">هيكل معدني</name>
        <name lang="fr">Masse</name>
        <name lang="ru">Шасси</name>
    </names>
    <informations>titus
 titus0818@yahoo.com</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="-16" x1="0" y2="13" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="-16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="14" x1="-13.6493" y2="14" x2="12.62"/>
+        <line antialias="false" length1="1.5" x2="12.62" end2="none" x1="-13.6493" end1="none" y2="14" length2="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="14"/>
        <input x="8" y="2" tagg="label" size="9" rotate="true" text="_"/>
        <terminal x="0" y="-20" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/masse.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/masse.elmt
@@ -1,27 +1,30 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="15" height="20" type="element" orientation="dnny">
+<definition width="20" link_type="simple" version="0.5" hotspot_x="9" orientation="dyyy" height="30" hotspot_y="20" type="element">
    <uuid uuid="{5983fe6f-de69-4368-a387-a6ce3b9c2951}"/>
    <names>
        <name lang="ar">هيكل معدني</name>
        <name lang="de">Masse</name>
        <name lang="ru">Шасси</name>
        <name lang="pt">Massa</name>
        <name lang="en">Chassis</name>
        <name lang="it">Massa</name>
        <name lang="fr">Masse</name>
        <name lang="pl">Masa</name>
        <name lang="es">Masa</name>
        <name lang="cs">Kostra</name>
        <name lang="nl">Massa</name>
        <name lang="el">Σασί</name>
        <name lang="de">Masse</name>
        <name lang="cs">Kostra</name>
        <name lang="pl">Masa</name>
        <name lang="it">Massa</name>
        <name lang="ar">هيكل معدني</name>
        <name lang="en">Chassis</name>
        <name lang="fr">Masse</name>
        <name lang="ru">Шасси</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.5" x1="7.5" y2="3" x2="5"/>
+        <input x="3" y="-12.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-1" y2="0.5" x2="1.5"/>
+        <line antialias="false" length1="1.5" x2="5" end2="none" x1="7.5" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-7" y2="0.5" x2="-4.5"/>
+        <line antialias="false" length1="1.5" x2="1.5" end2="none" x1="-1" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="2" y2="0.5" x2="4.5"/>
+        <line antialias="false" length1="1.5" x2="-4.5" end2="none" x1="-7" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-4" y2="0.5" x2="-1.5"/>
+        <line antialias="false" length1="1.5" x2="4.5" end2="none" x1="2" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="0" x2="8"/>
+        <line antialias="false" length1="1.5" x2="-1.5" end2="none" x1="-4" end1="none" y2="0.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="0" x2="0"/>
+        <line antialias="false" length1="1.5" x2="8" end2="none" x1="-7" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <terminal x="0" y="-11" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/qet_directory
+++ b/elements/10_electric/10_allpole/110_network_supplies/qet_directory
@@ -1,5 +1,6 @@
 <qet-directory>
    <names>
        <name lang="ru">Подвод питания, сеть</name>
        <name lang="en">Network supplies</name>
        <name lang="fr">Sources réseau</name>
        <name lang="it">Alimentazione da rete</name>
@@ -7,5 +8,6 @@
        <name lang="de">Netzquellen</name>
        <name lang="el">Παροχές δικτύου</name>
        <name lang="nl">Netwerk voedingen</name>
        <name lang="cs">Síťové zdroje</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_1p_pe_n.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_1p_pe_n.elmt
@@ -1,28 +1,30 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="60" hotspot_y="30" type="element">
    <uuid uuid="{35f2834a-308b-4e79-bc2a-1c00486b24e7}"/>
    <names>
        <name lang="ar">مصدر وحيد القطبية + أرضي PE + محايد N</name>
        <name lang="de">Wechselstrom + PE +N</name>
        <name lang="ru">Однополюсный + PE +N</name>
        <name lang="en">Single-pole source + PE +N</name>
        <name lang="it">Sorgente unipolare + PE +N</name>
        <name lang="fr">Source unipolaire + PE +N</name>
        <name lang="pl">Linia jednofazowa (trójprzewodowa)</name>
        <name lang="es">Fuente unipolo + PE +N</name>
        <name lang="cs">1 fáze + PE +N</name>
        <name lang="nl">1 fase + aarde + nul</name>
        <name lang="el">Μονοφασικό +N +PE</name>
        <name lang="de">Wechselstrom + PE +N</name>
        <name lang="cs">1 fáze + PE +N</name>
        <name lang="pl">Linia jednofazowa (trójprzewodowa)</name>
        <name lang="it">Sorgente unipolare + PE +N</name>
        <name lang="ar">مصدر وحيد القطبية + أرضي PE + محايد N</name>
        <name lang="en">Single-pole source + PE +N</name>
        <name lang="fr">Source unipolaire + PE +N</name>
        <name lang="ru">Однополюсный + PE +N</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="0" y2="20" x2="10"/>
+        <input x="-12" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-20" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
        <text x="-12" y="23" size="5" text="PE"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
        <text x="-12" y="3" size="5" text="N"/>
        <text x="-12" y="-17" size="5" text="L"/>
-        <terminal x="10" y="-20" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="20" orientation="e"/>
-        <terminal x="10" y="20" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-20" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_1p_pen.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_1p_pen.elmt
@@ -1,25 +1,27 @@
-<definition width="40" version="0.3" hotspot_x="22" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="40" link_type="simple" version="0.5" hotspot_x="22" orientation="dyyy" height="40" hotspot_y="20" type="element">
    <uuid uuid="{fd042050-e73b-4f95-b4c1-834aa403b07a}"/>
    <names>
        <name lang="ar">مصدر وحيد القطبية +PEN</name>
        <name lang="de">Wechselstrom + PEN</name>
        <name lang="ru">Однополюсный + PEN</name>
        <name lang="en">Single-pole source +PEN</name>
        <name lang="it">Sorgente unipolare + PEN</name>
        <name lang="fr">Source unipolaire + PEN</name>
        <name lang="pl">Linia jednofazowa (TN-C)</name>
        <name lang="es">Fuente unipolo + PEN</name>
        <name lang="cs">1 fáze + PEN</name>
        <name lang="nl">1 fase + aardenul</name>
        <name lang="el">Μονοφασικό +PEN</name>
        <name lang="de">Wechselstrom + PEN</name>
        <name lang="cs">1 fáze + PEN</name>
        <name lang="pl">Linia jednofazowa (TN-C)</name>
        <name lang="it">Sorgente unipolare + PEN</name>
        <name lang="ar">مصدر وحيد القطبية +PEN</name>
        <name lang="en">Single-pole source +PEN</name>
        <name lang="fr">Source unipolaire + PEN</name>
        <name lang="ru">Однополюсный + PEN</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-10" x2="10"/>
+        <input x="-7" y="-23.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="10" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
        <text x="-16" y="12" size="5" text="PEN"/>
        <text x="-15" y="-7" size="5" text="L"/>
-        <terminal x="10" y="-10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-10" orientation="e"/>
-        <terminal x="10" y="10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="10" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_1pn.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_1pn.elmt
@@ -1,26 +1,28 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="40" hotspot_y="20" type="element">
    <uuid uuid="{457a0c01-871c-40fd-83d7-14033333fb95}"/>
    <names>
        <name lang="ar">مصدر وحيد القطبية + محايد N</name>
        <name lang="de">Wechselstrom L + N</name>
        <name lang="ru">Однополюсный + нейтраль</name>
        <name lang="pt">Fonte unipolar + neutro</name>
        <name lang="en">Single-pole source + neutral</name>
        <name lang="it">Sorgente unipolare + neutro</name>
        <name lang="fr">Source unipolaire + neutre</name>
        <name lang="pl">Linia jednofazowa (dwuprzewodowa)</name>
        <name lang="es">Fuente unipolo + neutro</name>
        <name lang="cs">Jednopólový zdroj + nulový</name>
        <name lang="nl">Wisselspanning L + nul N</name>
        <name lang="el">Μονοφασικό + Ουδέτερος</name>
        <name lang="de">Wechselstrom L + N</name>
        <name lang="cs">Jednopólový zdroj + nulový</name>
        <name lang="pl">Linia jednofazowa (dwuprzewodowa)</name>
        <name lang="it">Sorgente unipolare + neutro</name>
        <name lang="ar">مصدر وحيد القطبية + محايد N</name>
        <name lang="en">Single-pole source + neutral</name>
        <name lang="fr">Source unipolaire + neutre</name>
        <name lang="ru">Однополюсный + нейтраль</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-10" x2="10"/>
+        <input x="-5" y="-25.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="10" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
        <text x="-12" y="13" size="5" text="N"/>
        <text x="-12" y="-7" size="5" text="L"/>
-        <terminal x="10" y="-10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-10" orientation="e"/>
-        <terminal x="10" y="10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="10" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3p.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_3p.elmt
@@ -1,29 +1,31 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="60" hotspot_y="30" type="element">
    <uuid uuid="{03b9e482-cb45-4bee-8030-96b93624fc60}"/>
    <names>
        <name lang="ar">مصدر ثلاثي القطبيّة</name>
        <name lang="de">Drehstrom</name>
        <name lang="ru">Трёхполюсный</name>
        <name lang="pt">Fonte tripolar</name>
        <name lang="en">Three-pole source</name>
        <name lang="it">Sorgente tripolare</name>
        <name lang="fr">Source tripolaire</name>
        <name lang="pl">Linia trójfazowa (trójprzewodowa)</name>
        <name lang="es">Fuente tripolar</name>
        <name lang="cs">Třípólový zdroj</name>
        <name lang="nl">3fasen</name>
        <name lang="el">Τριφασικό</name>
        <name lang="de">Drehstrom</name>
        <name lang="cs">Třípólový zdroj</name>
        <name lang="pl">Linia trójfazowa (trójprzewodowa)</name>
        <name lang="it">Sorgente tripolare</name>
        <name lang="ar">مصدر ثلاثي القطبيّة</name>
        <name lang="en">Three-pole source</name>
        <name lang="fr">Source tripolaire</name>
        <name lang="ru">Трёхполюсный</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="20" x1="0" y2="20" x2="10"/>
+        <input x="-2" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
        <text x="-12" y="23" size="5" text="L3"/>
        <text x="-12" y="3" size="5" text="L2"/>
        <text x="-12" y="-17" size="5" text="L1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-20" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <terminal x="10" y="-20" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-20" orientation="e"/>
-        <terminal x="10" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="20" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="20" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3p_pe_n.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_3p_pe_n.elmt
@@ -1,34 +1,36 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="50" height="100" type="element" ic="true" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="100" hotspot_y="50" type="element">
    <uuid uuid="{0e017749-6c0f-44c0-8726-6804be8bbee7}"/>
    <names>
        <name lang="ar">مصدر ثلاثي القطبية + PE + N</name>
        <name lang="de">Drehstrom + PE +N</name>
        <name lang="ru">Трёхполюсный + PE +N</name>
        <name lang="en">Three-pole source + PE +N</name>
        <name lang="it">Sorgente tripolare +PE + N</name>
        <name lang="fr">Source tripolaire + PE +N</name>
        <name lang="pl">Linia trójfazowa (pięcioprzewodowa)</name>
        <name lang="es">Fuente tripolar + PE +N</name>
        <name lang="cs">3 fáze + PE +N</name>
        <name lang="nl">driefase + aarde + nul</name>
        <name lang="el">Τριφασικό +N +PE</name>
        <name lang="de">Drehstrom + PE +N</name>
        <name lang="cs">3 fáze + PE +N</name>
        <name lang="pl">Linia trójfazowa (pięcioprzewodowa)</name>
        <name lang="it">Sorgente tripolare +PE + N</name>
        <name lang="ar">مصدر ثلاثي القطبية + PE + N</name>
        <name lang="en">Three-pole source + PE +N</name>
        <name lang="fr">Source tripolaire + PE +N</name>
        <name lang="ru">Трёхполюсный + PE +N</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="0" y2="40" x2="10"/>
+        <input x="3" y="-59.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
        <text x="-12" y="43" size="5" text="PE"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-20" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="0" y2="20" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
        <text x="-12" y="23" size="5" text="N"/>
        <text x="-12" y="3" size="5" text="L3"/>
        <text x="-12" y="-17" size="5" text="L2"/>
        <text x="-12" y="-37" size="5" text="L1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="0" y2="-40" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40"/>
-        <terminal x="10" y="-40" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-20" orientation="e"/>
-        <terminal x="10" y="-20" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-40" orientation="e"/>
-        <terminal x="10" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="20" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="20" orientation="e"/>
-        <terminal x="10" y="40" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="40" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3p_pen.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_3p_pen.elmt
@@ -1,31 +1,33 @@
-<definition width="40" version="0.3" hotspot_x="23" hotspot_y="41" height="80" type="element" ic="true" orientation="dyyy">
+<definition width="40" link_type="simple" version="0.5" hotspot_x="23" orientation="dyyy" height="80" hotspot_y="41" type="element">
    <uuid uuid="{c0913e95-3b3c-4dc2-a74d-bc73ded78c32}"/>
    <names>
        <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
        <name lang="de">Drehstrom + PEN</name>
        <name lang="ru">Трёхполюсный + PEN</name>
        <name lang="en">Three-pole source + PEN</name>
        <name lang="it">Sorgente tripolare + PEN</name>
        <name lang="fr">Source tripolaire + PEN</name>
        <name lang="pl">Linia trójfazowa (PEN)</name>
        <name lang="es">Fuente tripolar + PEN</name>
        <name lang="cs">3 fáze + PEN</name>
        <name lang="nl">driefasen + aardenul</name>
        <name lang="el">Τριφασικό + PEN</name>
        <name lang="de">Drehstrom + PEN</name>
        <name lang="cs">3 fáze + PEN</name>
        <name lang="pl">Linia trójfazowa (PEN)</name>
        <name lang="it">Sorgente tripolare + PEN</name>
        <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
        <name lang="en">Three-pole source + PEN</name>
        <name lang="fr">Source tripolaire + PEN</name>
        <name lang="ru">Трёхполюсный + PEN</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="10" x2="10"/>
+        <input x="-7" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-10" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="0" y2="30" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
        <text x="-18" y="32" size="5" text="PEN"/>
        <text x="-18" y="12" size="5" text="L3"/>
        <text x="-18" y="-8" size="5" text="L2"/>
        <text x="-18" y="-28" size="5" text="L1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-30" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <terminal x="10" y="-30" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-30" orientation="e"/>
-        <terminal x="10" y="-10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-10" orientation="e"/>
-        <terminal x="10" y="10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="10" orientation="e"/>
-        <terminal x="10" y="30" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="30" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_3pn.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_3pn.elmt
@@ -1,32 +1,34 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="40" height="80" type="element" ic="true" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="80" hotspot_y="40" type="element">
    <uuid uuid="{8bfb1790-0735-47d5-88a2-8b4d91aba2f1}"/>
    <names>
        <name lang="ar">مصدر ثلاثي القطبيّة + محايد</name>
        <name lang="de">Dreiphasig + Neutral</name>
        <name lang="ru">Трёхполюсный + нейтраль</name>
        <name lang="pt">Fonte tripolar + neutro</name>
        <name lang="en">Three-pole source + neutral</name>
        <name lang="it">Sorgente tripolare + neutro</name>
        <name lang="fr">Source tripolaire + neutre</name>
        <name lang="pl">Linia trójfazowa (czteroprzewodowa)</name>
        <name lang="es">Fuente tripolar + neutro</name>
        <name lang="cs">Třípólový zdroj + nulový</name>
        <name lang="nl">Driefasen + nul</name>
        <name lang="el">Τριφασικό + Ουδέτερος</name>
        <name lang="de">Dreiphasig + Neutral</name>
        <name lang="cs">Třípólový zdroj + nulový</name>
        <name lang="pl">Linia trójfazowa (czteroprzewodowa)</name>
        <name lang="it">Sorgente tripolare + neutro</name>
        <name lang="ar">مصدر ثلاثي القطبيّة + محايد</name>
        <name lang="en">Three-pole source + neutral</name>
        <name lang="fr">Source tripolaire + neutre</name>
        <name lang="ru">Трёхполюсный + нейтраль</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="10" x2="10"/>
+        <input x="-7" y="-44.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-10" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="0" y2="30" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
        <text x="-12" y="33" size="5" text="N"/>
        <text x="-12" y="13" size="5" text="L3"/>
        <text x="-12" y="-7" size="5" text="L2"/>
        <text x="-12" y="-27" size="5" text="L1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-30" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <terminal x="10" y="-30" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="10" orientation="e"/>
-        <terminal x="10" y="-10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="30" orientation="e"/>
-        <terminal x="10" y="10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-30" orientation="e"/>
-        <terminal x="10" y="30" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-10" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_n.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_n.elmt
@@ -1,22 +1,24 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dnnn">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="10" type="element">
    <uuid uuid="{b5ad2e41-804d-4745-99be-e8951cffdf98}"/>
    <names>
        <name lang="ar">مصدر محايد</name>
        <name lang="de">Neutralleiter</name>
        <name lang="ru">Нейтраль</name>
        <name lang="pt">Fonte de neutro</name>
        <name lang="en">Neutral source</name>
        <name lang="it">Sorgente neutro</name>
        <name lang="fr">Source neutre</name>
        <name lang="pl">Przewód neutralny</name>
        <name lang="es">Fuente neutro</name>
        <name lang="cs">Nulový zdroj</name>
        <name lang="nl">Nul voeding</name>
        <name lang="el">Ουδέτερος</name>
        <name lang="de">Neutralleiter</name>
        <name lang="cs">Nulový zdroj</name>
        <name lang="pl">Przewód neutralny</name>
        <name lang="it">Sorgente neutro</name>
        <name lang="ar">مصدر محايد</name>
        <name lang="en">Neutral source</name>
        <name lang="fr">Source neutre</name>
        <name lang="ru">Нейтраль</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
        <input x="-5" y="-14.45" tagg="label" size="9" rotate="true" text="_"/>
        <text x="-12" y="3" size="5" text="N"/>
        <terminal x="10" y="0" orientation="e"/>
    </description>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_p.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_p.elmt
@@ -1,22 +1,24 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dnnn">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="10" type="element">
    <uuid uuid="{7693c5e0-762b-4309-8d97-cb74619f9efd}"/>
    <names>
        <name lang="ar">مصدر وجه</name>
        <name lang="de">Phase</name>
        <name lang="ru">Фаза</name>
        <name lang="pt">Fonte de fase</name>
        <name lang="en">Phase source</name>
        <name lang="it">Sorgente fase</name>
        <name lang="fr">Source phase</name>
        <name lang="pl">Przewód liniowy</name>
        <name lang="es">Fuente fase</name>
        <name lang="cs">Fázový zdroj</name>
        <name lang="nl">Fase</name>
        <name lang="el">Φάση</name>
        <name lang="de">Phase</name>
        <name lang="cs">Fázový zdroj</name>
        <name lang="pl">Przewód liniowy</name>
        <name lang="it">Sorgente fase</name>
        <name lang="ar">مصدر وجه</name>
        <name lang="en">Phase source</name>
        <name lang="fr">Source phase</name>
        <name lang="ru">Фаза</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
+        <input x="-6" y="-14.45" tagg="label" size="9" rotate="true" text="_"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
        <text x="-12" y="3" size="5" text="L"/>
        <terminal x="10" y="0" orientation="e"/>
    </description>
--- a/elements/10_electric/10_allpole/110_network_supplies/src_tnc_tns.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/src_tnc_tns.elmt
@@ -1,46 +1,48 @@
-<definition width="70" version="0.3" hotspot_x="34" hotspot_y="40" height="100" type="element" ic="true" orientation="dyyy">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="100" hotspot_y="40" type="element">
    <uuid uuid="{4b9794cf-e7c0-4f59-aa0a-bb1fce4dfe48}"/>
    <names>
        <name lang="ar">نقطة توزيع TN-C &lt; TN-S </name>
        <name lang="de">Netz TNC > TNS</name>
        <name lang="ru">Распределительный пункт TN-C >TN-S</name>
        <name lang="en">Distribution point TN-C >TN-S</name>
        <name lang="it">Punto di distribuzione TN-C</name>
        <name lang="fr">Point de distribution TN-C >TN-S</name>
        <name lang="pl">Linia trójfazowa (TN-C-S)</name>
        <name lang="es">Punto de distribución TN-C > TN-S</name>
        <name lang="cs">Bod rozdělení TN-C > TN-S</name>
        <name lang="nl">Net TN-C > TN-S</name>
        <name lang="de">Netz TNC > TNS</name>
        <name lang="cs">Bod rozdělení TN-C > TN-S</name>
        <name lang="pl">Linia trójfazowa (TN-C-S)</name>
        <name lang="it">Punto di distribuzione TN-C</name>
        <name lang="ar">نقطة توزيع TN-C &lt; TN-S </name>
        <name lang="en">Distribution point TN-C >TN-S</name>
        <name lang="fr">Point de distribution TN-C >TN-S</name>
        <name lang="ru">Распределительный пункт TN-C >TN-S</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="24" y2="-30" x2="28"/>
+        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="24" y2="50" x2="28"/>
+        <input x="-17" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="24" y2="30" x2="28"/>
+        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="24" y2="10" x2="28"/>
+        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="24" y2="-10" x2="28"/>
+        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="-6" y2="54" x2="-4"/>
+        <line antialias="false" length1="1.5" x2="28" end2="none" x1="24" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="52" x1="-8" y2="52" x2="-2"/>
+        <line antialias="false" length1="1.5" x2="-4" end2="none" x1="-6" end1="none" y2="54" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-10" y2="50" x2="0"/>
+        <line antialias="false" length1="1.5" x2="-2" end2="none" x1="-8" end1="none" y2="52" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="52"/>
        <line antialias="false" length1="1.5" x2="0" end2="none" x1="-10" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
        <text x="13" y="53" size="5" text="PE"/>
        <text x="13" y="33" size="5" text="N"/>
        <text x="13" y="13" size="5" text="L3"/>
        <text x="13" y="-7" size="5" text="L2"/>
        <text x="13" y="-27" size="5" text="L1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-13" y2="10" x2="12"/>
+        <line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="7" y2="50" x2="12"/>
+        <line antialias="false" length1="1.5" x2="12" end2="none" x1="7" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-13" y2="-10" x2="12"/>
+        <line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-13" y2="30" x2="12"/>
+        <line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
        <text x="-30" y="33" size="5" text="PEN"/>
        <text x="-30" y="13" size="5" text="L3"/>
        <text x="-30" y="-7" size="5" text="L2"/>
        <text x="-30" y="-27" size="5" text="L1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-13" y2="-30" x2="12"/>
+        <line antialias="false" length1="1.5" x2="12" end2="none" x1="-13" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="50" x1="7" y2="30" x2="-5" y3="49" x3="-5"/>
+        <polygon antialias="true" x2="-5" x1="7" x3="-5" y2="30" y3="49" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <terminal x="30" y="50" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="-10" orientation="e"/>
-        <terminal x="30" y="-30" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="10" orientation="e"/>
-        <terminal x="30" y="-10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="30" orientation="e"/>
-        <terminal x="30" y="10" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="50" orientation="e"/>
-        <terminal x="30" y="30" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="30" y="-30" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/terre.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/terre.elmt
@@ -1,25 +1,27 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="15" height="30" type="element" orientation="dnny">
+<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="30" hotspot_y="19" type="element">
    <uuid uuid="{93eafb79-a84a-45e3-b43b-327d0944591b}"/>
    <names>
        <name lang="ar">تأريض</name>
        <name lang="de">Erde</name>
        <name lang="ru">Земля</name>
        <name lang="pt">Terra</name>
-        <name lang="el">Γη</name>
+        <name lang="el">Γείωση</name>
        <name lang="en">Ground</name>
        <name lang="it">Terra</name>
        <name lang="fr">Terre</name>
        <name lang="pl">Uziemienie</name>
        <name lang="es">Tierra</name>
        <name lang="cs">Země</name>
        <name lang="nl">Aarde</name>
        <name lang="de">Erde</name>
        <name lang="cs">Země</name>
        <name lang="pl">Uziemienie</name>
        <name lang="it">Terra</name>
        <name lang="ar">تأريض</name>
        <name lang="en">Ground</name>
        <name lang="fr">Terre</name>
        <name lang="ru">Земля</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="-3" y2="4" x2="3"/>
+        <input x="2" y="-11.5" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-5" y2="2" x2="5"/>
+        <line antialias="false" length1="1.5" x2="3" end2="none" x1="-3" end1="none" y2="4" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="0" x1="-7" y2="0" x2="7"/>
+        <line antialias="false" length1="1.5" x2="5" end2="none" x1="-5" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-10" x1="0" y2="0" x2="0"/>
+        <line antialias="false" length1="1.5" x2="7" end2="none" x1="-7" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <terminal x="0" y="-11" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/114_connections/combine.elmt
+++ b/elements/10_electric/10_allpole/114_connections/combine.elmt
@@ -1,17 +1,20 @@
-<definition width="30" version="0.3" hotspot_x="12" hotspot_y="5" height="20" type="element" ic="true" orientation="dyyy">
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="11">
    <uuid uuid="{8ef9d490-8db2-450a-ab89-22d2b35c01ed}"/>
    <names>
        <name lang="en">Combine</name>
        <name lang="it">Collegamento</name>
-        <name lang="fr">Jonction</name>
+        <name lang="en">Combine</name>
        <name lang="ru">Соединение</name>
        <name lang="pl">Połączenie 1</name>
        <name lang="fr">Jonction</name>
        <name lang="cs">Spoj</name>
    </names>
    <informations></informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="7" y2="0" x2="1"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="7" y1="0" end2="none" x2="1" antialias="false" end1="none" length2="1.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="0" y2="0" x2="6"/>
+        <input x="2" y="13.5" size="1" tagg="label" rotate="true" text="_"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
-        <terminal x="-4" y="0" orientation="w"/>
+        <terminal orientation="w" x="-4" y="0"/>
-        <terminal x="10" y="0" orientation="e"/>
+        <terminal orientation="s" x="0" y="10"/>
        <terminal orientation="e" x="10" y="0"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/114_connections/corner.elmt
+++ b/elements/10_electric/10_allpole/114_connections/corner.elmt
@@ -1,14 +1,17 @@
-<definition width="20" version="0.3" hotspot_x="12" hotspot_y="8" height="20" type="element" ic="true" orientation="dyyy">
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="7" width="20" hotspot_x="11">
    <uuid uuid="{2c6c492e-8d8e-402e-a449-0cf5a7462ced}"/>
    <names>
        <name lang="en">Corner</name>
        <name lang="it">Angolo</name>
        <name lang="ru">Угол</name>
        <name lang="fr">Coin</name>
        <name lang="pl">Narożnik</name>
        <name lang="cs">Roh</name>
    </names>
    <informations></informations>
    <description>
-        <terminal x="0" y="4" orientation="s"/>
+        <input x="-0.5" y="-0.45" size="1" tagg="label" rotate="true" text="_"/>
-        <terminal x="-4" y="0" orientation="w"/>
+        <terminal orientation="s" x="0" y="4"/>
        <terminal orientation="w" x="-4" y="0"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/114_connections/cross.elmt
+++ b/elements/10_electric/10_allpole/114_connections/cross.elmt
@@ -1,17 +1,20 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="9" width="20" hotspot_x="9">
    <uuid uuid="{eb8040c8-6998-4f43-818b-1d368825ffac}"/>
    <names>
        <name lang="en">Cross</name>
        <name lang="it">Croce</name>
        <name lang="ru">Пересечение</name>
        <name lang="fr">Croix</name>
        <name lang="pl">Połączenie 2</name>
        <name lang="cs">Kříž</name>
    </names>
    <informations></informations>
    <description>
-        <circle x="-1" y="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="2"/>
+        <circle x="-1" y="-1" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="true" diameter="2"/>
-        <terminal x="0" y="4" orientation="s"/>
+        <input x="-0.5" y="-4.45" size="1" tagg="label" rotate="true" text="_"/>
-        <terminal x="-4" y="0" orientation="w"/>
+        <terminal orientation="e" x="4" y="0"/>
-        <terminal x="4" y="0" orientation="e"/>
+        <terminal orientation="s" x="0" y="4"/>
-        <terminal x="0" y="-4" orientation="n"/>
+        <terminal orientation="n" x="0" y="-4"/>
        <terminal orientation="w" x="-4" y="0"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/114_connections/jump.elmt
+++ b/elements/10_electric/10_allpole/114_connections/jump.elmt
@@ -1,15 +1,18 @@
-<definition width="10" version="0.3" hotspot_x="5" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy">
+<definition type="element" height="30" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="14" width="10" hotspot_x="5">
    <uuid uuid="{cd8b3f5f-5eae-416c-9966-c7b5529b6e63}"/>
    <names>
        <name lang="en">Jump</name>
        <name lang="it">Salto</name>
        <name lang="ru">Перемычка</name>
        <name lang="fr">Saut</name>
        <name lang="pl">Brak połączenia</name>
        <name lang="cs">Skok</name>
    </names>
    <informations></informations>
    <description>
-        <arc width="6" x="-3" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
+        <arc height="6" start="90" angle="-180" x="-3" y="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="6"/>
-        <terminal x="0" y="7" orientation="s"/>
+        <input x="1.5" y="-6.45" size="1" tagg="label" rotate="true" text="_"/>
-        <terminal x="0" y="-7" orientation="n"/>
+        <terminal orientation="n" x="0" y="-7"/>
        <terminal orientation="s" x="0" y="7"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/114_connections/qet_directory
+++ b/elements/10_electric/10_allpole/114_connections/qet_directory
@@ -1,5 +1,6 @@
 <qet-directory>
    <names>
        <name lang="ru">Соединения</name>
        <name lang="de">Verbindungen</name>
        <name lang="en">Connections</name>
        <name lang="fr">Connections</name>
--- a/elements/10_electric/10_allpole/114_connections/splice.elmt
+++ b/elements/10_electric/10_allpole/114_connections/splice.elmt
@@ -1,17 +1,20 @@
-<definition width="30" version="0.3" hotspot_x="18" hotspot_y="5" height="20" type="element" ic="true" orientation="dyyy">
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="17">
    <uuid uuid="{0f807068-d5a4-4628-85f4-0644e6d3129f}"/>
    <names>
        <name lang="en">Splice</name>
        <name lang="it">Spaziatura</name>
        <name lang="ru">Сращивание</name>
        <name lang="fr">Epissure</name>
        <name lang="pl">Połączenie 3</name>
        <name lang="cs">Spojka</name>
    </names>
    <informations></informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="0" y2="0" x2="-6"/>
+        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="1" y2="0" x2="-5"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="1" y1="0" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
-        <terminal x="-10" y="0" orientation="w"/>
+        <terminal orientation="s" x="0" y="10"/>
-        <terminal x="4" y="0" orientation="e"/>
+        <terminal orientation="w" x="-10" y="0"/>
        <terminal orientation="e" x="4" y="0"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/114_connections/thruleft.elmt
+++ b/elements/10_electric/10_allpole/114_connections/thruleft.elmt
@@ -1,17 +1,20 @@
-<definition width="30" version="0.3" hotspot_x="18" hotspot_y="5" height="20" type="element" ic="true" orientation="dyyy">
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="17">
    <uuid uuid="{a1ced185-e98f-4cf1-8a62-3f8ea691bcb6}"/>
    <names>
        <name lang="en">Thru left</name>
        <name lang="it">Collegamento sinistro</name>
        <name lang="ru">Справа налево</name>
        <name lang="fr">Liaison gauche</name>
        <name lang="pl">Połączenie 4</name>
        <name lang="cs">Levé spojení</name>
    </names>
    <informations></informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="0" y2="0" x2="-6"/>
+        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="5" x2="0"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <line y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
-        <terminal x="-10" y="0" orientation="w"/>
+        <terminal orientation="e" x="4" y="0"/>
-        <terminal x="4" y="0" orientation="e"/>
+        <terminal orientation="w" x="-10" y="0"/>
        <terminal orientation="s" x="0" y="10"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/114_connections/thruright.elmt
+++ b/elements/10_electric/10_allpole/114_connections/thruright.elmt
@@ -1,18 +1,21 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="5" height="20" type="element" ic="true" orientation="dyyy">
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="14">
    <uuid uuid="{5d72394b-8aa0-4368-bc88-0f738478ca45}"/>
    <names>
        <name lang="en">Thru right</name>
        <name lang="it">Collegamento destro</name>
        <name lang="ru">Слева направо</name>
        <name lang="fr">Liaison droite</name>
        <name lang="pl">Połączenie 5</name>
        <name lang="cs">Pravé spojení</name>
    </names>
    <informations></informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="-6"/>
+        <input x="5.5" y="4.55" size="1" tagg="label" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="5" x2="0"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="6" y2="6" x2="0"/>
+        <line y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
-        <terminal x="0" y="10" orientation="s"/>
+        <line y2="6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="6" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
-        <terminal x="-10" y="0" orientation="w"/>
+        <terminal orientation="s" x="0" y="10"/>
-        <terminal x="10" y="0" orientation="e"/>
+        <terminal orientation="w" x="-10" y="0"/>
        <terminal orientation="e" x="10" y="0"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/cable.elmt
@@ -1,21 +1,24 @@
-<definition width="120" version="0.3" hotspot_x="51" hotspot_y="15" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="90" link_type="simple" version="0.5" hotspot_x="42" orientation="dyyy" height="20" hotspot_y="3" type="element">
    <uuid uuid="{5ba1917d-c353-41b2-aa70-caf65579b81e}"/>
    <names>
        <name lang="de">Kabel 3G</name>
        <name lang="cs">Označení drátového propojení - 2 fáze + země</name>
        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
        <name lang="it">Cavo 2 fasi + terra</name>
        <name lang="fr">Cable 2 phases+terre</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
+        <name lang="ru">Кабель 2 жилы + PE</name>
    </names>
    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <text x="32" y="9" size="4" text="2"/>
+        <text x="12" y="9" size="4" text="2"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="46.95" y2="11.95" x2="50.95"/>
+        <line antialias="true" length1="1.5" x2="30.95" end2="none" x1="26.95" end1="none" y2="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="28" y2="12" x2="32"/>
+        <line antialias="true" length1="1.5" x2="12" end2="none" x1="8" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
-        <text x="50.5" y="8.55" size="4" text="GNYE"/>
+        <text x="30.5" y="8.55" size="4" text="GNYE"/>
-        <input x="-48" y="17" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
+        <input x="-68" y="17" tagg="none" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-19.9373" y2="10" x2="57.932"/>
+        <line antialias="false" length1="1.5" x2="37.932" end2="none" x1="-39.9373" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-12" y2="12" x2="-8"/>
+        <line antialias="true" length1="1.5" x2="-28" end2="none" x1="-32" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
-        <text x="-8" y="9" size="4" text="1"/>
+        <text x="-28" y="9" size="4" text="1"/>
-        <input x="-41" y="1" size="5" rotate="true" text="+"/>
+        <input x="-61" y="1" tagg="label" size="5" rotate="true" text="+"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable1.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/cable1.elmt
@@ -1,23 +1,26 @@
-<definition width="120" version="0.3" hotspot_x="50" hotspot_y="15" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="100" link_type="simple" version="0.5" hotspot_x="46" orientation="dyyy" height="20" hotspot_y="3" type="element">
    <uuid uuid="{d95f81ca-8802-48c0-830d-b214fb41af86}"/>
    <names>
        <name lang="de">Kabel 4G</name>
        <name lang="cs">Označení drátového propojení - 3 fáze + země</name>
        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
        <name lang="it">Cavo 3 fasi + terra</name>
        <name lang="fr">Cable 3 phases+terre</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
+        <name lang="ru">Кабель 3 жилы + PE</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="7.95" y2="11.95" x2="11.95"/>
+        <line antialias="true" length1="1.5" x2="-8.05" end2="none" x1="-12.05" end1="none" y2="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95"/>
-        <text x="11" y="9" size="4" text="2"/>
+        <text x="-9" y="9" size="4" text="2"/>
-        <text x="32" y="9" size="4" text="3"/>
+        <text x="12" y="9" size="4" text="3"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="46.95" y2="11.95" x2="50.95"/>
+        <line antialias="true" length1="1.5" x2="30.95" end2="none" x1="26.95" end1="none" y2="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="28" y2="12" x2="32"/>
+        <line antialias="true" length1="1.5" x2="12" end2="none" x1="8" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
-        <text x="52" y="9" size="4" text="GNYE"/>
+        <text x="32" y="9" size="4" text="GNYE"/>
-        <input x="-48" y="17" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
+        <input x="-68" y="17" tagg="none" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-19.9373" y2="10" x2="57.932"/>
+        <line antialias="false" length1="1.5" x2="37.932" end2="none" x1="-39.9373" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-12" y2="12" x2="-8"/>
+        <line antialias="true" length1="1.5" x2="-28" end2="none" x1="-32" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
-        <text x="-8" y="9" size="4" text="1"/>
+        <text x="-28" y="9" size="4" text="1"/>
-        <input x="-41" y="1" size="5" rotate="true" text="+"/>
+        <input x="-61" y="1" tagg="label" size="5" rotate="true" text="+"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable2.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/cable2.elmt
@@ -1,21 +1,24 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="15" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="80" link_type="simple" version="0.5" hotspot_x="36" orientation="dyyy" height="20" hotspot_y="3" type="element">
    <uuid uuid="{d7b0edcd-eca1-432c-8ea7-698c613bca22}"/>
    <names>
        <name lang="de">Kabel 3G</name>
        <name lang="cs">Označení drátového propojení - 2 fáze + země</name>
        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
        <name lang="it">Cavo 2 fasi + terra</name>
        <name lang="fr">Cable 2 phases+terre</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
+        <name lang="ru">Кабель 2 жилы + PE</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="27.95" y2="11.95" x2="31.95"/>
+        <line antialias="true" length1="1.5" x2="21.95" end2="none" x1="17.95" end1="none" y2="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95"/>
-        <text x="12" y="9" size="4" text="2"/>
+        <text x="2" y="9" size="4" text="2"/>
-        <text x="33" y="9" size="4" text="GNYE"/>
+        <text x="23" y="9" size="4" text="GNYE"/>
-        <input x="-48" y="17" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
+        <input x="-58" y="17" tagg="none" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95" x1="7.95" y2="11.95" x2="11.95"/>
+        <line antialias="true" length1="1.5" x2="1.95" end2="none" x1="-2.05" end1="none" y2="11.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-20.2509" y2="10" x2="37.2717"/>
+        <line antialias="false" length1="1.5" x2="27.2717" end2="none" x1="-30.2509" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="-12" y2="12" x2="-8"/>
+        <line antialias="true" length1="1.5" x2="-18" end2="none" x1="-22" end1="none" y2="12" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8"/>
-        <text x="-8" y="9" size="4" text="1"/>
+        <text x="-18" y="9" size="4" text="1"/>
-        <input x="-41" y="1" size="5" rotate="true" text="+"/>
+        <input x="-51" y="1" tagg="label" size="5" rotate="true" text="+"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/cable_3wires.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/cable_3wires.elmt
@@ -1,16 +1,19 @@
-<definition width="110" version="0.3" hotspot_x="58" hotspot_y="21" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="9" type="element">
    <uuid uuid="{4b9a04b1-0d35-4d54-b5cb-b573ed3a9b0d}"/>
    <names>
        <name lang="de">Kabel 3x</name>
        <name lang="cs">Označení drátového propojení 3 vodiče</name>
        <name lang="pl">Oznaczenie przewodu trójżyłowego</name>
        <name lang="it">Cavo a 3 conduttori</name>
        <name lang="en">Cable 3 wires</name>
        <name lang="fr">Cable 3 brins</name>
-        <name lang="it">Cavo a 3 conduttori</name>
+        <name lang="ru">Кабель 3 жилы</name>
        <name lang="pl">Oznaczenie przewodu trójżyłowego</name>
    </names>
    <informations></informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10" y2="0" x2="50"/>
+        <line antialias="false" length1="1.5" x2="50" end2="none" x1="-10" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <input x="-36" y="-6" size="7" rotate="true" text="-W?"/>
+        <input x="-36" y="-6" tagg="label" size="7" rotate="true" text="-W?"/>
-        <input x="-56" y="4.5" size="5" rotate="true" text="ÖLFLEX 100"/>
+        <input x="-56" y="4.5" tagg="none" size="5" rotate="true" text="ÖLFLEX 100"/>
        <terminal x="0" y="-5" orientation="n"/>
        <terminal x="20" y="-5" orientation="n"/>
        <terminal x="40" y="-5" orientation="n"/>
--- a/elements/10_electric/10_allpole/120_cables&wiring/ecran_3p.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/ecran_3p.elmt
@@ -1,19 +1,22 @@
-<definition width="70" version="0.3" hotspot_x="15" hotspot_y="20" height="20" type="element" orientation="dyyy">
+<definition width="60" link_type="simple" version="0.5" hotspot_x="21" orientation="dyyy" height="10" hotspot_y="-6" type="element">
    <uuid uuid="{822e6fc1-0104-4d3a-ba3c-995c24c79cf2}"/>
    <names>
        <name lang="ar">شاشة</name>
        <name lang="en">Screen</name>
        <name lang="de">Schirm</name>
        <name lang="it">Schermo</name>
        <name lang="fr">Ecran</name>
        <name lang="pl">Ekran 3</name>
        <name lang="cs">Ochranné uzemnění</name>
        <name lang="nl">Scherm</name>
        <name lang="el">Πλέγμα</name>
        <name lang="de">Schirm</name>
        <name lang="cs">Obrazovka</name>
        <name lang="pl">Ekran 3</name>
        <name lang="it">Schermo</name>
        <name lang="ar">شاشة</name>
        <name lang="en">Screen</name>
        <name lang="fr">Ecran</name>
        <name lang="ru">Экран</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <ellipse width="50" x="-5" y="-12.5" antialias="true" height="5" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="50" x="-15" antialias="true" y="7.5" height="5" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-5" y="-10" orientation="w"/>
+        <input x="-9" y="-2.45" tagg="label" size="9" rotate="true" text="_"/>
        <terminal x="-15" y="10" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/fil_de_cable.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/fil_de_cable.elmt
@@ -1,16 +1,20 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="20" hotspot_y="9" type="element">
    <uuid uuid="{6ac285f9-6492-40cb-be58-9ba565ea1921}"/>
    <names>
        <name lang="de">Kabelader</name>
        <name lang="cs">Vedení kabelu</name>
        <name lang="pl">Połączenie przewodu</name>
        <name lang="it">Conduttore di un cavo</name>
        <name lang="en">Wire of cable</name>
        <name lang="fr">Fil de cable</name>
-        <name lang="it">Conduttore di un cavo</name>
+        <name lang="ru">Жила кабеля</name>
        <name lang="pl">Połączenie przewodu</name>
    </names>
    <informations></informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-9.76313" y2="0" x2="9.82672"/>
+        <line antialias="false" length1="1.5" x2="9.82672" end2="none" x1="-9.76313" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-4.10435" x1="0" y2="4.11304" x2="0"/>
+        <input x="1" y="-11.5" tagg="label" size="9" rotate="true" text="_"/>
-        <terminal x="0" y="-5" orientation="n"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="4.11304" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.10435"/>
        <terminal x="0" y="5" orientation="s"/>
        <terminal x="0" y="-5" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/filerie.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/filerie.elmt
@@ -1,15 +1,18 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
+<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="20" hotspot_y="9" type="element">
    <uuid uuid="{374ed6b3-7329-4cad-ac8c-200b17508460}"/>
    <names>
        <name lang="de">Verdrahtung</name>
-        <name lang="en">Wiring</name>
+        <name lang="cs">Drátové propojení</name>
        <name lang="it">Conduttura</name>
        <name lang="fr">Filerie</name>
        <name lang="pl">Oznaczenie przewodu</name>
        <name lang="it">Conduttura</name>
        <name lang="en">Wiring</name>
        <name lang="fr">Filerie</name>
    </names>
    <informations></informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="5" y2="5" x2="-5"/>
+        <line antialias="false" length1="1.5" x2="-5" end2="none" x1="5" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-5" x1="0" y2="5" x2="0"/>
+        <input x="0" y="-2.5" tagg="label" size="9" rotate="true" text="_"/>
        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
        <terminal x="0" y="-5" orientation="n"/>
        <terminal x="0" y="5" orientation="s"/>
    </description>
--- a/elements/10_electric/10_allpole/120_cables&wiring/nomenclature_section.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/nomenclature_section.elmt
@@ -1,21 +1,22 @@
-<definition width="60" version="0.3" hotspot_x="3" hotspot_y="16" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="14" orientation="dyyy" height="20" hotspot_y="4" type="element">
    <uuid uuid="{a0e9e33a-ee38-4c08-8f40-c307da8d822b}"/>
    <names>
        <name lang="ar">تسمية مساحة المقطع </name>
        <name lang="de">Verdrahtungsquerschnitt</name>
        <name lang="el">Διατομή αγωγού</name>
        <name lang="en">Wiring section</name>
        <name lang="it">Sezione della nomenclatura</name>
        <name lang="fr">Section de fil</name>
        <name lang="pl">Pole przekróju przewodu</name>
        <name lang="es">Clasificación de sección</name>
        <name lang="nl">Doorsnede</name>
-        <name lang="cs">Část členění</name>
+        <name lang="de">Verdrahtungsquerschnitt</name>
        <name lang="cs">Průřez drátovým propojením</name>
        <name lang="pl">Pole przekróju przewodu</name>
        <name lang="it">Sezione della nomenclatura</name>
        <name lang="ar">تسمية مساحة المقطع </name>
        <name lang="en">Wiring section</name>
        <name lang="fr">Section de fil</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <input x="0" y="0" size="6" rotate="true" text="_"/>
+        <input x="-40" y="10" tagg="label" size="6" rotate="true" text="_"/>
-        <text x="48" y="-3.6666" size="4" text="2"/>
+        <text x="8" y="6.3334" size="4" text="2"/>
-        <text x="30" y="0" size="6" text="mm"/>
+        <text x="-10" y="10" size="6" text="mm"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/qet_directory
+++ b/elements/10_electric/10_allpole/120_cables&wiring/qet_directory
@@ -1,5 +1,6 @@
 <qet-directory>
    <names>
        <name lang="ru">Кабели и провода</name>
        <name lang="en">Cables and wiring</name>
        <name lang="fr">Câbles et filerie</name>
        <name lang="it">Cavi e collegamenti</name>
@@ -7,5 +8,6 @@
        <name lang="de">Kabel und Verdrahtung</name>
        <name lang="el">Καλώδια και καλωδίωση</name>
        <name lang="nl">Kabels en draden</name>
        <name lang="cs">Kabely a drátové propojení</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/10_allpole/120_cables&wiring/section1conducteur.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/section1conducteur.elmt
@@ -1,15 +1,17 @@
-<definition width="60" version="0.3" hotspot_x="47" hotspot_y="13" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="10" hotspot_y="5" type="element">
    <uuid uuid="{b96a76a6-a798-497b-a044-dd933756d175}"/>
    <names>
        <name lang="de">Verdrahtungsdefinition 1 Leiter</name>
        <name lang="cs">Označení drátového propojení 1 vodič</name>
        <name lang="pl">Oznaczenie pola przekroju przewodu jednożyłowego</name>
        <name lang="it">Sezione 1 conduttore</name>
        <name lang="fr">Section 1 conducteur</name>
        <name lang="pl">Oznaczenie pola przekroju przewodu jednożyłowego</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10.8483" y2="0" x2="9.91885"/>
+        <line antialias="false" length1="1.5" x2="9.91885" end2="none" x1="-10.8483" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-2" y2="2" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-2" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2"/>
-        <input x="-44" y="2" size="4" rotate="true" text="1,5 mm²&#xa; "/>
+        <input x="-44" y="2" tagg="label" size="4" rotate="true" text="1,5 mm²&#xa; "/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/section2-1conducteurs.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/section2-1conducteurs.elmt
@@ -1,16 +1,18 @@
-<definition width="100" version="0.3" hotspot_x="48" hotspot_y="13" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="10" hotspot_y="5" type="element">
    <uuid uuid="{448ac784-f459-4f8f-bd3f-d911802b3369}"/>
    <names>
        <name lang="de">Verdrahtungsdefinition 2 Leiter</name>
        <name lang="cs">Označení drátového propojení 2 vodiče</name>
        <name lang="pl">Oznaczenie pola przekroju przewodu dwużyłowego</name>
        <name lang="it">Sezione 2 conduttori</name>
        <name lang="fr">Section 2 conducteurs</name>
        <name lang="pl">Oznaczenie pola przekroju przewodu dwużyłowego</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="-2.05" x1="37.95" y2="1.95" x2="41.95"/>
+        <line antialias="true" length1="1.5" x2="41.95" end2="none" x1="37.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10.2509" y2="0" x2="47.2717"/>
+        <line antialias="false" length1="1.5" x2="47.2717" end2="none" x1="-10.2509" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-2" y2="2" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-2" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2"/>
-        <input x="-44" y="2" size="4" rotate="true" text="1,5 mm²&#xa; "/>
+        <input x="-44" y="2" tagg="label" size="4" rotate="true" text="1,5 mm²&#xa; "/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/section2conducteurs.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/section2conducteurs.elmt
@@ -1,16 +1,18 @@
-<definition width="70" version="0.3" hotspot_x="46" hotspot_y="13" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="40" link_type="simple" version="0.5" hotspot_x="14" orientation="dyyy" height="10" hotspot_y="5" type="element">
    <uuid uuid="{c94d9e16-e3bb-4117-b037-466a15edcb14}"/>
    <names>
        <name lang="de">Verdrahtungsdefinition 2 Leiter</name>
        <name lang="cs">Označení drátového propojení 2 vodiče</name>
        <name lang="pl">Oznaczenie pola przekroju przewodu dwużyłowego</name>
        <name lang="it">Sezione 2 conduttori</name>
        <name lang="fr">Section 2 conducteurs</name>
        <name lang="pl">Oznaczenie pola przekroju przewodu dwużyłowego</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="-2.05" x1="17.95" y2="1.95" x2="21.95"/>
+        <line antialias="true" length1="1.5" x2="21.95" end2="none" x1="17.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10.8107" y2="0" x2="19.8781"/>
+        <line antialias="false" length1="1.5" x2="19.8781" end2="none" x1="-10.8107" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-2" y2="2" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-2" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2"/>
-        <input x="-44" y="2" size="4" rotate="true" text="1,5 mm²&#xa; "/>
+        <input x="-44" y="2" tagg="label" size="4" rotate="true" text="1,5 mm²&#xa; "/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/section3.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/section3.elmt
@@ -1,17 +1,19 @@
-<definition width="100" version="0.3" hotspot_x="48" hotspot_y="13" height="30" type="element" ic="true" orientation="dyyy">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="16" orientation="dyyy" height="10" hotspot_y="5" type="element">
    <uuid uuid="{9d939952-9c2b-4b12-898f-262abc91e845}"/>
    <names>
        <name lang="de">Verdrahtungsdefinition 3 Leiter</name>
        <name lang="cs">Označení drátového propojení 3 vodiče</name>
        <name lang="pl">Oznaczenie pola przekroju przewodu trójżyłowego</name>
        <name lang="it">Sezione 3 conduttori</name>
        <name lang="fr">Section 3 conducteurs</name>
        <name lang="pl">Oznaczenie pola przekroju przewodu trójżyłowego</name>
    </names>
    <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:normal;line-weight:normal;filling:none;color:black" y1="-2.05" x1="37.95" y2="1.95" x2="41.95"/>
+        <line antialias="true" length1="1.5" x2="41.95" end2="none" x1="37.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05" x1="17.95" y2="1.95" x2="21.95"/>
+        <line antialias="true" length1="1.5" x2="21.95" end2="none" x1="17.95" end1="none" y2="1.95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-10.2509" y2="0" x2="47.2717"/>
+        <line antialias="false" length1="1.5" x2="47.2717" end2="none" x1="-10.2509" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-2" y2="2" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-2" end1="none" y2="2" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2"/>
-        <input x="-44" y="2" size="4" rotate="true" text="1,5 mm²&#xa; "/>
+        <input x="-44" y="2" tagg="label" size="4" rotate="true" text="1,5 mm²&#xa; "/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/barette_de_terre.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/barette_de_terre.elmt
@@ -1,23 +1,25 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnnn">
+<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="60" hotspot_y="29" type="element">
    <uuid uuid="{e1463f74-cad0-4ef6-a1f4-beedd55b7d41}"/>
    <names>
        <name lang="ar">مشبك أرضي</name>
        <name lang="el">Μπάρα γείωσης</name>
        <name lang="en">Ground bar</name>
        <name lang="de">Erdtrennklemme</name>
        <name lang="it">Barra di terra</name>
        <name lang="fr">Barette de terre</name>
        <name lang="pl">Złącze gniazdowe dwuprzerwowe</name>
        <name lang="es">Barra de tierra</name>
        <name lang="de">Erdtrennklemme</name>
        <name lang="cs">Zemnící tyč</name>
        <name lang="pl">Złącze gniazdowe dwuprzerwowe</name>
        <name lang="it">Barra di terra</name>
        <name lang="ar">مشبك أرضي</name>
        <name lang="en">Ground bar</name>
        <name lang="fr">Barette de terre</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="5" x2="0"/>
+        <input x="8" y="0.55" tagg="label" size="9" rotate="true" text="_"/>
-        <arc width="10" x="-5" y="0" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="0" y2="10" x2="0"/>
+        <arc x="-5" width="10" antialias="true" y="0" angle="-180" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-20" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <arc width="10" x="-5" y="-10" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <arc x="-5" width="10" antialias="true" y="-10" angle="-180" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
        <terminal x="0" y="-21" orientation="n"/>
        <terminal x="0" y="21" orientation="s"/>
    </description>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/barre_interconnexion_tn.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/barre_interconnexion_tn.elmt
@@ -1,24 +1,26 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="70" type="element" orientation="dyyy">
+<definition width="20" link_type="simple" version="0.5" hotspot_x="10" orientation="dyyy" height="80" hotspot_y="39" type="element">
    <uuid uuid="{7ae24759-36ff-414f-bf1f-3a9861e75f73}"/>
    <names>
        <name lang="es">Barra de interconexión TN</name>
        <name lang="de">TN-Verbindungsschiene</name>
        <name lang="cs">Propojovací tyč TN</name>
        <name lang="pl">Oddzielacz w stanie zamknięcia</name>
        <name lang="it">Barra di connessione TN</name>
        <name lang="ar">شريط ربط</name>
        <name lang="en">Bar interconnection TN</name>
        <name lang="de">TN-Verbindungsschiene</name>
        <name lang="it">Barra di connessione TN</name>
        <name lang="fr">Barre d'interconnection TN</name>
        <name lang="pl">Oddzielacz w stanie zamknięcia</name>
        <name lang="cs">Propojovací tyč TN</name>
        <name lang="es">Barra de interconexión TN</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <circle x="-5" y="-19" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
+        <input x="13" y="-19.45" tagg="label" size="9" rotate="true" text="_"/>
-        <circle x="-5" y="9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
+        <circle x="-5" antialias="true" y="-19" diameter="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="16" x="-8" y="12" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <circle x="-5" antialias="true" y="9" diameter="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-8" y2="20" x2="-8"/>
+        <arc x="-8" width="16" antialias="true" y="12" angle="-180" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
-        <arc width="16" x="-8" y="-28" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="-8" end2="none" x1="-8" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="8" y2="20" x2="8"/>
+        <arc x="-8" width="16" antialias="true" y="-28" angle="-180" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180"/>
-        <terminal x="0" y="-32" orientation="n"/>
+        <line antialias="false" length1="1.5" x2="8" end2="none" x1="8" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
        <terminal x="0" y="32" orientation="s"/>
        <terminal x="0" y="-32" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/barrette_connexion_f.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/barrette_connexion_f.elmt
@@ -1,5 +1,5 @@
 <definition width="10" version="0.3" hotspot_x="5" hotspot_y="0" height="40" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{7499D25C-957E-43F1-8AFE-7E5D0EAE1C89}"/><names>
        <name lang="ar">شريط ربط, مُغلق</name>
        <name lang="de">Trennklemme, Lasche geschlossen</name>
        <name lang="en">Terminal strip, closed</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_2.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_2.elmt
@@ -1,5 +1,5 @@
 <definition width="20" version="0.4" hotspot_x="5" hotspot_y="15" height="30" link_type="terminal" type="element" ic="true" orientation="dyyy">
-    <names>
+<uuid uuid="{E45A9DD3-1458-47FC-A4DB-287174EB65FD}"/><names>
        <name lang="ar">طرف توصيل</name>
        <name lang="de">Klemme</name>
        <name lang="ru">Клеммное соединение</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_3.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_3.elmt
@@ -1,5 +1,5 @@
 <definition width="20" version="0.4" hotspot_x="15" hotspot_y="15" height="20" link_type="terminal" type="element" ic="true" orientation="dyyy">
-    <names>
+<uuid uuid="{70DF1247-B36D-4B2B-B44E-64EDFF85C45B}"/><names>
        <name lang="ar">طرف توصيل</name>
        <name lang="de">Klemme</name>
        <name lang="ru">Клеммное соединение</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_5.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_5.elmt
@@ -1,5 +1,5 @@
 <definition width="30" version="0.4" hotspot_x="15" hotspot_y="15" height="30" link_type="terminal" type="element" ic="true" orientation="dyyy">
-    <names>
+<uuid uuid="{8047131B-B73F-4FFD-95B5-21A2974006C1}"/><names>
        <name lang="ar">طرف توصيل</name>
        <name lang="de">Klemme</name>
        <name lang="ru">Клеммное соединение</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_bornier.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_bornier.elmt
@@ -1,23 +1,24 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="80" type="element" orientation="dnnn">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="80" hotspot_y="35" type="element">
    <uuid uuid="{96eb8e93-2001-4385-85cc-2d7dcc662024}"/>
    <names>
        <name lang="ar">طرف</name>
        <name lang="de">Klemme</name>
        <name lang="en">Terminal</name>
        <name lang="it">Morsetto</name>
        <name lang="fr">Borne de bornier</name>
        <name lang="pl">Zacisk</name>
        <name lang="es">Terminal</name>
        <name lang="cs">Svorka svorkoviště</name>
        <name lang="nl">Klem</name>
        <name lang="de">Klemme</name>
        <name lang="cs">Svorka svorkoviště</name>
        <name lang="pl">Zacisk</name>
        <name lang="it">Morsetto</name>
        <name lang="ar">طرف</name>
        <name lang="en">Terminal</name>
        <name lang="fr">Borne de bornier</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <input x="-14" y="-42" size="6" rotate="true" text="(0000)"/>
+        <input x="-14" y="-42" tagg="label" size="6" rotate="true" text="(0000)"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-3" y2="40" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="-3" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37"/>
-        <input x="-10" y="-18" size="9" rotate="true" text="00"/>
+        <input x="-10" y="-18" tagg="none" size="9" rotate="true" text="00"/>
-        <line 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="37" x2="3"/>
+        <line antialias="false" length1="1.5" x2="3" end2="none" x1="0" end1="none" y2="37" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="30" x1="0" y2="40" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <rect width="20" x="-10" y="-30" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-10" width="20" antialias="false" y="-30" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_bornier_fusible.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_bornier_fusible.elmt
@@ -1,25 +1,26 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="80" type="element" orientation="dnnn">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="80" hotspot_y="35" type="element">
    <uuid uuid="{952acd69-b847-48da-b80e-b1e75d525d83}"/>
    <names>
        <name lang="ar">طرف مصهر</name>
        <name lang="de">Klemme mit Sicherung</name>
        <name lang="en">Terminal fuse</name>
        <name lang="it">Morsetto con fusibile</name>
        <name lang="fr">Borne de bornier avec fusible</name>
        <name lang="pl">Zacisk bezpiecznikowy</name>
        <name lang="es">Terminal fusible</name>
        <name lang="cs">Svorka tavného svorkoviště</name>
        <name lang="nl">Klem met smeltzekering</name>
        <name lang="de">Klemme mit Sicherung</name>
        <name lang="cs">Svorka tavného svorkoviště</name>
        <name lang="pl">Zacisk bezpiecznikowy</name>
        <name lang="it">Morsetto con fusibile</name>
        <name lang="ar">طرف مصهر</name>
        <name lang="en">Terminal fuse</name>
        <name lang="fr">Borne de bornier avec fusible</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <rect width="6" x="-3" y="-5" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-3" width="6" antialias="false" y="-5" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="24" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="24" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <rect width="20" x="-10" y="-30" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-10" width="20" antialias="false" y="-30" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-14" y="-42" size="6" rotate="true" text="(0000)"/>
+        <input x="-14" y="-42" tagg="label" size="6" rotate="true" text="(0000)"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-3" y2="40" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="-3" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37"/>
-        <input x="-10" y="-18" size="9" rotate="true" text="00"/>
+        <input x="-10" y="-18" tagg="none" size="9" rotate="true" text="00"/>
-        <line 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="37" x2="3"/>
+        <line antialias="false" length1="1.5" x2="3" end2="none" x1="0" end1="none" y2="37" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="30" x1="0" y2="40" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_continuite.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_continuite.elmt
@@ -1,5 +1,5 @@
 <definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="30" link_type="terminal" type="element" ic="true" orientation="dyyy">
-    <names>
+<uuid uuid="{2A9F30BF-E099-47DA-9D11-13983B8F7AA6}"/><names>
        <name lang="ar">طرف توصيل</name>
        <name lang="de">Klemme</name>
        <name lang="ru">Клеммное соединение</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_finale.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_finale.elmt
@@ -1,5 +1,5 @@
 <definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
-    <names>
+<uuid uuid="{A4B7D0BD-2695-47D9-BF64-2DAD82C51772}"/><names>
        <name lang="ar">طرف نهائي</name>
        <name lang="de">Endklemme</name>
        <name lang="ru">Клеммник</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_fusible_cablage.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_fusible_cablage.elmt
@@ -1,29 +1,30 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="80" type="element" ic="true" orientation="dyyy">
+<definition width="10" link_type="simple" version="0.5" hotspot_x="5" orientation="dyyy" height="90" hotspot_y="14" type="element">
    <uuid uuid="{c419294c-f582-48ff-ada2-d1129abb2939}"/>
    <names>
        <name lang="ar">طرف ربط مصهر</name>
        <name lang="de">Sicherungsklemme</name>
        <name lang="en">Terminal fuse</name>
        <name lang="it">Terminale con fusibile</name>
        <name lang="fr">Borne fusible cablage</name>
        <name lang="pl">Złącze bezpiecznikowe</name>
        <name lang="es">Terminal fusible</name>
        <name lang="cs">Tavná pojistka elektrického propojení</name>
        <name lang="nl">klem met zekering</name>
        <name lang="de">Sicherungsklemme</name>
        <name lang="cs">Tavná pojistka elektrického propojení</name>
        <name lang="pl">Złącze bezpiecznikowe</name>
        <name lang="it">Terminale con fusibile</name>
        <name lang="ar">طرف ربط مصهر</name>
        <name lang="en">Terminal fuse</name>
        <name lang="fr">Borne fusible cablage</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <input x="10" y="24.6667" size="9" rotate="true" text="F_"/>
+        <input x="10" y="24.6667" tagg="label" size="9" rotate="true" text="F_"/>
-        <rect width="6" x="-3" y="17" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-3" width="6" antialias="false" y="17" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="5" y="68" size="7" text="_"/>
+        <input x="5" y="68" tagg="none" size="7" text="_"/>
-        <input x="5" y="8" size="7" text="_"/>
+        <input x="5" y="8" tagg="none" size="7" text="_"/>
-        <input x="5" y="55" size="10" text="_"/>
+        <input x="5" y="55" tagg="none" size="10" text="_"/>
-        <input x="5" y="-5" size="10" text="_"/>
+        <input x="5" y="-5" tagg="none" size="10" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="57" x1="0" y2="3" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="57"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70" x1="0" y2="63" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="63" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="70"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-3" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="-2.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="57.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="0" y="-10" orientation="n"/>
        <terminal x="0" y="70" orientation="s"/>
    </description>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/bornedouble.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/bornedouble.elmt
@@ -1,5 +1,5 @@
 <definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="40" link_type="terminal" type="element" ic="true" orientation="dyyy">
-    <names>
+<uuid uuid="{67C09183-7D17-4345-963E-DE42C9F33288}"/><names>
        <name lang="ar">طرف توصيل</name>
        <name lang="de">Klemme</name>
        <name lang="ru">Клеммное соединение</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/bornier.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/bornier.elmt
@@ -1,198 +1,203 @@
-<definition width="110" version="0.3" hotspot_x="55" hotspot_y="155" height="220" type="element" orientation="dyyy">
+<definition width="110" link_type="simple" version="0.5" hotspot_x="54" orientation="dyyy" height="210" hotspot_y="149" type="element">
    <uuid uuid="{bd88f531-e446-425d-9a8e-31bd4aab9839}"/>
    <names>
        <name lang="ar">طرف توصيل</name>
        <name lang="de">Klemmleiste</name>
        <name lang="en">Terminal</name>
        <name lang="it">Morsettiera Verticale</name>
        <name lang="fr">Bornier</name>
        <name lang="pl">Listwa zaciskowa</name>
        <name lang="cs">Svorkoviště</name>
        <name lang="es">Terminal multiple DIP 20 bornes</name>
        <name lang="nl">Klemmenlijst</name>
        <name lang="de">Klemmleiste</name>
        <name lang="cs">Svorkoviště</name>
        <name lang="pl">Listwa zaciskowa</name>
        <name lang="it">Morsettiera Verticale</name>
        <name lang="ar">طرف توصيل</name>
        <name lang="en">Terminal</name>
        <name lang="fr">Bornier</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-130" x1="-19" y2="-130" x2="-21"/>
+        <input x="-12" y="-166.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-133" x1="-18" y2="-125" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-130" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-130"/>
-        <rect width="34" x="-11" y="-133" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-125" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-133"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-133" x1="-18" y2="-133" x2="22"/>
+        <rect x="-11" width="34" antialias="false" y="-133" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-19" y2="30" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-133" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-133"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-50" x1="-19" y2="-50" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-90" x1="-19" y2="-90" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-50"/>
-        <input x="30" y="-131.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-90" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-90"/>
-        <input x="-9" y="-129.333" size="4" rotate="true" text="_"/>
+        <input x="30" y="-131.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-130" x1="26" y2="-130" x2="24"/>
+        <input x="-9" y="-129.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-110" x1="-19" y2="-110" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-130" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-130"/>
-        <input x="-40" y="-131.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-110" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-110"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27" x1="-18" y2="35" x2="-18"/>
+        <input x="-40" y="-131.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53" x1="-18" y2="-45" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-113" x1="-18" y2="-105" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-45" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-93" x1="-18" y2="-85" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-105" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-113"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-125" x1="-18" y2="-125" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-85" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-93"/>
-        <rect width="34" x="-11" y="27" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-125" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-125"/>
-        <rect width="34" x="-11" y="-53" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-11" width="34" antialias="false" y="27" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="34" x="-11" y="-113" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-11" width="34" antialias="false" y="-53" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="34" x="-11" y="-93" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-11" width="34" antialias="false" y="-113" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-9" y="-138.333" size="4" rotate="true" text="_"/>
+        <rect x="-11" width="34" antialias="false" y="-93" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53" x1="-18" y2="-53" x2="22"/>
+        <input x="-9" y="-138.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27" x1="-18" y2="27" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-53" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-53"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-93" x1="-18" y2="-93" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="27" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-113" x1="-18" y2="-113" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-93" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-93"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-140" x1="-19" y2="-140" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-113" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-113"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-19" y2="-10" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-140" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-140"/>
-        <input x="30" y="-111.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <input x="30" y="-91.333" size="4" rotate="true" text="_"/>
+        <input x="30" y="-111.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="30" y="-51.333" size="4" rotate="true" text="_"/>
+        <input x="30" y="-91.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-40" y="-141.333" size="4" rotate="true" text="_"/>
+        <input x="30" y="-51.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-89.333" size="4" rotate="true" text="_"/>
+        <input x="-40" y="-141.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-109.333" size="4" rotate="true" text="_"/>
+        <input x="-9" y="-89.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="30" y="28.667" size="4" rotate="true" text="_"/>
+        <input x="-9" y="-109.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="30.667" size="4" rotate="true" text="_"/>
+        <input x="30" y="28.667" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="30" y="-141.333" size="4" rotate="true" text="_"/>
+        <input x="-9" y="30.667" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-49.333" size="4" rotate="true" text="_"/>
+        <input x="30" y="-141.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-110" x1="26" y2="-110" x2="24"/>
+        <input x="-9" y="-49.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-90" x1="26" y2="-90" x2="24"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-110" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-110"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-70" x1="-19" y2="-70" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-90" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-143" x1="-18" y2="-135" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-70" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-70"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="26" y2="30" x2="24"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-135" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-143"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-50" x1="26" y2="-50" x2="24"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <input x="-40" y="-111.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-50"/>
-        <rect width="34" x="-11" y="-143" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-40" y="-111.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-19" y2="50" x2="-21"/>
+        <rect x="-11" width="34" antialias="false" y="-143" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-105" x1="-18" y2="-105" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-19" y2="-30" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-105" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-105"/>
-        <input x="-40" y="-91.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-143" x1="-18" y2="-143" x2="22"/>
+        <input x="-40" y="-91.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-40" y="28.667" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-143" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-143"/>
-        <input x="-40" y="-51.333" size="4" rotate="true" text="_"/>
+        <input x="-40" y="28.667" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-118.333" size="4" rotate="true" text="_"/>
+        <input x="-40" y="-51.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-73" x1="-18" y2="-65" x2="-18"/>
+        <input x="-9" y="-118.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-85" x1="-18" y2="-85" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-65" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-73"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-140" x1="26" y2="-140" x2="24"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-85" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="-18" y2="-25" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-140" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-140"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-120" x1="-19" y2="-120" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="47" x1="-18" y2="55" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-120" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-120"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-135" x1="-18" y2="-135" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="47"/>
-        <input x="-40" y="-121.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-135" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-135"/>
-        <rect width="34" x="-11" y="-73" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-40" y="-121.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-18" y2="-5" x2="-18"/>
+        <rect x="-11" width="34" antialias="false" y="-73" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-18" y2="35" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="-18" y2="-45" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35"/>
-        <input x="30" y="-121.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-45" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45"/>
-        <input x="-9" y="-98.333" size="4" rotate="true" text="_"/>
+        <input x="30" y="-121.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-73" x1="-18" y2="-73" x2="22"/>
+        <input x="-9" y="-98.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-123" x1="-18" y2="-115" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-73" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-73"/>
-        <rect width="34" x="-11" y="47" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-115" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-123"/>
-        <rect width="34" x="-11" y="-33" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-11" width="34" antialias="false" y="47" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="34" x="-11" y="-13" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-11" width="34" antialias="false" y="-33" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="-19" y2="-100" x2="-21"/>
+        <rect x="-11" width="34" antialias="false" y="-13" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="34" x="-11" y="-123" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-100" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100"/>
-        <input x="30" y="-71.333" size="4" rotate="true" text="_"/>
+        <rect x="-11" width="34" antialias="false" y="-123" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-9" y="-58.333" size="4" rotate="true" text="_"/>
+        <input x="30" y="-71.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="21.667" size="4" rotate="true" text="_"/>
+        <input x="-9" y="-58.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-123" x1="-18" y2="-123" x2="22"/>
+        <input x="-9" y="21.667" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-18" y2="-13" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-123" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-123"/>
-        <input x="-40" y="-101.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-120" x1="26" y2="-120" x2="24"/>
+        <input x="-40" y="-101.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="47" x1="-18" y2="47" x2="22"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-120" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-120"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="-18" y2="-33" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="47" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="47"/>
-        <input x="-9" y="-69.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-33" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-115" x1="-18" y2="-115" x2="22"/>
+        <input x="-9" y="-69.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60" x1="-19" y2="-60" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-115" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-115"/>
-        <line 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="-19" y2="20" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-60" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-60"/>
-        <input x="30" y="-101.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <input x="30" y="48.667" size="4" rotate="true" text="_"/>
+        <input x="30" y="-101.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="30" y="-31.333" size="4" rotate="true" text="_"/>
+        <input x="30" y="48.667" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-70" x1="26" y2="-70" x2="24"/>
+        <input x="30" y="-31.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="30" y="-11.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-70" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-70"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-103" x1="-18" y2="-95" x2="-18"/>
+        <input x="30" y="-11.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-40" y="-61.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-103"/>
-        <input x="-40" y="-71.333" size="4" rotate="true" text="_"/>
+        <input x="-40" y="-61.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-40" y="18.667" size="4" rotate="true" text="_"/>
+        <input x="-40" y="-71.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-9.333" size="4" rotate="true" text="_"/>
+        <input x="-40" y="18.667" tagg="none" size="4" rotate="true" text="_"/>
-        <rect width="34" x="-11" y="-103" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-9" y="-9.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="50.667" size="4" rotate="true" text="_"/>
+        <rect x="-11" width="34" antialias="false" y="-103" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-65" x1="-18" y2="-65" x2="22"/>
+        <input x="-9" y="50.667" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-29.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-65" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-65"/>
-        <input x="30" y="-61.333" size="4" rotate="true" text="_"/>
+        <input x="-9" y="-29.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="30" y="18.667" size="4" rotate="true" text="_"/>
+        <input x="30" y="-61.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-103" x1="-18" y2="-103" x2="22"/>
+        <input x="30" y="18.667" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="26" y2="-30" x2="24"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-103" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-103"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="26" y2="50" x2="24"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <input x="-9" y="-78.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="26" y2="-100" x2="24"/>
+        <input x="-9" y="-78.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="26" y2="-10" x2="24"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-100" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-19" y2="10" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-80" x1="-19" y2="-80" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-63" x1="-18" y2="-55" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-80" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-95" x1="-18" y2="-95" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-63"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17" x1="-18" y2="25" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-95" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-95"/>
-        <input x="-40" y="-31.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17"/>
-        <input x="-40" y="-81.333" size="4" rotate="true" text="_"/>
+        <input x="-40" y="-31.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-40" y="48.667" size="4" rotate="true" text="_"/>
+        <input x="-40" y="-81.333" tagg="none" size="4" rotate="true" text="_"/>
-        <rect width="34" x="-11" y="17" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-40" y="48.667" tagg="none" size="4" rotate="true" text="_"/>
-        <rect width="34" x="-11" y="-63" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-11" width="34" antialias="false" y="17" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="30" y="-81.333" size="4" rotate="true" text="_"/>
+        <rect x="-11" width="34" antialias="false" y="-63" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-83" x1="-18" y2="-75" x2="-18"/>
+        <input x="30" y="-81.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-18" y2="-25" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-75" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-83"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="-18" y2="55" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25"/>
-        <rect width="34" x="-11" y="-83" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55"/>
-        <input x="-40" y="-11.333" size="4" rotate="true" text="_"/>
+        <rect x="-11" width="34" antialias="false" y="-83" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-63" x1="-18" y2="-63" x2="22"/>
+        <input x="-40" y="-11.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17" x1="-18" y2="17" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-63" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-63"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-83" x1="-18" y2="-83" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="17" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17"/>
-        <input x="-9" y="-38.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-83" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-83"/>
-        <input x="-9" y="41.667" size="4" rotate="true" text="_"/>
+        <input x="-9" y="-38.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-80" x1="26" y2="-80" x2="24"/>
+        <input x="-9" y="41.667" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-75" x1="-18" y2="-75" x2="22"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-80" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-18" y2="15" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-75" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-18" y2="-5" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-60" x1="26" y2="-60" x2="24"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="26" y2="20" x2="24"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-60" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-19" y2="-40" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-19" y2="40" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-55" x1="-18" y2="-55" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="25" x1="-18" y2="25" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55"/>
-        <input x="-40" y="-41.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25"/>
-        <input x="-40" y="38.667" size="4" rotate="true" text="_"/>
+        <input x="-40" y="-41.333" tagg="none" size="4" rotate="true" text="_"/>
-        <rect width="34" x="-11" y="7" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-40" y="38.667" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="30" y="-41.333" size="4" rotate="true" text="_"/>
+        <rect x="-11" width="34" antialias="false" y="7" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="30" y="38.667" size="4" rotate="true" text="_"/>
+        <input x="30" y="-41.333" tagg="none" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-18.333" size="4" rotate="true" text="_"/>
+        <input x="30" y="38.667" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="-18" y2="7" x2="22"/>
+        <input x="-9" y="-18.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-18" y2="45" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-43" x1="-18" y2="-35" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="45" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37"/>
-        <line 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="-19" y2="-20" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-43"/>
-        <rect width="34" x="-11" y="-43" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <rect width="34" x="-11" y="37" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="-11" width="34" antialias="false" y="-43" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="30" y="8.667" size="4" rotate="true" text="_"/>
+        <rect x="-11" width="34" antialias="false" y="37" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37" x1="-18" y2="37" x2="22"/>
+        <input x="30" y="8.667" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-43" x1="-18" y2="-43" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="37" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37"/>
-        <input x="-40" y="-21.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-43" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-43"/>
-        <line 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="26" y2="-40" x2="24"/>
+        <input x="-40" y="-21.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40" x1="26" y2="40" x2="24"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40"/>
-        <input x="-9" y="10.667" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-35" x1="-18" y2="-35" x2="22"/>
+        <input x="-9" y="10.667" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45" x1="-18" y2="45" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35"/>
-        <input x="30" y="-21.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="45" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="26" y2="10" x2="24"/>
+        <input x="30" y="-21.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23" x1="-18" y2="-15" x2="-18"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <input x="-40" y="8.667" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="-15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23"/>
-        <rect width="34" x="-11" y="-23" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-40" y="8.667" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-18" y2="15" x2="22"/>
+        <rect x="-11" width="34" antialias="false" y="-23" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23" x1="-18" y2="-23" x2="22"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15"/>
-        <input x="-9" y="1.667" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-23" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="26" y2="-20" x2="24"/>
+        <input x="-9" y="1.667" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-19" y2="0" x2="-21"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-15" x1="-18" y2="-15" x2="22"/>
+        <line antialias="false" length1="1.5" x2="-21" end2="none" x1="-19" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <input x="-40" y="-1.333" size="4" rotate="true" text="_"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
-        <input x="30" y="-1.333" size="4" rotate="true" text="_"/>
+        <input x="-40" y="-1.333" tagg="none" size="4" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-18" y2="5" x2="-18"/>
+        <input x="30" y="-1.333" tagg="none" size="4" rotate="true" text="_"/>
-        <rect width="34" x="-11" y="-3" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line antialias="false" length1="1.5" x2="-18" end2="none" x1="-18" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-18" y2="-3" x2="22"/>
+        <rect x="-11" width="34" antialias="false" y="-3" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="26" y2="0" x2="24"/>
+        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-18" y2="5" x2="22"/>
+        <line antialias="false" length1="1.5" x2="24" end2="none" x1="26" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
        <line antialias="false" length1="1.5" x2="22" end2="none" x1="-18" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5"/>
        <terminal x="50" y="50" orientation="e"/>
        <terminal x="-50" y="20" orientation="w"/>
        <terminal x="50" y="20" orientation="e"/>
        <terminal x="-50" y="-100" orientation="w"/>
        <terminal x="50" y="-130" orientation="e"/>
        <terminal x="50" y="-90" orientation="e"/>
@@ -230,8 +235,5 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <terminal x="-50" y="30" orientation="w"/>
        <terminal x="-50" y="40" orientation="w"/>
        <terminal x="50" y="40" orientation="e"/>
        <terminal x="50" y="50" orientation="e"/>
        <terminal x="-50" y="20" orientation="w"/>
        <terminal x="50" y="20" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/bornier5x.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/bornier5x.elmt
@@ -1,35 +1,37 @@
-<definition width="130" version="0.3" hotspot_x="26" hotspot_y="24" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="90" link_type="simple" version="0.5" hotspot_x="4" orientation="dyyy" height="30" hotspot_y="14" type="element">
    <uuid uuid="{4ac5789b-e219-4d64-a5ed-12d806afcb3a}"/>
    <names>
        <name lang="de">Klemmleiste 3P+N+PE</name>
-        <name lang="en">Terminal block 3P+N+PE</name>
+        <name lang="cs">Svorková lišta 3P+N+PE</name>
        <name lang="it">Morsettiera 3P+N+PE</name>
        <name lang="fr">Bornier 3P+N+PE</name>
        <name lang="pl">Listwa zaciskowa</name>
        <name lang="it">Morsettiera 3P+N+PE</name>
        <name lang="en">Terminal block 3P+N+PE</name>
        <name lang="fr">Bornier 3P+N+PE</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <input x="30" y="-1" size="6" rotation="270" text="L2"/>
+        <input x="30" y="-1" tagg="none" size="6" text="L2" rotation="270"/>
-        <input x="70" y="-1" size="6" rotation="270" text="N"/>
+        <input x="70" y="-1" tagg="none" size="6" text="N" rotation="270"/>
-        <input x="50" y="-1" size="6" rotation="270" text="L3"/>
+        <input x="50" y="-1" tagg="none" size="6" text="L3" rotation="270"/>
-        <input x="10" y="-1" size="6" rotation="270" text="L1"/>
+        <input x="10" y="-1" tagg="none" size="6" text="L1" rotation="270"/>
-        <input x="90" y="-1" size="6" rotation="270" text="PE"/>
+        <input x="90" y="-1" tagg="none" size="6" text="PE" rotation="270"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="60" y2="3" x2="60"/>
+        <line antialias="false" length1="1.5" x2="60" end2="none" x1="60" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="80" y2="3" x2="80"/>
+        <line antialias="false" length1="1.5" x2="80" end2="none" x1="80" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="40" y2="3" x2="40"/>
+        <line antialias="false" length1="1.5" x2="40" end2="none" x1="40" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <input x="-21" y="-6.5" size="9" text="X?"/>
+        <input x="-21" y="-6.5" tagg="label" size="9" text="X?"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="60" y2="-3" x2="60"/>
+        <line antialias="false" length1="1.5" x2="60" end2="none" x1="60" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="3" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="40" y2="-3" x2="40"/>
+        <line antialias="false" length1="1.5" x2="40" end2="none" x1="40" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="80" y2="-3" x2="80"/>
+        <line antialias="false" length1="1.5" x2="80" end2="none" x1="80" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="3" x2="20"/>
+        <line antialias="false" length1="1.5" x2="20" end2="none" x1="20" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <circle x="57.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="57.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-3" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="77.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="77.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="37.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="37.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-3" x2="20"/>
+        <line antialias="false" length1="1.5" x2="20" end2="none" x1="20" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="17.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="0" y="-10" orientation="n"/>
        <terminal x="0" y="10" orientation="s"/>
        <terminal x="20" y="-10" orientation="n"/>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/bornier_1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/bornier_1.elmt
@@ -1,40 +1,42 @@
-<definition width="130" version="0.3" hotspot_x="15" hotspot_y="35" height="60" type="element" orientation="dyyy">
+<definition width="130" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="60" hotspot_y="34" type="element">
    <uuid uuid="{49729087-e683-425b-89e6-f41fe90f4f81}"/>
    <names>
        <name lang="ar">كتلة نهائيات</name>
        <name lang="en">Terminal block 6x terminals</name>
        <name lang="de">Klemmleiste mit 6x Klemmen</name>
        <name lang="it">Morsettira orizzontale</name>
        <name lang="fr">Bornier 6x bornes</name>
        <name lang="pl">Listwa zaciskowa</name>
        <name lang="cs">Svorkový blok</name>
        <name lang="es">Blok de terminales</name>
        <name lang="nl">Klemmenblok</name>
        <name lang="de">Klemmleiste mit 6x Klemmen</name>
        <name lang="cs">Svorkový blok</name>
        <name lang="pl">Listwa zaciskowa</name>
        <name lang="it">Morsettira orizzontale</name>
        <name lang="ar">كتلة نهائيات</name>
        <name lang="en">Terminal block 6x terminals</name>
        <name lang="fr">Bornier 6x bornes</name>
    </names>
    <informations>EN 60617: 03-02-03</informations>
    <description>
-        <rect width="20" x="90" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="90" width="20" antialias="false" y="-30" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="70" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-7" y="0.55" tagg="label" size="9" rotate="true" text="_"/>
-        <rect width="20" x="-10" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="70" width="20" antialias="false" y="-30" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="92" y="-19" size="8" rotate="true" text="6"/>
+        <rect x="-10" width="20" antialias="false" y="-30" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="72" y="-19" size="8" rotate="true" text="5"/>
+        <input x="92" y="-19" tagg="none" size="8" rotate="true" text="6"/>
-        <rect width="20" x="50" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="72" y="-19" tagg="none" size="8" rotate="true" text="5"/>
-        <rect width="20" x="30" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="50" width="20" antialias="false" y="-30" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="10" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect x="30" width="20" antialias="false" y="-30" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="52" y="-19" size="8" rotate="true" text="4"/>
+        <rect x="10" width="20" antialias="false" y="-30" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="32" y="-19" size="8" rotate="true" text="3"/>
+        <input x="52" y="-19" tagg="none" size="8" rotate="true" text="4"/>
-        <input x="12" y="-19" size="8" rotate="true" text="2"/>
+        <input x="32" y="-19" tagg="none" size="8" rotate="true" text="3"/>
-        <input x="-8" y="-19" size="8" rotate="true" text="1"/>
+        <input x="12" y="-19" tagg="none" size="8" rotate="true" text="2"/>
        <input x="-8" y="-19" tagg="none" size="8" rotate="true" text="1"/>
        <terminal x="0" y="-30" orientation="n"/>
        <terminal x="0" y="20" orientation="s"/>
        <terminal x="20" y="-30" orientation="n"/>
        <terminal x="20" y="20" orientation="s"/>
        <terminal x="40" y="-30" orientation="n"/>
        <terminal x="40" y="20" orientation="s"/>
        <terminal x="60" y="-30" orientation="n"/>
        <terminal x="60" y="20" orientation="s"/>
        <terminal x="80" y="-30" orientation="n"/>
        <terminal x="80" y="20" orientation="s"/>
        <terminal x="100" y="-30" orientation="n"/>
        <terminal x="100" y="20" orientation="s"/>
        <terminal x="40" y="20" orientation="s"/>
        <terminal x="60" y="-30" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/qet_directory
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/qet_directory
@@ -1,7 +1,7 @@
 <qet-directory>
    <names>
        <name lang="de">Klemmen und Klemmleisten</name>
-        <name lang="ru">соеденителей</name>
+        <name lang="ru">Клеммы и клеммники</name>
        <name lang="en">Terminals and terminal strips</name>
        <name lang="fr">Bornes et borniers</name>
        <name lang="ar">طرفيات توصيل</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/repartiteur.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/repartiteur.elmt
@@ -1,43 +1,44 @@
-<definition width="50" version="0.3" hotspot_x="0" hotspot_y="20" height="20" type="element" orientation="dyyy">
+<definition width="50" link_type="simple" version="0.5" hotspot_x="20" orientation="dyyy" height="30" hotspot_y="4" type="element">
    <uuid uuid="{5953974b-d91b-4358-b6e6-7ab44e9c46ca}"/>
    <names>
        <name lang="es">Distribuidor</name>
        <name lang="nl">Verdeler</name>
        <name lang="de">Verteiler</name>
        <name lang="cs">Rozdělovač</name>
        <name lang="pl">Łączówka</name>
        <name lang="it">Ripartitore</name>
        <name lang="ar">مُوزّع</name>
        <name lang="en">distributor</name>
        <name lang="de">Verteiler</name>
        <name lang="it">Ripartitore</name>
        <name lang="fr">Répartiteur</name>
        <name lang="pl">Łączówka</name>
        <name lang="es">Distribuidor</name>
        <name lang="cs">Rozdělovač</name>
        <name lang="nl">Verdeler</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <rect width="42" x="4" y="-16" antialias="false" height="12" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <rect x="-16" width="42" antialias="false" y="4" height="12" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <input x="47" y="-9.3333" size="9" text="XR_"/>
+        <input x="27" y="10.6667" tagg="label" size="9" text="XR_"/>
-        <ellipse width="1" x="39.5" y="-10.5" antialias="true" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="19.5" antialias="true" y="9.5" diameter="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1" x="29.5" y="-10.5" antialias="true" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="9.5" antialias="true" y="9.5" diameter="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1" x="19.5" y="-10.5" antialias="true" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-0.5" antialias="true" y="9.5" diameter="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-12.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1" x="9.5" y="-10.5" antialias="true" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-10.5" antialias="true" y="9.5" diameter="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="40" y2="-7" x2="40"/>
+        <line antialias="false" length1="1.5" x2="20" end2="none" x1="20" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="-7" x2="30"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="-7" x2="20"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="-7" x2="10"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="40" y2="-13" x2="40"/>
+        <line antialias="false" length1="1.5" x2="20" end2="none" x1="20" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="30" y2="-13" x2="30"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="20" y2="-13" x2="20"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="10" y2="-13" x2="10"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="37.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="17.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="27.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="17.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="10" y="-20" orientation="n"/>
+        <terminal x="-10" y="0" orientation="n"/>
-        <terminal x="10" y="0" orientation="s"/>
+        <terminal x="-10" y="20" orientation="s"/>
-        <terminal x="20" y="-20" orientation="n"/>
+        <terminal x="0" y="0" orientation="n"/>
-        <terminal x="20" y="0" orientation="s"/>
+        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="30" y="-20" orientation="n"/>
+        <terminal x="10" y="0" orientation="n"/>
-        <terminal x="30" y="0" orientation="s"/>
+        <terminal x="10" y="20" orientation="s"/>
-        <terminal x="40" y="-20" orientation="n"/>
+        <terminal x="20" y="0" orientation="n"/>
-        <terminal x="40" y="0" orientation="s"/>
+        <terminal x="20" y="20" orientation="s"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/sec_fus_ferme1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/sec_fus_ferme1.elmt
@@ -1,5 +1,5 @@
 <definition width="30" version="0.3" hotspot_x="0" hotspot_y="25" height="50" type="element" orientation="dnny">
-    <names>
+<uuid uuid="{B215E505-811F-4531-BAA7-5DE657D79A73}"/><names>
        <name lang="ar">مفتاح فصل</name>
        <name lang="de">Trenn- und Sicherungsklemme</name>
        <name lang="en">Disconnecting switch fused</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_12g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_12g1.elmt
@@ -1,10 +1,11 @@
 <definition width="290" version="0.4" hotspot_x="21" hotspot_y="32" height="520" link_type="simple" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{4703BDD4-D90B-4E3F-AF60-679EB66DD5E4}"/><names>
        <name lang="en">Terminal 12G1</name>
        <name lang="fr">Bornier cable 12G1</name>
        <name lang="it">Morsettiera Cavo 12
 G1</name>
        <name lang="pl">Listwa zaciskowa 12G</name>
        <name lang="cs">Svorková lišta 12G1</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_19g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_19g1.elmt
@@ -1,9 +1,10 @@
 <definition width="430" version="0.4" hotspot_x="19" hotspot_y="32" height="520" link_type="simple" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{A8C79B55-90AC-4F98-81C2-3A20BDBC7B5E}"/><names>
        <name lang="en">Terminal_19G1</name>
        <name lang="fr">Bornier cable 19G1</name>
        <name lang="it">Morsettiera Cavo 19G1</name>
        <name lang="pl">Listwa zaciskowa 19G</name>
        <name lang="cs">Svorková lišta 19G1</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_3g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_3g1.elmt
@@ -1,9 +1,10 @@
 <definition width="100" version="0.4" hotspot_x="24" hotspot_y="29" height="520" link_type="simple" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{DF43B4E0-C908-420E-B61B-B0C0E12EF629}"/><names>
        <name lang="en">Terminal_3G1</name>
        <name lang="fr">Bornier cable 3G1</name>
        <name lang="pl">Listwa zaciskowa 3G</name>
        <name lang="it">Morsettiera Cavo 3G1</name>
        <name lang="cs">Svorková lišta 3G1</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_4g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_4g1.elmt
@@ -1,9 +1,10 @@
 <definition width="120" version="0.4" hotspot_x="24" hotspot_y="32" height="520" link_type="simple" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{DE548E2C-13F5-4269-BA5A-B16C2909B3C5}"/><names>
        <name lang="en">Terminal_4G1</name>
        <name lang="fr">Bornier cable 4G1</name>
        <name lang="pl">Listwa zaciskowa 4G</name>
        <name lang="it">Morsettiera Cavo 4G1</name>
        <name lang="cs">Svorková lišta 4G1</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_5g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_5g1.elmt
@@ -1,9 +1,10 @@
 <definition width="140" version="0.4" hotspot_x="20" hotspot_y="32" height="520" link_type="simple" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{BF950FAB-A8D9-40E4-B239-0C3413B2BFD4}"/><names>
        <name lang="en">Terminal_5G1</name>
        <name lang="fr">Bornier cable 5G1</name>
        <name lang="it">Morsettiera Cavo 5G1</name>
        <name lang="pl">Listwa zaciskowa 5G</name>
        <name lang="cs">Svorková lišta 5G1</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_7g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/terminal_7g1.elmt
@@ -1,9 +1,10 @@
 <definition width="180" version="0.4" hotspot_x="18" hotspot_y="32" height="520" link_type="simple" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{DC3C9BE3-B4C2-431A-85CA-40244D09AA67}"/><names>
        <name lang="en">Terminal_7G1</name>
        <name lang="fr">Bornier cable 7G1</name>
        <name lang="it">Morsettiera Cavo 7G1</name>
        <name lang="pl">Listwa zaciskowa 7G</name>
        <name lang="cs">Svorková lišta 7G1</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/connecteur_f.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/connecteur_f.elmt
@@ -1,24 +1,25 @@
-<definition width="10" version="0.3" hotspot_x="5" hotspot_y="15" height="20" type="element" orientation="dyyy">
+<definition type="element" link_type="simple" hotspot_x="5" hotspot_y="18" orientation="dyyy" version="0.5" width="10" height="30">
-    <names>
+<uuid uuid="{315322F0-8C5C-48CA-8825-1B90F4053902}"/><names>
        <name lang="ar">موصل أنثوي</name>
        <name lang="de">Steckverbindung Buchse</name>
        <name lang="ru">Гнездо (нов.)</name>
        <name lang="pt">Conector fêmea</name>
        <name lang="en">Female connector</name>
        <name lang="it">Connettore femmina</name>
        <name lang="fr">Connecteur femelle</name>
-        <name lang="pl">Gniazdo</name>
+        <name lang="ru">Гнездо (нов.)</name>
        <name lang="es">Conector hembra</name>
        <name lang="cs">Ženská spojka</name>
        <name lang="nl">Contact vrouw</name>
        <name lang="pt">Conector fêmea</name>
        <name lang="cs">Ženská spojka</name>
        <name lang="de">Steckverbindung Buchse</name>
        <name lang="it">Connettore femmina</name>
        <name lang="el">Θηλυκός σύνδεσμος</name>
        <name lang="ar">موصل أنثوي</name>
        <name lang="pl">Gniazdo</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <input x="4" y="-7.5" size="8" rotate="true" text="_" tagg="label"/>
+        <input x="4" tagg="label" y="-7.5" size="8" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-1" x2="0"/>
+        <line x1="0" end1="none" antialias="false" x2="0" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y2="-1"/>
-        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-84"/>
+        <arc x="-3" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" width="6" angle="-84" height="6"/>
-        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="83" angle="-84"/>
+        <arc x="-3" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="83" width="6" angle="-84" height="6"/>
        <terminal x="0" y="-11" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/connecteur_m.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/connecteur_m.elmt
@@ -1,23 +1,25 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="0" height="20" type="element" orientation="dyyy">
+<definition type="element" link_type="simple" hotspot_x="4" hotspot_y="13" orientation="dyyy" version="0.5" width="10" height="30">
-    <names>
+<uuid uuid="{9016050F-26E2-4F2B-8EED-9BDBCF8BE98E}"/><names>
        <name lang="ar">موصل ذكري</name>
        <name lang="de">Steckverbindung Stecker</name>
        <name lang="ru">Штырь (нов.)</name>
        <name lang="pt">Conector macho</name>
        <name lang="en">Male connector</name>
        <name lang="it">Connettore maschio</name>
        <name lang="fr">Connecteur mâle</name>
-        <name lang="pl">Wtyk</name>
+        <name lang="ru">Штырь (нов.)</name>
        <name lang="es">Conector macho</name>
        <name lang="cs">Mužská spojka</name>
        <name lang="nl">Steker Man</name>
        <name lang="pt">Conector macho</name>
        <name lang="cs">Mužská spojka</name>
        <name lang="de">Steckverbindung Stecker</name>
        <name lang="it">Connettore maschio</name>
        <name lang="el">Αρσενικός σύνδεσμος</name>
        <name lang="ar">موصل ذكري</name>
        <name lang="pl">Wtyk</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-1" y2="9" x2="-1"/>
+        <line x1="-1" end1="none" antialias="false" x2="-1" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" y2="-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="2" x1="1" y2="9" x2="1"/>
+        <line x1="1" end1="none" antialias="false" x2="1" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" y2="-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="2" x1="0" y2="20" x2="0"/>
+        <line x1="0" end1="none" antialias="false" x2="0" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" y2="10"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <input x="5" tagg="label" y="1.5" size="8" rotate="true" text="_"/>
        <terminal x="0" y="10" orientation="s"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/connecteur_mf.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/connecteur_mf.elmt
@@ -1,27 +1,28 @@
-<definition width="10" version="0.3" hotspot_x="5" hotspot_y="15" height="40" type="element" orientation="dyyy">
+<definition type="element" link_type="simple" hotspot_x="5" hotspot_y="19" orientation="dyyy" version="0.5" width="10" height="50">
-    <names>
+<uuid uuid="{6B7F5E99-EF67-4D6A-AA1B-4C373960C9F6}"/><names>
        <name lang="ar">موصل</name>
        <name lang="de">Steckverbindung Buchse + Stecker</name>
        <name lang="ru">Соединение (нов.)</name>
        <name lang="pt">Conector</name>
        <name lang="en">Connector</name>
        <name lang="it">Connettori M/F</name>
        <name lang="fr">Connecteur</name>
-        <name lang="pl">Złącze wtykowe</name>
+        <name lang="ru">Соединение (нов.)</name>
        <name lang="es">Conector</name>
        <name lang="cs">Spojka</name>
        <name lang="nl">Stopcontact</name>
        <name lang="pt">Conector</name>
        <name lang="cs">Spojka</name>
        <name lang="de">Steckverbindung Buchse + Stecker</name>
        <name lang="it">Connettori M/F</name>
        <name lang="el">Σύνδεσμος</name>
        <name lang="ar">موصل</name>
        <name lang="pl">Złącze wtykowe</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <input x="4" y="-5.5" size="8" rotate="true" text="_" tagg="label"/>
+        <input x="4" tagg="label" y="-5.5" size="8" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-1" y2="9" x2="-1"/>
+        <line x1="-1" end1="none" antialias="false" x2="-1" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" y2="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="2" x1="1" y2="9" x2="1"/>
+        <line x1="1" end1="none" antialias="false" x2="1" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" y2="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="2" x1="0" y2="20" x2="0"/>
+        <line x1="0" end1="none" antialias="false" x2="0" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" y2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-1" x2="0"/>
+        <line x1="0" end1="none" antialias="false" x2="0" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y2="-1"/>
-        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-84"/>
+        <arc x="-3" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" width="6" angle="-84" height="6"/>
-        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="83" angle="-84"/>
+        <arc x="-3" y="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="83" width="6" angle="-84" height="6"/>
        <terminal x="0" y="-11" orientation="n"/>
        <terminal x="0" y="21" orientation="s"/>
    </description>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/contact_prise_fiche.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/contact_prise_fiche.elmt
@@ -1,5 +1,5 @@
 <definition width="10" version="0.3" hotspot_x="5" hotspot_y="10" height="20" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{58685DC3-B284-4884-93E1-34D1E4529C04}"/><names>
        <name lang="ar">قابس ذكري</name>
        <name lang="de">Steckverbindung Stecker</name>
        <name lang="en">plug male</name>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/prise_fiche.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/prise_fiche.elmt
@@ -1,5 +1,5 @@
 <definition width="10" version="0.3" hotspot_x="5" hotspot_y="10" height="30" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{054A0374-5307-4A91-94D1-35F34D1A894A}"/><names>
        <name lang="ar">قابس و مقبس</name>
        <name lang="de">Steckverbindung Buchse + Stecker</name>
        <name lang="en">Plug and socket</name>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/prise_multipolaire.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/prise_multipolaire.elmt
@@ -1,5 +1,5 @@
 <definition width="60" version="0.3" hotspot_x="5" hotspot_y="35" height="40" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{A67145A1-F353-4EDE-B65C-63A7FE7A1EA0}"/><names>
        <name lang="ar">قابس و مقبس متعدّد الأقطاب</name>
        <name lang="de">Steckverbindung komplett mit 6 Kontakten</name>
        <name lang="en">Plug multipolar</name>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/qet_directory
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/01_connectors_pins/qet_directory
@@ -1,9 +1,12 @@
 <qet-directory>
    <names>
        <name lang="ru">Контакты разъемов</name>
        <name lang="de">Steckkontakte</name>
        <name lang="en">Connector pins</name>
        <name lang="el">Ακίδες συνδέσμων</name>
        <name lang="pl">Złącza wtykowe</name>
        <name lang="fr">Contacts de fiche</name>
        <name lang="it">Contatti</name>
        <name lang="cs">Doteky zástrčky</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/broche_17.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/broche_17.elmt
@@ -1,18 +1,18 @@
-<definition width="90" version="0.3" hotspot_x="45" hotspot_y="45" height="90" type="element" orientation="dyyy">
+<definition type="element" link_type="simple" hotspot_x="45" hotspot_y="45" orientation="dyyy" version="0.5" width="90" height="90">
-    <names>
+<uuid uuid="{5CF8F597-642C-40B0-8416-1A4DFC9F5231}"/><names>
        <name lang="el">17 ακροδεκτών</name>
        <name lang="en">Pin 17</name>
        <name lang="fr">Broche_17</name>
        <name lang="nl">Rond 17Pins</name>
        <name lang="cs">Zástrčka 17 kolíků</name>
        <name lang="de">Rundstecker 17-polig</name>
        <name lang="it">Circolare 17 Pin</name>
-        <name lang="fr">Broche_17</name>
+        <name lang="el">17 ακροδεκτών</name>
        <name lang="pl">Złącze sidemnastostykowe</name>
        <name lang="cs">Kolík 17</name>
        <name lang="nl">Rond 17Pins</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <arc width="80" x="-40" y="-40" antialias="true" height="80" style="line-style:normal;line-weight:normal;filling:none;color:black" start="87" angle="-354"/>
+        <arc x="-40" y="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="87" width="80" angle="-354" height="80"/>
        <circle x="10.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="-12.5" y="27.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="27.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
@@ -24,7 +24,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <circle x="-17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="-11.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-39.5" x1="-2" y2="-35.5" x2="-2" y3="-35.5" x3="2" y4="-39.5"/>
+        <polygon y3="-35.5" closed="false" x1="-2" y4="-39.5" antialias="false" x2="-2" x3="2" x4="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-39.5" y2="-35.5"/>
        <circle x="-15.5" y="-32.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="6.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="-16.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
@@ -48,6 +48,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-11" y="1" size="4" text="11"/>
        <text x="4" y="1" size="4" text="10"/>
        <text x="35" y="1" size="4" text="8"/>
        <input x="60" tagg="label" y="20" size="8" rotate="true" text="_"/>
        <terminal x="0" y="-32" orientation="n"/>
        <terminal x="0" y="-2" orientation="n"/>
        <terminal x="0" y="17" orientation="s"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/connettore_22.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/connettore_22.elmt
@@ -1,9 +1,11 @@
-<definition width="110" version="0.3" hotspot_x="45" hotspot_y="45" height="90" type="element" ic="true" orientation="dyyy">
+<definition type="element" link_type="simple" hotspot_x="45" hotspot_y="45" orientation="dyyy" version="0.5" width="90" height="90">
-    <names>
+<uuid uuid="{9EE4C06A-364C-474F-8EBB-CBA4A9DBD89F}"/><names>
        <name lang="de">Rundstecker 22-polig</name>
        <name lang="en">22 Pin Male Connector</name>
        <name lang="it">Maschio 22 Pin</name>
        <name lang="fr">Connecteur male 22 broches</name>
        <name lang="cs">Kulatá zástrčka 22 kolíků</name>
        <name lang="de">Rundstecker 22-polig</name>
        <name lang="it">Maschio 22 Pin</name>
        <name lang="el">Αρσενικός σύνδεσμος 22 ακροδεκτών</name>
        <name lang="pl">Złącze dwudziestodwustykowe</name>
    </names>
    <informations>Author: The QElectroTech team
@@ -13,7 +15,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="21" y="-3" size="4" text="V"/>
        <text x="20" y="18" size="4" text="X"/>
        <text x="20" y="-13" size="4" text="U"/>
-        <arc width="80" x="-40" y="-40" antialias="true" height="80" style="line-style:normal;line-weight:normal;filling:none;color:black" start="87" angle="-354"/>
+        <arc x="-40" y="-40" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="87" width="80" angle="-354" height="80"/>
        <text x="-10" y="22" size="4" text="I"/>
        <circle x="-16.5" y="17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="-3.5" y="20.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7"/>
@@ -36,7 +38,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <circle x="-29.5" y="1.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="-16.5" y="-22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="-29.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-39.5" x1="-2" y2="-35.5" x2="-2" y3="-35.5" x3="2" y4="-39.5"/>
+        <polygon y3="-35.5" closed="false" x1="-2" y4="-39.5" antialias="false" x2="-2" x3="2" x4="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-39.5" y2="-35.5"/>
        <circle x="-29.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <circle x="-16.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
        <text x="-24" y="-13" size="4" text="A"/>
@@ -55,7 +57,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="7" y="-8" size="4" text="P"/>
        <text x="8" y="22" size="4" text="T"/>
        <text x="-1" y="0" size="4" text="K"/>
-        <input x="45" y="4.5" size="9" rotate="true" text="_"/>
+        <input x="45" tagg="label" y="4.5" size="9" rotate="true" text="_"/>
        <terminal x="0" y="-27" orientation="n"/>
        <terminal x="-16" y="0" orientation="w"/>
        <terminal x="-16" y="-20" orientation="w"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_2_broches_avec_borne_centrale_plate.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_2_broches_avec_borne_centrale_plate.elmt
@@ -1,25 +1,27 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="70" type="element" orientation="dnnn">
+<definition width="60" link_type="simple" version="0.5" hotspot_x="25" orientation="dyyy" height="60" hotspot_y="23" type="element">
    <uuid uuid="{291fc0d7-cc36-4f89-a4f8-e7bef74d95be}"/>
    <names>
        <name lang="nl">DIN 2 pin, luidspreker</name>
        <name lang="de">Rundstecker 2-polig</name>
        <name lang="cs">Kulatá zástrčka DIN 2 kolíky s plochým středovým kolíkem</name>
        <name lang="pl">Złącze DIN, dwustykowe</name>
        <name lang="it">DIN 2 pin, centrale piatto</name>
        <name lang="ar">قاعدة توصيل  DIN بطرفي توصيل أحدهما مركزي</name>
        <name lang="en">2-pin DIN socket with center pin flat</name>
        <name lang="de">Rundstecker 2-polig</name>
        <name lang="fr">Embase DIN 2 broches avec borne centrale plate</name>
        <name lang="pl">Złącze DIN, dwustykowe</name>
        <name lang="cs">Zásuvka DIN 2 kolíky s plochým středovým kolíkem</name>
        <name lang="it">DIN 2 pin, centrale piatto</name>
        <name lang="nl">DIN 2 pin, luidspreker</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="27"/>
+        <input x="18" y="15.55" tagg="label" size="9" rotate="true" text="_"/>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <line antialias="false" length1="1.5" x2="27" end2="none" x1="10" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <rect width="20" x="-10" y="-1.5" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84"/>
        <rect x="-10" width="20" antialias="false" y="-1.5" height="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <text x="1" y="29.3333" size="4" text="2"/>
        <text x="23" y="-1.6666" size="4" 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="30" x1="0" y2="18" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="18" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <circle x="-2.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
        <terminal x="28" y="0" orientation="e"/>
        <terminal x="0" y="31" orientation="s"/>
    </description>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_3_broches_180_degres.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_3_broches_180_degres.elmt
@@ -1,28 +1,30 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="70" type="element" orientation="dnnn">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="60" hotspot_y="23" type="element">
    <uuid uuid="{d23e52bf-9e3e-446b-994d-3f4f20acd607}"/>
    <names>
        <name lang="nl">DIN 3 Pin 180°</name>
        <name lang="de">Rundstecker 3-polig 180°</name>
        <name lang="cs">Kulatá zástrčka DIN 3 kolíky 180 stupňů</name>
        <name lang="pl">Złącze DIN, trójstykowe</name>
        <name lang="it">DIN 3 Pin 180°</name>
        <name lang="ar">قاعدة توصيل ب3  أطراف 180 درجة </name>
        <name lang="en">3-pin DIN socket 180 degrees</name>
        <name lang="de">Rundstecker 3-polig 180°</name>
        <name lang="fr">Embase DIN 3 broches 180 degrés</name>
        <name lang="pl">Złącze DIN, trójstykowe</name>
        <name lang="cs">Zásuvka DIN 3 kolíky 180 stupňů</name>
        <name lang="it">DIN 3 Pin 180°</name>
        <name lang="nl">DIN 3 Pin 180°</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84"/>
        <input x="18" y="15.55" tagg="label" size="9" rotate="true" text="_"/>
        <text x="-26" y="-1.6666" size="4" text="3"/>
        <text x="1" y="29.3333" size="4" text="2"/>
        <text x="23" y="-1.6666" size="4" 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="30" x1="0" y2="18" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="18" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line 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="-18" y2="0" x2="-25"/>
+        <line antialias="false" length1="1.5" x2="-25" end2="none" x1="-18" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="-2.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="25" y2="0" x2="18"/>
+        <line antialias="false" length1="1.5" x2="18" end2="none" x1="25" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="-17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-17.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="12.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="12.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-26" y="0" orientation="w"/>
        <terminal x="26" y="0" orientation="e"/>
        <terminal x="0" y="31" orientation="s"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_4_broches.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_4_broches.elmt
@@ -1,31 +1,33 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="70" type="element" orientation="dnnn">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="50" hotspot_y="25" type="element">
    <uuid uuid="{1b5c434d-630e-412b-98c0-c6f9f25a7016}"/>
    <names>
        <name lang="nl">DIN 4 Pin</name>
        <name lang="de">Rundstecker 4-polig</name>
        <name lang="cs">Kulatá zástrčka DIN 4 kolíky</name>
        <name lang="pl">Złącze DIN czterostykowe</name>
        <name lang="it">DIN 4 Pin</name>
        <name lang="ar">قاعدة DINب 4 أطراف توصيل </name>
        <name lang="en">4-pin DIN socket</name>
        <name lang="de">Rundstecker 4-polig</name>
        <name lang="fr">Embase DIN 4 broches</name>
        <name lang="pl">Złącze DIN czterostykowe</name>
        <name lang="cs">Zásuvka DIN 4 kolíky</name>
        <name lang="it">DIN 4 Pin</name>
        <name lang="nl">DIN 4 Pin</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <text x="-25" y="-12.6667" size="4" text="1"/>
        <input x="18" y="20.55" tagg="label" size="9" rotate="true" text="_"/>
        <text x="22" y="-12.6667" size="4" text="4"/>
        <text x="23" y="6.3333" size="4" text="5"/>
        <text x="-25" y="8.3333" 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="-10" x1="25" y2="-10" x2="13"/>
+        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-25" y2="-10" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="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="10" x1="25" y2="10" x2="13"/>
+        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-25" y2="10" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <circle x="-12.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-12.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-12.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-12.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-26" y="10" orientation="w"/>
        <terminal x="26" y="10" orientation="e"/>
        <terminal x="-26" y="-10" orientation="w"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_5_broches.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_5_broches.elmt
@@ -1,33 +1,35 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="70" type="element" orientation="dnnn">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="60" hotspot_y="23" type="element">
    <uuid uuid="{fbd0333e-782a-4042-99f6-e80e3f9bba2e}"/>
    <names>
        <name lang="nl">DIN 5 Pin</name>
        <name lang="de">Rundstecker 5-polig</name>
        <name lang="cs">Kulatá zástrčka DIN 5 kolíků</name>
        <name lang="pl">Złącze DIN, pięciostykowe</name>
        <name lang="it">DIN 5 Pin</name>
        <name lang="ar">قاعدة DIN ب5 نقاط توصيل </name>
        <name lang="en">5-pin DIN socket</name>
        <name lang="de">Rundstecker 5-polig</name>
        <name lang="fr">Embase DIN 5 broches</name>
        <name lang="pl">Złącze DIN, pięciostykowe</name>
        <name lang="cs">Zásuvka DIN 5 kolíků</name>
        <name lang="it">DIN 5 Pin</name>
        <name lang="nl">DIN 5 Pin</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="0" y2="18" x2="0"/>
+        <input x="13" y="20.55" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="25" y2="10" x2="13"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="18" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-25" y2="10" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-18" y2="0" x2="-25"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <circle x="-2.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <line antialias="false" length1="1.5" x2="-25" end2="none" x1="-18" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <circle x="-2.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="25" y2="0" x2="18"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84"/>
-        <circle x="-17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <line antialias="false" length1="1.5" x2="18" end2="none" x1="25" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="12.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-17.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="12.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-12.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <circle x="-12.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-26" y="0" orientation="w"/>
        <terminal x="0" y="31" orientation="s"/>
        <terminal x="-26" y="10" orientation="w"/>
        <terminal x="26" y="0" orientation="e"/>
        <terminal x="26" y="10" orientation="e"/>
        <terminal x="0" y="31" orientation="s"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_5_broches_180_degres.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_5_broches_180_degres.elmt
@@ -1,38 +1,40 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="70" type="element" orientation="dnnn">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="60" hotspot_y="23" type="element">
    <uuid uuid="{ba141940-e7cb-4238-ba66-4938e9bee6e2}"/>
    <names>
        <name lang="nl">DIN 5 Pin 180°</name>
        <name lang="de">Rundstecker 5-polig 180°</name>
        <name lang="cs">Kulatá zástrčka DIN 5 kolíků 180 stupňů</name>
        <name lang="pl">Złącze DIN, pięciostykowe</name>
        <name lang="it">DIN 5 Pin</name>
        <name lang="ar">قاعدة DIN ب5 نقاط توصيل 180 درجة</name>
        <name lang="en">5-pin DIN socket 180 degrees</name>
        <name lang="de">Rundstecker 5-polig 180°</name>
        <name lang="fr">Embase DIN 5 broches 180 degrés</name>
        <name lang="pl">Złącze DIN, pięciostykowe</name>
        <name lang="cs">Zásuvka DIN 5 kolíků 180 stupňů</name>
        <name lang="it">DIN 5 Pin</name>
        <name lang="nl">DIN 5 Pin 180°</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84"/>
        <input x="8" y="20.55" tagg="label" size="9" rotate="true" text="_"/>
        <text x="-26" y="-1.6666" size="4" text="3"/>
        <text x="1" y="29.3333" size="4" text="2"/>
        <text x="23" y="-1.6666" size="4" text="1"/>
        <text x="22.5" y="8.3333" size="4" text="4"/>
        <text x="-26" y="8.3333" size="4" text="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="0" y2="18" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="18" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="25" y2="10" x2="13"/>
+        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-25" y2="10" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-18" y2="0" x2="-25"/>
+        <line antialias="false" length1="1.5" x2="-25" end2="none" x1="-18" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="-2.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="25" y2="0" x2="18"/>
+        <line antialias="false" length1="1.5" x2="18" end2="none" x1="25" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="-17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-17.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="12.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="12.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-12.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-12.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-26" y="0" orientation="w"/>
        <terminal x="-26" y="10" orientation="w"/>
        <terminal x="26" y="0" orientation="e"/>
        <terminal x="26" y="10" orientation="e"/>
        <terminal x="0" y="31" orientation="s"/>
        <terminal x="-26" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_5_broches_270_degres.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_5_broches_270_degres.elmt
@@ -1,38 +1,40 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="70" type="element" orientation="dnnn">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="60" hotspot_y="23" type="element">
    <uuid uuid="{0e4bfdb7-7b87-4485-bc92-42d8676a5da7}"/>
    <names>
        <name lang="nl">DIN 5 Pin 270°</name>
        <name lang="de">Rundstecker 5-polig 270°</name>
        <name lang="cs">Kulatá zástrčka DIN 5 kolíků 270 stupňů</name>
        <name lang="pl">Złącze DIN, pięciostykowe</name>
        <name lang="it">DIN 5 Pin 270°</name>
        <name lang="ar">قاعدة DIN  ب 5 نقاط توصيل  270 درجة</name>
        <name lang="en">5-pin DIN socket 270 degrees</name>
        <name lang="de">Rundstecker 5-polig 270°</name>
        <name lang="fr">Embase DIN 5 broches 270 degrés</name>
        <name lang="pl">Złącze DIN, pięciostykowe</name>
        <name lang="cs">Zásuvka DIN 5 kolíků 270 stupňů</name>
        <name lang="it">DIN 5 Pin 270°</name>
        <name lang="nl">DIN 5 Pin 270°</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-25" y2="-10" x2="-13"/>
+        <input x="8" y="20.55" tagg="label" size="9" rotate="true" text="_"/>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="-10" x2="13"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84"/>
        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <text x="-25" y="-11.6667" size="4" text="3"/>
        <text x="1" y="29.3333" size="4" text="2"/>
        <text x="22" y="-11.6667" size="4" text="1"/>
        <text x="22.5" y="8.3333" size="4" text="4"/>
        <text x="-26" y="8.3333" size="4" text="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="0" y2="18" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="18" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="25" y2="10" x2="13"/>
+        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-25" y2="10" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <circle x="-2.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <circle x="-12.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-12.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-12.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-12.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-26" y="10" orientation="w"/>
        <terminal x="26" y="10" orientation="e"/>
        <terminal x="0" y="31" orientation="s"/>
        <terminal x="-26" y="-10" orientation="w"/>
        <terminal x="-26" y="10" orientation="w"/>
        <terminal x="26" y="-10" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_5_broches_360_degres_avec_borne_centrale.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_5_broches_360_degres_avec_borne_centrale.elmt
@@ -1,38 +1,40 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="30" height="70" type="element" orientation="dnnn">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="60" hotspot_y="23" type="element">
    <uuid uuid="{d8f3ea1f-b354-43bd-b274-03f315f4cfc6}"/>
    <names>
        <name lang="nl">DIN 5 Pin 360° centraal pin</name>
        <name lang="de">Rundstecker 5-polig 360°</name>
        <name lang="cs">Kulatá zástrčka DIN 5 kolíků 360 stupňů se středovým kolíčkem</name>
        <name lang="pl">Złącze DIN, pięciostykowe</name>
        <name lang="it">DIN 5 Pin 360° con pin centrale</name>
        <name lang="ar">قاعدة DIN ب 5 أطراف توصيل 360 درجة  بما فيها طرف مركزي</name>
        <name lang="en">5-pin DIN socket 360 degrees with central terminal</name>
        <name lang="de">Rundstecker 5-polig 360°</name>
        <name lang="fr">Embase DIN 5 broches 360 degrés avec borne centrale</name>
        <name lang="pl">Złącze DIN, pięciostykowe</name>
        <name lang="cs">Zásuvka DIN 5 kolíků 360 stupňů se středovým kolíčkem</name>
        <name lang="it">DIN 5 Pin 360° con pin centrale</name>
        <name lang="nl">DIN 5 Pin 360° centraal pin</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-25" y2="-10" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <input x="8" y="20.55" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="-10" x2="13"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84"/>
        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <text x="-25" y="-11.6667" size="4" text="5"/>
        <text x="1" y="29.3333" size="4" text="1"/>
        <text x="22" y="-11.6667" size="4" text="2"/>
        <text x="22" y="8.3333" size="4" text="3"/>
        <text x="-25.5" y="8.3333" size="4" text="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="30" x1="0" y2="3" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="25" y2="10" x2="13"/>
+        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-25" y2="10" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <circle x="-12.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-12.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-12.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-12.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-26" y="10" orientation="w"/>
        <terminal x="26" y="10" orientation="e"/>
        <terminal x="0" y="31" orientation="s"/>
        <terminal x="-26" y="-10" orientation="w"/>
        <terminal x="-26" y="10" orientation="w"/>
        <terminal x="26" y="-10" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_8_broches.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_din_8_broches.elmt
@@ -1,35 +1,38 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="40" height="80" type="element" orientation="dnnn">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="80" hotspot_y="39" type="element">
    <uuid uuid="{2c54bdbd-fa9c-4e3e-80ca-cad5135afd29}"/>
    <names>
-        <name lang="ar">قاعدة DIN ب 8 أطراف توصيل </name>
+        <name lang="nl">DIN 8 Pin</name>
        <name lang="de">Rundstecker 8-polig</name>
        <name lang="cs">Kulatá zástrčka DIN 8 kolíků</name>
        <name lang="pl">Złącze DIN, ośmiostykowe</name>
        <name lang="it">DIN 8 Pin</name>
        <name lang="ar">قاعدة DIN ب 8 أطراف توصيل </name>
        <name lang="en">8-pin DIN socket</name>
        <name lang="fr">Embase DIN 8 broches</name>
        <name lang="pl">Złącze DIN, ośmiostykowe</name>
        <name lang="cs">Zásuvka DIN 8 kolíků</name>
        <name lang="it">DIN 8 Pin</name>
        <name lang="nl">DIN 8 Pin</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="0" y2="-30" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="0" y2="18" x2="0"/>
+        <input x="13" y="20.55" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="25" y2="10" x2="13"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="18" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-25" y2="10" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-18" y2="0" x2="-25"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <circle x="-2.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <line antialias="false" length1="1.5" x2="-25" end2="none" x1="-18" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <circle x="-2.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="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="-10" x1="25" y2="-10" x2="13"/>
+        <circle x="-2.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="25" y2="0" x2="18"/>
+        <line antialias="false" length1="1.5" x2="13" end2="none" x1="25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="-17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <line antialias="false" length1="1.5" x2="18" end2="none" x1="25" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="12.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-17.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="12.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-12.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-25" y2="-10" x2="-13"/>
+        <circle x="-12.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="-12.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="7.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <circle x="-12.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="0" y="-31" orientation="n"/>
        <terminal x="-26" y="0" orientation="w"/>
        <terminal x="-26" y="10" orientation="w"/>
        <terminal x="26" y="0" orientation="e"/>
@@ -37,6 +40,5 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <terminal x="0" y="31" orientation="s"/>
        <terminal x="-26" y="-10" orientation="w"/>
        <terminal x="26" y="-10" orientation="e"/>
        <terminal x="0" y="-31" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_minidin_8_broches.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/embase_minidin_8_broches.elmt
@@ -1,26 +1,28 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="40" height="80" type="element" orientation="dnnn">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="80" hotspot_y="40" type="element">
    <uuid uuid="{ff4b4de8-6164-4b54-92a7-b29a3b3e6cf9}"/>
    <names>
        <name lang="nl">Mini-DIN 8 Pin</name>
        <name lang="de">Rundstecker 8-polig</name>
        <name lang="cs">Kulatá zástrčka mini-DIN 8 kolíků</name>
        <name lang="pl">Złącze Mini-DIN, ośmiostykowe</name>
        <name lang="it">Mini-DIN 8 Pin</name>
        <name lang="ar">قاعدة mini-DIN  ب 8 أطراف توصيل</name>
        <name lang="en">Base 8 pin mini-DIN</name>
        <name lang="de">Rundstecker 8-polig</name>
        <name lang="fr">Embase mini-DIN 8 broches</name>
        <name lang="pl">Złącze Mini-DIN, ośmiostykowe</name>
        <name lang="cs">Zásuvka mini-DIN 8 kolíků</name>
        <name lang="it">Mini-DIN 8 Pin</name>
        <name lang="nl">Mini-DIN 8 Pin</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <input x="18" y="15.55" tagg="label" size="9" rotate="true" text="_"/>
        <text x="11" y="27.3333" size="4" text="1"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="17" x1="7" y2="20" x2="10" y3="30" x3="10"/>
+        <polygon antialias="false" x2="10" x1="7" x3="10" y2="20" y3="30" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="17" x1="-7" y2="20" x2="-10" y3="30" x3="-10"/>
+        <polygon antialias="false" x2="-10" x1="-7" x3="-10" y2="20" y3="30" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17"/>
-        <polygon x4="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-2" x1="5" y2="-13" x2="5" y3="-20" x3="10" y4="-30"/>
+        <polygon antialias="false" x2="5" x4="10" x1="5" x3="10" y2="-13" y3="-20" closed="false" y4="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-13" x1="0" y2="-30" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="-18" y2="1" x2="-25"/>
+        <line antialias="false" length1="1.5" x2="-25" end2="none" x1="-18" end1="none" y2="1" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1"/>
-        <circle x="2.5" y="-1.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="2.5" antialias="true" y="-1.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84"/>
        <text x="-25" y="-11.6667" size="4" text="8"/>
        <text x="1" y="-26.6667" size="4" text="7"/>
        <text x="22" y="-11.6667" size="4" text="6"/>
@@ -28,23 +30,23 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="11.5" y="-26.6667" size="4" text="4"/>
        <text x="22" y="-0.6666" size="4" text="3"/>
        <text x="-8" y="27.3333" size="4" text="2"/>
-        <circle x="-2.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="-10" x2="15"/>
+        <line antialias="false" length1="1.5" x2="15" end2="none" x1="25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="25" y2="1" x2="18"/>
+        <line antialias="false" length1="1.5" x2="18" end2="none" x1="25" end1="none" y2="1" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1"/>
-        <circle x="-17.5791" y="-1.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-17.5791" antialias="true" y="-1.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="12.5" y="-1.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="12.5" antialias="true" y="-1.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="2.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="2.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-7.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-25" y2="-10" x2="-15"/>
+        <line antialias="false" length1="1.5" x2="-15" end2="none" x1="-25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="9.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="9.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-14.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-14.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-26" y="1" orientation="w"/>
+        <terminal x="26" y="-10" orientation="e"/>
-        <terminal x="-10" y="31" orientation="s"/>
+        <terminal x="0" y="-31" orientation="n"/>
        <terminal x="26" y="1" orientation="e"/>
        <terminal x="10" y="31" orientation="s"/>
        <terminal x="10" y="-31" orientation="n"/>
        <terminal x="-26" y="1" orientation="w"/>
        <terminal x="-10" y="31" orientation="s"/>
        <terminal x="-26" y="-10" orientation="w"/>
        <terminal x="26" y="-10" orientation="e"/>
        <terminal x="0" y="-31" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/encoder_17.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/encoder_17.elmt
@@ -1,34 +1,36 @@
-<definition width="110" version="0.3" hotspot_x="44" hotspot_y="45" height="90" type="element" ic="true" orientation="dyyy">
+<definition width="90" link_type="simple" version="0.5" hotspot_x="45" orientation="dyyy" height="90" hotspot_y="45" type="element">
    <uuid uuid="{f53dffe0-4e1a-4a53-aefb-42719976cbe3}"/>
    <names>
        <name lang="de">Rundstecker 17-polig</name>
-        <name lang="en">Encoder plug 17 Pin</name>
+        <name lang="cs">Zástrčka kodéru 17 kolíků</name>
        <name lang="it">Encoder maschio 17 Pin</name>
        <name lang="fr">Fiche codeur 17 broches</name>
        <name lang="pl">Złącze enkodera</name>
        <name lang="it">Encoder maschio 17 Pin</name>
        <name lang="en">Encoder plug 17 Pin</name>
        <name lang="fr">Fiche codeur 17 broches</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <text x="-22" y="17" size="4" text="E"/>
-        <circle x="-2.5" y="28.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="28.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="80" x="-40" y="-40" antialias="true" height="80" style="line-style:normal;line-weight:normal;filling:none;color:black" start="87" angle="-354"/>
+        <arc x="-40" width="80" antialias="true" y="-40" angle="-354" height="80" style="line-style:normal;line-weight:normal;filling:none;color:black" start="87"/>
-        <circle x="8.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="8.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-16.5" y="25.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-16.5" antialias="true" y="25.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="27.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="27.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-27.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-27.5" antialias="true" y="-17.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="22.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="22.5" antialias="true" y="-17.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="10.5" y="-9.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="10.5" antialias="true" y="-9.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-32.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-32.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="24.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="24.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-14.5" y="-9.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-14.5" antialias="true" y="-9.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-2.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="-17.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-28.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-28.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-39.5" x1="-2" y2="-35.5" x2="-2" y3="-35.5" x3="2" y4="-39.5"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-35.5" y3="-35.5" closed="false" y4="-39.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-39.5"/>
-        <circle x="-17.5" y="-29.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-17.5" antialias="true" y="-29.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-13.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-13.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="12.5" y="25.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="12.5" antialias="true" y="25.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="12.5" y="-29.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="12.5" antialias="true" y="-29.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-2.5" y="-32.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="-32.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <text x="-1" y="-23" size="4" text="A"/>
        <text x="-10" y="29" size="4" text="F"/>
        <text x="-20" y="-13" size="4" text="C"/>
@@ -45,7 +47,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-11" y="0" size="4" text="P"/>
        <text x="7" y="0" size="4" text="T"/>
        <text x="22" y="2" size="4" text="K"/>
-        <input x="47" y="2" size="9" rotate="true" text="_"/>
+        <input x="47" y="2" tagg="label" size="9" rotate="true" text="_"/>
        <terminal x="0" y="-32" orientation="n"/>
        <terminal x="29" y="15" orientation="e"/>
        <terminal x="-28" y="15" orientation="w"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/fiche_femelle_codeur_12_points.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/fiche_femelle_codeur_12_points.elmt
@@ -1,34 +1,36 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="40" height="80" type="element" orientation="dnnn">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="34" orientation="dyyy" height="80" hotspot_y="40" type="element">
    <uuid uuid="{2c5c6896-dc6e-44ce-ba81-05fbe325f15c}"/>
    <names>
        <name lang="nl">Encoder M12 12Pin</name>
        <name lang="de">Rundstecker 12-polig</name>
        <name lang="cs">Samičí zástrčka kodéru, zásuvka s 12 kolíky</name>
        <name lang="pl">Gniazdo dwunastostykowe</name>
        <name lang="it">12 Pin encoder</name>
        <name lang="ar">رابط توصيل أنثوي 12 نقطة - مُشفّر </name>
        <name lang="en">Encoder plug receptacle 12 points</name>
        <name lang="de">Rundstecker 12-polig</name>
        <name lang="fr">Fiche femelle codeur 12 points</name>
        <name lang="pl">Gniazdo dwunastostykowe</name>
        <name lang="cs">Zástrčka kodéru, zásuvka s 12 body</name>
        <name lang="it">12 Pin encoder</name>
        <name lang="nl">Encoder M12 12Pin</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="17" x1="7" y2="20" x2="10" y3="20" x3="19"/>
+        <polygon antialias="false" x2="10" x1="7" x3="19" y2="20" y3="20" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="17" x1="-7" y2="20" x2="-10" y3="20" x3="-19"/>
+        <input x="12" y="21.5" tagg="label" size="9" rotate="true" text="_"/>
-        <polygon x4="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-5" y2="-13" x2="-5" y3="-20" x3="-10" y4="-30"/>
+        <polygon antialias="false" x2="-10" x1="-7" x3="-19" y2="20" y3="20" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="9" x1="0" y2="30" x2="0"/>
+        <polygon antialias="false" x2="-5" x4="-10" x1="-5" x3="-10" y2="-13" y3="-20" closed="false" y4="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4"/>
        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9"/>
        <text x="17.5" y="18.3333" size="4" text="4"/>
-        <polygon x4="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="5" y2="-13" x2="5" y3="-20" x3="10" y4="-30"/>
+        <polygon antialias="false" x2="5" x4="10" x1="5" x3="10" y2="-13" y3="-20" closed="false" y4="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-13" x1="0" y2="-30" x2="0"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-18" y2="-1" x2="-25"/>
+        <line antialias="false" length1="1.5" x2="-25" end2="none" x1="-18" end1="none" y2="-1" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1"/>
-        <circle x="2.5" y="-3.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="2.5" antialias="true" y="-3.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <polygon antialias="false" x2="-2" x4="2" x1="-2" x3="2" y2="-16" y3="-16" closed="false" y4="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <arc width="40" x="-20" y="-20" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84" angle="-348"/>
+        <arc x="-20" width="40" antialias="true" y="-20" angle="-348" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="84"/>
        <text x="-20" y="18.3333" size="4" text="5"/>
        <text x="-9" y="-26.6667" size="4" text="12"/>
        <text x="-25" y="7.3333" size="4" text="6"/>
        <text x="22" y="7.3333" size="4" text="3"/>
-        <circle x="-7.5" y="-3.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-7.5" antialias="true" y="-3.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-2.5" y="3.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="3.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <text x="-25" y="-11.6667" size="4" text="8"/>
        <text x="1" y="-26.6667" size="4" text="9"/>
        <text x="22" y="-11.6667" size="4" text="1"/>
@@ -36,31 +38,31 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="11" y="-26.6667" size="4" text="10"/>
        <text x="22" y="-2.6666" size="4" text="2"/>
        <text x="1" y="29.3333" size="4" text="11"/>
-        <circle x="-2.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-2.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="-10" x2="15"/>
+        <line antialias="false" length1="1.5" x2="15" end2="none" x1="25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="25" y2="-1" x2="18"/>
+        <line antialias="false" length1="1.5" x2="18" end2="none" x1="25" end1="none" y2="-1" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1"/>
-        <circle x="-17.5791" y="-3.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-17.5791" antialias="true" y="-3.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="12.5" y="-3.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="12.5" antialias="true" y="-3.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="2.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="2.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-7.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="25" y2="9" x2="15"/>
+        <line antialias="false" length1="1.5" x2="15" end2="none" x1="25" end1="none" y2="9" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-10" x1="-25" y2="-10" x2="-15"/>
+        <line antialias="false" length1="1.5" x2="-15" end2="none" x1="-25" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-25" y2="9" x2="-15"/>
+        <line antialias="false" length1="1.5" x2="-15" end2="none" x1="-25" end1="none" y2="9" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9"/>
-        <circle x="9.5" y="6.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="9.5" antialias="true" y="6.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="9.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="9.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-14.5" y="6.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-14.5" antialias="true" y="6.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-14.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-14.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-26" y="-1" orientation="w"/>
        <terminal x="-20" y="20" orientation="w"/>
        <terminal x="26" y="-1" orientation="e"/>
        <terminal x="20" y="20" orientation="e"/>
        <terminal x="10" y="-31" orientation="n"/>
        <terminal x="-26" y="-10" orientation="w"/>
        <terminal x="26" y="-10" orientation="e"/>
        <terminal x="0" y="-31" orientation="n"/>
        <terminal x="26" y="9" orientation="e"/>
        <terminal x="-26" y="9" orientation="w"/>
        <terminal x="-10" y="-31" orientation="n"/>
        <terminal x="0" y="31" orientation="s"/>
        <terminal x="-20" y="20" orientation="w"/>
        <terminal x="26" y="-1" orientation="e"/>
        <terminal x="20" y="20" orientation="e"/>
        <terminal x="10" y="-31" orientation="n"/>
        <terminal x="-26" y="-10" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/qet_directory
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/10_connectors_circular/qet_directory
@@ -1,9 +1,12 @@
 <qet-directory>
    <names>
        <name lang="ru">Цилиндрические сединители</name>
        <name lang="de">Rundsteckverbinder</name>
        <name lang="en">Circular connectors</name>
        <name lang="el">Κυκλικοί σύνδεσμοι</name>
        <name lang="pl">Złącza okrągłe</name>
        <name lang="fr">Connecteurs circulaires</name>
        <name lang="it">Connettori circolari</name>
        <name lang="cs">Kulaté přípojky</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/qet_directory
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/qet_directory
@@ -1,9 +1,12 @@
 <qet-directory>
    <names>
        <name lang="ru">Разъмы D-sub</name>
        <name lang="de">Stecker D-Sub</name>
        <name lang="en">Plugs D-sub</name>
        <name lang="el">Σύνδεσμοι D-sub</name>
        <name lang="pl">Złącza D-Sub</name>
        <name lang="fr">Connecteurs D-sub</name>
        <name lang="it">Connettori D-Sub</name>
        <name lang="cs">Zástrčka D-Sub</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d-20-femelle.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d-20-femelle.elmt
@@ -1,5 +1,5 @@
 <definition width="80" version="0.4" hotspot_x="39" hotspot_y="38" height="80" link_type="simple" type="element" orientation="dyyy">
-    <names>
+<uuid uuid="{CF65B829-E48B-4F7B-A1FA-7DC042254B84}"/><names>
        <name lang="ar">sub din 20</name>
        <name lang="de">Stecker D-SUB HD 20-polig weiblich</name>
        <name lang="el">D-SUB HD 20 ακροδέκτες (θηλυκό)</name>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d-20-male.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d-20-male.elmt
@@ -1,45 +1,45 @@
-<definition width="80" version="0.4" hotspot_x="39" hotspot_y="38" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
+<definition type="element" link_type="simple" hotspot_x="39" hotspot_y="38" orientation="dyyy" version="0.5" width="80" height="80">
-    <names>
+<uuid uuid="{BF651A87-0EFE-45A9-9D2A-2C574BF96BEB}"/><names>
        <name lang="ar">sub din 20</name>
        <name lang="el">D-SUB HD 20 ακροδέκτες (θηλυκό)</name>
        <name lang="en">D-SUB HD 20 pin (male)</name>
        <name lang="de">Stecker D-SUB HD 20-polig männlich</name>
        <name lang="it">D-SUB 20 Pin (maschio)</name>
        <name lang="fr">SUB-D HD 20 broches (femelle)</name>
        <name lang="pl">Gniazdo D-Sub, piętnastostykowe</name>
        <name lang="nl">D-SUB 20 pin vrouw</name>
        <name lang="cs">Zásuvka D-SUB HD 20 kolíků (ženská)</name>
        <name lang="de">Stecker D-SUB HD 20-polig männlich</name>
        <name lang="it">D-SUB 20 Pin (maschio)</name>
        <name lang="el">D-SUB HD 20 ακροδέκτες (αρσενικό)</name>
        <name lang="ar">sub din 20</name>
        <name lang="pl">Gniazdo D-Sub, piętnastostykowe</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="9" y2="2" x2="9"/>
+        <line x1="9" end1="none" antialias="false" x2="9" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" y2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="10" y2="12" x2="10"/>
+        <line x1="10" end1="none" antialias="false" x2="10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" y2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="9" y2="-8" x2="9"/>
+        <line x1="9" end1="none" antialias="false" x2="9" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" y2="-8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="10" y2="22" x2="10"/>
+        <line x1="10" end1="none" antialias="false" x2="10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" y2="22"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="34" y2="-15" x2="6"/>
+        <line x1="34" end1="none" antialias="false" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" y2="-15"/>
        <text x="-21" y="9" size="2" text="14"/>
        <text x="-21" y="-11" size="2" text="18"/>
        <text x="-21" y="-1" size="2" text="16"/>
        <text x="-21" y="19" size="2" text="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-10.7367" y2="-15" x2="-33.243"/>
+        <line x1="-10.7367" end1="none" antialias="false" x2="-33.243" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" y2="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="24" y2="20" x2="11"/>
+        <line x1="24" end1="none" antialias="false" x2="11" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" y2="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="25" x1="34" y2="25" x2="6"/>
+        <line x1="34" end1="none" antialias="false" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" y2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-10.7461" y2="25" x2="-33.2343"/>
+        <line x1="-10.7461" end1="none" antialias="false" x2="-33.2343" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" y2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="24" y2="10" x2="11"/>
+        <line x1="24" end1="none" antialias="false" x2="11" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" y2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="34" y2="15" x2="6"/>
+        <line x1="34" end1="none" antialias="false" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" y2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10.7443" y2="15" x2="-33.2361"/>
+        <line x1="-10.7443" end1="none" antialias="false" x2="-33.2361" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" y2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="34" y2="5" x2="6"/>
+        <line x1="34" end1="none" antialias="false" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" y2="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="5" x1="-10.7443" y2="5" x2="-33.2361"/>
+        <line x1="-10.7443" end1="none" antialias="false" x2="-33.2361" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" y2="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="-5" x1="-10.7443" y2="-5" x2="-33.2361"/>
+        <line x1="-10.7443" end1="none" antialias="false" x2="-33.2361" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" y2="-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="-5" x1="34" y2="-5" x2="6"/>
+        <line x1="34" end1="none" antialias="false" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" y2="-5"/>
        <text x="20" y="19" size="2" text="2"/>
        <text x="-30" y="24" size="2" text="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="23" y2="0" x2="10"/>
+        <line x1="23" end1="none" antialias="false" x2="10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y2="0"/>
        <text x="-31" y="-16" size="2" text="19"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="23" y2="-10" x2="10"/>
+        <line x1="23" end1="none" antialias="false" x2="10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y2="-10"/>
        <text x="29" y="24" size="2" 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="-20" x1="24" y2="-20" x2="11"/>
+        <line x1="24" end1="none" antialias="false" x2="11" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" y2="-20"/>
        <text x="30" y="14" size="2" text="3"/>
        <text x="30" y="4" size="2" text="5"/>
        <text x="30" y="-6" size="2" text="7"/>
@@ -51,37 +51,38 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-30" y="14" size="2" text="13"/>
        <text x="-31" y="4" size="2" text="15"/>
        <text x="-31" y="-6" size="2" text="17"/>
-        <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="-24" x1="-12" y2="-31" x2="6"/>
+        <line x1="-12" end1="none" antialias="true" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" y2="-31"/>
-        <arc width="10" x="-13" y="-26" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-32"/>
+        <arc x="-13" y="-26" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" width="10" angle="-32" height="10"/>
-        <arc width="10" x="4" y="-32" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" angle="-120"/>
+        <arc x="4" y="-32" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" width="10" angle="-120" height="10"/>
-        <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="34" x1="6" y2="29" x2="-12"/>
+        <line x1="6" end1="none" antialias="true" x2="-12" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="34" y2="29"/>
-        <arc width="10" x="-13" y="21" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" angle="-30"/>
+        <arc x="-13" y="21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" width="10" angle="-30" height="10"/>
-        <arc width="10" x="4" y="25" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-120"/>
+        <arc x="4" y="25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" width="10" angle="-120" height="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.8207" x1="-13" y2="25.8058" x2="-13"/>
+        <line x1="-13" end1="none" antialias="false" x2="-13" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.8207" y2="25.8058"/>
-        <line 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.845" x1="14" y2="29.832" x2="14"/>
+        <line x1="14" end1="none" antialias="false" x2="14" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26.845" y2="29.832"/>
-        <line 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="-5.41935" y2="20" x2="-22.6129"/>
+        <line x1="-5.41935" end1="none" antialias="false" x2="-22.6129" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" y2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-5.41935" y2="10" x2="-22.6129"/>
+        <line x1="-5.41935" end1="none" antialias="false" x2="-22.6129" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" y2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-5.41935" y2="0" x2="-22.6129"/>
+        <line x1="-5.41935" end1="none" antialias="false" x2="-22.6129" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5.41935" y2="-10" x2="-22.6129"/>
+        <line x1="-5.41935" end1="none" antialias="false" x2="-22.6129" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y2="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-5.41935" y2="-20" x2="-22.6129"/>
+        <line x1="-5.41935" end1="none" antialias="false" x2="-22.6129" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" y2="-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="-22" x1="10" y2="-18" x2="10"/>
+        <line x1="10" end1="none" antialias="false" x2="10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22" y2="-18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22" x1="-5" y2="-18" x2="-5"/>
+        <line x1="-5" end1="none" antialias="false" x2="-5" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22" y2="-18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-10" y2="-13" x2="-10"/>
+        <line x1="-10" end1="none" antialias="false" x2="-10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" y2="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="5" y2="-13" x2="5"/>
+        <line x1="5" end1="none" antialias="false" x2="5" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" y2="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="6" y2="-3" x2="6"/>
+        <line x1="6" end1="none" antialias="false" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" y2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="6" y2="7" x2="6"/>
+        <line x1="6" end1="none" antialias="false" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" y2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" x1="6" y2="17" x2="6"/>
+        <line x1="6" end1="none" antialias="false" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" y2="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="23" x1="6" y2="27" x2="6"/>
+        <line x1="6" end1="none" antialias="false" x2="6" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" y2="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="-10" y2="27" x2="-10"/>
+        <line x1="-10" end1="none" antialias="false" x2="-10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" y2="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" x1="-5" y2="22" x2="-5"/>
+        <line x1="-5" end1="none" antialias="false" x2="-5" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18" y2="22"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" x1="-10" y2="17" x2="-10"/>
+        <line x1="-10" end1="none" antialias="false" x2="-10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" y2="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="8" x1="-5" y2="12" x2="-5"/>
+        <line x1="-5" end1="none" antialias="false" x2="-5" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" y2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-10" y2="7" x2="-10"/>
+        <line x1="-10" end1="none" antialias="false" x2="-10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" y2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-5" y2="2" x2="-5"/>
+        <line x1="-5" end1="none" antialias="false" x2="-5" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" y2="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="-7" x1="-10" y2="-3" x2="-10"/>
+        <line x1="-10" end1="none" antialias="false" x2="-10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" y2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-5" y2="-8" x2="-5"/>
+        <line x1="-5" end1="none" antialias="false" x2="-5" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" y2="-8"/>
-        <input x="-26" y="-25.1565" size="2" rotate="true" text="" tagg="none"/>
+        <input x="-26" tagg="none" y="-25.1565" size="2" rotate="true" text=""/>
        <text x="-21" y="-21" size="2" text="20"/>
        <input x="-15" tagg="label" y="-40" size="8" rotate="true" text="_"/>
        <terminal x="-24" y="-20" orientation="w"/>
        <terminal x="-24" y="-10" orientation="w"/>
        <terminal x="-34" y="5" orientation="w"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d-hd_15_broches_femelle.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d-hd_15_broches_femelle.elmt
@@ -1,32 +1,32 @@
-<definition width="70" version="0.3" hotspot_x="40" hotspot_y="35" height="70" type="element" orientation="dyyy">
+<definition type="element" link_type="simple" hotspot_x="39" hotspot_y="34" orientation="dyyy" version="0.5" width="70" height="70">
-    <names>
+<uuid uuid="{5E71E5E9-C1A8-45FD-AF43-27AA4B991889}"/><names>
        <name lang="ar">رابط 15 نقطة SUB-DHD 15 (أنثى) </name>
        <name lang="el">D-SUB HD 15 ακροδέκτες (θηλυκό)</name>
        <name lang="en">D-SUB HD 15 pin (female)</name>
        <name lang="fr">SUB-D HD 15 broches (femelle)</name>
        <name lang="nl">D-SUB 15 pin vrouw</name>
        <name lang="cs">Zásuvka D-SUB HD 15 kolíků (ženská)</name>
        <name lang="de">Stecker D-SUB HD 15-polig weiblich</name>
        <name lang="it">D-SUB 15 Pin (femmina)</name>
-        <name lang="fr">SUB-D HD 15 broches (femelle)</name>
+        <name lang="el">D-SUB HD 15 ακροδέκτες (θηλυκό)</name>
        <name lang="ar">رابط 15 نقطة SUB-DHD 15 (أنثى) </name>
        <name lang="pl">Gniazdo D-Sub, piętnastostykowe</name>
        <name lang="cs">Zásuvka D-SUB HD 15 kolíků (ženská)</name>
        <name lang="nl">D-SUB 15 pin vrouw</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-2" y2="-15" x2="-30"/>
+        <line x1="-2" end1="none" antialias="false" x2="-30" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" y2="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-2" y2="25" x2="-30"/>
+        <line x1="-2" end1="none" antialias="false" x2="-30" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" y2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-2" y2="15" x2="-30"/>
+        <line x1="-2" end1="none" antialias="false" x2="-30" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" y2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-2" y2="5" x2="-30"/>
+        <line x1="-2" end1="none" antialias="false" x2="-30" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" y2="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="-5" x1="-2" y2="-5" x2="-30"/>
+        <line x1="-2" end1="none" antialias="false" x2="-30" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" y2="-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="20" y2="20" x2="7"/>
+        <line x1="20" end1="none" antialias="false" x2="7" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" y2="20"/>
        <text x="16" y="18" size="2" text="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="10" x2="7"/>
+        <line x1="20" end1="none" antialias="false" x2="7" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" y2="10"/>
        <text x="-18" y="18" size="2" text="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="7"/>
+        <line x1="20" end1="none" antialias="false" x2="7" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y2="0"/>
        <text x="-18" y="-22" size="2" text="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="-10" x1="20" y2="-10" x2="7"/>
+        <line x1="20" end1="none" antialias="false" x2="7" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y2="-10"/>
        <text x="-28" y="23" size="2" text="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="20" y2="-20" x2="7"/>
+        <line x1="20" end1="none" antialias="false" x2="7" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" y2="-20"/>
        <text x="-28" y="13" size="2" text="9"/>
        <text x="-28" y="3" size="2" text="8"/>
        <text x="-28" y="-7" size="2" text="7"/>
@@ -38,25 +38,25 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-18" y="8" size="2" text="14"/>
        <text x="-18" y="-2" size="2" text="13"/>
        <text x="-18" y="-12" size="2" text="12"/>
-        <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="-23" x1="-9" y2="-29" x2="2"/>
+        <line x1="-9" end1="none" antialias="true" x2="2" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23" y2="-29"/>
-        <arc width="10" x="-10" y="-25" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-32"/>
+        <arc x="-10" y="-25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" width="10" angle="-32" height="10"/>
-        <arc width="10" x="0" y="-30" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" angle="-120"/>
+        <arc x="0" y="-30" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" width="10" angle="-120" height="10"/>
-        <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="30" x1="2" y2="24" x2="-9"/>
+        <line x1="2" end1="none" antialias="true" x2="-9" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" y2="24"/>
-        <arc width="10" x="-10" y="16" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" angle="-30"/>
+        <arc x="-10" y="16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" width="10" angle="-30" height="10"/>
-        <arc width="10" x="0" y="21" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-120"/>
+        <arc x="0" y="21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" width="10" angle="-120" height="10"/>
        <circle x="-2" y="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="-19" x1="-10" y2="21" x2="-10"/>
+        <line x1="-10" end1="none" antialias="false" x2="-10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" y2="21"/>
-        <line 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="10" y2="26" x2="10"/>
+        <line x1="10" end1="none" antialias="false" x2="10" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" y2="26"/>
        <circle x="-2" y="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
        <circle x="3" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
        <circle x="3" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
        <circle x="3" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
        <circle x="-2" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="20" x1="-7" y2="20" x2="-20"/>
+        <line x1="-7" end1="none" antialias="false" x2="-20" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" y2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-7" y2="10" x2="-20"/>
+        <line x1="-7" end1="none" antialias="false" x2="-20" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" y2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="0" x2="-20"/>
+        <line x1="-7" end1="none" antialias="false" x2="-20" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" y2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-7" y2="-10" x2="-20"/>
+        <line x1="-7" end1="none" antialias="false" x2="-20" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" y2="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-7" y2="-20" x2="-20"/>
+        <line x1="-7" end1="none" antialias="false" x2="-20" length1="1.5" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" y2="-20"/>
        <circle x="-7" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
        <circle x="3" y="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
        <circle x="-2" y="13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
@@ -66,6 +66,7 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <circle x="-7" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
        <circle x="-7" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
        <circle x="-7" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
        <input x="-14" tagg="label" y="-38" size="8" rotate="true" text="_"/>
        <terminal x="-21" y="-20" orientation="w"/>
        <terminal x="-21" y="-10" orientation="w"/>
        <terminal x="-31" y="5" orientation="w"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d-hd_15_broches_male.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d-hd_15_broches_male.elmt
@@ -1,32 +1,34 @@
-<definition width="70" version="0.3" hotspot_x="40" hotspot_y="35" height="70" type="element" orientation="dyyy">
+<definition width="70" link_type="simple" version="0.5" hotspot_x="39" orientation="dyyy" height="70" hotspot_y="34" type="element">
    <uuid uuid="{d4d6cb06-b049-4aec-8447-df7993991bda}"/>
    <names>
        <name lang="ar">رابط توصيلSUB-D HD 15 (ذكري)</name>
        <name lang="el">D-SUB HD 15 ακροδέκτες (αρσενικό)</name>
        <name lang="en">D-SUB HD 15 pin (male)</name>
        <name lang="de">Stecker D-SUB HD 15-polig männlich</name>
        <name lang="it">D-SUB 15 Pin (maschio)</name>
        <name lang="fr">SUB-D HD 15 broches (male)</name>
        <name lang="pl">Wtyk D-Sub, piętnastostykowy</name>
        <name lang="cs">Zástrčka D-SUB HD 15 kolíků (mužská)</name>
        <name lang="nl">D-SUB 15 pin man</name>
        <name lang="de">Stecker D-SUB HD 15-polig männlich</name>
        <name lang="cs">Zástrčka D-SUB HD 15 kolíků (mužská)</name>
        <name lang="pl">Wtyk D-Sub, piętnastostykowy</name>
        <name lang="it">D-SUB 15 Pin (maschio)</name>
        <name lang="ar">رابط توصيلSUB-D HD 15 (ذكري)</name>
        <name lang="en">D-SUB HD 15 pin (male)</name>
        <name lang="fr">SUB-D HD 15 broches (male)</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-2" y2="-15" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="-2" end1="none" y2="-15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-2" y2="25" x2="-30"/>
+        <input x="-13" y="-34.5" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-2" y2="15" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="-2" end1="none" y2="25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-2" y2="5" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="-2" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-2" y2="-5" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="-2" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="20" y2="20" x2="7"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="-2" end1="none" y2="-5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
        <line antialias="false" length1="1.5" x2="7" end2="none" x1="20" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
        <text x="16" y="18" size="2" 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="10" x1="20" y2="10" x2="7"/>
+        <line antialias="false" length1="1.5" x2="7" end2="none" x1="20" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
        <text x="-18" y="18" size="2" text="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="7"/>
+        <line antialias="false" length1="1.5" x2="7" end2="none" x1="20" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
        <text x="-18" y="-22" size="2" text="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-10" x2="7"/>
+        <line antialias="false" length1="1.5" x2="7" end2="none" x1="20" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
        <text x="-28" y="23" size="2" text="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="20" y2="-20" x2="7"/>
+        <line antialias="false" length1="1.5" x2="7" end2="none" x1="20" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
        <text x="-28" y="13" size="2" text="7"/>
        <text x="-28" y="3" size="2" text="8"/>
        <text x="-28" y="-7" size="2" text="9"/>
@@ -38,34 +40,36 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-18" y="8" size="2" text="12"/>
        <text x="-18" y="-2" size="2" text="13"/>
        <text x="-18" y="-12" size="2" text="14"/>
-        <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="-23" x1="-9" y2="-29" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-9" end1="none" y2="-29" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23"/>
-        <arc width="10" x="-10" y="-25" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-32"/>
+        <arc x="-10" width="10" antialias="true" y="-25" angle="-32" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="10" x="0" y="-30" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="-30" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240"/>
-        <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="30" x1="2" y2="24" x2="-9"/>
+        <line antialias="true" length1="1.5" x2="-9" end2="none" x1="2" end1="none" y2="24" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <arc width="10" x="-10" y="16" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" angle="-30"/>
+        <arc x="-10" width="10" antialias="true" y="16" angle="-30" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150"/>
-        <arc width="10" x="0" y="21" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="21" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
-        <circle x="-2" y="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-2" antialias="true" y="23" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="-10" y2="21" x2="-10"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="21" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19"/>
-        <line 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="10" y2="26" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="26" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24"/>
-        <circle x="-2" y="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-2" antialias="true" y="-17" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="18" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-22" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-2" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-2" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-2" antialias="true" y="3" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-7" y2="20" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-7" y2="10" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="0" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-7" y2="-10" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-7" y2="-20" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <circle x="-7" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-12" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="8" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-2" y="13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-2" antialias="true" y="13" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-12" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="8" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-2" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-2" antialias="true" y="-7" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="18" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-22" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-2" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="21" y="-10" orientation="e"/>
        <terminal x="21" y="-20" orientation="e"/>
        <terminal x="-21" y="-20" orientation="w"/>
        <terminal x="-21" y="-10" orientation="w"/>
        <terminal x="-31" y="5" orientation="w"/>
@@ -76,8 +80,6 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <terminal x="-21" y="20" orientation="w"/>
        <terminal x="-31" y="15" orientation="w"/>
        <terminal x="-31" y="25" orientation="w"/>
        <terminal x="21" y="-20" orientation="e"/>
        <terminal x="21" y="-10" orientation="e"/>
        <terminal x="21" y="0" orientation="e"/>
        <terminal x="21" y="10" orientation="e"/>
        <terminal x="21" y="20" orientation="e"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_15_broches_femelle.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_15_broches_femelle.elmt
@@ -1,19 +1,21 @@
-<definition width="60" version="0.3" hotspot_x="40" hotspot_y="45" height="90" type="element" orientation="dyyy">
+<definition width="50" link_type="simple" version="0.5" hotspot_x="36" orientation="dyyy" height="90" hotspot_y="45" type="element">
    <uuid uuid="{f9512315-ebb2-41b7-96f4-f3489774b378}"/>
    <names>
        <name lang="ar">رابط توصيل SUB D15 (أنثوي)  </name>
        <name lang="el">D-SUB 15 ακροδέκτες (θηλυκό)</name>
        <name lang="en">D-SUB  15 pin (female)</name>
        <name lang="de">Stecker D-SUB 15-polig weiblich</name>
        <name lang="it">D-SUB 15 Pin (femmina)</name>
        <name lang="fr">SUB-D 15 broches (femelle)</name>
        <name lang="pl">Gniazdo D-Sub, piętnastostykowe</name>
        <name lang="cs">Zásuvka D-SUB 15 kolíků (ženská)</name>
        <name lang="nl">D-SUB  15 pin vrouw</name>
        <name lang="de">Stecker D-SUB 15-polig weiblich</name>
        <name lang="cs">Zásuvka D-SUB 15 kolíků (ženská)</name>
        <name lang="pl">Gniazdo D-Sub, piętnastostykowe</name>
        <name lang="it">D-SUB 15 Pin (femmina)</name>
        <name lang="ar">رابط توصيل SUB D15 (أنثوي)  </name>
        <name lang="en">D-SUB  15 pin (female)</name>
        <name lang="fr">SUB-D 15 broches (femelle)</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <text x="-28" y="-37" size="2" text="1"/>
        <input x="-12" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
        <text x="-18" y="28" size="2" text="15"/>
        <text x="-18" y="-12" size="2" text="11"/>
        <text x="-18" y="-22" size="2" text="10"/>
@@ -25,47 +27,47 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-28" y="-7" size="2" text="4"/>
        <text x="-28" y="-17" size="2" text="3"/>
        <text x="-28" y="-27" size="2" 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="-7" y2="-20" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
        <text x="-18" y="18" size="2" text="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="-30" x1="-7" y2="-30" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
        <text x="-18" y="8" size="2" text="13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="3" y2="-25" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25"/>
        <text x="-18" y="-2" size="2" text="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="3" y2="-35" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35"/>
-        <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="-34" x1="-9" y2="-40" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-9" end1="none" y2="-40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-34"/>
-        <arc width="10" x="-10" y="-36" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-32"/>
+        <arc x="-10" width="10" antialias="true" y="-36" angle="-32" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="10" x="0" y="-41" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="-41" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240"/>
-        <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="40" x1="2" y2="34" x2="-9"/>
+        <line antialias="true" length1="1.5" x2="-9" end2="none" x1="2" end1="none" y2="34" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40"/>
-        <arc width="10" x="-10" y="26" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" angle="-30"/>
+        <arc x="-10" width="10" antialias="true" y="26" angle="-30" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150"/>
-        <arc width="10" x="0" y="31" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="31" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
-        <circle x="3" y="-27" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-27" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-10" y2="30" x2="-10"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="10" y2="35" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="3" y2="35" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="3" y2="25" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="3" y2="15" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="3" y2="5" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-5" x1="3" y2="-5" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="3" y2="-15" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
-        <circle x="-7" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-22" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="33" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="33" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-7" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="13" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-37" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-37" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-7" y2="30" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line 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="-7" y2="20" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-7" y2="10" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="0" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-7" y2="-10" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="-7" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-2" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="23" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-17" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="3" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="18" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-32" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-32" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="28" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-12" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="8" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-31" y="-35" orientation="w"/>
        <terminal x="-21" y="-30" orientation="w"/>
        <terminal x="-31" y="-25" orientation="w"/>
@@ -76,10 +78,10 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <terminal x="-31" y="15" orientation="w"/>
        <terminal x="-31" y="5" orientation="w"/>
        <terminal x="-31" y="-5" orientation="w"/>
        <terminal x="-21" y="20" orientation="w"/>
        <terminal x="-21" y="10" orientation="w"/>
        <terminal x="-21" y="30" orientation="w"/>
        <terminal x="-31" y="25" orientation="w"/>
        <terminal x="-31" y="35" orientation="w"/>
        <terminal x="-21" y="20" orientation="w"/>
        <terminal x="-21" y="10" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_15_broches_male.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_15_broches_male.elmt
@@ -1,19 +1,21 @@
-<definition width="60" version="0.3" hotspot_x="40" hotspot_y="45" height="90" type="element" orientation="dyyy">
+<definition width="50" link_type="simple" version="0.5" hotspot_x="36" orientation="dyyy" height="90" hotspot_y="45" type="element">
    <uuid uuid="{ae378d47-b1d0-4a1a-a90f-9bc80c609c37}"/>
    <names>
        <name lang="ar">رابط توصيل SUB -D 15  (ذكري)</name>
        <name lang="el">D-SUB 15 ακροδέκτες (αρσενικό)</name>
        <name lang="en">D-SUB 15 pin (male)</name>
        <name lang="de">Stecker D-SUB 15-polig männlich</name>
        <name lang="it">D-SUB 15 Pin (maschio)</name>
        <name lang="fr">SUB-D 15 broches (male)</name>
        <name lang="pl">Wtyk D-Sub, piętnastostykowy</name>
        <name lang="cs">Zástrčka D-SUB 15 kolíků (mužská)</name>
        <name lang="nl">D-SUB  15 pin man</name>
        <name lang="de">Stecker D-SUB 15-polig männlich</name>
        <name lang="cs">Zástrčka D-SUB 15 kolíků (mužská)</name>
        <name lang="pl">Wtyk D-Sub, piętnastostykowy</name>
        <name lang="it">D-SUB 15 Pin (maschio)</name>
        <name lang="ar">رابط توصيل SUB -D 15  (ذكري)</name>
        <name lang="en">D-SUB 15 pin (male)</name>
        <name lang="fr">SUB-D 15 broches (male)</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <text x="-28" y="-37" size="2" text="8"/>
        <input x="-12" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
        <text x="-18" y="28" size="2" text="9"/>
        <text x="-18" y="-12" size="2" text="13"/>
        <text x="-18" y="-22" size="2" text="14"/>
@@ -25,47 +27,52 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-28" y="-7" size="2" text="5"/>
        <text x="-28" y="-17" size="2" text="6"/>
        <text x="-28" y="-27" size="2" text="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="-20" x1="-7" y2="-20" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
        <text x="-18" y="18" size="2" text="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-7" y2="-30" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
        <text x="-18" y="8" size="2" text="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="-25" x1="3" y2="-25" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25"/>
        <text x="-18" y="-2" size="2" text="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="3" y2="-35" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35"/>
-        <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="-34" x1="-9" y2="-40" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-9" end1="none" y2="-40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-34"/>
-        <arc width="10" x="-10" y="-36" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-32"/>
+        <arc x="-10" width="10" antialias="true" y="-36" angle="-32" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="10" x="0" y="-41" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="-41" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240"/>
-        <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="40" x1="2" y2="34" x2="-9"/>
+        <line antialias="true" length1="1.5" x2="-9" end2="none" x1="2" end1="none" y2="34" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40"/>
-        <arc width="10" x="-10" y="26" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" angle="-30"/>
+        <arc x="-10" width="10" antialias="true" y="26" angle="-30" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150"/>
-        <arc width="10" x="0" y="31" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="31" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
-        <circle x="3" y="-27" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-27" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-10" y2="30" x2="-10"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="10" y2="35" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="3" y2="35" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="3" y2="25" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="3" y2="15" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="3" y2="5" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-5" x1="3" y2="-5" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="3" y2="-15" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
-        <circle x="-7" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-22" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="33" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="33" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-7" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="13" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-37" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-37" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-7" y2="30" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line 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="-7" y2="20" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-7" y2="10" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="0" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-7" y2="-10" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="-7" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-2" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="23" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-17" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="3" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="18" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-32" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-32" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="28" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-12" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="8" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-21" y="10" orientation="w"/>
        <terminal x="-21" y="20" orientation="w"/>
        <terminal x="-21" y="30" orientation="w"/>
        <terminal x="-31" y="25" orientation="w"/>
        <terminal x="-31" y="35" orientation="w"/>
        <terminal x="-31" y="-35" orientation="w"/>
        <terminal x="-21" y="-30" orientation="w"/>
        <terminal x="-31" y="-25" orientation="w"/>
@@ -76,10 +83,5 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <terminal x="-31" y="15" orientation="w"/>
        <terminal x="-31" y="5" orientation="w"/>
        <terminal x="-31" y="-5" orientation="w"/>
        <terminal x="-21" y="20" orientation="w"/>
        <terminal x="-21" y="10" orientation="w"/>
        <terminal x="-21" y="30" orientation="w"/>
        <terminal x="-31" y="25" orientation="w"/>
        <terminal x="-31" y="35" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_25_broches_femelle.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_25_broches_femelle.elmt
@@ -1,26 +1,28 @@
-<definition width="60" version="0.3" hotspot_x="40" hotspot_y="70" height="140" type="element" orientation="dyyy">
+<definition width="50" link_type="simple" version="0.5" hotspot_x="36" orientation="dyyy" height="140" hotspot_y="70" type="element">
    <uuid uuid="{4366df35-e30f-4a0c-b536-36ba6be9ad50}"/>
    <names>
        <name lang="ar">رابط توصيل SUB-D 25 (أنثوي)</name>
        <name lang="el">D-SUB 25 ακροδέκτες (θηλυκό)</name>
        <name lang="en">D-SUB 25 pin (female)</name>
        <name lang="de">Stecker D-SUB 25-polig weiblich</name>
        <name lang="it">D-SUB 25 Pin (femmina)</name>
        <name lang="fr">SUB-D 25 broches (femelle)</name>
        <name lang="pl">Gniazdo D-Sub, dwudziestopięciostykowe</name>
        <name lang="cs">Zásuvka D-SUB 25 kolíků (ženská)</name>
        <name lang="nl">D-SUB 25 pin vrouw</name>
        <name lang="de">Stecker D-SUB 25-polig weiblich</name>
        <name lang="cs">Zásuvka D-SUB 25 kolíků (ženská)</name>
        <name lang="pl">Gniazdo D-Sub, dwudziestopięciostykowe</name>
        <name lang="it">D-SUB 25 Pin (femmina)</name>
        <name lang="ar">رابط توصيل SUB-D 25 (أنثوي)</name>
        <name lang="en">D-SUB 25 pin (female)</name>
        <name lang="fr">SUB-D 25 broches (femelle)</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="10" y2="-60" x2="10"/>
+        <input x="-17" y="-79.45" tagg="label" size="9" rotate="true" text="_"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="-60" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60"/>
        <text x="-18" y="-17" size="2" text="18"/>
        <text x="-28" y="-62" size="2" text="1"/>
        <text x="-28" y="-12" size="2" text="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="-15" x1="-7" y2="-15" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
        <text x="-18" y="-37" size="2" text="16"/>
        <text x="-18" y="53" size="2" text="25"/>
-        <circle x="-7" y="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-17" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <text x="-18" y="-47" size="2" text="15"/>
        <text x="-18" y="13" size="2" text="21"/>
        <text x="-18" y="-57" size="2" text="14"/>
@@ -33,69 +35,69 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-28" y="48" size="2" text="12"/>
        <text x="-28" y="-52" size="2" text="2"/>
        <text x="-28" y="38" size="2" text="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="-45" x1="-7" y2="-45" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-45" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45"/>
        <text x="-28" y="28" size="2" text="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55" x1="-7" y2="-55" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55"/>
        <text x="-28" y="18" size="2" text="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="-50" x1="3" y2="-50" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-50"/>
        <text x="-28" y="8" size="2" text="8"/>
        <text x="-18" y="-27" size="2" text="17"/>
        <text x="-28" y="-2" size="2" text="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="-60" x1="3" y2="-60" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-60" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="5" x1="-7" y2="5" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5"/>
-        <circle x="3" y="-52" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-52" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <text x="-18" y="43" size="2" text="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="3" y2="-20" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-5" x1="-7" y2="-5" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-30" x1="3" y2="-30" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
        <text x="-18" y="33" size="2" text="23"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="3" y2="-40" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="0" x1="3" y2="0" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="-7" y="-47" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-47" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <text x="-18" y="23" size="2" text="22"/>
-        <circle x="3" y="-32" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-32" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="3" y2="-10" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="3" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-62" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <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="-58" x1="-9" y2="-64" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-9" end1="none" y2="-64" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-58"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-7" y2="-25" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25"/>
-        <arc width="10" x="-10" y="-60" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-32"/>
+        <arc x="-10" width="10" antialias="true" y="-60" angle="-32" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-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="-35" x1="-7" y2="-35" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35"/>
-        <arc width="10" x="0" y="-65" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="-65" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240"/>
-        <circle x="-7" y="-27" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-27" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <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="65" x1="2" y2="59" x2="-9"/>
+        <line antialias="true" length1="1.5" x2="-9" end2="none" x1="2" end1="none" y2="59" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65"/>
-        <circle x="3" y="-42" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-42" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="-10" y="51" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" angle="-30"/>
+        <arc x="-10" width="10" antialias="true" y="51" angle="-30" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150"/>
-        <circle x="3" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-22" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="0" y="56" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="56" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
-        <circle x="-7" y="-57" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-57" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-2" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-37" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-37" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55" x1="-10" y2="55" x2="-10"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="3" y2="60" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="60" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="50" x1="3" y2="50" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <line 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="3" y2="40" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="30" x1="3" y2="30" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line 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="3" y2="20" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="3" y2="10" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <circle x="-7" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="3" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="58" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="58" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="18" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="38" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="38" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-12" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="-7" y2="55" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45" x1="-7" y2="45" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="45" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-7" y2="35" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-7" y2="25" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-7" y2="15" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15"/>
-        <circle x="-7" y="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="23" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="48" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="48" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="8" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="28" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="43" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="43" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-7" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="53" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="53" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="13" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="33" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="33" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-31" y="-10" orientation="w"/>
        <terminal x="-21" y="-5" orientation="w"/>
        <terminal x="-31" y="0" orientation="w"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_25_broches_male.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_25_broches_male.elmt
@@ -1,27 +1,29 @@
-<definition width="60" version="0.3" hotspot_x="40" hotspot_y="70" height="140" type="element" orientation="dyyy">
+<definition width="50" link_type="simple" version="0.5" hotspot_x="36" orientation="dyyy" height="140" hotspot_y="70" type="element">
    <uuid uuid="{90d20825-b0d0-49bf-b02f-40b549a24ba4}"/>
    <names>
        <name lang="ar">رابط توصيل SUB-D 25 (ذكري)</name>
        <name lang="el">D-SUB 25 ακροδέκτες (αρσενικό)</name>
        <name lang="en">D-SUB 25 pin (male)</name>
        <name lang="de">Stecker D-SUB 25-polig männlich</name>
        <name lang="it">D-SUB 25 Pin (maschio)</name>
        <name lang="fr">SUB-D 25 broches (male)</name>
        <name lang="pl">Wtyk D-Sub, dwudziestopięciostykowy</name>
        <name lang="cs">Zástrčka D-SUB 25 kolíků (mužská)</name>
        <name lang="nl">D-SUB 25 pin man</name>
        <name lang="de">Stecker D-SUB 25-polig männlich</name>
        <name lang="cs">Zástrčka D-SUB 25 kolíků (mužská)</name>
        <name lang="pl">Wtyk D-Sub, dwudziestopięciostykowy</name>
        <name lang="it">D-SUB 25 Pin (maschio)</name>
        <name lang="ar">رابط توصيل SUB-D 25 (ذكري)</name>
        <name lang="en">D-SUB 25 pin (male)</name>
        <name lang="fr">SUB-D 25 broches (male)</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-58" x1="-9" y2="-64" x2="2"/>
+        <input x="-17" y="-79.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="10" y2="-60" x2="10"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-9" end1="none" y2="-64" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-58"/>
        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="-60" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60"/>
        <text x="-18" y="-17" size="2" text="21"/>
        <text x="-28" y="-62" size="2" text="13"/>
        <text x="-28" y="-12" size="2" text="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-7" y2="-15" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
        <text x="-18" y="-37" size="2" text="23"/>
        <text x="-18" y="53" size="2" text="14"/>
-        <circle x="-7" y="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-17" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <text x="-18" y="-47" size="2" text="24"/>
        <text x="-18" y="13" size="2" text="18"/>
        <text x="-18" y="-57" size="2" text="25"/>
@@ -34,68 +36,68 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-28" y="48" size="2" text="2"/>
        <text x="-28" y="-52" size="2" text="12"/>
        <text x="-28" y="38" size="2" text="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="-7" y2="-45" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-45" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45"/>
        <text x="-28" y="28" size="2" text="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="-55" x1="-7" y2="-55" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55"/>
        <text x="-28" y="18" size="2" text="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-50" x1="3" y2="-50" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-50"/>
        <text x="-28" y="8" size="2" text="6"/>
        <text x="-18" y="-27" size="2" text="22"/>
        <text x="-28" y="-2" size="2" text="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="-60" x1="3" y2="-60" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-60" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="5" x1="-7" y2="5" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5"/>
-        <circle x="3" y="-52" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-52" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <text x="-18" y="43" size="2" text="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="3" y2="-20" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-5" x1="-7" y2="-5" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="-30" x1="3" y2="-30" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
        <text x="-18" y="33" size="2" text="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="3" y2="-40" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="0" x1="3" y2="0" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="-7" y="-47" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-47" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <text x="-18" y="23" size="2" text="17"/>
-        <circle x="3" y="-32" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-32" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="3" y2="-10" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <circle x="3" y="-62" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-62" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-7" y2="-25" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25"/>
-        <arc width="10" x="-10" y="-60" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-32"/>
+        <arc x="-10" width="10" antialias="true" y="-60" angle="-32" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-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="-35" x1="-7" y2="-35" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35"/>
-        <arc width="10" x="0" y="-65" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="-65" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240"/>
-        <circle x="-7" y="-27" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-27" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <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="65" x1="2" y2="59" x2="-9"/>
+        <line antialias="true" length1="1.5" x2="-9" end2="none" x1="2" end1="none" y2="59" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="65"/>
-        <circle x="3" y="-42" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-42" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="-10" y="51" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" angle="-30"/>
+        <arc x="-10" width="10" antialias="true" y="51" angle="-30" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150"/>
-        <circle x="3" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-22" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="0" y="56" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="56" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
-        <circle x="-7" y="-57" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-57" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-2" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-37" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-37" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55" x1="-10" y2="55" x2="-10"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-55"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="3" y2="60" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="60" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="50" x1="3" y2="50" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="50" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50"/>
-        <line 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="3" y2="40" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="40" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="30" x1="3" y2="30" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="30" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30"/>
-        <line 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="3" y2="20" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="3" y2="10" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <circle x="-7" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="3" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="58" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="58" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="18" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="38" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="38" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-12" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="-7" y2="55" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="55" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45" x1="-7" y2="45" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="45" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="45"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-7" y2="35" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="35" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25" x1="-7" y2="25" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="25" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-7" y2="15" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15"/>
-        <circle x="-7" y="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="23" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="48" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="48" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="8" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="28" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="28" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="43" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="43" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-7" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="53" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="53" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="13" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="33" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="33" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-31" y="-10" orientation="w"/>
        <terminal x="-21" y="-5" orientation="w"/>
        <terminal x="-31" y="0" orientation="w"/>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_9_broches_femelle.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_9_broches_femelle.elmt
@@ -1,18 +1,20 @@
-<definition width="60" version="0.3" hotspot_x="40" hotspot_y="35" height="70" type="element" orientation="dyyy">
+<definition width="50" link_type="simple" version="0.5" hotspot_x="36" orientation="dyyy" height="60" hotspot_y="30" type="element">
    <uuid uuid="{e129ab40-2056-4d43-8335-c3ec5a83ed0b}"/>
    <names>
        <name lang="ar">رابط توصيل SUB-D 9 (أنثوي)</name>
        <name lang="el">D-SUB 9 ακροδέκτες (θηλυκό)</name>
        <name lang="en">D-SUB  9 pin (female)</name>
        <name lang="de">Stecker D-SUB 9-polig weiblich</name>
        <name lang="it">D-SUB 9 pin</name>
        <name lang="fr">SUB-D 9 broches (femelle)</name>
        <name lang="pl">Gniazdo D-Sub, dziewięciostykowe</name>
        <name lang="cs">Zásuvka D-SUB 9 kolíků (ženská)</name>
        <name lang="nl">D-SUB  9 pin  vrouw</name>
        <name lang="de">Stecker D-SUB 9-polig weiblich</name>
        <name lang="cs">Zásuvka D-SUB 9 kolíků (ženská)</name>
        <name lang="pl">Gniazdo D-Sub, dziewięciostykowe</name>
        <name lang="it">D-SUB 9 pin</name>
        <name lang="ar">رابط توصيل SUB-D 9 (أنثوي)</name>
        <name lang="en">D-SUB  9 pin (female)</name>
        <name lang="fr">SUB-D 9 broches (femelle)</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <input x="-12" y="-31.5" tagg="label" size="9" rotate="true" text="_"/>
        <text x="-18" y="13" size="2" text="9"/>
        <text x="-28" y="18" size="2" text="5"/>
        <text x="-28" y="8" size="2" text="4"/>
@@ -22,39 +24,39 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-18" y="3" size="2" text="8"/>
        <text x="-18" y="-7" size="2" text="7"/>
        <text x="-18" y="-17" size="2" text="6"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-9" y2="-24" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-9" end1="none" y2="-24" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18"/>
-        <arc width="10" x="-10" y="-20" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-32"/>
+        <arc x="-10" width="10" antialias="true" y="-20" angle="-32" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="10" x="0" y="-25" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="-25" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240"/>
-        <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="25" x1="2" y2="19" x2="-9"/>
+        <line antialias="true" length1="1.5" x2="-9" end2="none" x1="2" end1="none" y2="19" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25"/>
-        <arc width="10" x="-10" y="11" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" angle="-30"/>
+        <arc x="-10" width="10" antialias="true" y="11" angle="-30" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150"/>
-        <arc width="10" x="0" y="16" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="16" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="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="-15" x1="-10" y2="15" x2="-10"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="20" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="3" y2="20" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="3" y2="10" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="3" y2="0" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="3" y2="-10" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="3" y2="-20" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <circle x="3" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="18" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-22" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-2" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-7" y2="15" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-7" y2="5" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-5" x1="-7" y2="-5" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-7" y2="-15" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
-        <circle x="-7" y="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-17" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="8" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-12" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="3" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="13" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-7" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-21" y="-15" orientation="w"/>
        <terminal x="-31" y="0" orientation="w"/>
        <terminal x="-31" y="-10" orientation="w"/>
        <terminal x="-31" y="-20" orientation="w"/>
        <terminal x="-21" y="5" orientation="w"/>
        <terminal x="-21" y="-5" orientation="w"/>
        <terminal x="-31" y="-20" orientation="w"/>
        <terminal x="-21" y="15" orientation="w"/>
        <terminal x="-21" y="-15" orientation="w"/>
        <terminal x="-31" y="10" orientation="w"/>
        <terminal x="-31" y="20" orientation="w"/>
    </description>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_9_broches_male.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/15_connectors_dsub/sub-d_9_broches_male.elmt
@@ -1,19 +1,21 @@
-<definition width="60" version="0.3" hotspot_x="40" hotspot_y="35" height="70" type="element" orientation="dyyy">
+<definition width="50" link_type="simple" version="0.5" hotspot_x="36" orientation="dyyy" height="60" hotspot_y="30" type="element">
    <uuid uuid="{9dfafb95-dcef-4007-b2ea-419c25dac39e}"/>
    <names>
        <name lang="ar">رابط توصيل SUB-D9 (ذكري)</name>
        <name lang="el">D-SUB 9 ακροδέκτες (αρσενικό)</name>
        <name lang="en">D-SUB  9 pin (male)</name>
        <name lang="de">Stecker D-SUB 9-polig männlich</name>
        <name lang="it">D-SUB 9 Pin (maschio)</name>
        <name lang="fr">SUB-D 9 broches (male)</name>
        <name lang="pl">Wtyk D-Sub, dziewięciostykowy</name>
        <name lang="cs">Zástrčka D-SUB 9 kolíků (mužská)</name>
        <name lang="nl">D-SUB  9 pin man</name>
        <name lang="de">Stecker D-SUB 9-polig männlich</name>
        <name lang="cs">Zástrčka D-SUB 9 kolíků (mužská)</name>
        <name lang="pl">Wtyk D-Sub, dziewięciostykowy</name>
        <name lang="it">D-SUB 9 Pin (maschio)</name>
        <name lang="ar">رابط توصيل SUB-D9 (ذكري)</name>
        <name lang="en">D-SUB  9 pin (male)</name>
        <name lang="fr">SUB-D 9 broches (male)</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
        <text x="-18" y="13" size="2" text="6"/>
        <input x="-17" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>
        <text x="-28" y="18" size="2" text="1"/>
        <text x="-28" y="8" size="2" text="2"/>
        <text x="-28" y="-2" size="2" text="3"/>
@@ -22,40 +24,40 @@ License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
        <text x="-18" y="3" size="2" text="7"/>
        <text x="-18" y="-7" size="2" text="8"/>
        <text x="-18" y="-17" size="2" text="9"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-9" y2="-24" x2="2"/>
+        <line antialias="true" length1="1.5" x2="2" end2="none" x1="-9" end1="none" y2="-24" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18"/>
-        <arc width="10" x="-10" y="-20" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-32"/>
+        <arc x="-10" width="10" antialias="true" y="-20" angle="-32" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="10" x="0" y="-25" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="-25" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-240"/>
-        <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="25" x1="2" y2="19" x2="-9"/>
+        <line antialias="true" length1="1.5" x2="-9" end2="none" x1="2" end1="none" y2="19" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25"/>
-        <arc width="10" x="-10" y="11" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150" angle="-30"/>
+        <arc x="-10" width="10" antialias="true" y="11" angle="-30" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-150"/>
-        <arc width="10" x="0" y="16" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-120"/>
+        <arc x="0" width="10" antialias="true" y="16" angle="-120" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="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="-15" x1="-10" y2="15" x2="-10"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="10" y2="20" x2="10"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="3" y2="20" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="3" y2="10" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="3" y2="0" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="3" y2="-10" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="3" y2="-20" x2="-30"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="3" end1="none" y2="-20" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <circle x="3" y="18" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="18" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-22" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-2" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-7" y2="15" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-7" y2="5" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-5" x1="-7" y2="-5" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-7" y2="-15" x2="-20"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-7" end1="none" y2="-15" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15"/>
-        <circle x="-7" y="-17" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-17" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="8" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="3" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="3" antialias="true" y="-12" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="3" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="13" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="13" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-7" y="-7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-7" antialias="true" y="-7" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-21" y="-15" orientation="w"/>
        <terminal x="-31" y="0" orientation="w"/>
        <terminal x="-31" y="-10" orientation="w"/>
        <terminal x="-31" y="-20" orientation="w"/>
        <terminal x="-21" y="5" orientation="w"/>
        <terminal x="-21" y="-5" orientation="w"/>
        <terminal x="-21" y="15" orientation="w"/>
        <terminal x="-31" y="10" orientation="w"/>
        <terminal x="-31" y="20" orientation="w"/>
        <terminal x="-21" y="5" orientation="w"/>
        <terminal x="-21" y="-5" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/bloc_3pc_230v16a.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/bloc_3pc_230v16a.elmt
@@ -1,47 +1,49 @@
-<definition width="120" version="0.3" hotspot_x="0" hotspot_y="0" height="40" type="element" orientation="dyyy">
+<definition width="120" link_type="simple" version="0.5" hotspot_x="51" orientation="dyyy" height="50" hotspot_y="17" type="element">
    <uuid uuid="{355a6cff-a677-4a53-b6a2-79bf09d28904}"/>
    <names>
-        <name lang="ar">مجموعة 3PC 2P+T 220V 16A</name>
+        <name lang="nl">Contactdoos 3voudig 230V 16A</name>
        <name lang="de">Steckdose 3-fach P+N+PE 230V 16A</name>
        <name lang="cs">Blok 3 PC 2P+T 230v 16A</name>
        <name lang="pl">Potrójne gniazdo wtyczkowe (modułowe)</name>
        <name lang="it">Blocco 3 prese di corrente 220V 16A</name>
        <name lang="ar">مجموعة 3PC 2P+T 220V 16A</name>
        <name lang="en">Plugs 3 PC 2P+T 230v 16A</name>
        <name lang="fr">Bloc 3 PC 2P+T 230v 16A</name>
        <name lang="pl">Potrójne gniazdo wtyczkowe (modułowe)</name>
        <name lang="cs">Blok 3 PC 2P+T 230v 16A</name>
        <name lang="it">Blocco 3 prese di corrente 220V 16A</name>
        <name lang="nl">Contactdoos 3voudig 230V 16A</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <circle x="69.25" y="3.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
+        <input x="13" y="-19.45" tagg="label" size="9" rotate="true" text="_"/>
-        <circle x="59.25" y="6.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
+        <circle x="19.25" antialias="true" y="-6.75" diameter="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="49.25" y="9.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
+        <circle x="9.25" antialias="true" y="-3.75" diameter="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="30" y2="4" x2="110"/>
+        <circle x="-0.75" antialias="true" y="-0.75" diameter="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="20" y2="7" x2="100"/>
+        <line antialias="false" length1="1.5" x2="60" end2="none" x1="-20" end1="none" y2="-6" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6"/>
-        <circle x="29.25" y="3.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
+        <line antialias="false" length1="1.5" x2="50" end2="none" x1="-30" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="10" x2="90"/>
+        <circle x="-20.75" antialias="true" y="-6.75" diameter="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="19.25" y="6.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
+        <line antialias="false" length1="1.5" x2="40" end2="none" x1="-40" end1="none" y2="0" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <circle x="9.25" y="9.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1.5"/>
+        <circle x="-30.75" antialias="true" y="-3.75" diameter="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="59" y="19" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <circle x="-40.75" antialias="true" y="-0.75" diameter="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="99" y="19" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <rect x="9" width="2" antialias="false" y="9" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <text x="5" y="34.3333" size="4" text="Bloc 3 x PC 230V 16A"/>
+        <rect x="49" width="2" antialias="false" y="9" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="60" y2="19" x2="60"/>
+        <text x="-45" y="24.3333" size="4" text="Bloc 3 x PC 230V 16A"/>
-        <rect width="2" x="19" y="19" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="9" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="100" y2="19" x2="100"/>
+        <rect x="-31" width="2" antialias="false" y="9" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="110" y2="17" x2="110"/>
+        <line antialias="false" length1="1.5" x2="50" end2="none" x1="50" end1="none" y2="9" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="70" y2="17" x2="70"/>
+        <line antialias="false" length1="1.5" x2="60" end2="none" x1="60" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-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="0" x1="20" y2="19" x2="20"/>
+        <line antialias="false" length1="1.5" x2="20" end2="none" x1="20" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6"/>
-        <arc width="6" x="87" y="17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="-30" end2="none" x1="-30" end1="none" y2="9" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="17" x2="30"/>
+        <arc x="37" width="6" antialias="true" y="7" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="6" x="47" y="17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="-20" end2="none" x1="-20" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="50" y2="17" x2="50"/>
+        <arc x="-3" width="6" antialias="true" y="7" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="6" x="7" y="17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="90" y2="17" x2="90"/>
+        <arc x="-43" width="6" antialias="true" y="7" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="6" x="67" y="17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="40" end2="none" x1="40" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="10" y2="17" x2="10"/>
+        <arc x="17" width="6" antialias="true" y="7" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="6" x="107" y="17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="-40" end2="none" x1="-40" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <arc width="6" x="27" y="17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <arc x="57" width="6" antialias="true" y="7" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <terminal x="20" y="0" orientation="n"/>
+        <arc x="-23" width="6" antialias="true" y="7" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <terminal x="10" y="0" orientation="n"/>
+        <terminal x="-30" y="-10" orientation="n"/>
-        <terminal x="30" y="0" orientation="n"/>
+        <terminal x="-40" y="-10" orientation="n"/>
        <terminal x="-20" y="-10" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc_2p_t.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc_2p_t.elmt
@@ -1,26 +1,28 @@
-<definition width="40" version="0.3" hotspot_x="0" hotspot_y="0" height="40" type="element" orientation="dyyy">
+<definition width="40" link_type="simple" version="0.5" hotspot_x="19" orientation="dyyy" height="50" hotspot_y="16" type="element">
    <uuid uuid="{c73b40e1-79a4-4711-9338-e019449bf76e}"/>
    <names>
-        <name lang="ar">Outlet 2P+T</name>
+        <name lang="nl">Contact AC + aarde</name>
        <name lang="de">Steckdose P+N+PE</name>
        <name lang="cs">Zásuvka PC 2P+T</name>
        <name lang="pl">Gniazdo wtyczkowe</name>
        <name lang="it">Presa 2p+T</name>
        <name lang="ar">Outlet 2P+T</name>
        <name lang="en">PC 2P+T</name>
        <name lang="fr">PC 2P+T</name>
        <name lang="pl">Gniazdo wtyczkowe</name>
        <name lang="cs">Zásuvka PC 2P+T</name>
        <name lang="it">Presa 2p+T</name>
        <name lang="nl">Contact AC + aarde</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <text x="5" y="34.3333" size="4" text="PC 230V 16A"/>
+        <text x="-15" y="24.3333" size="4" text="PC 230V 16A"/>
-        <rect width="2" x="19" y="19" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <input x="13" y="-4.45" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="19" x2="20"/>
+        <rect x="-1" width="2" antialias="false" y="9" height="5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="30" y2="17" x2="30"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="9" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <arc width="6" x="7" y="17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="10" end2="none" x1="10" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="17" x2="10"/>
+        <arc x="-13" width="6" antialias="true" y="7" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <arc width="6" x="27" y="17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="-10" end2="none" x1="-10" end1="none" y2="7" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10"/>
-        <terminal x="20" y="1" orientation="n"/>
+        <arc x="7" width="6" antialias="true" y="7" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180"/>
-        <terminal x="10" y="1" orientation="n"/>
+        <terminal x="0" y="-9" orientation="n"/>
-        <terminal x="30" y="1" orientation="n"/>
+        <terminal x="-10" y="-9" orientation="n"/>
        <terminal x="10" y="-9" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc_5p.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc_5p.elmt
@@ -1,47 +1,49 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dyyy">
+<definition width="60" link_type="simple" version="0.5" hotspot_x="30" orientation="dyyy" height="40" hotspot_y="19" type="element">
    <uuid uuid="{d692a53d-bf99-47a4-9e9c-ff1334a17f95}"/>
    <names>
        <name lang="nl">Contact 3AC + nul +aarde</name>
        <name lang="de">Steckdose 3P+N+PE</name>
        <name lang="cs">Zásuvka 5 pólová</name>
        <name lang="pl">Złącze wielostykowe</name>
        <name lang="it">Presa 3P+N+T</name>
        <name lang="ar">ماخذ تيّار 5 أقطاب</name>
        <name lang="en">Outlet 5 poles</name>
        <name lang="de">Steckdose 3P+N+PE</name>
        <name lang="fr">PC 5P</name>
        <name lang="pl">Złącze wielostykowe</name>
        <name lang="cs">Zásuvka 5 pólová</name>
        <name lang="it">Presa 3P+N+T</name>
        <name lang="nl">Contact 3AC + nul +aarde</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="17" y2="13" x2="17"/>
+        <input x="24" y="-8.5" tagg="label" size="9" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="7" y2="13" x2="7"/>
+        <line antialias="false" length1="1.5" x2="17" end2="none" x1="17" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="7" y2="13" x2="7"/>
+        <line antialias="false" length1="1.5" x2="7" end2="none" x1="7" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-3" y2="13" x2="-3"/>
+        <line antialias="false" length1="1.5" x2="7" end2="none" x1="7" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-13" y2="13" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="-3" end2="none" x1="-3" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-23" y2="13" x2="-23"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-13" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <arc width="6" x="14" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <line antialias="false" length1="1.5" x2="-23" end2="none" x1="-23" end1="none" y2="13" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3"/>
-        <arc width="6" x="-6" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc x="14" width="6" antialias="true" y="-3" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
        <arc x="-6" width="6" antialias="true" y="-3" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
        <text x="-21" y="-7.6666" size="4" text="PE"/>
        <text x="18" y="-7.6666" size="4" text="L3"/>
-        <arc width="6" x="4" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc x="4" width="6" antialias="true" y="-3" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
        <text x="-2" y="-7.6666" size="4" text="L1"/>
        <text x="9" y="-7.6666" size="4" text="L2"/>
        <text x="-11" y="-7.6666" size="4" text="N"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="17" y2="-3" x2="17"/>
+        <line antialias="false" length1="1.5" x2="17" end2="none" x1="17" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="7" y2="-3" x2="7"/>
+        <line antialias="false" length1="1.5" x2="7" end2="none" x1="7" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-3" y2="-3" x2="-3"/>
+        <line antialias="false" length1="1.5" x2="-3" end2="none" x1="-3" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-13" y2="-3" x2="-13"/>
+        <line antialias="false" length1="1.5" x2="-13" end2="none" x1="-13" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13"/>
-        <arc width="6" x="-26" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc x="-26" width="6" antialias="true" y="-3" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-23" y2="-3" x2="-23"/>
+        <line antialias="false" length1="1.5" x2="-23" end2="none" x1="-23" end1="none" y2="-3" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13"/>
-        <arc width="6" x="-16" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc x="-16" width="6" antialias="true" y="-3" angle="-180" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0"/>
        <terminal x="-3" y="-14" orientation="n"/>
        <terminal x="-23" y="-14" orientation="n"/>
        <terminal x="-13" y="-14" orientation="n"/>
        <terminal x="17" y="-14" orientation="n"/>
        <terminal x="7" y="-14" orientation="n"/>
        <terminal x="-23" y="14" orientation="s"/>
        <terminal x="-13" y="14" orientation="s"/>
        <terminal x="-23" y="-14" orientation="n"/>
        <terminal x="-3" y="14" orientation="s"/>
        <terminal x="7" y="14" orientation="s"/>
        <terminal x="17" y="14" orientation="s"/>
        <terminal x="-13" y="-14" orientation="n"/>
        <terminal x="17" y="-14" orientation="n"/>
        <terminal x="7" y="-14" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc_mono.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc_mono.elmt
@@ -1,24 +1,26 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="dyyy">
+<definition width="30" link_type="simple" version="0.5" hotspot_x="15" orientation="dyyy" height="50" hotspot_y="23" type="element">
    <uuid uuid="{4288f955-7b7d-4baf-858a-5a97c21a5447}"/>
    <names>
        <name lang="nl">Contact AC + aarde</name>
        <name lang="de">Steckdose 3-polig</name>
        <name lang="cs">Zásuvka jednopólová</name>
        <name lang="pl">Gniazdo wtyczkowe</name>
        <name lang="it">Presa monofase</name>
        <name lang="ar">مقبس أحادي الوجه</name>
        <name lang="en">Outlet 3 poles</name>
        <name lang="de">Steckdose 3-polig</name>
        <name lang="fr">PC mono</name>
        <name lang="pl">Gniazdo wtyczkowe</name>
        <name lang="cs">Zásuvka jednopólová</name>
        <name lang="it">Presa monofase</name>
        <name lang="nl">Contact AC + aarde</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="0" y2="16" x2="0"/>
+        <input x="13" y="-5.45" tagg="label" size="9" rotate="true" text="_"/>
-        <circle x="-10.0499" y="-10.0499" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20.0998"/>
+        <line antialias="false" length1="1.5" x2="0" end2="none" x1="0" end1="none" y2="16" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="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="-8" x1="-6" y2="-14" x2="-6"/>
+        <circle x="-10.0499" antialias="true" y="-10.0499" diameter="20.0998" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-6" y="-6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <line antialias="false" length1="1.5" x2="-6" end2="none" x1="-6" end1="none" y2="-14" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8"/>
-        <circle x="-2" y="3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-6" antialias="true" y="-6" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="6" y2="-14" x2="6"/>
+        <circle x="-2" antialias="true" y="3" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="2" y="-6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <line antialias="false" length1="1.5" x2="6" end2="none" x1="6" end1="none" y2="-14" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8"/>
        <circle x="2" antialias="true" y="-6" diameter="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <terminal x="-6" y="-15" orientation="n"/>
        <terminal x="6" y="-15" orientation="n"/>
        <terminal x="0" y="17" orientation="s"/>
--- a/Show More
+++ b/Show More