Tag version 0.5

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/tags/0.5@4275 bfdf4180-ca20-0410-9c96-a3a8aa849046
Prepare to final tag
2025-12-18 13:30:34 +01:00 · 2015-11-27 17:21:03 +00:00 · 2015-11-27 17:19:22 +00:00 · 2015-11-27 07:04:08 +00:00 · 2015-11-21 16:35:49 +00:00 · 2015-11-21 16:20:29 +00:00
3306 changed files with 208489 additions and 139414 deletions
--- a/22
+++ b/22
@@ -1,3 +1,21 @@
+====== ChangeLog from 0.4 to 0.5 ======
+In the official collection, there are now  2625 elements, and 418 catégoris for a total of 3043 files.
+
+* Port to Qt 5 framework
+* New QSettings native format for config files.
+* In the diagram editor, the grid is not displayed by default outside the diagram, the minimum zoom is blocked. A button allows you to un-validate this operation.
+* It is now possible to put the tittle block on the right vertical mode.
+* The default tittle block can be defined for the next folios of the project.
+* The summary now takes the font set in the QElectroTech.conf
+* The floating dock is now operational, variables, actions are taken into account on the fly.
+* A transformation tool transforms quickly and finely each primitive by handles.
+* Add UUID tag for element XML.
+* The database enables faster loading a large number of managing symbols in tables changes pixmaps collections, it no longer compares the modification date of the files but their use UUID attributes to update the cache .
+* In terms of basic shapes, the transform tool works directly on vectors, it replaces the reduction tool / enlargement that has just been deleted as unnecessary.
+* Improve Undo command by QPropertyUndoCommand class.
+
+
+
 ====== ChangeLog from 0.3 to 0.4 ======
 In the official collection, there are now 2298 elements, and 376 catégoris for a total of 2674 files.

@@ -6,7 +24,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 +38,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/48
+++ b/48
@@ -1,131 +1,131 @@
 [en]
 Requirements :
-libQt4 (see packages libqt4*)
+libQt5 (see packages libqt5*)
 cupsys-bsd for printing

 Howto compile :
-$ qmake (qmake-qt4 for Debian-based systems)
+$ qmake (qmake-qt5 for Debian-based systems)
 $ make
 # umask 0022
 # make install

 [fr]
 Pré-requis :
-libQt4 (paquets libqt4*)
+libQt5 (paquets libqt5*)
 cupsys-bsd pour l'impression

 Comment compiler :
-$ qmake (qmake-qt4 pour les systèmes basés sur Debian)
+$ qmake (qmake-qt5 pour les systèmes basés sur Debian)
 $ make
 # umask 0022
 # make install

 [ru]
 Зависимости:
-libQt4 (пакет libqt4*)
+libQt5 (пакет libqt5*)
 cupsys-bsd для печати

 Как компилировать?:
-$ qmake (qmake-qt4 для систем основанных на Debian)
+$ qmake (qmake-qt5 для систем основанных на Debian)
 $ make
 # umask 0022
 # make install

 [pt]
 Dependências:
-libQt4 (ver pacotes libqt4*)
+libQt5 (ver pacotes libqt5*)
 cupsys-bsd para impressão

 Como compilar:
-$ qmake (qmake-qt4 para sistemas baseados em Debian)
+$ qmake (qmake-qt5 para sistemas baseados em Debian)
 $ make
 # umask 0022
 # make install

 [es]
 Dependencias:
-libQt4 (paquetes libqt4*)
+libQt5 (paquetes libqt5*)
 cupsys-bsd para imprimir

 Cómo compilar:
-$ qmake (qmake-qt4 para los sistemas basados en Debian)
+$ qmake (qmake-qt5 para los sistemas basados en Debian)
 $ make
 # umask 0022
 # make install

 [ca]
 Dependències:
-libQt4 (paquets libqt4*)
+libQt5 (paquets libqt5*)
 cupsys-bsd per imprimir

 Com compilar:
-$ qmake (qmake-qt4 pels sistemes basats en Debian)
+$ qmake (qmake-qt5 pels sistemes basats en Debian)
 $ make
 # umask 0022
 # make install

 [cs]
 Požadavky :
-libQt4 (viz balíček libqt4*)
+libQt5 (viz balíček libqt5*)
 cupsys-bsd kvůli tisku

 Jak program sestavit :
-$ qmake (qmake-qt4 u systémů založených na Debianu)
+$ qmake (qmake-qt5 u systémů založených na Debianu)
 $ make
 # umask 0022
 # make install

 [pl]
 Zależności:
-libQt4 (pakiety libqt4 *)
+libQt5 (pakiety libqt5 *)
 cupsys-bsd do druku

 Sposób kompilacji:
-$ qmake (qmake-qt4 dla systemów opartych na Debianie)
+$ qmake (qmake-qt5 dla systemów opartych na Debianie)
 $ make
 # umask 0022
 # make install

 [it]
 Dipendenze:
-libQt4 (vedi pacchetti libqt4*)
+libQt5 (vedi pacchetti libqt5*)
 cupsys-bsd per la stampa

 Come compilare:
-$ qmake (qmake-qt4 per sistemi basati su Debian)
+$ qmake (qmake-qt5 per sistemi basati su Debian)
 $ make
 # umask 0022
 # make install

 [el]
 Απαιτήσεις:
-libQt4 (δείτε για πακέτα libqt4*)
+libQt5 (δείτε για πακέτα libqt5*)
 cupsys-bsd για εκτύπωση

 Πως να το μεταγλωττίσετε:
-$ qmake (qmake-qt4 για συστήματα βασισμένα σε Debian)
+$ qmake (qmake-qt5 για συστήματα βασισμένα σε Debian)
 $ make
 # umask 0022
 # make install

 [nl]
 vereisten:
-libqt4 (zie pakketten libqt4 *)
+libqt5 (zie pakketten libqt5 *)
 cupsys-bsd om af te drukken  

 Hoe te compileren:
-     $ Qmake (qmake-qt4 voor Debian-gebaseerde systemen)
+     $ Qmake (qmake-qt5 voor Debian-gebaseerde systemen)
     $ make
     # Umask 0022
     # Make install

 [be]
 Vereisten:
-libQt4 (pakketten libqt4*)
+libQt5 (pakketten libqt5*)
 cupsys-bsd voor het afdrukken

 Hoe te compileren :
-$ qmake (qmake-qt4 voor systemen op basis van Debian)
+$ qmake (qmake-qt5 voor systemen op basis van Debian)
 $ make
 # umask 0022
 # make install
--- a/22
+++ b/22
@@ -1,43 +1,43 @@
 [en]
-QElectroTech is a Qt4 application to design electric diagrams.
+QElectroTech is a Qt5 application to design electric diagrams.
 It uses XML files for elements and diagrams, and includes both a diagram editor, a element editor, and an titleblock editor.

 [fr]
-QElectroTech est une application Qt4 pour réaliser des schémas électriques.
+QElectroTech est une application Qt5 pour réaliser des schémas électriques.
 QET utilise le format XML pour ses éléments et ses schémas et inclut un éditeur de schémas, un éditeur d'élément, ainsi qu'un editeur de cartouche.

 [ru]
-QElectroTech - приложение написанное на Qt4 и предназначенное для разработки электрических схем.
+QElectroTech - приложение написанное на Qt5 и предназначенное для разработки электрических схем.
 Оно использует XML-файлы для элементов и схем, и включает, как редактор схем, так и редактор элементов.

 [pt]
-QElectroTech é uma aplicação baseada em Qt4 para desenhar esquemas eléctricos.
+QElectroTech é uma aplicação baseada em Qt5 para desenhar esquemas eléctricos.
 QET utiliza ficheiros XML para os elementos e para os esquemas e inclui um editor de esquemas e um editor de elementos.

 [es]
-QElectroTech es una aplicación Qt4 para diseñar esquemas eléctricos.
+QElectroTech es una aplicación Qt5 para diseñar esquemas eléctricos.
 Utiliza archivos XML para los elementos y esquemas, e incluye un editor de esquemas y un editor de elemento.

 [cs]
-QElectroTech je aplikací Qt4 určenou pro návrh nákresů elektrických obvodů.
+QElectroTech je aplikací Qt5 určenou pro návrh nákresů elektrických obvodů.
 Pro prvky a nákresy používá soubory XML, a zahrnuje v sobě jak editor nákresů, tak editor prvků.

 [pl]
-QElectroTech to aplikacja napisana w Qt4, przeznaczona do tworzenia schematów elektrycznych.
+QElectroTech to aplikacja napisana w Qt5, przeznaczona do tworzenia schematów elektrycznych.
 Wykorzystuje XML do zapisywania plików elementów i projektów. Posiada edytor schematów i elementów.

 [it]
-QElectroTech è una applicazione fatta in Qt4 per disegnare schemi elettrici.
+QElectroTech è una applicazione fatta in Qt5 per disegnare schemi elettrici.
 QET usa il formato XML per i suoi elementi e schemi, includendo anche un editor per gli stessi.

 [el]
-Το QElectroTech είναι μια εφαρμογή Qt4 για σχεδίαση ηλεκτρικών διαγραμμάτων.
+Το QElectroTech είναι μια εφαρμογή Qt5 για σχεδίαση ηλεκτρικών διαγραμμάτων.
 Χρησιμοποιεί αρχεία XML για στοιχεία και διαγράμματα, και περιλαμβάνει επεξεργαστή διαγραμμάτων καθώς και επεξεργαστή στοιχείων.

 [nl]
-QElectroTech is een Qt4 applicatie om elektrische schema's te ontwerpen.
+QElectroTech is een Qt5 applicatie om elektrische schema's te ontwerpen.
 Het maakt gebruik van XML-bestanden voor elementen en diagrammen, en omvat zowel een diagram bewerker, een element bewerker, en een bloksjabloon bewerker.

 [be]
-QElectroTech is een QT4 toepassing voor het maken en beheren van elektrische schema's.
+QElectroTech is een Qt5 toepassing voor het maken en beheren van elektrische schema's.
 QET gebruikt XML voor de elementen en schema's en omvat een schematische editor, itemeditor, en een titel sjabloon editor.
--- 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/docs/Documentation.webloc
+++ b/docs/Documentation.webloc
--- 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 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="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 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"/>
-        <line 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 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 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 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 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 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"/>
+        <input x="3" y="-12.45" tagg="label" size="9" rotate="true" text="_"/>
+        <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 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 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 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 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 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"/>
-        <line 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 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" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="20" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="10" y="20" 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"/>
-        <line 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 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" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-10" 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"/>
-        <line 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 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" nameHidden="0" number="" name="" orientation="e"/>
+        <terminal x="10" y="-10" 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"/>
-        <line 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="-2" y="-34.45" tagg="label" size="9" rotate="true" text="_"/>
+        <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"/>
-        <terminal x="10" y="-20" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="0" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="20" nameHidden="0" number="" name="" orientation="e"/>
+        <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" orientation="e"/>
+        <terminal x="10" y="0" 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"/>
-        <line 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="3" y="-59.45" tagg="label" size="9" rotate="true" text="_"/>
+        <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 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="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"/>
-        <terminal x="10" y="-40" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="-20" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="0" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="20" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="40" nameHidden="0" number="" name="" orientation="e"/>
+        <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="-20" orientation="e"/>
+        <terminal x="10" y="-40" orientation="e"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="10" y="20" 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"/>
-        <line 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 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"/>
+        <input x="-7" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
+        <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"/>
+        <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"/>
-        <terminal x="10" y="-30" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="-10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="30" nameHidden="0" number="" name="" orientation="e"/>
+        <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" orientation="e"/>
+        <terminal x="10" y="-10" orientation="e"/>
+        <terminal x="10" y="10" 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="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"/>
-        <line 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 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"/>
+        <input x="-7" y="-44.45" tagg="label" size="9" rotate="true" text="_"/>
+        <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"/>
+        <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"/>
-        <terminal x="10" y="-30" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="-10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="30" nameHidden="0" number="" name="" orientation="e"/>
+        <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="10" orientation="e"/>
+        <terminal x="10" y="30" orientation="e"/>
+        <terminal x="10" y="-30" 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 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"/>
-        <line 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 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 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 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 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 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="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"/>
+        <input x="-17" y="-49.45" tagg="label" size="9" rotate="true" text="_"/>
+        <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 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 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 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 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 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 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 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 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="10" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10"/>
+        <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 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 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"/>
-        <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"/>
-        <terminal x="30" y="50" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="30" y="-30" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="30" y="-10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="30" y="10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="30" y="30" nameHidden="0" number="" name="" orientation="e"/>
+        <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" 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="-10" orientation="e"/>
+        <terminal x="30" y="10" orientation="e"/>
+        <terminal x="30" y="30" orientation="e"/>
+        <terminal x="30" y="50" 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="en">Ground</name>
-        <name lang="it">Terra</name>
-        <name lang="fr">Terre</name>
-        <name lang="pl">Uziemienie</name>
+        <name lang="el">Γείωση</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"/>
-        <line 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 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 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"/>
+        <input x="2" y="-11.5" tagg="label" size="9" rotate="true" text="_"/>
+        <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 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 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 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"/>
-        <terminal x="0" y="10" orientation="s"/>
-        <terminal x="-4" y="0" orientation="w"/>
-        <terminal x="10" y="0" orientation="e"/>
+        <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"/>
+        <input x="2" y="13.5" size="1" tagg="label" rotate="true" text="_"/>
+        <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 orientation="w" x="-4" y="0"/>
+        <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"/>
-        <terminal x="-4" y="0" orientation="w"/>
+        <input x="-0.5" y="-0.45" size="1" tagg="label" rotate="true" text="_"/>
+        <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"/>
-        <terminal x="0" y="4" orientation="s"/>
-        <terminal x="-4" y="0" orientation="w"/>
-        <terminal x="4" y="0" orientation="e"/>
-        <terminal x="0" y="-4" orientation="n"/>
+        <circle x="-1" y="-1" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="true" diameter="2"/>
+        <input x="-0.5" y="-4.45" size="1" tagg="label" rotate="true" text="_"/>
+        <terminal orientation="e" x="4" y="0"/>
+        <terminal orientation="s" x="0" y="4"/>
+        <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"/>
-        <terminal x="0" y="7" orientation="s"/>
-        <terminal x="0" y="-7" orientation="n"/>
+        <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"/>
+        <input x="1.5" y="-6.45" size="1" tagg="label" rotate="true" text="_"/>
+        <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"/>
-        <line 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"/>
-        <terminal x="0" y="10" orientation="s"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="4" y="0" orientation="e"/>
+        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
+        <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"/>
+        <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 orientation="s" x="0" y="10"/>
+        <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"/>
-        <line 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"/>
-        <terminal x="0" y="10" orientation="s"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="4" y="0" orientation="e"/>
+        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
+        <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"/>
+        <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 orientation="e" x="4" y="0"/>
+        <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"/>
-        <line 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 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"/>
-        <terminal x="0" y="10" orientation="s"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="10" y="0" orientation="e"/>
+        <input x="5.5" y="4.55" size="1" tagg="label" rotate="true" text="_"/>
+        <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 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"/>
+        <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 orientation="s" x="0" y="10"/>
+        <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"/>
-        <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 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"/>
-        <text x="50.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"/>
-        <line 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 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"/>
-        <text x="-8" y="9" size="4" text="1"/>
-        <input x="-41" y="1" size="5" rotate="true" text="+"/>
+        <text x="12" y="9" size="4" text="2"/>
+        <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 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="30.5" y="8.55" size="4" text="GNYE"/>
+        <input x="-68" y="17" tagg="none" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
+        <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 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="-28" y="9" size="4" text="1"/>
+        <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"/>
-        <text x="11" y="9" size="4" text="2"/>
-        <text x="32" 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 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"/>
-        <text x="52" y="9" size="4" text="GNYE"/>
-        <input x="-48" y="17" 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 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"/>
-        <text x="-8" y="9" size="4" text="1"/>
-        <input x="-41" y="1" size="5" rotate="true" text="+"/>
+        <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="-9" y="9" size="4" text="2"/>
+        <text x="12" y="9" size="4" text="3"/>
+        <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 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="32" y="9" size="4" text="GNYE"/>
+        <input x="-68" y="17" tagg="none" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
+        <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 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="-28" y="9" size="4" text="1"/>
+        <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"/>
-        <text x="12" y="9" size="4" text="2"/>
-        <text x="33" y="9" size="4" text="GNYE"/>
-        <input x="-48" y="17" 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 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 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"/>
-        <text x="-8" y="9" size="4" text="1"/>
-        <input x="-41" y="1" size="5" rotate="true" text="+"/>
+        <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="2" y="9" size="4" text="2"/>
+        <text x="23" y="9" size="4" text="GNYE"/>
+        <input x="-58" y="17" tagg="none" size="3" rotate="true" text="210007&#xa;4G1,5 mm²&#xa;               4m"/>
+        <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 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 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="-18" y="9" size="4" text="1"/>
+        <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="pl">Oznaczenie przewodu trójżyłowego</name>
+        <name lang="ru">Кабель 3 жилы</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"/>
-        <input x="-36" y="-6" size="7" rotate="true" text="-W?"/>
-        <input x="-56" y="4.5" size="5" rotate="true" text="ÖLFLEX 100"/>
+        <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" tagg="label" size="7" rotate="true" text="-W?"/>
+        <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"/>
-        <terminal x="-5" y="-10" orientation="w"/>
+        <ellipse width="50" x="-15" antialias="true" y="7.5" height="5" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <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="pl">Połączenie przewodu</name>
+        <name lang="ru">Жила кабеля</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 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"/>
-        <terminal x="0" y="-5" orientation="n"/>
+        <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"/>
+        <input x="1" y="-11.5" tagg="label" size="9" rotate="true" text="_"/>
+        <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="it">Conduttura</name>
-        <name lang="fr">Filerie</name>
+        <name lang="cs">Drátové propojení</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 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"/>
+        <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"/>
+        <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="_"/>
-        <text x="48" y="-3.6666" size="4" text="2"/>
-        <text x="30" y="0" size="6" text="mm"/>
+        <input x="-40" y="10" tagg="label" size="6" rotate="true" text="_"/>
+        <text x="8" y="6.3334" size="4" text="2"/>
+        <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 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"/>
-        <input x="-44" y="2" size="4" rotate="true" text="1,5 mm²&#xa; "/>
+        <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 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" 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 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 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"/>
-        <input x="-44" y="2" size="4" rotate="true" text="1,5 mm²&#xa; "/>
+        <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 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 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" 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 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 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"/>
-        <input x="-44" y="2" size="4" rotate="true" text="1,5 mm²&#xa; "/>
+        <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 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 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" 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 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 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 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"/>
-        <input x="-44" y="2" size="4" rotate="true" text="1,5 mm²&#xa; "/>
+        <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 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 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 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" tagg="label" size="4" rotate="true" text="1,5 mm²&#xa; "/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0101.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0101.elmt
@@ -0,0 +1,15 @@
+<definition height="80" hotspot_y="39" hotspot_x="17" version="0.5" orientation="dyyy" width="40" link_type="simple" type="element">
+    <uuid uuid="{9d2d8902-b36a-4974-b46d-4de6741f6b9b}"/>
+    <names>
+        <name lang="en">Terminal strip label</name>
+        <name lang="fr">Label de bornier</name>
+        <name lang="de">Klemmleisten-BMK</name>
+    </names>
+    <informations/>
+    <description>
+        <input tagg="label" x="1" rotation="270" y="21" rotate="true" text="_" size="11"/>
+        <rect height="71" x="-15" y="-35" style="line-style:normal;line-weight:hight;filling:none;color:black" antialias="false" width="30"/>
+        <line end1="none" length1="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" x2="20" antialias="false" y2="-30" x1="15" end2="none" length2="1.5" y1="-30"/>
+        <line end1="none" length1="1.5" style="line-style:normal;line-weight:hight;filling:none;color:black" x2="20" antialias="false" y2="30" x1="15" end2="none" length2="1.5" y1="30"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0111.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0111.elmt
@@ -0,0 +1,17 @@
+<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+    <uuid uuid="{2d155649-d0f5-419b-b94a-a13d3fcf38c7}"/>
+    <names>
+        <name lang="fr">Borne (continuité)</name>
+        <name lang="de">Klemme (Durchgang)</name>
+        <name lang="en">Terminal (feed-through)</name>
+    </names>
+    <informations/>
+    <description>
+        <input tagg="none" x="0" rotation="270" y="14" rotate="true" text="" size="9"/>
+        <rect height="80" x="-10" y="-40" style="line-style:normal;line-weight:hight;filling:none;color:black" antialias="false" width="20"/>
+        <rect height="24" x="-8" y="-12" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <circle x="-3" y="17" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="6" antialias="false"/>
+        <terminal x="0" y="-40" orientation="n"/>
+        <terminal x="0" y="40" orientation="s"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0121.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0121.elmt
@@ -0,0 +1,20 @@
+<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+    <uuid uuid="{da19301b-f6e7-478f-a6dd-eb72e497883b}"/>
+    <names>
+        <name lang="fr">Borne (terre)</name>
+        <name lang="de">Klemme (Erdung)</name>
+        <name lang="en">Terminal (Grounding)</name>
+    </names>
+    <informations/>
+    <description>
+        <input tagg="none" x="0" rotation="270" y="14" rotate="true" text="" size="9"/>
+        <rect height="80" x="-10" y="-40" style="line-style:normal;line-weight:hight;filling:none;color:black" antialias="false" width="20"/>
+        <rect height="24" x="-8" y="-12" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <line end1="none" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="1" antialias="false" y2="25" x1="-1" end2="none" length2="1.5" y1="25"/>
+        <line end1="none" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="3" antialias="false" y2="23" x1="-3" end2="none" length2="1.5" y1="23"/>
+        <line end1="none" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="5" antialias="false" y2="21" x1="-5" end2="none" length2="1.5" y1="21"/>
+        <line end1="none" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="0" antialias="false" y2="16" x1="0" end2="none" length2="1.5" y1="21"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="0" y="-40" orientation="n"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0501.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0501.elmt
@@ -0,0 +1,14 @@
+<definition height="10" hotspot_y="5" hotspot_x="5" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+    <uuid uuid="{9a3ee0a0-5a0e-4f0c-93dd-396ddc3d7f11}"/>
+    <names>
+        <name lang="de">Einlegebrücke</name>
+        <name lang="fr">Barette de pontage</name>
+        <name lang="en">Insertion bridge</name>
+    </names>
+    <informations/>
+    <description>
+        <circle x="18" y="-2" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="4" antialias="false"/>
+        <circle x="-2" y="-2" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="4" antialias="false"/>
+        <rect height="2" x="0" y="-1" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" width="20"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0901.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-10-0901.elmt
@@ -0,0 +1,164 @@
+<definition height="90" hotspot_y="44" hotspot_x="15" version="0.5" orientation="dyyy" width="510" link_type="simple" type="element">
+    <uuid uuid="{c17e98a3-738f-4c7a-ac89-91bb4c08fb45}"/>
+    <names>
+        <name lang="fr">Connecteur 25 fiches</name>
+        <name lang="en">Connector 25 pins</name>
+        <name lang="de">Stecker 25-polig</name>
+    </names>
+    <informations/>
+    <description>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="66" x1="50" x7="66" x2="54" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="70" x4="57" y4="5" x3="54" x5="63"/>
+        <text x="264" rotation="270" y="-3" text="14" size="9"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="466" x1="450" x7="466" x2="454" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="470" x4="457" y4="5" x3="454" x5="463"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="306" x1="290" x7="306" x2="294" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="310" x4="297" y4="5" x3="294" x5="303"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="146" x1="130" x7="146" x2="134" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="150" x4="137" y4="5" x3="134" x5="143"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="106" x1="90" x7="106" x2="94" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="110" x4="97" y4="5" x3="94" x5="103"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="26" x1="10" x7="26" x2="14" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="30" x4="17" y4="5" x3="14" x5="23"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="186" x1="170" x7="186" x2="174" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="190" x4="177" y4="5" x3="174" x5="183"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="226" x1="210" x7="226" x2="214" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="230" x4="217" y4="5" x3="214" x5="223"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="86" x1="70" x7="86" x2="74" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="90" x4="77" y4="5" x3="74" x5="83"/>
+        <text x="344" rotation="270" y="-3" text="18" size="9"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="46" x1="30" x7="46" x2="34" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="50" x4="37" y4="5" x3="34" x5="43"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="386" x1="370" x7="386" x2="374" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="390" x4="377" y4="5" x3="374" x5="383"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="266" x1="250" x7="266" x2="254" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="270" x4="257" y4="5" x3="254" x5="263"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="166" x1="150" x7="166" x2="154" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="170" x4="157" y4="5" x3="154" x5="163"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="426" x1="410" x7="426" x2="414" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="430" x4="417" y4="5" x3="414" x5="423"/>
+        <text x="64" rotation="270" y="-6" text="4" size="9"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="246" x1="230" x7="246" x2="234" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="250" x4="237" y4="5" x3="234" x5="243"/>
+        <text x="104" rotation="270" y="-6" text="6" size="9"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="126" x1="110" x7="126" x2="114" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="130" x4="117" y4="5" x3="114" x5="123"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="406" x1="390" x7="406" x2="394" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="410" x4="397" y4="5" x3="394" x5="403"/>
+        <text x="24" rotation="270" y="-6" text="2" size="9"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="346" x1="330" x7="346" x2="334" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="350" x4="337" y4="5" x3="334" x5="343"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="206" x1="190" x7="206" x2="194" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="210" x4="197" y4="5" x3="194" x5="203"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="366" x1="350" x7="366" x2="354" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="370" x4="357" y4="5" x3="354" x5="363"/>
+        <input tagg="none" x="0" rotation="270" y="2" rotate="true" text="" size="9"/>
+        <text x="184" rotation="270" y="-3" text="10" size="9"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="326" x1="310" x7="326" x2="314" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="330" x4="317" y4="5" x3="314" x5="323"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="486" x1="470" x7="486" x2="474" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="490" x4="477" y4="5" x3="474" x5="483"/>
+        <text x="424" rotation="270" y="-3" text="22" size="9"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="446" x1="430" x7="446" x2="434" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="450" x4="437" y4="5" x3="434" x5="443"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="286" x1="270" x7="286" x2="274" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="290" x4="277" y4="5" x3="274" x5="283"/>
+        <text x="484" rotation="270" y="-4" text="PE" size="9"/>
+        <rect height="24" x="12" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <text x="44" rotation="270" y="-6" text="3" size="9"/>
+        <text x="144" rotation="270" y="-6" text="8" size="9"/>
+        <rect height="24" x="472" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <text x="464" rotation="270" y="-3" text="24" size="9"/>
+        <text x="384" rotation="270" y="-3" text="20" size="9"/>
+        <text x="304" rotation="270" y="-3" text="16" size="9"/>
+        <text x="224" rotation="270" y="-3" text="12" size="9"/>
+        <text x="364" rotation="270" y="-3" text="19" size="9"/>
+        <text x="444" rotation="270" y="-3" text="23" size="9"/>
+        <text x="204" rotation="270" y="-3" text="11" size="9"/>
+        <text x="284" rotation="270" y="-3" text="15" size="9"/>
+        <rect height="24" x="-8" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <text x="124" rotation="270" y="-6" text="7" size="9"/>
+        <rect height="24" x="52" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="22" x1="10" x7="22" x2="18" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="30" x4="19" y4="8" x3="18" x5="21"/>
+        <text x="244" rotation="270" y="-3" text="13" size="9"/>
+        <rect height="24" x="92" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <text x="164" rotation="270" y="-6" text="9" size="9"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="482" x1="470" x7="482" x2="478" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="490" x4="479" y4="8" x3="478" x5="481"/>
+        <text x="404" rotation="270" y="-3" text="21" size="9"/>
+        <text x="324" rotation="270" y="-3" text="17" size="9"/>
+        <text x="84" rotation="270" y="-6" text="5" size="9"/>
+        <rect height="24" x="32" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="62" x1="50" x7="62" x2="58" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="70" x4="59" y4="8" x3="58" x5="61"/>
+        <rect height="24" x="332" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="132" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="172" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="2" x1="-10" x7="2" x2="-2" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="10" x4="-1" y4="8" x3="-2" x5="1"/>
+        <rect height="24" x="72" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="42" x1="30" x7="42" x2="38" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="50" x4="39" y4="8" x3="38" x5="41"/>
+        <rect height="24" x="212" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="102" x1="90" x7="102" x2="98" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="110" x4="99" y4="8" x3="98" x5="101"/>
+        <rect height="24" x="372" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="312" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="152" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="112" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="142" x1="130" x7="142" x2="138" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="150" x4="139" y4="8" x3="138" x5="141"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="182" x1="170" x7="182" x2="178" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="190" x4="179" y4="8" x3="178" x5="181"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="342" x1="330" x7="342" x2="338" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="350" x4="339" y4="8" x3="338" x5="341"/>
+        <rect height="24" x="412" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="252" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="82" x1="70" x7="82" x2="78" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="90" x4="79" y4="8" x3="78" x5="81"/>
+        <rect height="24" x="192" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="122" x1="110" x7="122" x2="118" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="130" x4="119" y4="8" x3="118" x5="121"/>
+        <rect height="24" x="352" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="452" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="292" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="382" x1="370" x7="382" x2="378" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="390" x4="379" y4="8" x3="378" x5="381"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="222" x1="210" x7="222" x2="218" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="230" x4="219" y4="8" x3="218" x5="221"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="162" x1="150" x7="162" x2="158" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="170" x4="159" y4="8" x3="158" x5="161"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="322" x1="310" x7="322" x2="318" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="330" x4="319" y4="8" x3="318" x5="321"/>
+        <rect height="24" x="392" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="232" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="202" x1="190" x7="202" x2="198" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="210" x4="199" y4="8" x3="198" x5="201"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="362" x1="350" x7="362" x2="358" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="370" x4="359" y4="8" x3="358" x5="361"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="422" x1="410" x7="422" x2="418" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="430" x4="419" y4="8" x3="418" x5="421"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="262" x1="250" x7="262" x2="258" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="270" x4="259" y4="8" x3="258" x5="261"/>
+        <rect height="24" x="432" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="24" x="272" y="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" width="16"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="302" x1="290" x7="302" x2="298" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="310" x4="299" y4="8" x3="298" x5="301"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="462" x1="450" x7="462" x2="458" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="470" x4="459" y4="8" x3="458" x5="461"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="242" x1="230" x7="242" x2="238" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="250" x4="239" y4="8" x3="238" x5="241"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="402" x1="390" x7="402" x2="398" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="410" x4="399" y4="8" x3="398" x5="401"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="282" x1="270" x7="282" x2="278" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="290" x4="279" y4="8" x3="278" x5="281"/>
+        <polygon y3="10" y2="22" antialias="false" y8="22" y6="10" closed="false" x6="442" x1="430" x7="442" x2="438" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="22" y7="22" y5="8" x8="450" x4="439" y4="8" x3="438" x5="441"/>
+        <polygon y4="22" x4="490" style="line-style:normal;line-weight:hight;filling:none;color:black" x2="-10" x3="490" antialias="false" y2="40" closed="false" x1="-10" y1="22" y3="40"/>
+        <polygon y4="18" x4="490" style="line-style:normal;line-weight:hight;filling:none;color:black" x2="-10" x3="490" antialias="false" y2="-40" closed="false" x1="-10" y1="18" y3="-40"/>
+        <text x="4" rotation="270" y="-6" text="1" size="9"/>
+        <polygon y3="10" y2="18" antialias="false" y8="18" y6="10" closed="false" x6="6" x1="-10" x7="6" x2="-6" style="line-style:normal;line-weight:hight;filling:none;color:black" y1="18" y7="18" y5="5" x8="10" x4="-3" y4="5" x3="-6" x5="3"/>
+        <terminal x="180" y="-40" orientation="n"/>
+        <terminal x="0" y="-40" orientation="n"/>
+        <terminal x="460" y="-40" orientation="n"/>
+        <terminal x="80" y="-40" orientation="n"/>
+        <terminal x="240" y="-40" orientation="n"/>
+        <terminal x="40" y="-40" orientation="n"/>
+        <terminal x="400" y="-40" orientation="n"/>
+        <terminal x="160" y="40" orientation="s"/>
+        <terminal x="20" y="40" orientation="s"/>
+        <terminal x="100" y="-40" orientation="n"/>
+        <terminal x="20" y="-40" orientation="n"/>
+        <terminal x="360" y="40" orientation="s"/>
+        <terminal x="420" y="-40" orientation="n"/>
+        <terminal x="40" y="40" orientation="s"/>
+        <terminal x="340" y="-40" orientation="n"/>
+        <terminal x="260" y="40" orientation="s"/>
+        <terminal x="380" y="40" orientation="s"/>
+        <terminal x="460" y="40" orientation="s"/>
+        <terminal x="440" y="-40" orientation="n"/>
+        <terminal x="380" y="-40" orientation="n"/>
+        <terminal x="320" y="-40" orientation="n"/>
+        <terminal x="280" y="40" orientation="s"/>
+        <terminal x="440" y="40" orientation="s"/>
+        <terminal x="140" y="40" orientation="s"/>
+        <terminal x="280" y="-40" orientation="n"/>
+        <terminal x="160" y="-40" orientation="n"/>
+        <terminal x="420" y="40" orientation="s"/>
+        <terminal x="100" y="40" orientation="s"/>
+        <terminal x="200" y="-40" orientation="n"/>
+        <terminal x="240" y="40" orientation="s"/>
+        <terminal x="120" y="40" orientation="s"/>
+        <terminal x="480" y="40" orientation="s"/>
+        <terminal x="120" y="-40" orientation="n"/>
+        <terminal x="300" y="40" orientation="s"/>
+        <terminal x="260" y="-40" orientation="n"/>
+        <terminal x="320" y="40" orientation="s"/>
+        <terminal x="360" y="-40" orientation="n"/>
+        <terminal x="200" y="40" orientation="s"/>
+        <terminal x="340" y="40" orientation="s"/>
+        <terminal x="300" y="-40" orientation="n"/>
+        <terminal x="140" y="-40" orientation="n"/>
+        <terminal x="400" y="40" orientation="s"/>
+        <terminal x="220" y="40" orientation="s"/>
+        <terminal x="180" y="40" orientation="s"/>
+        <terminal x="220" y="-40" orientation="n"/>
+        <terminal x="60" y="-40" orientation="n"/>
+        <terminal x="60" y="40" orientation="s"/>
+        <terminal x="0" y="40" orientation="s"/>
+        <terminal x="480" y="-40" orientation="n"/>
+        <terminal x="80" y="40" orientation="s"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-20-0001.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-20-0001.elmt
@@ -0,0 +1,16 @@
+<definition height="80" hotspot_y="67" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+    <uuid uuid="{116e1210-b7f9-4737-a94f-1034ecb45cc4}"/>
+    <names>
+        <name lang="fr">Appareil (connexion en bas)</name>
+        <name lang="de">Gerät (Anschluss unten)</name>
+        <name lang="en">Device (connection on bottom)</name>
+    </names>
+    <informations/>
+    <description>
+        <input tagg="none" x="0" rotation="270" y="2" rotate="true" text="_" size="6"/>
+        <input tagg="none" x="0" rotation="270" y="-20" rotate="true" text="-" size="9"/>
+        <rect height="60" x="-10" y="-60" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="20"/>
+        <line end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false" y2="4" x1="0" end2="none" length2="1.5" y1="0"/>
+        <terminal x="0" y="4" orientation="s"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-20-0002.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-20-0002.elmt
@@ -0,0 +1,16 @@
+<definition height="80" hotspot_y="13" hotspot_x="15" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+    <uuid uuid="{e396fc1b-28d7-4978-879a-9b666a2648d3}"/>
+    <names>
+        <name lang="fr">Appareil (connexion en bas)</name>
+        <name lang="de">Gerät (Anschluss unten)</name>
+        <name lang="en">Device (connection on bottom)</name>
+    </names>
+    <informations/>
+    <description>
+        <input tagg="none" x="0" rotation="270" y="15" rotate="true" text="_" size="6"/>
+        <input tagg="none" x="0" rotation="270" y="60" rotate="true" text="-" size="9"/>
+        <rect height="60" x="-10" y="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="20"/>
+        <line end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false" y2="0" x1="0" end2="none" length2="1.5" y1="-4"/>
+        <terminal x="0" y="-4" orientation="n"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-30-0001.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-30-0001.elmt
@@ -0,0 +1,17 @@
+<definition height="70" hotspot_y="34" hotspot_x="4" version="0.5" orientation="dyyy" width="10" link_type="simple" type="element">
+    <uuid uuid="{2ac227dc-33a0-49f5-b8a0-b834d9386b60}"/>
+    <names>
+        <name lang="de">Kabel Bezeichnungsschild</name>
+        <name lang="fr">Cable etiquette</name>
+        <name lang="en">Cable tag</name>
+    </names>
+    <informations/>
+    <description>
+        <input tagg="none" x="20" rotation="270" y="30" rotate="true" text="?m" size="6"/>
+        <input tagg="label" x="-9" rotation="270" y="30" rotate="true" text="-W" size="11"/>
+        <line end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false" y2="30" x1="0" end2="none" length2="1.5" y1="-30"/>
+        <input tagg="none" x="9" rotation="270" y="30" rotate="true" text="Cable type" size="6"/>
+        <terminal x="0" y="30" orientation="s"/>
+        <terminal x="0" y="-30" orientation="n"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-30-0010.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-30-0010.elmt
@@ -0,0 +1,13 @@
+<definition height="20" hotspot_y="12" hotspot_x="4" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+    <uuid uuid="{ce9e32d1-edd6-4bf2-a6f4-a519b878d80d}"/>
+    <names>
+        <name lang="de">Kabel Ader nach oben</name>
+        <name lang="en">Cable wire towards top</name>
+        <name lang="fr">Cable brin vers le haut</name>
+    </names>
+    <informations/>
+    <description>
+        <polygon y4="-5" x4="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" x3="20" antialias="false" y2="0" closed="false" x5="20" x1="0" y1="0" y5="-5" y3="-5"/>
+        <terminal x="20" y="-5" orientation="n"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-30-0011.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/90-30-0011.elmt
@@ -0,0 +1,13 @@
+<definition height="20" hotspot_y="6" hotspot_x="4" version="0.5" orientation="dyyy" width="30" link_type="simple" type="element">
+    <uuid uuid="{2935f975-67f8-4e41-ad18-7fbb24e67465}"/>
+    <names>
+        <name lang="de">Kabel Ader nach unten</name>
+        <name lang="en">Cable wire towards bottom</name>
+        <name lang="fr">Cable brin vers le bas</name>
+    </names>
+    <informations/>
+    <description>
+        <polygon y4="5" x4="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" x3="20" antialias="false" y2="0" closed="false" x5="20" x1="0" y1="0" y5="5" y3="5"/>
+        <terminal x="20" y="5" orientation="s"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/borne_bornier.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/borne_bornier.elmt
@@ -0,0 +1,24 @@
+<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="es">Terminal</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" tagg="label" size="6" rotate="true" text="(0000)"/>
+        <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" tagg="none" size="9" rotate="true" text="00"/>
+        <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 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 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/90_terminal_strips_diagram/borne_bornier_fusible.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/borne_bornier_fusible.elmt
@@ -0,0 +1,26 @@
+<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="es">Terminal fusible</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 x="-3" width="6" antialias="false" y="-5" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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" tagg="label" size="6" rotate="true" text="(0000)"/>
+        <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" tagg="none" size="9" rotate="true" text="00"/>
+        <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 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/90_terminal_strips_diagram/qet_directory
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/qet_directory
@@ -0,0 +1,7 @@
+<qet-directory>
+    <names>
+        <name lang="fr">Plans de borniers</name>
+        <name lang="de">Klemmenanschlusspläne</name>
+        <name lang="en">Terminal strips diagram</name>
+    </names>
+</qet-directory>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/repartiteur.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/repartiteur.elmt
@@ -0,0 +1,44 @@
+<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="fr">Répartiteur</name>
+    </names>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <rect x="-16" width="42" antialias="false" y="4" height="12" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <input x="27" y="10.6667" tagg="label" size="9" text="XR_"/>
+        <circle x="19.5" antialias="true" y="9.5" diameter="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"/>
+        <circle x="-0.5" antialias="true" y="9.5" diameter="1" 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"/>
+        <circle x="-10.5" antialias="true" y="9.5" diameter="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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 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 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 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 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 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 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="17.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="7.5" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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="0" orientation="n"/>
+        <terminal x="-10" y="20" orientation="s"/>
+        <terminal x="0" y="0" orientation="n"/>
+        <terminal x="0" y="20" orientation="s"/>
+        <terminal x="10" y="0" orientation="n"/>
+        <terminal x="10" y="20" orientation="s"/>
+        <terminal x="20" y="0" orientation="n"/>
+        <terminal x="20" y="20" orientation="s"/>
+    </description>
+</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/terminal_12g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/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/90_terminal_strips_diagram/terminal_19g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/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/90_terminal_strips_diagram/terminal_3g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/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/90_terminal_strips_diagram/terminal_4g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/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/90_terminal_strips_diagram/terminal_5g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/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/90_terminal_strips_diagram/terminal_7g1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/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/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"/>
-        <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 length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="0" y2="10" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-20" x2="0"/>
-        <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"/>
+        <input x="8" y="0.55" 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"/>
+        <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 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"/>
+        <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"/>
-        <circle x="-5" y="9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <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"/>
-        <line 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 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 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"/>
-        <terminal x="0" y="-32" orientation="n"/>
+        <input x="13" y="-19.45" tagg="label" size="9" rotate="true" text="_"/>
+        <circle x="-5" antialias="true" y="-19" diameter="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-5" antialias="true" y="9" diameter="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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"/>
+        <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"/>
+        <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"/>
+        <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 +0,0 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="80" type="element" orientation="dnnn">
-    <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>
-    </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)"/>
-        <line 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"/>
-        <input x="-10" y="-18" 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 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"/>
-        <rect width="20" x="-10" y="-30" antialias="false" 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 +0,0 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="80" type="element" orientation="dnnn">
-    <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>
-    </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"/>
-        <line 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"/>
-        <rect width="20" x="-10" y="-30" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-14" y="-42" 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"/>
-        <input x="-10" y="-18" 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 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"/>
-    </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_"/>
-        <rect width="6" x="-3" y="17" antialias="false" 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="8" size="7" text="_"/>
-        <input x="5" y="55" size="10" text="_"/>
-        <input x="5" y="-5" 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 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 length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-3" x2="0"/>
-        <circle x="-2.5" y="57.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"/>
+        <input x="10" y="24.6667" tagg="label" size="9" rotate="true" text="F_"/>
+        <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" tagg="none" size="7" text="_"/>
+        <input x="5" y="8" tagg="none" size="7" text="_"/>
+        <input x="5" y="55" tagg="none" size="10" text="_"/>
+        <input x="5" y="-5" tagg="none" size="10" text="_"/>
+        <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 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 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" antialias="true" y="57.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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,237 +0,0 @@
-<definition width="110" version="0.3" hotspot_x="55" hotspot_y="155" height="220" type="element" orientation="dyyy">
-    <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>
-    </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"/>
-        <line 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"/>
-        <rect width="34" x="-11" y="-133" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-133" x1="-18" y2="-133" x2="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="30" x1="-19" y2="30" x2="-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="-50" x1="-19" y2="-50" x2="-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="-90" x1="-19" y2="-90" x2="-21"/>
-        <input x="30" y="-131.333" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-129.333" 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"/>
-        <line 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"/>
-        <input x="-40" y="-131.333" 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="35" x2="-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="-53" x1="-18" y2="-45" x2="-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="-113" x1="-18" y2="-105" x2="-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="-93" x1="-18" y2="-85" x2="-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="-125" x1="-18" y2="-125" x2="22"/>
-        <rect width="34" x="-11" y="27" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="34" x="-11" y="-53" antialias="false" 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 width="34" x="-11" y="-93" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-9" y="-138.333" 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="-53" x2="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="27" x1="-18" y2="27" x2="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="-93" x1="-18" y2="-93" x2="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="-113" x1="-18" y2="-113" x2="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="-140" x1="-19" y2="-140" x2="-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="-10" x1="-19" y2="-10" x2="-21"/>
-        <input x="30" y="-111.333" size="4" rotate="true" text="_"/>
-        <input x="30" y="-91.333" size="4" rotate="true" text="_"/>
-        <input x="30" y="-51.333" size="4" rotate="true" text="_"/>
-        <input x="-40" y="-141.333" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-89.333" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-109.333" size="4" rotate="true" text="_"/>
-        <input x="30" y="28.667" size="4" rotate="true" text="_"/>
-        <input x="-9" y="30.667" size="4" rotate="true" text="_"/>
-        <input x="30" y="-141.333" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-49.333" 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"/>
-        <line 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 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 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 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 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"/>
-        <input x="-40" y="-111.333" size="4" rotate="true" text="_"/>
-        <rect width="34" x="-11" y="-143" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="50" x1="-19" y2="50" x2="-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="-105" x1="-18" y2="-105" x2="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="-30" x1="-19" y2="-30" x2="-21"/>
-        <input x="-40" y="-91.333" 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="-143" x1="-18" y2="-143" x2="22"/>
-        <input x="-40" y="28.667" size="4" rotate="true" text="_"/>
-        <input x="-40" y="-51.333" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-118.333" 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"/>
-        <line 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 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 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 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 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 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"/>
-        <input x="-40" y="-121.333" size="4" rotate="true" text="_"/>
-        <rect width="34" x="-11" y="-73" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-18" y2="-5" x2="-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="35" x1="-18" y2="35" x2="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="-45" x1="-18" y2="-45" x2="22"/>
-        <input x="30" y="-121.333" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-98.333" 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"/>
-        <line 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"/>
-        <rect width="34" x="-11" y="47" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="34" x="-11" y="-33" antialias="false" 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"/>
-        <line 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 width="34" x="-11" y="-123" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="30" y="-71.333" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-58.333" size="4" rotate="true" text="_"/>
-        <input x="-9" y="21.667" 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"/>
-        <line 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"/>
-        <input x="-40" y="-101.333" 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="-120" x1="26" y2="-120" x2="24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="47" x1="-18" y2="47" x2="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="-33" x1="-18" y2="-33" x2="22"/>
-        <input x="-9" y="-69.333" 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="-115" x1="-18" y2="-115" x2="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="-60" x1="-19" y2="-60" x2="-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="20" x1="-19" y2="20" x2="-21"/>
-        <input x="30" y="-101.333" size="4" rotate="true" text="_"/>
-        <input x="30" y="48.667" size="4" rotate="true" text="_"/>
-        <input x="30" y="-31.333" 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="-11.333" 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="-95" x2="-18"/>
-        <input x="-40" y="-61.333" size="4" rotate="true" text="_"/>
-        <input x="-40" y="-71.333" size="4" rotate="true" text="_"/>
-        <input x="-40" y="18.667" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-9.333" 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="50.667" 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="-65" x1="-18" y2="-65" x2="22"/>
-        <input x="-9" y="-29.333" size="4" rotate="true" text="_"/>
-        <input x="30" y="-61.333" size="4" rotate="true" text="_"/>
-        <input x="30" y="18.667" 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"/>
-        <line 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 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"/>
-        <input x="-9" y="-78.333" 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="-100" x1="26" y2="-100" x2="24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="26" y2="-10" x2="24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-19" y2="10" x2="-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="-80" x1="-19" y2="-80" x2="-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="-63" x1="-18" y2="-55" x2="-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="-95" x1="-18" y2="-95" x2="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="17" x1="-18" y2="25" x2="-18"/>
-        <input x="-40" y="-31.333" size="4" rotate="true" text="_"/>
-        <input x="-40" y="-81.333" size="4" rotate="true" text="_"/>
-        <input x="-40" y="48.667" 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"/>
-        <rect width="34" x="-11" y="-63" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="30" y="-81.333" 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="-83" x1="-18" y2="-75" x2="-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="-25" x1="-18" y2="-25" x2="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="55" x1="-18" y2="55" x2="22"/>
-        <rect width="34" x="-11" y="-83" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-40" y="-11.333" 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="-63" x1="-18" y2="-63" x2="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="17" x1="-18" y2="17" x2="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="-83" x1="-18" y2="-83" x2="22"/>
-        <input x="-9" y="-38.333" size="4" rotate="true" text="_"/>
-        <input x="-9" y="41.667" 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"/>
-        <line 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 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 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 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 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 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 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 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 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"/>
-        <input x="-40" y="-41.333" size="4" rotate="true" text="_"/>
-        <input x="-40" y="38.667" 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="30" y="-41.333" size="4" rotate="true" text="_"/>
-        <input x="30" y="38.667" size="4" rotate="true" text="_"/>
-        <input x="-9" y="-18.333" 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"/>
-        <line 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 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 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"/>
-        <rect width="34" x="-11" y="-43" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="34" x="-11" y="37" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="30" y="8.667" 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="37" x2="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="-43" x1="-18" y2="-43" x2="22"/>
-        <input x="-40" y="-21.333" 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 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="-9" y="10.667" 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="-35" x1="-18" y2="-35" x2="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="45" x1="-18" y2="45" x2="22"/>
-        <input x="30" y="-21.333" 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 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"/>
-        <input x="-40" y="8.667" size="4" rotate="true" text="_"/>
-        <rect width="34" x="-11" y="-23" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-18" y2="15" x2="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="-23" x1="-18" y2="-23" x2="22"/>
-        <input x="-9" y="1.667" 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="-20" x1="26" y2="-20" x2="24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-19" y2="0" x2="-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="-15" x1="-18" y2="-15" x2="22"/>
-        <input x="-40" y="-1.333" size="4" rotate="true" text="_"/>
-        <input x="30" y="-1.333" 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"/>
-        <rect width="34" x="-11" y="-3" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-18" y2="-3" x2="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="0" x1="26" y2="0" x2="24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-18" y2="5" x2="22"/>
-        <terminal x="-50" y="-100" orientation="w"/>
-        <terminal x="50" y="-130" orientation="e"/>
-        <terminal x="50" y="-90" orientation="e"/>
-        <terminal x="-50" y="-110" orientation="w"/>
-        <terminal x="-50" y="-70" orientation="w"/>
-        <terminal x="50" y="-100" orientation="e"/>
-        <terminal x="-50" y="-10" orientation="w"/>
-        <terminal x="-50" y="-130" orientation="w"/>
-        <terminal x="-50" y="-60" orientation="w"/>
-        <terminal x="-50" y="-80" orientation="w"/>
-        <terminal x="-50" y="-40" orientation="w"/>
-        <terminal x="-50" y="-120" orientation="w"/>
-        <terminal x="50" y="-70" orientation="e"/>
-        <terminal x="50" y="-20" orientation="e"/>
-        <terminal x="50" y="-120" orientation="e"/>
-        <terminal x="50" y="-60" orientation="e"/>
-        <terminal x="-50" y="-50" orientation="w"/>
-        <terminal x="50" y="-110" orientation="e"/>
-        <terminal x="-50" y="-20" orientation="w"/>
-        <terminal x="-50" y="10" orientation="w"/>
-        <terminal x="-50" y="-90" orientation="w"/>
-        <terminal x="-50" y="-30" orientation="w"/>
-        <terminal x="50" y="-40" orientation="e"/>
-        <terminal x="50" y="0" orientation="e"/>
-        <terminal x="50" y="-30" orientation="e"/>
-        <terminal x="50" y="10" orientation="e"/>
-        <terminal x="50" y="-50" orientation="e"/>
-        <terminal x="50" y="-10" orientation="e"/>
-        <terminal x="-50" y="-140" orientation="w"/>
-        <terminal x="50" y="-140" orientation="e"/>
-        <terminal x="50" y="-80" orientation="e"/>
-        <terminal x="-50" y="0" orientation="w"/>
-        <terminal x="50" y="30" orientation="e"/>
-        <terminal x="-50" y="50" orientation="w"/>
-        <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="it">Morsettiera 3P+N+PE</name>
-        <name lang="fr">Bornier 3P+N+PE</name>
+        <name lang="cs">Svorková lišta 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="70" y="-1" size="6" rotation="270" text="N"/>
-        <input x="50" y="-1" size="6" rotation="270" text="L3"/>
-        <input x="10" y="-1" size="6" rotation="270" text="L1"/>
-        <input x="90" y="-1" size="6" rotation="270" 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="10" x1="60" y2="3" x2="60"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="80" y2="3" x2="80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="40" y2="3" x2="40"/>
-        <input x="-21" y="-6.5" 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 length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="3" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="40" y2="-3" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="80" y2="-3" x2="80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="20" y2="3" x2="20"/>
-        <circle x="57.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-3" x2="0"/>
-        <circle x="77.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="37.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-3" x2="20"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <input x="30" y="-1" tagg="none" size="6" text="L2" rotation="270"/>
+        <input x="70" y="-1" tagg="none" size="6" text="N" rotation="270"/>
+        <input x="50" y="-1" tagg="none" size="6" text="L3" rotation="270"/>
+        <input x="10" y="-1" tagg="none" size="6" text="L1" rotation="270"/>
+        <input x="90" y="-1" tagg="none" size="6" text="PE" rotation="270"/>
+        <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 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 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" tagg="label" size="9" text="X?"/>
+        <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 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 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 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 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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="37.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 +0,0 @@
-<definition width="130" version="0.3" hotspot_x="15" hotspot_y="35" height="60" type="element" orientation="dyyy">
-    <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>
-    </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 width="20" x="70" y="-30" antialias="false" 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"/>
-        <input x="92" y="-19" size="8" rotate="true" text="6"/>
-        <input x="72" y="-19" size="8" rotate="true" text="5"/>
-        <rect width="20" x="50" y="-30" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="30" y="-30" antialias="false" 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"/>
-        <input x="52" y="-19" size="8" rotate="true" text="4"/>
-        <input x="32" y="-19" size="8" rotate="true" text="3"/>
-        <input x="12" y="-19" size="8" rotate="true" text="2"/>
-        <input x="-8" y="-19" 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"/>
-    </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 +0,0 @@
-<definition width="50" version="0.3" hotspot_x="0" hotspot_y="20" height="20" type="element" orientation="dyyy">
-    <names>
-        <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"/>
-        <input x="47" y="-9.3333" 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"/>
-        <ellipse width="1" x="29.5" y="-10.5" antialias="true" height="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="7.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <ellipse width="1" x="9.5" y="-10.5" antialias="true" height="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 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 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 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 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 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 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 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"/>
-        <circle x="37.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="27.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="17.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="10" y="-20" orientation="n"/>
-        <terminal x="10" y="0" orientation="s"/>
-        <terminal x="20" y="-20" orientation="n"/>
-        <terminal x="20" y="0" orientation="s"/>
-        <terminal x="30" y="-20" orientation="n"/>
-        <terminal x="30" y="0" orientation="s"/>
-        <terminal x="40" y="-20" orientation="n"/>
-        <terminal x="40" y="0" 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/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">
-    <names>
-        <name lang="ar">موصل أنثوي</name>
-        <name lang="de">Steckverbindung Buchse</name>
-        <name lang="ru">Гнездо (нов.)</name>
-        <name lang="pt">Conector fêmea</name>
+<definition type="element" link_type="simple" hotspot_x="5" hotspot_y="18" orientation="dyyy" version="0.5" width="10" height="30">
+<uuid uuid="{315322F0-8C5C-48CA-8825-1B90F4053902}"/><names>
        <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"/>
-        <line 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"/>
-        <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 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"/>
+        <input x="4" tagg="label" y="-7.5" size="8" rotate="true" text="_"/>
+        <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 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 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">
-    <names>
-        <name lang="ar">موصل ذكري</name>
-        <name lang="de">Steckverbindung Stecker</name>
-        <name lang="ru">Штырь (нов.)</name>
-        <name lang="pt">Conector macho</name>
+<definition type="element" link_type="simple" hotspot_x="4" hotspot_y="13" orientation="dyyy" version="0.5" width="10" height="30">
+<uuid uuid="{9016050F-26E2-4F2B-8EED-9BDBCF8BE98E}"/><names>
        <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 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 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"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <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 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 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"/>
+        <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">
-    <names>
-        <name lang="ar">موصل</name>
-        <name lang="de">Steckverbindung Buchse + Stecker</name>
-        <name lang="ru">Соединение (нов.)</name>
-        <name lang="pt">Conector</name>
+<definition type="element" link_type="simple" hotspot_x="5" hotspot_y="19" orientation="dyyy" version="0.5" width="10" height="50">
+<uuid uuid="{6B7F5E99-EF67-4D6A-AA1B-4C373960C9F6}"/><names>
        <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"/>
-        <line 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 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 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 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"/>
-        <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 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"/>
+        <input x="4" tagg="label" y="-5.5" size="8" rotate="true" text="_"/>
+        <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 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 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 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 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 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">
-    <names>
-        <name lang="el">17 ακροδεκτών</name>
+<definition type="element" link_type="simple" hotspot_x="45" hotspot_y="45" orientation="dyyy" version="0.5" width="90" height="90">
+<uuid uuid="{5CF8F597-642C-40B0-8416-1A4DFC9F5231}"/><names>
        <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">
-    <names>
-        <name lang="de">Rundstecker 22-polig</name>
+<definition type="element" link_type="simple" hotspot_x="45" hotspot_y="45" orientation="dyyy" version="0.5" width="90" height="90">
+<uuid uuid="{9EE4C06A-364C-474F-8EBB-CBA4A9DBD89F}"/><names>
        <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"/>
-        <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"/>
-        <rect width="20" x="-10" y="-1.5" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
+        <input x="18" y="15.55" tagg="label" size="9" rotate="true" text="_"/>
+        <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"/>
+        <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"/>
-        <circle x="-2.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="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-20"/>
+        <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" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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"/>
-        <circle x="-2.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="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-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"/>
-        <circle x="-17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="12.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="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 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" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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 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 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 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"/>
-        <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="-12.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <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" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-12.5" y="7.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"/>
+        <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 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"/>
+        <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 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" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" 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="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"/>
-        <line 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 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 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"/>
-        <circle x="-2.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="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-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"/>
-        <line 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"/>
-        <circle x="-17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="12.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <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" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <input x="13" y="20.55" tagg="label" size="9" rotate="true" text="_"/>
+        <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 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 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 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" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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="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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" 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 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 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 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"/>
-        <circle x="-2.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="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-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"/>
-        <circle x="-17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="12.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <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" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="-26" y="0" orientation="w"/>
+        <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 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 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 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" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" 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="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"/>
-        <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 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="_"/>
+        <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 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 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 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" 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="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-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="7.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <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" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="-26" y="10" orientation="w"/>
+        <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 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 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" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" 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="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"/>
-        <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 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"/>
+        <input x="8" y="20.55" tagg="label" size="9" rotate="true" text="_"/>
+        <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 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 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" 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="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-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="7.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <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" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="-26" y="10" orientation="w"/>
+        <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 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 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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" 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="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 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 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 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 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"/>
-        <circle x="-2.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="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-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"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="25" y2="-10" x2="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="0" x1="25" y2="0" x2="18"/>
-        <circle x="-17.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="12.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <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" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-25" y2="-10" x2="-13"/>
-        <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" 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="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"/>
+        <input x="13" y="20.55" tagg="label" size="9" rotate="true" text="_"/>
+        <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 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 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 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" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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="-2.5" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" 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"/>
+        <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="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" 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 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"/>
-        <line 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 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"/>
-        <circle x="2.5" y="-1.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="-20" x1="-2" y2="-16" x2="-2" y3="-16" x3="2" y4="-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"/>
+        <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" 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" 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 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 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" antialias="true" y="-1.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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"/>
-        <line 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 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"/>
-        <circle x="-17.5791" y="-1.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="12.5" y="-1.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="2.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-7.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-25" y2="-10" x2="-15"/>
-        <circle x="9.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-14.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="-26" y="1" orientation="w"/>
-        <terminal x="-10" y="31" orientation="s"/>
+        <circle x="-2.5" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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 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" antialias="true" y="-1.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-7.5" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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="-10" orientation="e"/>
+        <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="it">Encoder maschio 17 Pin</name>
-        <name lang="fr">Fiche codeur 17 broches</name>
+        <name lang="cs">Zástrčka kodéru 17 kolíků</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"/>
-        <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"/>
-        <circle x="8.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-16.5" y="25.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"/>
-        <circle x="-27.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="22.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="10.5" y="-9.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-32.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="24.5" y="12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-14.5" y="-9.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-2.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-28.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"/>
-        <circle x="-17.5" y="-29.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-13.5" y="7.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <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" y="-29.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <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="28.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="7.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-17.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-2.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-9.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="12.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="-29.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" antialias="true" y="25.5" diameter="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <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" 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/Show More
+++ b/Show More