Tag de la version 0.70-RC1

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/tags/0.70rc1@5833 bfdf4180-ca20-0410-9c96-a3a8aa849046
2025-12-17 20:50:34 +01:00 · 2019-04-12 04:31:32 +00:00
4422 changed files with 77156 additions and 372837 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +0,0 @@
-*.snap
-.flatpak-builder
--- a/117
+++ b/117
@@ -1,75 +1,3 @@
-====== ChangeLog from 0.7 to 0.8 ======
-
-* Element editor :
-* with Ctrl key you can moving by keyboard primitives selected by 0.1 point instead by 1 points, added the same feature for moving the selected aera.
-* Improve polygon widget editor on elements editor.
-
-* Diagram editor :
-* User can choose now folio list emplacement in project by select position number in settings :
-1 for the first position
-2 for the second position
-etc
-0 for always at the end of project
-Because index folio is 0 and not 1 we apply -1 in formula to not complicate your life..
-
-
-
-
-
-* macOS :
-* Add Fusion style and fix tilesets tab bar size
-* Enable mouse wheel on tilesets tab bar with command keyboard, thanks Giovanni.
-(removed by Qt upstream) https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=commitdiff;h=ea47d152b35158ba07a55d009f57df0e4c2a048f;hp=08cc9b9991ae9ab51bed5b857b6257401401ff6f
-
-
-
-* For the Flatpak package : remove the file name extension added
-automatically to the saved files even if the user sets an unknown file
-extension for the program.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ====== ChangeLog from 0.6 to 0.7 ======


@@ -82,7 +10,6 @@ extension for the program.
 * Alignment of text field can be edited.
 * Added two new actions in context menu for insert or remove point of a selected polygon.
 * Rectangle can have rounded corner.
-* Polyline: finish the creation of polyline with the last point at the same position of the first point, close the polyline.


 * Diagram editor :
@@ -120,36 +47,13 @@ This commit fix it : When element is removed one or several conductors are creat
 * Added 4 tools for edit the depth (Z value) of items.
 * Element panel : elements can be searched by their name but also with by all their informations.
 * New free selection style.
-* Diagram editor : dock used to edit the shape item, can now edit several items in the same time.
-* Dynamic element text item : The font of the dynamic texts can be individually be setted.

-* Adding or revoming diagram set project to modified
-* When user cleanning an project, set project to modified
-* Add a shortcut "Ctrl+Shift+P" to quickly open the dialog used for create the auto numbering rules.
-* Add missing StatusTip of some QAction
-
-* When user add a polygon, a message in statusBar show how to finish this shape
-* Polyline: finish the creation of polyline with the last point at the same position of the first point, close the polyline.
-
-
-
-* Plug-in : Add StatusTip instruction for install and launching DXF plugin depending on the operating system
-* when plugin qet-tb-generator"generate terminal blocks and connectors" isn't installed show an QMessageBox instruction now depending on the operating system for install it 
-Add in QMessageBox url encoding/decoding for easy download packages
-
-* Elementspanelwidget: adds keyboard shortcuts to quickly move up, down,or move the targeted folio to the beginning of the project
-F3 MoveUp
-F4 MoveDown
-F5 MoveUpTop

 * Title block editor :
 Added new title block variables %projectpath, %projectfilename, %projecttitle, previous-folio-num and next-folio-num
 "%saveddate, %savedtime, %savedfilename and %savedfilepath" they variables should be updated after file save or save as dialog is confirmed,
 before file is saved.
 * NameList widget : add a combo box for easily paste texts, like the variables for title block.
-*  The font of the dynamic text field can be edited.
-* The font of the static text field can be edited.
-* The color of the static text field can be edited.



@@ -160,8 +64,6 @@ If not a file dialog is showed to select the QET project.


 * QET create a backup file, use to restore the project when a crash occur.
-* Use KAutoSaveFile for the backup system, instead of home made function.
-* Use of QSAveFile instead a QFile.
 * User can enable and edit autosave timer.
 * let user define the file system path of the common,custom elements collections, and custom title blocks template.

@@ -169,7 +71,6 @@ If not a file dialog is showed to select the QET project.
 * QetGraphicsItem, remove the function applyRotation and rotateBy, and use instead the native function of QGraphicsItem : setRotation
 * Conductor is an herited class of QGraphicsObject, instead of QObject and QGraphicsPathItem
 * Clean (and reduce the size) the class QETDiagramEditor, mostly by replacing the connection syntax "signal -> slot" by "signal -> lambda".
-* Replace deprecated QMatrix by QTransform.


 * DXF export : fix some double items in dxf file.
@@ -192,19 +93,8 @@ clear the element texts when paste an element with the option "Do not store the
 * Fix : in some condition, dynamic text are not at the same position when open a project.
 * On windows when user drag and drop an element from the common elements collection to the custom elements collection,
 the element file stay in read only mode, and so user can't save the element
-* Improvement : minimize the unwanted gap of the top right folio of the view (see https://qelectrotech.org/forum/viewtopic.php?pid=9379#p9379)
-* Fix: bug 168
-* Fix : when create multiple conductors with the free hand selection, the checking of existing potentiel don't search trought a folio report.
-* Fix:  DXF export.
-* Minor fix : remove from the element information the html hexadecimal and decimal characters of line feed and carriage return.
-* fix : in the diagram editor, when we select several shapes at the same time, the properties widget only apply the change to one shape.
-* Bug fix : when user load a project which contains summary pages, project was marked modified (summary was created on the fly and moved from the end on second
-position), now the project is no longer marked as amended when user have one or multiples summary pages when loading this project.
-* Static text of element are now exported to dxf
-* Fix Static text size of element exported to dxf
-* Improvement : minimize the unwanted gap of the top right folio of the view
-* Fix : when create multiple conductors with the free hand selection, the checking of existing potentiel don't search trought a folio report.
-* Don't display gui when qet is launched with specific argument
+
+



@@ -481,5 +371,4 @@ Le dialogue "Exporter" (pour générer un fichier image d'un schéma) a égaleme
  * Affinage du constructeur de la classe QETApp
  * Moins d'avertissements à la compilation (testé avec gcc 4.3)
  * Moins d'inclusions non pertinentes
-
-  
+  * Nettoyage du trunk : déplacement des sources dans un sous-répertoire
--- a/4
+++ b/4
@@ -31,7 +31,7 @@ PROJECT_NAME           = QElectroTech
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.

-PROJECT_NUMBER         = 0.70
+PROJECT_NUMBER         = 0.3a

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -124,7 +124,7 @@ FULL_PATH_NAMES        = NO
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.

-STRIP_FROM_PATH        = /home/laurent/Qet-svn/git/qet/
+STRIP_FROM_PATH        = /home/xavier/projets/qet/qelectrotech/

 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
--- a/README.md
+++ b/README.md
@@ -1,178 +0,0 @@
-![](logo.png)
-
-
-# QElectroTech
-
-### What it is
-
-QElectroTech, or QET in short, is a libre and open source desktop application to create diagrams and schematics.  
-The software is primarily intended to create electrical documentation but it can also be used to draw any kinds of diagrams, such as those made in pneumatics, hydraulics, process industries, electronics...  
-Generally speaking, QET is a **CAD/CAE editor focusing on schematics drawing features**.  
-
-This means that there are no embedded simulating or calculating functionalities and it is not planned to implement them.
-
-The main goal of the developers is to provide a libre, easy to use and effective software for **schematics drawing purposes**.
-
-### Version
-
-The current stable version is 0.70 and was released on 2019.07.13.  
-Once it has been officialy released, the stable version is always frozen and is no longer developed.
-
-New functionalities, bug and issue fixings are further made in the development version (currently 0.8), which can also be [downloaded](https://qelectrotech.org/download.html).
-
-Users who want to test and take benefits from the last software implementations should use the development version. But... use it at your own risk, since things are sometimes broken or only partialy implemented until they are done!
-
-### License
-
-The software is licensed under [GNU/GPL](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html).  
-You are free to use, copy, modify and redistribute it under the terms of the license.
-
-
-Like many other open source softwares, QElectroTech is provided as it is, without any warranty.
-
-### Development / technical choices
-
-The development follows the classical way of free and open source software: the source code, written by a community of users, is freely accessible.
-
-Here are the technical choices made for the software development:
-
-*   Integrated development environment: [Qt Framework](https://www.qt.io/ide/)
-*   Libraries: Qt 5.x
-*   [KF5 Framework](https://github.com/KDE)  
-    [Cmake](https://cmake.org/install/)   
-    [kcoreaddons](https://github.com/KDE/kcoreaddons)   
-    [kwidgetsaddons](https://github.com/KDE/kwidgetsaddons).  
-*   Coding language: [C++](https://en.wikipedia.org/wiki/C%2B%2B)
-*   GUI translations: [Qt Linguist](http://doc.qt.io/qt-5/qtlinguist-index.html)
-*   Version control: [GIT](https://git.tuxfamily.org/qet/qet.git/)
-*   File format for projects, elements and titleblocks: [XML](http://www.w3schools.com/xml/xml_whatis.asp)
-*   Main development platform: [GNU/Linux](http://getgnulinux.org/en/linux/)
-*   Targeted platforms: Windows, GNU/Linux, Mac OS X, BSDs
-*   [Forum](https://qelectrotech.org/forum/index.php)
-*   [Wiki](https://qelectrotech.org/wiki_new/)
-*   [Mantis_bugtracker](https://qelectrotech.org/bugtracker/my_view_page.php)
-
-If you wish to be informed of the latest developments, browse the [archive](https://listengine.tuxfamily.org/lists.tuxfamily.org/qet/) of the project mailing list where all commits (changes) are registered. This archive is publicly available, you don't need any account to access it.
-
-
-# Features
-
-QElectroTech is a free and open source software.  
-No need to worry about restrictive licensing, privacy violation or dependency on a company.  
-Zero cost and no licensing fees!  
-But you are welcome to make a donation to support the development
-
-QElectroTech runs on the 3 most widespread operating systems for desktop computers in the world.  
-Files that were created on an OS can be edited on another OS without any conversion or restriction.  
-MS Windows users can even run the "ready-to-use" version of QElectroTech from an external medium with no need to install it on an access restricted computer.
-
-
-Take advantage of the modern GUI
-
-Toolbars and panels can be enabled/disabled, moved and displayed the way you want to work.  
-Panels can be stacked on each other (as tabs) or docked on the sides (as docks) or completely separated from the main window (as windows).  
-The GUI can fit to small or big screens, and even to multi-display configurations.
-![](https://download.tuxfamily.org/qet/images-features/0030.png "GUI overview")
-
-
-The GUI of QElectroTech is translated in 19 languages.  
-You only need to restart the application for the new selected language to take effect.
-![](https://download.tuxfamily.org/qet/images-features/0040.png "Lang menu")
-
-Create technical documentation in professional quality
-
-Size, look and informations of the folios (sheets) are fully configurable.  
-You can set vertical and horizontal headers (printed rulers) individually on and off, set number of columns and rows, and set width/height of each column/row.
-
-Titlebocks can be created and edited with the embedded titleblock editor to perfectly suit your needs.  
-Custom variables can be defined to display the informations you wish in the titleblock.
-![](https://download.tuxfamily.org/qet/images-features/0055.png "Titleblock editor")
-
-With only 2 mouse clicks you can add a full automatic generated table of content.  
-Changes in the documentation are updated on the fly.
-![](https://download.tuxfamily.org/qet/images-features/0060.png "Table of content")
-
-Choose from more than 7.000 symbols...
-The embedded QET collection contains a rich library of electric, logic, pneumatic, hydraulic and fluid symbols.  
-The library grows at every new release thanks to an active user community.
-![](https://download.tuxfamily.org/qet/images-features/0070.png "Collections")
-
-...or create your own collection
-
-The embedded element editor is a nice tool to create your own elements (symbols or anything else).  
-Your own elements are stored in the user collection.
-![](https://download.tuxfamily.org/qet/images-features/0080.png "Element editor")
-
-Quickly find what you need
-
-All collections can quickly be searched with the integrated search engine.  
-Furthermore, the search request can be restricted to the folder of your choice.
-![](https://download.tuxfamily.org/qet/images-features/0090.png "Search engine")
-
-Easily draw complex schematics
-
-To add an element on the drawing area, it only needs a drag & drop from the collection panel.
-![](https://download.tuxfamily.org/qet/images-features/0102.png "Drag and drop")
-
-Elements are automatically connected if they are aligned, or connected from point to point by pulling a conductor with the mouse.
-![](https://download.tuxfamily.org/qet/images-features/0105.png "Conductor connections")
-
-The path of every conductor can be modified by moving its handles with the mouse.
-![](https://download.tuxfamily.org/qet/images-features/0107.png "Conductor handles")
-And of course, you can accurately zoom with the mouse wheel over the drawing area to catch the smallest details.
-
-Link elements together to create cross references
-
-Several types of element can be linked together to display a cross reference text.  
-All types of cross references are automatically updated on the fly, you don't need to think about them if you make changes.
-![](https://download.tuxfamily.org/qet/images-features/0112.png "Cross ref elements")
-To speed up your work, linkable elements are easily searched and shown.
-![](https://download.tuxfamily.org/qet/images-features/0115.png  "Cross ref search")
-
-
-Export informations to a parts list
-Informations of all elements in the project can be exported to a .csv file that can be read and edited by any spreadsheet application.
-![](https://download.tuxfamily.org/qet/images-features/0122.png "Element informations")
-
-This way, you can make your own parts list or bill of material using the full power of a spreadsheet program.
-![](https://download.tuxfamily.org/qet/images-features/0125.png "Spreadsheet")
-Print to pdf and/or export your work to images
-
-Your whole documentation or only selected parts of it can be printed to a real printer or to a pdf file.  
-Alternatively, you can export to vector (svg) or pixel (png, jpg, bmp) format images.
-
-### And much more:
-
-*   open and edit several projects at the same time
-*   import images (.bmp, .jpg, .png, .svg) in your diagrams
-*   add basic shapes (lines, rectangles, ellipses, polygons) to your drawings
-*   edit the thickness, the line style and the color of conductors
-*   define some autonum patterns for conductors, symbols and folios
-*   take advantage of the open xml standard of elements and projects to create custom tools
-*   search and replace Widget (Ctrl + F) in entire project
-*   conductors num can be exported to csv file.
-*   ***
-
-### Story
-
-The QElectroTech project was founded in 2007 by two french students, Xavier and Benoit.  
-Xavier developed the base application itself and made all technical choices about the development.  
-The first version of QET (0.1) was released on 09.03.2008.  
-However, both Xavier and Benoit do not participate anymore in the project since 2013.
-
-Following this period, new developers and contributors took over the project and kept it alive.  
-The development and the many translations are actively maintained.  
-New functionalities and evolutions are planned to make QET ever better.
-
-Nowadays, QET is not only used by many individuals, teachers and students but also by professional electricians and companies all over the world.
-
-  
-### Donate Money
-
-If you love QElectroTech, you can help developers to buy new hardware to test
-and implement new features. Thanks in advance for your generous donations.
-
-For more information, look at [Paypal](https://www.paypal.com/donate/?token=rqf80cP0Ck1F2jn4Y46G7tIPv9bq7x0crXkwt3GZ6OZYG6ihJYi8lZxmmQ8itsFwMUdd1G&country.x=GB&locale.x=GB)  
-or at [leetchi.com](https://www.leetchi.com/c/qelectroteck)
-
-
--- a/SingleApplication/CHANGELOG.md
+++ b/SingleApplication/CHANGELOG.md
@@ -1,54 +1,6 @@
 Changelog
 =========

-__3.0.18__
----------
-
-* Fallback to standard QApplication class on iOS and Android systems where
-  the library is not supported.
-  
-* Added Build CI tests to verify the library builds successfully on Linux, Windows and MacOS  across multiple Qt versions.
-
-  _Anton Filimonov_
-
-__3.0.17__
----------
-
-* Fixed compilation warning/error caused by `geteuid()` on unix based systems.
-
-   _Iakov Kirilenko_
-
-* Added CMake support
-
-   _Hennadii Chernyshchyk_
-
-__3.0.16__
----------
-
-* Use geteuid and getpwuid to get username on Unix, fallback to environment variable.
-
-   _Jonas Kvinge_
-
-__3.0.15__
----------
-
-* Bug Fix: sendMessage() might return false even though data was actually written.
-
-   _Jonas Kvinge_
-
-__3.0.14__
----------
-
-* Fixed uninitialised variables in the `SingleApplicationPrivate` constructor.
-
-__3.0.13a__
----------
-
-* Process socket events asynchronously
-* Fix undefined variable error on Windows
-
-   _Francis Giraldeau_
-
 __3.0.12a__
 ----------

@@ -161,7 +113,7 @@ __3.0.1a__
 __v3.0a__
 ---------

-*   Deprecated secondary instances count.
+*   Depricated secondary instances count.
 *   Added a sendMessage() method to send a message to the primary instance.
 *   Added a receivedMessage() signal, emitted when a message is received from a
    secondary instance.
--- a/SingleApplication/CMakeLists.txt
+++ b/SingleApplication/CMakeLists.txt
@@ -1,43 +0,0 @@
-cmake_minimum_required(VERSION 3.1.0)
-
-project(SingleApplication)
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-
-# SingleApplication base class
-set(QAPPLICATION_CLASS QCoreApplication CACHE STRING "Inheritance class for SingleApplication")
-set_property(CACHE QAPPLICATION_CLASS PROPERTY STRINGS QApplication QGuiApplication QCoreApplication)
-
-# Libary target
-add_library(${PROJECT_NAME} STATIC
-    singleapplication.cpp
-    singleapplication_p.cpp
-    )
-
-# Find dependencies
-find_package(Qt5Network)
-if(QAPPLICATION_CLASS STREQUAL QApplication)
-    find_package(Qt5 COMPONENTS Widgets REQUIRED)
-elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
-    find_package(Qt5 COMPONENTS Gui REQUIRED)
-else()
-    find_package(Qt5 COMPONENTS Core REQUIRED)
-endif()
-add_compile_definitions(QAPPLICATION_CLASS=${QAPPLICATION_CLASS})
-
-# Link dependencies
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Network)
-if(QAPPLICATION_CLASS STREQUAL QApplication)
-    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets)
-elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication)
-    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Gui)
-else()
-    target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core)
-endif()
-
-if(WIN32)
-    target_link_libraries(${PROJECT_NAME} PRIVATE advapi32)
-endif()
-
-target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
--- a/SingleApplication/README.md
+++ b/SingleApplication/README.md
@@ -50,27 +50,15 @@ how:
 git submodule add git@github.com:itay-grudev/SingleApplication.git singleapplication
 ```

-**Qmake:**
-
-Then include the `singleapplication.pri` file in your `.pro` project file.
+Then include the `singleapplication.pri` file in your `.pro` project file. Also
+don't forget to specify which `QCoreApplication` class your app is using if it
+is not `QCoreApplication`.

 ```qmake
 include(singleapplication/singleapplication.pri)
 DEFINES += QAPPLICATION_CLASS=QApplication
 ```

-**CMake:**
-
-Then include the subdirectory in your `CMakeLists.txt` project file.
-
-```cmake
-set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication")
-add_subdirectory(src/third-party/singleapplication)
-```
-
-Also don't forget to specify which `QCoreApplication` class your app is using if it
-is not `QCoreApplication` as in examples above.
-
 The `Instance Started` signal
 ------------------------

--- a/SingleApplication/Windows.md
+++ b/SingleApplication/Windows.md
@@ -24,7 +24,7 @@ Here is an example:
 ```cpp
 if( app.isSecondary() ) {
    // This API requires LIBS += User32.lib to be added to the project
-    AllowSetForegroundWindow( DWORD( app.primaryPid() ) );
+    AllowSetForegroundWindow( DWORD( app.getPrimaryPid() ) );
 }

 if( app.isPrimary() ) {
--- a/SingleApplication/examples/basic/basic.pro
+++ b/SingleApplication/examples/basic/basic.pro
--- a/SingleApplication/examples/basic/main.cpp
+++ b/SingleApplication/examples/basic/main.cpp
--- a/SingleApplication/examples/sending_arguments/main.cpp
+++ b/SingleApplication/examples/sending_arguments/main.cpp
--- a/SingleApplication/examples/sending_arguments/sending_arguments.pro
+++ b/SingleApplication/examples/sending_arguments/sending_arguments.pro
--- a/SingleApplication/singleapplication.cpp
+++ b/SingleApplication/singleapplication.cpp
@@ -25,10 +25,7 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QByteArray>
 #include <QtCore/QSharedMemory>
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
-#else
-#include <QRandomGenerator>
-#endif
+
 #include "singleapplication.h"
 #include "singleapplication_p.h"

@@ -44,13 +41,6 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
 {
    Q_D(SingleApplication);

-#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
-    // On Android and iOS since the library is not supported fallback to
-    // standard QApplication behaviour by simply returning at this point.
-    qWarning() << "SingleApplication is not supported on Android and iOS systems.";
-    return;
-#endif
-
    // Store the current mode of the program
    d->options = options;

@@ -85,7 +75,7 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
    }

    InstancesInfo* inst = static_cast<InstancesInfo*>( d->memory->data() );
-    QElapsedTimer time;
+    QTime time;
    time.start();

    // Make sure the shared memory block is initialised and in consistent state
@@ -102,13 +92,8 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
        d->memory->unlock();

        // Random sleep here limits the probability of a collision between two racing apps
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)	// ### Qt 6: remove
        qsrand( QDateTime::currentMSecsSinceEpoch() % std::numeric_limits<uint>::max() );
        QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( qrand() ) / RAND_MAX * 10 ) );
-#else
-	quint32 value = QRandomGenerator::global()->generate();
-        QThread::sleep( 8 + static_cast <unsigned long>( static_cast <float>( value ) / RAND_MAX * 10 ) );
-#endif
    }

    if( inst->primary == false) {
@@ -183,7 +168,7 @@ bool SingleApplication::sendMessage( QByteArray message, int timeout )
    d->connectToPrimary( timeout,  SingleApplicationPrivate::Reconnect );

    d->socket->write( message );
-    bool dataWritten = d->socket->waitForBytesWritten( timeout );
-    d->socket->flush();
+    bool dataWritten = d->socket->flush();
+    d->socket->waitForBytesWritten( timeout );
    return dataWritten;
 }
--- a/SingleApplication/singleapplication.h
+++ b/SingleApplication/singleapplication.h
@@ -25,7 +25,6 @@

 #include <QtCore/QtGlobal>
 #include <QtNetwork/QLocalSocket>
-#include <QElapsedTimer>

 #ifndef QAPPLICATION_CLASS
  #define QAPPLICATION_CLASS QCoreApplication
@@ -36,7 +35,7 @@
 class SingleApplicationPrivate;

 /**
- * @brief The SingleApplication class handles multiple instances of the same
+ * @brief The SingleApplication class handles multipe instances of the same
 * Application
 * @see QCoreApplication
 */
@@ -75,7 +74,7 @@ public:
     * if there is already a primary instance.
     * @arg {Mode} mode - Whether for the SingleApplication block to be applied
     * User wide or System wide.
-     * @arg {int} timeout - Timeout to wait in milliseconds.
+     * @arg {int} timeout - Timeout to wait in miliseconds.
     * @note argc and argv may be changed as Qt removes arguments that it
     * recognizes
     * @note Mode::SecondaryNotification only works if set on both the primary
--- a/SingleApplication/singleapplication_p.cpp
+++ b/SingleApplication/singleapplication_p.cpp
@@ -33,8 +33,11 @@
 #include <cstddef>

 #include <QtCore/QDir>
+#include <QtCore/QProcess>
 #include <QtCore/QByteArray>
+#include <QtCore/QSemaphore>
 #include <QtCore/QDataStream>
+#include <QtCore/QStandardPaths>
 #include <QtCore/QCryptographicHash>
 #include <QtNetwork/QLocalServer>
 #include <QtNetwork/QLocalSocket>
@@ -42,12 +45,6 @@
 #include "singleapplication.h"
 #include "singleapplication_p.h"

-#ifdef Q_OS_UNIX
-    #include <unistd.h>
-    #include <sys/types.h>
-    #include <pwd.h>
-#endif
-
 #ifdef Q_OS_WIN
    #include <windows.h>
    #include <lmcons.h>
@@ -58,8 +55,6 @@ SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr )
 {
    server = nullptr;
    socket = nullptr;
-    memory = nullptr;
-    instanceNumber = -1;
 }

 SingleApplicationPrivate::~SingleApplicationPrivate()
@@ -112,20 +107,22 @@ void SingleApplicationPrivate::genBlockServerName()
        if( GetUserNameW( username, &usernameLength ) ) {
            appData.addData( QString::fromWCharArray(username).toUtf8() );
        } else {
-            appData.addData( qgetenv("USERNAME") );
+            appData.addData( QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).join("").toUtf8() );
        }
 #endif
 #ifdef Q_OS_UNIX
-        QByteArray username;
-        uid_t uid = geteuid();
-        struct passwd *pw = getpwuid(uid);
-        if( pw ) {
-            username = pw->pw_name;
+        QProcess process;
+        process.start( "whoami" );
+        if( process.waitForFinished( 100 ) &&
+            process.exitCode() == QProcess::NormalExit) {
+            appData.addData( process.readLine() );
+        } else {
+            appData.addData(
+                QDir(
+                    QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).first()
+                ).absolutePath().toUtf8()
+            );
        }
-        if( username.isEmpty() ) {
-            username = qgetenv("USER");
-        }
-        appData.addData(username);
 #endif
    }

@@ -388,7 +385,8 @@ void SingleApplicationPrivate::readInitMessageBody( QLocalSocket *sock )
    }

    if (sock->bytesAvailable() > 0) {
-        Q_EMIT this->slotDataAvailable( sock, instanceId );
+			//This line crash
+        //Q_EMIT this->slotDataAvailable( sock, instanceId );
    }
 }

--- a/build-aux/flatpak/org.qelectrotech.QElectroTech.json
+++ b/build-aux/flatpak/org.qelectrotech.QElectroTech.json
@@ -1,37 +0,0 @@
-{
-  "id": "org.qelectrotech.QElectroTech",
-  "runtime": "org.kde.Platform",
-  "runtime-version": "5.14",
-  "sdk": "org.kde.Sdk",
-  "command": "qelectrotech",
-  "rename-desktop-file": "qelectrotech.desktop",
-  "rename-appdata-file": "qelectrotech.appdata.xml",
-  "rename-icon": "qelectrotech",
-  "copy-icon": true,
-  "finish-args": [
-    "--socket=wayland",
-    "--socket=x11",
-    "--device=dri",
-    "--share=ipc",
-    "--filesystem=host"
-  ],
-  "modules": [
-    {
-      "name": "qelectrotech",
-      "buildsystem": "qmake",
-      "post-install": [
-        "mv /app/share/mime/packages/qelectrotech.xml /app/share/mime/packages/org.qelectrotech.QElectroTech.xml"
-      ],
-      "sources": [
-        {
-          "type": "dir",
-          "path": "../.."
-        },
-        {
-          "type": "patch",
-          "path": "patches/0001-build-Fix-the-installation-paths.patch"
-        }
-      ]
-    }
-  ]
-}
--- a/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch
+++ b/build-aux/flatpak/patches/0001-build-Fix-the-installation-paths.patch
@@ -1,44 +0,0 @@
-From 579ee22f1d2bef560ec90d324a0e476b81faf495 Mon Sep 17 00:00:00 2001
-From: Mathieu Bridon <mathieu@hashbang.fr>
-Date: Tue, 7 Jan 2020 14:39:08 +0100
-Subject: [PATCH] build: Fix the installation paths
-
---
- qelectrotech.pro | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/qelectrotech.pro b/qelectrotech.pro
-index 07e51fb..2a86b91 100644
--- a/qelectrotech.pro
-+++ b/qelectrotech.pro
-@@ -5,20 +5,20 @@
- # Chemins utilises pour la compilation et l'installation de QET
- unix {
- 	# Chemins UNIX
-	COMPIL_PREFIX              = '/usr/local/'
-	INSTALL_PREFIX             = '/usr/local/'
-+	COMPIL_PREFIX              = '/app/'
-+	INSTALL_PREFIX             = '/app/'
- 	QET_BINARY_PATH            = 'bin/'
- 	QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
- 	QET_COMMON_TBT_PATH        = 'share/qelectrotech/titleblocks/'
- 	QET_LANG_PATH              = 'share/qelectrotech/lang/'
- 	QET_EXAMPLES_PATH          = 'share/qelectrotech/examples/'
-	QET_LICENSE_PATH           = 'doc/qelectrotech/'
-	QET_MIME_XML_PATH          = '../share/mime/application/'
-	QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
-	QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
-+	QET_LICENSE_PATH           = 'share/doc/qelectrotech/'
-+	QET_MIME_XML_PATH          = 'share/mime/application/'
-+	QET_MIME_DESKTOP_PATH      = 'share/mimelnk/application/'
-+	QET_MIME_PACKAGE_PATH      = 'share/mime/packages/'
- 	QET_DESKTOP_PATH           = 'share/applications/'
- 	QET_ICONS_PATH             = 'share/icons/hicolor/'
-	QET_MAN_PATH               = 'man/'
-+	QET_MAN_PATH               = 'share/man/'
- 	QET_APPDATA_PATH           = 'share/appdata'
- }
- win32 {
-- 
-2.24.1
-
--- a/build-aux/snap/local/launchers/qelectrotech-launch
+++ b/build-aux/snap/local/launchers/qelectrotech-launch
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# a KDE session forces the KDE Plasma platformtheme which is incompatible with QET
-# unset the ENV vars in that case to prevent loading of the theme
-if [ ! -z "$KDE_FULL_SESSION" ]; then
-  unset KDE_FULL_SESSION
-fi
-
-if echo "$XDG_CURRENT_DESKTOP" | grep -q KDE; then
-  unset XDG_CURRENT_DESKTOP
-fi
-
-# migrate .qet directory from SNAP_USER_DATA to SNAP_USER_COMMON
-from="$SNAP_USER_DATA/.qet"
-to="$SNAP_USER_COMMON/.qet"
-if [ ! -d "$to" ] && [ -d "$from" ]; then
-  echo "Migrating user data from $from to $to"
-  mkdir "$to"
-  cp -av "$from/." "$to"
-fi
-
-# link DXFtoQET so that QET finds it
-mkdir -p "$HOME/.qet"
-ln -snf "$SNAP/bin/DXFtoQET" "$HOME/.qet/DXFtoQET"
-
-# start desktop portal. Open & save dialogs might fail if it is not running
-dbus-send --print-reply \
-  --dest=org.freedesktop.DBus \
-  /org/freedesktop/DBus \
-  org.freedesktop.DBus.StartServiceByName \
-  string:org.freedesktop.portal.Desktop \
-  uint32:0
-
-exec "${@}"
--- a/build-aux/snap/snapcraft.yaml
+++ b/build-aux/snap/snapcraft.yaml
@@ -1,122 +0,0 @@
-name: qelectrotech
-title: QElectroTech
-base: core18
-adopt-info: qelectrotech
-license: GPL-2.0
-summary: Electrical diagram editor
-description: |
-  QElectroTech, or QET in short, is a libre and open source desktop application 
-  to create diagrams and schematics.
-
-grade: stable
-confinement: strict
-
-architectures:
-  - build-on: amd64
-    run-on: amd64
-
-layout:
-  /usr/local/share/qelectrotech:
-    symlink: $SNAP/usr/local/share/qelectrotech
-  /usr/share/libdrm/amdgpu.ids:
-    symlink: $SNAP/kf5/usr/share/libdrm/amdgpu.ids
-
-apps:
-  qelectrotech:
-    command: usr/local/bin/qelectrotech
-    command-chain:
-      - bin/qelectrotech-launch
-    desktop: usr/local/share/applications/qelectrotech.desktop
-    extensions: [kde-neon]
-    plugs: &plugs [opengl, unity7, home, removable-media, gsettings, network, cups-control]
-    environment: &env
-      __EGL_VENDOR_LIBRARY_DIRS: $SNAP/kf5/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
-      TCL_LIBRARY: $SNAP/usr/share/tcltk/tcl8.6
-      QT_QPA_PLATFORMTHEME: gtk3
-      QT_AUTO_SCREEN_SCALE_FACTOR: 1
-      HOME: $SNAP_USER_COMMON
-      PYTHONPATH: $SNAP:$SNAP/lib/python3.6/site-packages:$SNAP/usr/lib/python3.6:$SNAP/usr/lib/python3.6/lib-dynload
-
-  qet-tb-generator:
-    command: bin/qelectrotech-launch $SNAP/bin/qet_tb_generator
-    extensions: [kde-neon]
-    plugs: *plugs
-    environment: *env
-      
-  dxf-to-qet:
-    command: bin/DXFtoQET
-    extensions: [kde-neon]
-    plugs: *plugs
-    environment: *env
-
-parts:
-  launchers:
-    plugin: dump
-    source: build-aux/snap/local/launchers
-    organize:
-      '*': bin/
-
-  qet-tb-generator:
-    plugin: python
-    python-version: python3
-    source: https://github.com/qelectrotech/qet_tb_generator.git
-    stage-packages: 
-      - python3-lxml
-      - python3-tk
-      - libtk8.6
-
-  kde-sdk-setup:
-    plugin: nil
-    build-snaps:
-      - kde-frameworks-5-core18-sdk
-    build-packages:
-      - g++
-      - mesa-common-dev
-      - libglvnd-dev
-      - rsync
-    override-build: |
-      rsync -a --ignore-existing /snap/kde-frameworks-5-core18-sdk/current/ /
-      
-  dxf-to-qet:
-    after: [kde-sdk-setup]
-    plugin: nil
-    source: https://github.com/qelectrotech/DXFtoQET-2020.git
-    override-build: |
-      qmake "$SNAPCRAFT_PART_SRC/DXFtoQET.pro"
-      make -j$(nproc)
-      mkdir -p "$SNAPCRAFT_PART_INSTALL/bin"
-      cp DXFtoQET "$SNAPCRAFT_PART_INSTALL/bin/"
-
-  qelectrotech:
-    after: [kde-sdk-setup]
-    plugin: nil
-    source: .
-    build-packages:
-      - git
-    override-pull: |
-      snapcraftctl pull
-      snap_version=$(git describe --dirty)
-      modified_displayed_version=$snap_version".snap"
-      sed -i -E "s|const QString displayedVersion =.*|const QString displayedVersion =\"$modified_displayed_version\";|" sources/qet.h
-      snapcraftctl set-version "$snap_version"
-    override-build: |
-      qmake "$SNAPCRAFT_PART_SRC/qelectrotech.pro"
-      make -j$(nproc)
-      make install INSTALL_ROOT="$SNAPCRAFT_PART_INSTALL"
-    override-stage: |
-      snapcraftctl stage
-      # patch desktop file with correct icon path
-      SED_CMD="sed -i -E s|^Icon=(.*)|Icon=\${SNAP}/usr/local/share/icons/hicolor/128x128/apps/\1.png|g" 
-      $SED_CMD usr/local/share/applications/qelectrotech.desktop
-
-  cleanup:
-    after: [qelectrotech, dxf-to-qet, qet-tb-generator]
-    plugin: nil
-    build-snaps: [core18, kde-frameworks-5-core18]
-    override-prime: |
-      # Remove all files from snap that are already included in the base snap or in
-      # any connected content snaps
-      set -eux
-      for snap in "core18" "kde-frameworks-5-core18"; do  # List all content-snaps and base snaps you're using here
-        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
-      done
--- a/dev_doc/ID_of_QUndoCommand.txt
+++ b/dev_doc/ID_of_QUndoCommand.txt
--- a/dev_doc/enum_type_of_QGraphicsItem
+++ b/dev_doc/enum_type_of_QGraphicsItem
@@ -1,16 +1,16 @@
 		Type = UserType + ???
 ###DIAGRAM EDITOR###
-Element             + 1000
-Conductor           + 1001
-Terminal            + 1002
-ElementTextItem     + 1003
-DiagramTextItem     + 1004
+Element + 1000
+Conductor + 1001
+Terminal + 1002
+ElementTextItem + 1003
+DiagramTextItem + 1004
 IndependentTextItem + 1005
-ConductorTextItem   + 1006
-DiagramImageItem    + 1007
-QetShapItem         + 1008
-crossRefItem        + 1009
-DynamiqueElementTextItem  + 1010
+ConductorTextItem + 1006
+DiagramImageItem + 1007
+QetShapItem + 1008
+crossRefItem + 1009
+DynamiqueElementTextItem + 1010
 ElementPrimitiveDecorator + 2200

 ###ELEMENT EDITOR###
@@ -25,8 +25,4 @@ part rectangle  + 1109
 part dynamic text field + 1110

 ###QetGraphicsHandlerItem###
-QetGraphicsHandlerItem + 1200
-
-###VIEW ITEMS###
-QetGraphicsTableItem  + 1300
-QetGraphicsHeaderItem + 1301
+QetGraphicsHandlerItem = 1200
--- a/elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/3_pen_pravy.elmt
@@ -1,37 +0,0 @@
-<definition type="element" orientation="dyyy" height="80" hotspot_y="40" version="0.70" width="50" hotspot_x="23" link_type="simple">
-    <uuid uuid="{65b9e889-c2eb-4d85-aa9e-c1dff55678f5}"/>
-    <names>
-        <name lang="en">Three-pole source + PEN</name>
-        <name lang="el">Τριφασικό + PEN</name>
-        <name lang="es">Fuente tripolar + PEN</name>
-        <name lang="nl">driefasen + aardenul</name>
-        <name lang="pl">Linia trójfazowa (PEN)</name>
-        <name lang="it">Sorgente tripolare + PEN</name>
-        <name lang="de">Drehstrom + PEN</name>
-        <name lang="ru">Трёхполюсный + PEN</name>
-        <name lang="fr">Source tripolaire + PEN</name>
-        <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
-        <name lang="cs">3 fáze + PEN pravý</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <dynamic_text z="1" Valignment="AlignTop" x="-7" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{7c68cf51-b979-4e89-97b2-a93b5ad61f95}" y="-60.45" Halignment="AlignLeft" frame="false" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="33" text="PEN" color="#000000"/>
-        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="13" text="L3" color="#000000"/>
-        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-7" text="L2" color="#000000"/>
-        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-27" text="L1" color="#000000"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-10" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="10" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-14" y2="30" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
-        <terminal orientation="w" x="-15" y="-30"/>
-        <terminal orientation="w" x="-15" y="-10"/>
-        <terminal orientation="w" x="-15" y="30"/>
-        <terminal orientation="w" x="-15" y="10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/3f_n_pe_pravy.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/3f_n_pe_pravy.elmt
@@ -1,40 +0,0 @@
-<definition type="element" orientation="dyyy" height="100" hotspot_y="40" version="0.70" width="40" hotspot_x="20" link_type="simple">
-    <uuid uuid="{b4b70d3d-8784-4323-b17b-d8ff3677cdc1}"/>
-    <names>
-        <name lang="en">Three-pole source + PEN</name>
-        <name lang="el">Τριφασικό + PEN</name>
-        <name lang="es">Fuente tripolar + PEN</name>
-        <name lang="nl">driefasen + aardenul</name>
-        <name lang="pl">Linia trójfazowa (PEN)</name>
-        <name lang="it">Sorgente tripolare + PEN</name>
-        <name lang="de">Drehstrom + PEN</name>
-        <name lang="ru">Трёхполюсный + PEN</name>
-        <name lang="fr">Source tripolaire + PEN</name>
-        <name lang="ar">مصدر ثلاثي القطبيّة + PEN</name>
-        <name lang="cs">3 fáze + N+PE pravý</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <dynamic_text z="1" Valignment="AlignTop" x="-7" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{1955f25e-b33b-4106-8b36-46862006122c}" y="-60.45" Halignment="AlignLeft" frame="false" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="53" text="PE" color="#000000"/>
-        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="33" text="N" color="#000000"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="50" end1="none" y1="50" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
-        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="13" text="L3" color="#000000"/>
-        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-7" text="L2" color="#000000"/>
-        <text x="7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-27" text="L1" color="#000000"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="-10" end1="none" y1="-10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="10" end1="none" y1="10" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15" y2="30" end1="none" y1="30" length1="1.5" length2="1.5" antialias="false" x2="-5"/>
-        <terminal orientation="w" x="-15" y="50"/>
-        <terminal orientation="w" x="-15" y="-30"/>
-        <terminal orientation="w" x="-15" y="-10"/>
-        <terminal orientation="w" x="-15" y="30"/>
-        <terminal orientation="w" x="-15" y="10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/110_network_supplies/ground1.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/ground1.elmt
@@ -1,42 +1,26 @@
-<definition height="50" width="30" link_type="terminal" hotspot_x="16" version="0.80" orientation="dyyy" type="element" hotspot_y="29">
-    <uuid uuid="{a98ac40d-9055-4b9b-88ab-cffe6b08ed37}"/>
+<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="ro">Masă</name>
        <name lang="pt">Massa</name>
-        <name lang="cs">Kostra</name>
-        <name lang="it">Massa</name>
+        <name lang="es">Masa</name>
        <name lang="nl">Massa</name>
        <name lang="el">Γείωση</name>
-        <name lang="ru">Шасси</name>
        <name lang="de">Masse</name>
-        <name lang="en">Ground</name>
+        <name lang="cs">Kostra</name>
        <name lang="pl">Masa</name>
-        <name lang="es">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>
-    <elementInformations>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1"></elementInformation>
-        <elementInformation name="designation" show="1"></elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="label" show="1"></elementInformation>
-    </elementInformations>
-    <informations>titus&#xd;
+    <informations>titus
 titus0818@yahoo.com</informations>
    <description>
-        <line y1="-16" x1="0" style="line-style:normal;line-weight:hight;filling:none;color:black" end2="none" y2="13" length2="1.5" length1="1.5" x2="0" end1="none" antialias="false"/>
-        <line y1="14" x1="-13.6493" style="line-style:normal;line-weight:hight;filling:none;color:black" end2="none" y2="14" length2="1.5" length1="1.5" x2="12.62" end1="none" antialias="false"/>
-        <dynamic_text uuid="{7f02ce13-533d-4501-980d-6cb67bd1110d}" Halignment="AlignLeft" frame="false" x="8" Valignment="AlignTop" text_from="ElementInfo" y="-9" font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="3" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
+        <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/terre.elmt
+++ b/elements/10_electric/10_allpole/110_network_supplies/terre.elmt
@@ -1,43 +1,27 @@
-<definition height="30" width="20" link_type="terminal" hotspot_x="10" version="0.80" orientation="dyyy" type="element" hotspot_y="19">
-    <uuid uuid="{e4e753a8-9fde-4e8e-9256-0cf99d67e3de}"/>
+<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="pt">Terra</name>
-        <name lang="cs">Země</name>
-        <name lang="it">Terra</name>
        <name lang="el">Γείωση</name>
-        <name lang="nl">Aarde</name>
-        <name lang="ru">Земля</name>
-        <name lang="de">Erde</name>
-        <name lang="en">Ground</name>
-        <name lang="pl">Uziemienie</name>
        <name lang="es">Tierra</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>
-    <elementInformations>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1"></elementInformation>
-        <elementInformation name="designation" show="1"></elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="label" show="1"></elementInformation>
-    </elementInformations>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <dynamic_text uuid="{0af57a27-1887-4576-8b51-200ca996e582}" Halignment="AlignLeft" frame="false" x="2" Valignment="AlignTop" text_from="ElementInfo" y="-22.5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="1" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="4" x1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="4" length2="1.5" length1="1.5" x2="3" end1="none" antialias="false"/>
-        <line y1="2" x1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="2" length2="1.5" length1="1.5" x2="5" end1="none" antialias="false"/>
-        <line y1="0" x1="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="0" length2="1.5" length1="1.5" x2="7" end1="none" antialias="false"/>
-        <line y1="-10" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" y2="0" length2="1.5" length1="1.5" x2="0" end1="none" antialias="false"/>
+        <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/120_cables&wiring/kabel3g.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/kabel3g.elmt
@@ -1,33 +0,0 @@
-<definition width="70" hotspot_x="35" hotspot_y="5" orientation="dyyy" version="0.80" type="element" height="10" link_type="simple">
-    <uuid uuid="{3cfdc90d-f114-4ecd-9ab2-37786c279287}"/>
-    <names>
-        <name lang="de">Kabel 3G</name>
-        <name lang="fr">Cable 3G</name>
-        <name lang="cs">Kabel 3G</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line x2="1.95" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.05" length2="1.5" antialias="true" y2="1.95" end2="none" x1="-2.05" length1="1.5"/>
-        <line x2="22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" length2="1.5" antialias="true" y2="2" end2="none" x1="18" length1="1.5"/>
-        <dynamic_text text_width="-1" font="Sans Serif,7,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" z="3" Valignment="AlignTop" frame="false" x="-50" uuid="{fe752adf-2e2b-4005-a272-42dd6976c493}" y="0.5" text_from="UserText" rotation="0">
-            <text>3G</text>
-        </dynamic_text>
-        <line x2="30" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" length2="1.5" antialias="false" y2="0" end2="none" x1="-29.9373" length1="1.5"/>
-        <line x2="-18" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" length2="1.5" antialias="true" y2="2" end2="none" x1="-22" length1="1.5"/>
-        <dynamic_text text_width="-1" font="Sans Serif,7,-1,5,50,0,0,0,0,0" Halignment="AlignLeft" z="6" Valignment="AlignTop" frame="false" x="-51" uuid="{65bfd07e-7af5-4193-a5ba-b3dc967da121}" y="-18.5" text_from="ElementInfo" rotation="0">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <dynamic_text text_width="-1" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" z="7" Valignment="AlignTop" frame="false" x="-22" uuid="{df01c7dd-b2e7-4b24-9057-b8bc3478ff67}" y="-11" text_from="UserText" rotation="0">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" z="8" Valignment="AlignTop" frame="false" x="-2" uuid="{ce5a0030-5247-47ab-a975-63256db0d2bd}" y="-11" text_from="UserText" rotation="0">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Halignment="AlignLeft" z="9" Valignment="AlignTop" frame="false" x="18" uuid="{e0a00f86-dd76-48fe-be8b-8ff6f510e651}" y="-11" text_from="UserText" rotation="0">
-            <text>PE</text>
-        </dynamic_text>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/kabel4g.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/kabel4g.elmt
@@ -1,27 +0,0 @@
-<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="36" hotspot_y="5" orientation="dyyy" width="90">
-    <uuid uuid="{e02f4582-b5dd-4f81-ba71-e3d5521b4152}"/>
-    <names>
-        <name lang="ru">Кабель 3 жилы + PE</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
-        <name lang="cs">Kabel 4G</name>
-        <name lang="de">Kabel 4G</name>
-        <name lang="es">Cable 3 fases+tierra</name>
-        <name lang="it">Cavo 3 fasi + terra</name>
-        <name lang="fr">Cable 3 phases+terre</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line x1="-2.05" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="1.95" y2="1.95" antialias="true"/>
-        <line x1="37.95" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="41.95" y2="1.95" antialias="true"/>
-        <line x1="18" y1="-2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="22" y2="2" antialias="true"/>
-        <input size="7" tagg="none" rotate="true" x="-50" y="10" text="4G"/>
-        <line x1="-29.9373" y1="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="47.932" y2="0" antialias="false"/>
-        <line x1="-22" y1="-2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="-18" y2="2" antialias="true"/>
-        <input size="7" tagg="label" rotate="true" x="-51" y="-9" text="_"/>
-        <input size="4" tagg="none" rotate="true" x="-22" y="-4" text="1"/>
-        <input size="4" tagg="none" rotate="true" x="-2" y="-4" text="2"/>
-        <input size="4" tagg="none" rotate="true" x="18" y="-4" text="3"/>
-        <input size="4" tagg="none" rotate="true" x="38" y="-4" text="PE"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/120_cables&wiring/kabel7g.elmt
+++ b/elements/10_electric/10_allpole/120_cables&wiring/kabel7g.elmt
@@ -1,33 +0,0 @@
-<definition type="element" height="10" link_type="simple" version="0.60" hotspot_x="73" hotspot_y="5" orientation="dyyy" width="150">
-    <uuid uuid="{d1007c67-032b-4925-8560-aac9e547d6ae}"/>
-    <names>
-        <name lang="ru">Кабель 6 жилы + PE</name>
-        <name lang="pl">Oznaczenie przewodu czterożyłowego</name>
-        <name lang="cs">Kabel 7G</name>
-        <name lang="de">Kabel 7G</name>
-        <name lang="es">Cable 6 fases+tierra</name>
-        <name lang="it">Cavo  fasi + terra</name>
-        <name lang="fr">Cable 6 phases+terre</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input size="4" tagg="none" rotate="true" x="38" y="-4" text="6"/>
-        <input size="4" tagg="none" rotate="true" x="18" y="-4" text="5"/>
-        <input size="4" tagg="none" rotate="true" x="-2" y="-4" text="4"/>
-        <line x1="57.95" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="61.95" y2="1.95" antialias="true"/>
-        <line x1="-42.05" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="-38.05" y2="1.95" antialias="true"/>
-        <line x1="37.95" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="41.95" y2="1.95" antialias="true"/>
-        <line x1="17.95" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="21.95" y2="1.95" antialias="true"/>
-        <line x1="-2.05" y1="-2.05" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="1.95" y2="1.95" antialias="true"/>
-        <line x1="-22" y1="-2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="-18" y2="2" antialias="true"/>
-        <input size="7" tagg="none" rotate="true" x="-89" y="10" text="7G"/>
-        <line x1="-67.9373" y1="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="71" y2="0" antialias="false"/>
-        <line x1="-62" y1="-2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" length2="1.5" x2="-58" y2="2" antialias="true"/>
-        <input size="7" tagg="label" rotate="true" x="-90" y="-9" text="_"/>
-        <input size="4" tagg="none" rotate="true" x="-62" y="-4" text="1"/>
-        <input size="4" tagg="none" rotate="true" x="-42" y="-4" text="2"/>
-        <input size="4" tagg="none" rotate="true" x="-22" y="-4" text="3"/>
-        <input size="4" tagg="none" rotate="true" x="58" y="-4" text="PE"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/cable.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/90_terminal_strips_diagram/cable.elmt
@@ -1,17 +0,0 @@
-<definition version="0.80" link_type="simple" hotspot_y="13" type="element" height="250" hotspot_x="15" width="30" orientation="dyyy">
-    <uuid uuid="{bb4c314c-2020-4c8a-b465-632eb562e1f7}"/>
-    <names>
-        <name lang="fr">Cable</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <rect ry="0" y="0" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" height="230" rx="0" width="20" antialias="false"/>
-        <dynamic_text uuid="{3a1faa81-e74a-4640-af5a-3fb5c454f467}" rotation="270" text_width="-1" text_from="ElementInfo" font="Sans Serif,7,-1,5,50,0,0,0,0,0" frame="false" Valignment="AlignTop" y="200" x="-10" Halignment="AlignLeft" z="2">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line x1="0" x2="0" end1="none" end2="none" y2="0" length1="1.5" y1="-4" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <terminal y="-4" x="0" orientation="n"/>
-    </description>
-</definition>
--- 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,4 +1,4 @@
-<definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="20" link_type="terminal" type="element" ic="true" orientation="dyyy">
+<definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
 <uuid uuid="{A4B7D0BD-2695-47D9-BF64-2DAD82C51772}"/><names>
        <name lang="ar">طرف نهائي</name>
        <name lang="de">Endklemme</name>
--- a/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_finale1.elmt
+++ b/elements/10_electric/10_allpole/130_terminals&terminal_strips/borne_finale1.elmt
@@ -1,4 +1,4 @@
-<definition width="20" hotspot_y="14" height="20" hotspot_x="10" version="0.51" orientation="dyyy" link_type="terminal" type="element">
+<definition width="20" hotspot_y="14" height="20" hotspot_x="10" version="0.51" orientation="dyyy" link_type="simple" type="element">
    <uuid uuid="{ff1573e9-b618-45a8-93af-58562f69c9bb}"/>
    <names>
        <name lang="ar">طرف نهائي</name>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc16pnt.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc16pnt.elmt
@@ -1,37 +0,0 @@
-<definition hotspot_x="20" width="40" version="0.80" orientation="dyyy" hotspot_y="28" type="element" height="60" link_type="simple">
-    <uuid uuid="{d662a17e-3d5d-4833-967b-51f763ef4688}"/>
-    <names>
-        <name lang="it">Presa monofase</name>
-        <name lang="cs">Zásuvka jednopólová</name>
-        <name lang="ar">مقبس أحادي الوجه</name>
-        <name lang="en">Outlet 3 poles</name>
-        <name lang="pl">Gniazdo wtyczkowe</name>
-        <name lang="fr">PC mono</name>
-        <name lang="de">Steckdose 3-polig</name>
-        <name lang="nl">Contact AC + aarde</name>
-        <name lang="es">Toma corriente 3P</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <dynamic_text frame="false" text_width="-1" rotation="0" uuid="{9a66ab1b-c9d8-4de6-a786-a16ba182d28f}" x="19.3725" text_from="ElementInfo" Valignment="AlignTop" y="-19.7" z="1" Halignment="AlignLeft" font="Sans Serif,9,-1,5,50,0,0,0,0,0">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line antialias="false" length1="1.5" y2="22" x1="0" y1="14" end1="none" x2="0" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
-        <circle antialias="true" diameter="30" x="-15" y="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line antialias="false" length1="1.5" y2="-18" x1="-10" y1="-11" end1="none" x2="-10" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
-        <circle antialias="true" diameter="5" x="-7.5" y="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle antialias="true" diameter="5" x="-2.5" y="7.5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line antialias="false" length1="1.5" y2="-18" x1="10" y1="-11" end1="none" x2="10" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
-        <circle antialias="true" diameter="5" x="3.5" y="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line antialias="false" length1="1.5" y2="3" x1="0" y1="5" end1="none" x2="0" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <line antialias="false" length1="1.5" y2="0.7" x1="2" y1="0.7" end1="none" x2="-2" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <line antialias="false" length1="1.5" y2="2.5" x1="-3" y1="2.5" end1="none" x2="3" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <line antialias="false" length1="1.5" y2="-1.1" x1="-1" y1="-1.1" end1="none" x2="1" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <terminal x="-10" orientation="n" y="-20"/>
-        <terminal x="0" orientation="s" y="22"/>
-        <terminal x="10" orientation="n" y="-20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc_mono2.elmt
+++ b/elements/10_electric/10_allpole/140_connectors&plugs/20_socket_outlets/pc_mono2.elmt
@@ -1,49 +0,0 @@
-<definition height="50" hotspot_x="15" hotspot_y="23" orientation="dyyy" link_type="simple" type="element" version="0.80" width="30">
-    <uuid uuid="{f09c1826-5deb-4e5d-a565-992b010a8007}"/>
-    <names>
-        <name lang="it">Presa monofase</name>
-        <name lang="nl">Contact AC + aarde</name>
-        <name lang="pl">Gniazdo wtyczkowe</name>
-        <name lang="cs">Zásuvka jednopólová</name>
-        <name lang="de">Steckdose 3-polig</name>
-        <name lang="ar">مقبس أحادي الوجه</name>
-        <name lang="fr">PC mono 2P+ Terre</name>
-        <name lang="en">Outlet 3 poles</name>
-        <name lang="es">Toma corriente 3P</name>
-    </names>
-    <elementInformations>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-        <elementInformation name="label" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="designation" show="1"></elementInformation>
-        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
-    </elementInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <dynamic_text z="1" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="13" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-16" uuid="{9a66ab1b-c9d8-4de6-a786-a16ba182d28f}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="18"/>
-        <circle x="-10.0499" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20.0998" y="-10.0499"/>
-        <line end1="none" x1="-6" x2="-6" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14"/>
-        <circle x="-6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4" y="-6"/>
-        <circle x="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="4" y="4"/>
-        <line end1="none" x1="6" x2="6" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-14"/>
-        <circle x="2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4" y="-6"/>
-        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="3"/>
-        <line end1="none" x1="1.3" x2="-1.3" end2="none" length1="1.5" length2="1.5" antialias="false" y1="1" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1"/>
-        <line end1="none" x1="-2.3" x2="2.3" end2="none" length1="1.5" length2="1.5" antialias="false" y1="2.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2.5"/>
-        <line end1="none" x1="-0.6" x2="0.6" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-0.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-0.5"/>
-        <terminal x="6" orientation="n" y="-15"/>
-        <terminal x="-6" orientation="n" y="-15"/>
-        <terminal x="0" orientation="s" y="17"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/poj_odpinac.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/poj_odpinac.elmt
@@ -1,42 +0,0 @@
-<definition hotspot_y="19" link_type="simple" hotspot_x="13" orientation="dyyy" version="0.80" width="20" height="40" type="element">
-    <uuid uuid="{db0d94b0-30de-4477-b693-49af4da70f3e}"/>
-    <names>
-        <name lang="fr">Porte fusible</name>
-        <name lang="cs">Pojistkový odpínač</name>
-    </names>
-    <elementInformations>
-        <elementInformation show="1" name="manufacturer"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="designation"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="-3" z="1" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{d3f026c2-4718-4cf6-b783-49b6080d3ec3}" Halignment="AlignLeft">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="UserText" y="4" x="-2" z="2" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{f3c9c54f-bc4f-44b6-a691-e28a08f857d2}" Halignment="AlignLeft">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="ElementInfo" y="-15" x="-28" z="3" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" frame="false" uuid="{0e5e65df-6f92-4dc2-a46e-040c5e3e1d6c}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <polygon x3="-8.77479" y2="10.8817" y3="-6.81657" y1="8.87394" y4="-8.81219" x5="2.8423" x1="2.82578" x4="-3.13713" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-2.92493" closed="false" y5="8.89046" antialias="true"/>
-        <line y2="10.0885" length2="1.5" y1="-7.79981" x1="-5.91596" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0.01823" antialias="true"/>
-        <line y2="-10" length2="1.5" y1="-10" x1="-3" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="3" antialias="false"/>
-        <dynamic_text text_width="-1" text_from="ElementInfo" y="2" x="-34" z="7" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" rotation="0" frame="false" uuid="{f61998ec-d878-4737-9e74-8679a306af5a}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <line y2="-15" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <line y2="15" length2="1.5" y1="10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <terminal y="15" orientation="s" x="0"/>
-        <terminal y="-15" orientation="n" x="0"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/poj_odpinac_2p.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/poj_odpinac_2p.elmt
@@ -1,46 +0,0 @@
-<definition hotspot_y="23" link_type="simple" hotspot_x="13" orientation="dyyy" version="0.80" width="40" height="50" type="element">
-    <uuid uuid="{c05b1ed0-3c90-4883-b55e-5ce37456066e}"/>
-    <names>
-        <name lang="fr">Porte fusible 2p</name>
-        <name lang="cs">Pojistkový odpínač 2p</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="-2" z="1" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{f3c93a63-d77b-424b-9c18-d153bea32786}" Halignment="AlignLeft">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="18" z="2" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{38a6df9a-8413-46c8-aa7d-d1d5ef63881a}" Halignment="AlignLeft">
-            <text>3</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="UserText" y="6" x="-3" z="3" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{b31fc96e-a908-411c-b40a-b3a7f22198d5}" Halignment="AlignLeft">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="UserText" y="6" x="17" z="4" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{466cd65b-73e6-45a3-8814-f355c2932228}" Halignment="AlignLeft">
-            <text>4</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="ElementInfo" y="-17" x="-37" z="5" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" frame="false" uuid="{889abca0-c07a-45fb-8316-336ef36bf18d}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <polygon x3="10.8698" y2="12.4573" y3="-6.75574" y1="10.2834" y4="-8.81219" x5="22.7384" x1="22.4446" x4="16.8629" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="17.0979" closed="false" y5="9.98961" antialias="true"/>
-        <polygon x3="-9.13021" y2="12.4573" y3="-6.75574" y1="10.2834" y4="-8.81219" x5="2.73843" x1="2.44465" x4="-3.13713" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-2.90211" closed="false" y5="9.98961" antialias="true"/>
-        <line y2="11.0885" length2="1.5" y1="-7.51957" x1="13.8663" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20.0182" antialias="true"/>
-        <line y2="-10" length2="1.5" y1="-10" x1="17" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="23" antialias="false"/>
-        <line y2="11.0885" length2="1.5" y1="-7.51957" x1="-6.13367" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0.01823" antialias="true"/>
-        <line y2="-10" length2="1.5" y1="-10" x1="-3" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="3" antialias="false"/>
-        <line y2="0" length2="1.5" y1="0" x1="0" end2="none" end1="none" length1="1.5" style="line-style:dashed;line-weight:thin;filling:none;color:black" x2="12" antialias="false"/>
-        <dynamic_text text_width="-1" text_from="ElementInfo" y="-1" x="-43" z="13" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" rotation="0" frame="false" uuid="{26a975c5-2a42-4c0b-b887-0c1879ae28bc}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <line y2="-16" length2="1.5" y1="-10" x1="20" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" antialias="false"/>
-        <line y2="-16" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <line y2="18" length2="1.5" y1="12" x1="20" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" antialias="false"/>
-        <line y2="18" length2="1.5" y1="12" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <terminal y="18" orientation="s" x="0"/>
-        <terminal y="-16" orientation="n" x="20"/>
-        <terminal y="18" orientation="s" x="20"/>
-        <terminal y="-16" orientation="n" x="0"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/poj_odpinac_3p.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/poj_odpinac_3p.elmt
@@ -1,60 +0,0 @@
-<definition type="element" link_type="simple" hotspot_y="18" orientation="dyyy" hotspot_x="13" width="60" height="40" version="0.80">
-    <uuid uuid="{bdaf5ba8-ac37-4518-b0ae-6e98828eaa6d}"/>
-    <names>
-        <name lang="cs">Pojistkový odpínač 3p</name>
-        <name lang="fr">Porte Fusible 3p</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="1" frame="false" uuid="{a1bea68c-2f6b-47e9-95cb-796c23035510}" rotation="0" x="37" Halignment="AlignLeft" text_from="UserText" y="-22" text_width="-1" Valignment="AlignTop">
-            <text>5</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="2" frame="false" uuid="{fea18f19-a064-4c5f-89d3-394f1556c09f}" rotation="0" x="17" Halignment="AlignLeft" text_from="UserText" y="-22" text_width="-1" Valignment="AlignTop">
-            <text>3</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="3" frame="false" uuid="{73eb4bf8-0b8d-4ef4-8608-ecf1dcb5ce68}" rotation="0" x="-3" Halignment="AlignLeft" text_from="UserText" y="-22" text_width="-1" Valignment="AlignTop">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="4" frame="false" uuid="{79b7fc2c-af09-4355-8472-41f49d3cbf41}" rotation="0" x="17" Halignment="AlignLeft" text_from="UserText" y="5" text_width="-1" Valignment="AlignTop">
-            <text>4</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="5" frame="false" uuid="{a8895b11-8d45-40bd-a211-fe80d05f254e}" rotation="0" x="37" Halignment="AlignLeft" text_from="UserText" y="5" text_width="-1" Valignment="AlignTop">
-            <text>6</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" z="6" frame="false" uuid="{7e5d1555-4bd8-4e16-97fa-41d95ed212b7}" rotation="0" x="-3" Halignment="AlignLeft" text_from="UserText" y="6" text_width="-1" Valignment="AlignTop">
-            <text>2</text>
-        </dynamic_text>
-        <polygon y1="10.2834" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="22.7384" closed="false" y3="-6.75574" x3="10.8698" y5="9.98961" x1="22.4446" y2="12.4573" x4="16.8629" y4="-8.81219" x2="17.0979" antialias="true"/>
-        <polygon y1="10.2834" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="42.7384" closed="false" y3="-6.75574" x3="30.8698" y5="9.98961" x1="42.4447" y2="12.4573" x4="36.8629" y4="-8.81219" x2="37.0979" antialias="true"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="9" frame="false" uuid="{f497d4a7-97ed-478a-8d51-e7712d3da71a}" rotation="0" x="-37" Halignment="AlignLeft" text_from="ElementInfo" y="-17" text_width="-1" Valignment="AlignTop">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="-7.51957" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="13.8663" y2="11.0885" length2="1.5" x2="20.0182" antialias="true"/>
-        <line y1="-7.51957" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="33.8663" y2="11.0885" length2="1.5" x2="40.0182" antialias="true"/>
-        <polygon y1="10.2834" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="2.73843" closed="false" y3="-6.75574" x3="-9.13021" y5="9.98961" x1="2.44465" y2="12.4573" x4="-3.13713" y4="-8.81219" x2="-2.90211" antialias="true"/>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="17" y2="-10" length2="1.5" x2="23" antialias="false"/>
-        <line y1="-7.51957" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="-6.13367" y2="11.0885" length2="1.5" x2="0.01823" antialias="true"/>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="37" y2="-10" length2="1.5" x2="43" antialias="false"/>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="-3" y2="-10" length2="1.5" x2="3" antialias="false"/>
-        <line y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="0" y2="0" length2="1.5" x2="12" antialias="false"/>
-        <line y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="20" y2="0" length2="1.5" x2="32" antialias="false"/>
-        <dynamic_text font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" z="19" frame="false" uuid="{f70a1441-9e9b-40ca-b09f-35d65dfdd582}" rotation="0" x="-44" Halignment="AlignLeft" text_from="ElementInfo" y="0" text_width="-1" Valignment="AlignTop">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="0" y2="-14" length2="1.5" x2="0" antialias="false"/>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="20" y2="-14" length2="1.5" x2="20" antialias="false"/>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="40" y2="-14" length2="1.5" x2="40" antialias="false"/>
-        <line y1="12" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="40" y2="16" length2="1.5" x2="40" antialias="false"/>
-        <line y1="12" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="20" y2="16" length2="1.5" x2="20" antialias="false"/>
-        <line y1="12" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="0" y2="16" length2="1.5" x2="0" antialias="false"/>
-        <terminal x="40" orientation="s" y="16"/>
-        <terminal x="0" orientation="n" y="-14"/>
-        <terminal x="40" orientation="n" y="-14"/>
-        <terminal x="0" orientation="s" y="16"/>
-        <terminal x="20" orientation="n" y="-14"/>
-        <terminal x="20" orientation="s" y="16"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/pojistka1p.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/pojistka1p.elmt
@@ -1,32 +0,0 @@
-<definition hotspot_y="19" link_type="simple" hotspot_x="5" orientation="dyyy" version="0.80" width="10" height="40" type="element">
-    <uuid uuid="{82d755cf-7766-41ec-847a-6e23987685d5}"/>
-    <names>
-        <name lang="fr">Fusible</name>
-        <name lang="cs">Pojistka</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <rect y="-10" ry="0" x="-3" width="6" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" antialias="false"/>
-        <line y2="10" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="-2" z="3" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{bfbf3256-ac23-4ce9-b4e0-729aa7338739}" Halignment="AlignLeft">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="UserText" y="5" x="-2" z="4" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{b12232a5-c73b-4559-ba54-076c7a50bef5}" Halignment="AlignLeft">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="ElementInfo" y="-17" x="-30" z="5" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" frame="false" uuid="{dd6f5b99-eca8-4928-89f0-eb8204fb8854}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="ElementInfo" y="-1" x="-35" z="6" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" rotation="0" frame="false" uuid="{77ff60fb-d245-4681-8f5e-ac827f675bab}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <line y2="-15" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <line y2="15" length2="1.5" y1="10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <line y2="15" length2="1.5" y1="-15" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <terminal y="-15" orientation="n" x="0"/>
-        <terminal y="15" orientation="s" x="0"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/pojistka2p.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/10_fuses/pojistka2p.elmt
@@ -1,43 +0,0 @@
-<definition hotspot_y="19" link_type="simple" hotspot_x="5" orientation="dyyy" version="0.80" width="20" height="40" type="element">
-    <uuid uuid="{329f82a5-7029-4192-ab32-2e8b11615564}"/>
-    <names>
-        <name lang="fr">Fusible 2p</name>
-        <name lang="cs">Pojistka 2p</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <rect y="-10" ry="0" x="7" width="6" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" antialias="false"/>
-        <rect y="-10" ry="0" x="-3" width="6" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" antialias="false"/>
-        <line y2="10" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <line y2="10" length2="1.5" y1="-10" x1="10" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" antialias="false"/>
-        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="7" z="5" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{c37aa946-efa6-4e46-b228-9c8b1d8ce193}" Halignment="AlignLeft">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="UserText" y="-22" x="-3" z="6" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{6190ce78-54fe-49ae-85b3-915fd3bcf431}" Halignment="AlignLeft">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="UserText" y="5" x="7" z="7" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{caa6bbc0-5cda-4bd6-8c5d-14a8b1a19f5d}" Halignment="AlignLeft">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="UserText" y="5" x="-3" z="8" Valignment="AlignTop" font="Sans Serif,5,-1,5,25,0,0,0,0,0" rotation="0" frame="false" uuid="{9f060a2d-d66b-4b5b-b86b-d4c0c872f605}" Halignment="AlignLeft">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="ElementInfo" y="-17" x="-30" z="9" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" frame="false" uuid="{c8fdb551-ba1e-4910-9293-206116b3640f}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <dynamic_text text_width="-1" text_from="ElementInfo" y="0" x="-36" z="10" Valignment="AlignTop" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" rotation="0" frame="false" uuid="{9a3517e6-3bbf-4a00-8ebb-198952257b50}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <line y2="-15" length2="1.5" y1="-10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <line y2="-15" length2="1.5" y1="-10" x1="10" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" antialias="false"/>
-        <line y2="15" length2="1.5" y1="10" x1="10" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" antialias="false"/>
-        <line y2="15" length2="1.5" y1="10" x1="0" end2="none" end1="none" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false"/>
-        <terminal y="15" orientation="s" x="0"/>
-        <terminal y="-15" orientation="n" x="0"/>
-        <terminal y="15" orientation="s" x="10"/>
-        <terminal y="-15" orientation="n" x="10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_2f2.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/disjonct-m_2f2.elmt
@@ -1,67 +0,0 @@
-<definition version="0.70" height="60" type="element" width="40" hotspot_x="30" link_type="master" hotspot_y="34" orientation="dyyy">
-    <uuid uuid="{315bc1e6-0466-4d2f-a6e4-547252f6bd16}"/>
-    <names>
-        <name lang="ar">قطب ثنائي القطبية قطبين محميين</name>
-        <name lang="de">Leitungsschutzschalter 2P</name>
-        <name lang="en">Circuit-breaker</name>
-        <name lang="es">Disyuntor termico magnetico en 2P</name>
-        <name lang="it">Int. Aut. Magneto-termico 2P</name>
-        <name lang="fr">Disjoncteur bipolaire 2 poles proteges</name>
-        <name lang="pl">Wyłącznik</name>
-        <name lang="nl">Lastscheider 2</name>
-        <name lang="cs">Dvojpólový jistič 2 póly chránící</name>
-    </names>>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line y1="-10" style="line-style:dashed;line-weight:thin;filling:none;color:black" x1="-23" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="-3"/>
-        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="0"/>
-        <arc height="5" x="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
-        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="-20"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="0"/>
-        <arc height="5" x="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
-        <polygon x3="-5" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" antialias="true" y2="0" closed="false" x2="0"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-20"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
-        <polygon x3="-25" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" antialias="true" y2="0" closed="false" x2="-20"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="-15"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="5"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="-15"/>
-        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="0"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="-15"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-2"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="2"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-50.8598" text_from="ElementInfo" y="-20.6932" z="19" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{eb3e61e9-605d-4992-b5ea-7f0f84509000}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="-20"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-18" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-22"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-22" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-18"/>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-22" text_from="UserText" y="-36" z="23" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{73b5a968-8936-4cd5-8ecc-cd7ab85d42a1}" Halignment="AlignLeft">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-2" text_from="UserText" y="-36" z="24" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{20a7e985-c1d2-44e7-bb18-76aa73849729}" Halignment="AlignLeft">
-            <text>3</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-21" text_from="UserText" y="9" z="25" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{1c2a2b8e-1f38-49b3-9a86-61004e06cf0d}" Halignment="AlignLeft">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-1" text_from="UserText" y="9" z="26" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{471cb447-49c7-4d4b-8e37-fe17d6251401}" Halignment="AlignLeft">
-            <text>4</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" frame="false" x="-50" text_from="ElementInfo" y="-2" z="27" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{8d5fdb0a-e44b-4d3f-b448-ddb983b2658d}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="-20" y="20" orientation="s"/>
-        <terminal x="-20" y="-30" orientation="n"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/jistic_3p.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/11_circuit_breakers/jistic_3p.elmt
@@ -1,84 +0,0 @@
-<definition version="0.70" height="60" type="element" width="60" hotspot_x="30" link_type="master" hotspot_y="34" orientation="dyyy">
-    <uuid uuid="{458bcb69-d51d-4add-ab45-1830d8f42c0f}"/>
-    <names>
-        <name lang="cs">Trojpólový jistič</name>
-        <name lang="ar">قاطع ثلاثي القطبية</name>
-        <name lang="en">Circuit-breaker</name>
-        <name lang="nl">Lastscheider 3</name>
-        <name lang="pl">Wyłącznik</name>
-        <name lang="it">Int. Aut. Magneto-termico 3P</name>
-        <name lang="de">Leitungsschutzschalter 3P</name>
-        <name lang="fr">Disjoncteur tripolaire</name>
-    </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line y1="-10" style="line-style:dashed;line-weight:thin;filling:none;color:black" x1="-23" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="17"/>
-        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="0"/>
-        <arc height="5" x="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
-        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="-20"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="0"/>
-        <arc height="5" x="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
-        <polygon x3="-5" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" antialias="true" y2="0" closed="false" x2="0"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="-20"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
-        <polygon x3="-25" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" antialias="true" y2="0" closed="false" x2="-20"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="-15"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="5"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="-15"/>
-        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="0"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="-15"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-2"/>
-        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="20"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="2"/>
-        <polygon x3="15" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" antialias="true" y2="0" closed="false" x2="20"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-58" text_from="ElementInfo" y="-17" z="21" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{c1498517-6b83-4819-acf9-40e73beeed6e}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <arc height="5" x="16" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
-        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="-20"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="20"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="25"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="25" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="25"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-18" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-22"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="25"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-22" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-18"/>
-        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="20"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="22" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="18"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="18" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="22"/>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-22" text_from="UserText" y="-36" z="33" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{a2e86dba-725c-4b0c-903a-67538d17bc4e}" Halignment="AlignLeft">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-2" text_from="UserText" y="-36" z="34" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{dad2c45a-8585-46a9-a90c-a8fd0d67cb27}" Halignment="AlignLeft">
-            <text>3</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="18" text_from="UserText" y="-36" z="35" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{885a15ae-5164-4b25-b69d-ae08df7f26e6}" Halignment="AlignLeft">
-            <text>5</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-21" text_from="UserText" y="9" z="36" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{192b9597-f3e8-4a9c-9b67-e46d9e7a645c}" Halignment="AlignLeft">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-1" text_from="UserText" y="9" z="37" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{3c3c969f-f7f0-4606-afc2-14fec241addc}" Halignment="AlignLeft">
-            <text>4</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="19" text_from="UserText" y="9" z="38" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{37c0d3b1-0e66-4d8c-b068-202e17d9c204}" Halignment="AlignLeft">
-            <text>6</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" frame="false" x="-60" text_from="ElementInfo" y="0" z="39" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{2773a71b-e557-4b99-bdaf-be7d85d0257f}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="-20" y="20" orientation="s"/>
-        <terminal x="20" y="-30" orientation="n"/>
-        <terminal x="-20" y="-30" orientation="n"/>
-        <terminal x="20" y="20" orientation="s"/>
-        <terminal x="0" y="20" orientation="s"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/20_disconnecting_switches/01_intersectiotetra.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/20_disconnecting_switches/01_intersectiotetra.elmt
@@ -1,47 +0,0 @@
-<definition width="60" hotspot_y="6" height="100" version="0.70" hotspot_x="7" link_type="master" type="element" orientation="dyyy">
-    <uuid uuid="{aa1df2e5-0495-4657-abda-0143e08e2314}"/>
-    <names>
-        <name lang="fr">Interrupteur sectionneur TETRA</name>
-        <name lang="es">Seccionador 3P mando de palanca</name>
-    </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <circle y="18" x="16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle y="58" x="16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle y="38" x="16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <line end2="none" end1="none" x1="5" length1="1.5" x2="15" antialias="false" y1="60" length2="1.5" y2="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="5" length1="1.5" x2="15" antialias="false" y1="40" length2="1.5" y2="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="5" length1="1.5" x2="15" antialias="false" y1="20" length2="1.5" y2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle y="70" x="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <line end2="none" end1="none" x1="15" length1="1.5" x2="15" antialias="false" y1="38" length2="1.5" y2="42" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="15" length1="1.5" x2="15" antialias="false" y1="18" length2="1.5" y2="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="15" length1="1.5" x2="15" antialias="false" y1="58" length2="1.5" y2="62" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="20" length1="1.5" x2="28" antialias="false" y1="67" length2="1.5" y2="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="20" length1="1.5" x2="28" antialias="false" y1="47" length2="1.5" y2="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="20" length1="1.5" x2="28" antialias="false" y1="27" length2="1.5" y2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="28" length1="1.5" x2="40" antialias="false" y1="40" length2="1.5" y2="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="28" length1="1.5" x2="40" antialias="false" y1="20" length2="1.5" y2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="28" length1="1.5" x2="40" antialias="false" y1="60" length2="1.5" y2="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle y="-2" x="16" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <line end2="none" end1="none" x1="5" length1="1.5" x2="15" antialias="false" y1="0" length2="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="15" length1="1.5" x2="15" antialias="false" y1="-2" length2="1.5" y2="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="20" length1="1.5" x2="28" antialias="false" y1="7" length2="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="28" length1="1.5" x2="40" antialias="false" y1="0" length2="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="24" length1="1.5" x2="24" antialias="false" y1="5" length2="1.5" y2="70" style="line-style:dashed;line-weight:normal;filling:none;color:black"/>
-        <line end2="none" end1="none" x1="25" length1="1.5" x2="35" antialias="false" y1="75" length2="1.5" y2="90" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal y="20" orientation="w" x="0"/>
-        <terminal y="20" orientation="w" x="0"/>
-        <terminal y="20" orientation="e" x="44"/>
-        <terminal y="0" orientation="e" x="44"/>
-        <terminal y="40" orientation="e" x="44"/>
-        <terminal y="40" orientation="w" x="0"/>
-        <terminal y="60" orientation="e" x="44"/>
-        <terminal y="60" orientation="w" x="0"/>
-        <terminal y="0" orientation="w" x="0"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/20_disconnecting_switches/inter-sectionneur_tetra.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/20_disconnecting_switches/inter-sectionneur_tetra.elmt
@@ -1,59 +0,0 @@
-<definition hotspot_x="61" orientation="dyyy" width="100" hotspot_y="23" version="0.70" link_type="master" height="50" type="element">
-    <uuid uuid="{ac09254a-46b6-491f-be79-15e36e8e2173}"/>
-    <names>
-        <name lang="fr">Interrupteur sectionneur tétrapolaire</name>
-        <name lang="en">Four pole switch disconnector</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="type">protection</kindInformation>
-    </kindInformations>
-    <elementInformations>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="manufacturer"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="manufacturer_reference"></elementInformation>
-        <elementInformation show="1" name="designation"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="machine_manufacturer_reference"></elementInformation>
-        <elementInformation show="1" name="description"></elementInformation>
-    </elementInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon x3="-10" x2="-10" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" antialias="true" x1="-15" y2="11" y3="21"/>
-        <circle diameter="4" y="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="28"/>
-        <circle diameter="4" y="11" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-52"/>
-        <polygon x3="30" x2="30" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" antialias="true" x1="25" y2="11" y3="21"/>
-        <circle diameter="4" y="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="8"/>
-        <line end2="none" length2="1.5" end1="none" x2="30" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" length1="1.5" antialias="false" x1="30" y2="-11"/>
-        <circle diameter="4" y="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-32"/>
-        <line end2="none" length2="1.5" end1="none" x2="28" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" length1="1.5" antialias="false" x1="32" y2="-11"/>
-        <circle diameter="4" y="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x="-12"/>
-        <dynamic_text frame="false" Halignment="AlignLeft" text_from="ElementInfo" y="-7" z="9" uuid="{951a9adc-1e0f-4e24-8137-16b3e55dd9ab}" rotation="0" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" x="32.75">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line end2="none" length2="1.5" end1="none" x2="-50" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="1" length1="1.5" antialias="false" x1="25" y2="1"/>
-        <polygon x3="-10" x2="-10" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" antialias="true" x1="-15" y2="11" y3="21"/>
-        <polygon x3="10" x2="10" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" antialias="true" x1="5" y2="11" y3="21"/>
-        <polygon x3="-30" x2="-30" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" antialias="true" x1="-35" y2="11" y3="21"/>
-        <line end2="none" length2="1.5" end1="none" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" length1="1.5" antialias="false" x1="-10" y2="-11"/>
-        <line end2="none" length2="1.5" end1="none" x2="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" length1="1.5" antialias="false" x1="-8" y2="-11"/>
-        <line end2="none" length2="1.5" end1="none" x2="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" length1="1.5" antialias="false" x1="-30" y2="-11"/>
-        <line end2="none" length2="1.5" end1="none" x2="-32" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" length1="1.5" antialias="false" x1="-28" y2="-11"/>
-        <line end2="none" length2="1.5" end1="none" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" length1="1.5" antialias="false" x1="10" y2="-11"/>
-        <line end2="none" length2="1.5" end1="none" x2="8" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" length1="1.5" antialias="false" x1="12" y2="-11"/>
-        <line end2="none" length2="1.5" end1="none" x2="-55" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11" length1="1.5" antialias="false" x1="-50" y2="-9"/>
-        <terminal orientation="n" y="-19" x="-10"/>
-        <terminal orientation="n" y="-19" x="30"/>
-        <terminal orientation="s" y="21" x="10"/>
-        <terminal orientation="s" y="21" x="30"/>
-        <terminal orientation="n" y="-19" x="10"/>
-        <terminal orientation="n" y="-19" x="-30"/>
-        <terminal orientation="s" y="21" x="-30"/>
-        <terminal orientation="s" y="21" x="-10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/20_disconnecting_switches/interrupteur_sectionneur_biphase.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/20_disconnecting_switches/interrupteur_sectionneur_biphase.elmt
@@ -1,39 +0,0 @@
-<definition link_type="master" hotspot_x="51" type="element" width="60" height="50" hotspot_y="24" version="0.70" orientation="dyyy">
-    <uuid uuid="{1efb43f5-78b4-401d-8031-581442217549}"/>
-    <names>
-        <name lang="fr">Interrupteur sectionneur biphasé</name>
-        <name lang="es">Seccionador 2P mando de palanca</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="type">protection</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x3="0" y2="10" closed="false" antialias="true" x1="-5" x2="0"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" x="-42" antialias="true" y="10" diameter="4"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" x="-22" antialias="true" y="-12" diameter="4"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" x="-2" antialias="true" y="-12" diameter="4"/>
-        <polygon y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x3="0" y2="10" closed="false" antialias="true" x1="-5" x2="0"/>
-        <polygon y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x3="-20" y2="10" closed="false" antialias="true" x1="-25" x2="-20"/>
-        <line length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" y2="-12" antialias="false" x1="0" end1="none" length2="1.5" x2="0" end2="none"/>
-        <line length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" y2="-12" antialias="false" x1="2" end1="none" length2="1.5" x2="-2" end2="none"/>
-        <line length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" y2="-12" antialias="false" x1="-20" end1="none" length2="1.5" x2="-20" end2="none"/>
-        <line length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" y2="-12" antialias="false" x1="-18" end1="none" length2="1.5" x2="-22" end2="none"/>
-        <line length1="1.5" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="0" y2="0" antialias="false" x1="-4" end1="none" length2="1.5" x2="-40" end2="none"/>
-        <line length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" y2="-10" antialias="false" x1="-40" end1="none" length2="1.5" x2="-45" end2="none"/>
-        <dynamic_text Valignment="AlignTop" rotation="0" Halignment="AlignLeft" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" text_width="-1" text_from="ElementInfo" uuid="{620b15e0-0261-49ea-a770-4bc5f7c1444e}" frame="false" x="8" y="-32" z="18">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <dynamic_text Valignment="AlignTop" rotation="0" Halignment="AlignLeft" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" text_width="-1" text_from="ElementInfo" uuid="{61e061f0-9168-437d-86a6-72874b562b56}" frame="false" x="4" y="-8" z="19">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <terminal x="-20" y="20" orientation="s"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="-20" y="-20" orientation="n"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/ddr4.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/ddr4.elmt
@@ -1,51 +1,44 @@
-<definition width="60" version="0.70" type="element" hotspot_y="24" hotspot_x="33" orientation="dyyy" link_type="master" height="50">
-    <uuid uuid="{11c09304-97cd-40f4-825f-4329bdf7e5db}"/>
-    <names>
-        <name lang="pt">Disjunctor diferencial</name>
-        <name lang="pl">Wyącznik różnicowoprądowy</name>
-        <name lang="es">Dispositivo diferencial residual</name>
-        <name lang="fr">Disjoncteur différentiel</name>
-        <name lang="en">Residual Circuit Breaker with Overload</name>
+<definition width="110" version="0.3" hotspot_x="32" hotspot_y="25" height="50" type="element" ic="true" orientation="dyyy" link_type="master">
+<uuid uuid="{B78BD5BC-8612-47D3-BA7D-ED388110DB3A}"/><names>
        <name lang="ar">قاطع تفاضلي</name>
-        <name lang="nl">Aardlekschakelaar + automaat</name>
-        <name lang="it">Interruttore differenziale</name>
        <name lang="de">Fehlerstromschutzschalter 3-polig</name>
        <name lang="ru">Дифавтомат</name>
+        <name lang="pt">Disjunctor diferencial</name>
+        <name lang="en">Residual Circuit Breaker with Overload</name>
+        <name lang="it">Interruttore differenziale</name>
+        <name lang="fr">Disjoncteur différentiel</name>
+        <name lang="pl">Wyącznik różnicowoprądowy</name>
+        <name lang="es">Dispositivo diferencial residual</name>
        <name lang="cs">Rozdílový jistič</name>
+        <name lang="nl">Aardlekschakelaar + automaat</name>
    </names>
    <kindInformations>
-        <kindInformation show="1" name="type">protection</kindInformation>
+        <kindInformation name="type" show="1">protection</kindInformation>
    </kindInformations>
-    <elementInformations/>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <line y1="-20" end1="none" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="false" x1="0" y2="-10" length1="1.5"/>
-        <line y1="-20" end1="none" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" antialias="false" x1="20" y2="-10" length1="1.5"/>
-        <line y1="-20" end1="none" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-20" antialias="false" x1="-20" y2="-10" length1="1.5"/>
-        <line y1="-12" end1="none" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-2" antialias="false" x1="2" y2="-8" length1="1.5"/>
-        <line y1="-12" end1="none" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="17.8" antialias="false" x1="21.8" y2="-8" length1="1.5"/>
-        <line y1="-12" end1="none" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="21.8" antialias="false" x1="17.8" y2="-8" length1="1.5"/>
-        <line y1="-12" end1="none" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="2" antialias="false" x1="-2" y2="-8" length1="1.5"/>
-        <polygon y1="20" closed="false" x3="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" antialias="true" x1="0" y2="10" y3="-9"/>
-        <polygon y1="20" closed="false" x3="13" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" antialias="true" x1="20" y2="10" y3="-9"/>
-        <dynamic_text y="-17.5" z="10" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="40" frame="false" Valignment="AlignTop" text_width="-1" rotation="0" uuid="{0b158bf8-6742-41d8-ac12-73828f75194a}" text_from="ElementInfo" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="-12" end1="none" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-22" antialias="false" x1="-18" y2="-8" length1="1.5"/>
-        <line y1="-12" end1="none" end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-18" antialias="false" x1="-22" y2="-8" length1="1.5"/>
-        <dynamic_text y="2.5" z="13" font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="44" frame="false" Valignment="AlignTop" text_width="-1" rotation="0" uuid="{1d22f9f7-bcad-4e1e-b191-78da97c93729}" text_from="UserText" Halignment="AlignLeft">
-            <text>___mA</text>
-        </dynamic_text>
-        <polygon y1="20" closed="false" x3="-27" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-20" antialias="true" x1="-20" y2="10" y3="-9"/>
-        <ellipse y="12" width="46" x="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" height="4"/>
-        <polygon y1="0" closed="false" y4="14" x3="-30" style="line-style:dashed;line-weight:thin;filling:none;color:black" x2="-30" antialias="false" x1="16" x4="-23" y2="0" y3="14"/>
-        <terminal y="20" x="-20" orientation="s"/>
-        <terminal y="-20" x="-20" orientation="n"/>
-        <terminal y="-20" x="20" orientation="n"/>
-        <terminal y="-20" x="0" orientation="n"/>
-        <terminal y="20" x="20" orientation="s"/>
-        <terminal y="20" x="0" orientation="s"/>
+        <line 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="-20" x1="19.8" y2="-10" x2="19.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="-20" x1="-20" y2="-10" 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="-12" x1="2" y2="-8" 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="-12" x1="21.8" y2="-8" x2="17.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="-12" x1="17.8" y2="-8" x2="21.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="-12" x1="-2" y2="-8" x2="2"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="10" x2="0" y3="-9" x3="-7"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="19.8" y2="10" x2="19.8" y3="-9" x3="12.8"/>
+        <input x="40" y="-6.5" size="9" text="_" tagg="label"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-18" y2="-8" 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="-12" x1="-22" y2="-8" x2="-18"/>
+        <input x="44" y="10.5" size="5" rotate="true" text="___mA"/>
+        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="-20" y2="10" x2="-20" y3="-9" x3="-27"/>
+        <ellipse width="46" x="-23" y="12" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x4="-23" antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="16" y2="0" x2="-30" y3="14" x3="-30" y4="14"/>
+        <terminal x="-20" y="-20" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-20" y="20" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="0" y="-20" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="0" y="20" nameHidden="0" number="" name="" orientation="s"/>
+        <terminal x="19.8" y="-20" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="19.8" y="20" nameHidden="0" number="" name="" orientation="s"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interdiff_40a.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interdiff_40a.elmt
@@ -1,69 +0,0 @@
-<definition orientation="dyyy" link_type="master" width="100" version="0.80" hotspot_y="34" type="element" height="80" hotspot_x="42">
-    <uuid uuid="{8bb0ba6c-cdca-4b77-9ecc-f3fe070bcd34}"/>
-    <names>
-        <name lang="nl">Lastscheider 1P+N</name>
-        <name lang="es">Disyuntor termico magnetico en polo P+N</name>
-        <name lang="ar">قاطع ثنائي القطبية - 1 قطب محمي</name>
-        <name lang="cs">Dvojpólový jistič 1 pól chránící</name>
-        <name lang="en">Circuit-breaker</name>
-        <name lang="pl">Wyłącznik</name>
-        <name lang="it">Int. Aut. Magneto-termico 1P+N</name>
-        <name lang="de">Leitungsschutzschalter 1P+N</name>
-        <name lang="fr">Interrupteur différentiel  40A 30mA </name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="number">1</kindInformation>
-        <kindInformation show="1" name="state">NO</kindInformation>
-        <kindInformation show="1" name="type">protection</kindInformation>
-    </kindInformations>
-    <elementInformations>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="designation"></elementInformation>
-        <elementInformation show="1" name="machine_manufacturer_reference"></elementInformation>
-        <elementInformation show="1" name="manufacturer"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="manufacturer_reference"></elementInformation>
-    </elementInformations>
-    <informations>S.DEFFAUX
-Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" length2="1.5" antialias="false" y1="4" y2="40" x1="10"/>
-        <polygon x3="-35" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" antialias="true" y1="3" y3="-20" closed="false" y2="0" x1="-30"/>
-        <polygon x3="-25" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-20" antialias="true" y1="5" y3="-20" closed="false" y2="0" x1="-20"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-10" length2="1.5" antialias="false" y1="4" y2="40" x1="-10"/>
-        <dynamic_text y="-18" text_from="ElementInfo" z="6" frame="false" rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" Valignment="AlignTop" Halignment="AlignLeft" x="20" text_width="-1" uuid="{7c189aba-a86c-4286-964d-b437612ed744}">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line length1="1.5" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" x2="8" length2="1.5" antialias="false" y1="-10" y2="-10" x1="-22"/>
-        <polygon x3="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-10" antialias="true" y1="3" y3="-20" closed="false" y2="0" x1="-10"/>
-        <polygon x3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" antialias="true" y1="3" y3="-20" closed="false" y2="0" x1="10"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-10" length2="1.5" antialias="false" y1="-30" y2="-20" x1="-10"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-12" length2="1.5" antialias="true" y1="-22" y2="-18" x1="-8"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-8" length2="1.5" antialias="true" y1="-22" y2="-18" x1="-12"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="10" length2="1.5" antialias="false" y1="-30" y2="-20" x1="10"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="8" length2="1.5" antialias="true" y1="-22" y2="-18" x1="12"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="12" length2="1.5" antialias="true" y1="-22" y2="-18" x1="8"/>
-        <text y="20" text="40A" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" x="22" color="#000000"/>
-        <text y="34" text="30mA" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" x="22" color="#000000"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" length2="1.5" antialias="false" y1="35" y2="35" x1="-10"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" length2="1.5" antialias="false" y1="35" y2="20" x1="-30"/>
-        <rect y="10" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4" rx="0" height="10" x="-32" antialias="false" ry="0"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" length2="1.5" antialias="false" y1="10" y2="3" x1="-30"/>
-        <polygon x3="-20" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-30" y5="-20" x5="-20" antialias="false" x4="-20" y1="-20" y3="-25" y4="-20" closed="false" y2="-25" x1="-30"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="10" length2="1.5" antialias="false" y1="5" y2="5" x1="-20"/>
-        <line length1="1.5" end1="none" end2="none" style="line-style:dashdotted;line-weight:thin;filling:none;color:black" x2="-35" length2="1.5" antialias="false" y1="-10" y2="-10" x1="-40"/>
-        <polygon x3="-40" style="line-style:normal;line-weight:thin;filling:none;color:black" x2="-40" y5="-7" x5="-38" antialias="false" x4="-38" y1="-13" y3="-7" y4="-7" closed="false" y2="-13" x1="-38"/>
-        <rect y="20" style="line-style:normal;line-weight:normal;filling:none;color:black" width="40" rx="5" height="10" x="-20" antialias="false" ry="5"/>
-        <terminal orientation="n" y="-30" x="10"/>
-        <terminal orientation="n" y="-30" x="-10"/>
-        <terminal orientation="s" y="40" x="-10"/>
-        <terminal orientation="s" y="40" x="10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interrupteur_differentiel.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/50_residual_current_circuit_breaker/interrupteur_differentiel.elmt
@@ -1,66 +0,0 @@
-<definition width="50" link_type="master" hotspot_x="27" height="80" hotspot_y="34" type="element" version="0.70" orientation="dyyy">
-    <uuid uuid="{daaec1a5-d463-4bb3-9a92-e26a13f5a0ec}"/>
-    <names>
-        <name lang="ar">مفتاح تفاضلي</name>
-        <name lang="de">Fehlerstromschutzschalter 2P</name>
-        <name lang="ru">УЗО</name>
-        <name lang="pt">Interruptor diferencial</name>
-        <name lang="en">Differential switch</name>
-        <name lang="it">Interruttore differenziale</name>
-        <name lang="fr">Interrupteur différentiel</name>
-        <name lang="pl">Rozłącznik różnicowoprądowy</name>
-        <name lang="es">Interruptor diferencial</name>
-        <name lang="cs">Rozdílový spínač</name>
-        <name lang="nl">Aardlekschakelaar</name>
-    </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
-    <elementInformations>
-        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1"></elementInformation>
-        <elementInformation name="designation" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-        <elementInformation name="label" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-    </elementInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <arc width="10" start="90" height="10" angle="180" style="line-style:dashed;line-weight:normal;filling:none;color:black" y="20" antialias="true" x="-20"/>
-        <line y2="40" x2="-10" x1="-10" end2="none" y1="3" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <line y2="-10" x2="7" x1="-12" end2="none" y1="-10" end1="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <polygon x3="-15" y2="0" y3="-20" x2="-10" x1="-10" y1="3" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true"/>
-        <line y2="40" x2="10" x1="10" end2="none" y1="4" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <polygon x3="5" y2="0" y3="-20" x2="10" x1="10" y1="3" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true"/>
-        <dynamic_text uuid="{7c189aba-a86c-4286-964d-b437612ed744}" text_from="ElementInfo" z="6" text_width="-1" Halignment="AlignLeft" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-17" frame="false" x="20" rotation="0">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y2="-20" x2="-10" x1="-10" end2="none" y1="-30" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <line y2="-18" x2="-12" x1="-8" end2="none" y1="-22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="true"/>
-        <line y2="-18" x2="-8" x1="-12" end2="none" y1="-22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="true"/>
-        <line y2="-20" x2="10" x1="10" end2="none" y1="-30" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <line y2="-18" x2="8" x1="12" end2="none" y1="-22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="true"/>
-        <line y2="-18" x2="12" x1="8" end2="none" y1="-22" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="true"/>
-        <arc width="10" start="270" height="10" angle="180" style="line-style:dashed;line-weight:normal;filling:none;color:black" y="20" antialias="true" x="10"/>
-        <line y2="20" x2="15" x1="-15" end2="none" y1="20" end1="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <line y2="30" x2="15" x1="-15" end2="none" y1="30" end1="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <line y2="25" x2="-25" x1="-25" end2="none" y1="-10" end1="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <line y2="25" x2="-20" x1="-25" end2="none" y1="25" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <line y2="-10" x2="-15" x1="-25" end2="none" y1="-10" end1="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" length2="1.5" antialias="false"/>
-        <dynamic_text uuid="{1cb14ddb-caa4-45ed-92cd-1b59b3562cb9}" text_from="ElementInfo" z="25" text_width="-1" Halignment="AlignLeft" Valignment="AlignTop" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" y="20" frame="false" x="25" rotation="0">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <terminal orientation="n" y="-30" x="10"/>
-        <terminal orientation="s" y="40" x="10"/>
-        <terminal orientation="n" y="-30" x="-10"/>
-        <terminal orientation="s" y="40" x="-10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre-2.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre-2.elmt
@@ -1,37 +1,33 @@
-<definition height="60" hotspot_x="18" hotspot_y="30" orientation="dyyy" link_type="simple" type="element" version="0.80" width="40">
-    <uuid uuid="{2aad9da5-665a-4189-9034-2bd6e1b00386}"/>
+<definition height="60" version="0.5" link_type="simple" width="40" orientation="dyyy" hotspot_x="18" hotspot_y="30" type="element">
+    <uuid uuid="{a091ae1e-5e4f-4afe-a478-25d13dc34e61}"/>
    <names>
-        <name lang="it">Protez. alimentazione</name>
-        <name lang="nl">Overspanning beveiligig</name>
-        <name lang="pl">Ogranicznik przepięć</name>
        <name lang="de">Blitz-/Überspannungsschutz</name>
-        <name lang="cs">Bleskojistka, ochrana proti nárazu</name>
-        <name lang="ar">حامي من الصواعق</name>
        <name lang="el">Προστασία από υπέρταση</name>
-        <name lang="fr">Parafoudre</name>
+        <name lang="pl">Ogranicznik przepięć</name>
+        <name lang="ar">حامي من الصواعق</name>
+        <name lang="it">Protez. alimentazione</name>
        <name lang="en">Surge protection</name>
        <name lang="es">Protección contra descargas 2</name>
+        <name lang="cs">Bleskojistka, ochrana proti nárazu</name>
+        <name lang="fr">Parafoudre</name>
+        <name lang="nl">Overspanning beveiligig</name>
    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;
+    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <dynamic_text z="1" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="18" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-15.45" uuid="{daef117a-d243-49f7-b089-6a8ffe076f69}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <text rotation="0" x="-10" text="N" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000" y="-16.6667"/>
-        <line end1="none" x1="8" x2="14" end2="none" length1="1.5" length2="1.5" antialias="false" y1="24" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="24"/>
-        <line end1="none" x1="6" x2="16" end2="none" length1="1.5" length2="1.5" antialias="false" y1="22" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="22"/>
-        <line end1="none" x1="4" x2="18" end2="none" length1="1.5" length2="1.5" antialias="false" y1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20"/>
-        <line end1="none" x1="-11" x2="-11" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20"/>
-        <rect height="20" x="-15" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0" y="-10" width="30"/>
-        <text rotation="0" x="10" text="T" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000" y="15"/>
-        <text rotation="0" x="11" text="L1" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000" y="-16.6667"/>
-        <line end1="none" x1="11" x2="11" end2="none" length1="1.5" length2="1.5" antialias="false" y1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
-        <line end1="none" x1="10" x2="10" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20"/>
-        <terminal x="10" orientation="n" y="-21"/>
-        <terminal x="11" orientation="s" y="17"/>
-        <terminal x="-11" orientation="n" y="-21"/>
+        <input tagg="label" y="-4.45" size="9" rotate="true" text="_" x="18"/>
+        <text y="-16.6667" size="4" text="N" x="-10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" length1="1.5" antialias="false" end2="none" length2="1.5" x2="14" x1="8" end1="none" y2="24"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="22" length1="1.5" antialias="false" end2="none" length2="1.5" x2="16" x1="6" end1="none" y2="22"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" length1="1.5" antialias="false" end2="none" length2="1.5" x2="18" x1="4" end1="none" y2="20"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" length1="1.5" antialias="false" end2="none" length2="1.5" x2="-11" x1="-11" end1="none" y2="-20"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" y="-10" antialias="false" width="30" x="-15"/>
+        <text y="14.3333" size="4" text="T" x="12.5"/>
+        <text y="-16.6667" size="4" text="L1" x="11"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" length1="1.5" antialias="false" end2="none" length2="1.5" x2="11" x1="11" end1="none" y2="10"/>
+        <line style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" length1="1.5" antialias="false" end2="none" length2="1.5" x2="10" x1="10" end1="none" y2="-20"/>
+        <terminal y="-21" orientation="n" x="10"/>
+        <terminal y="17" orientation="s" x="11"/>
+        <terminal y="-21" orientation="n" x="-11"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre_3.elmt
+++ b/elements/10_electric/10_allpole/200_fuses&protective_gears/90_overvoltage_protections/parafoudre_3.elmt
@@ -1,51 +0,0 @@
-<definition height="50" hotspot_x="30" hotspot_y="25" orientation="dyyy" link_type="simple" type="element" version="0.80" width="40">
-    <uuid uuid="{1a8ba1ea-6c13-41d0-996b-74c83bfdb91b}"/>
-    <names>
-        <name lang="it">Scaricatore</name>
-        <name lang="nl">Overspanning beveiliging</name>
-        <name lang="pl">Ogranicznik przepięć</name>
-        <name lang="de">Blitzschutz</name>
-        <name lang="cs">Bleskojistka, ochrana proti přepětí</name>
-        <name lang="fr">Parafoudre</name>
-        <name lang="en">Surge protector</name>
-        <name lang="es">Protección contra descargas</name>
-    </names>
-    <elementInformations>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-        <elementInformation name="label" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="designation" show="1"></elementInformation>
-        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
-    </elementInformations>
-    <informations>EN 60617: 07-22-03</informations>
-    <description>
-        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20"/>
-        <line end1="none" x1="-20" x2="-20" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20"/>
-        <polygon y3="-8" x1="-2" x2="-2" antialias="true" x3="2" y1="-8" style="line-style:normal;line-weight:thin;filling:black;color:black" y2="-8" x5="-2" y5="-8" y4="-2" x4="0"/>
-        <polygon y3="-8" x1="-22" x2="-22" antialias="true" x3="-18" y1="-8" style="line-style:normal;line-weight:thin;filling:black;color:black" y2="-8" x5="-22" y5="-8" y4="-2" x4="-20"/>
-        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15"/>
-        <line end1="none" x1="-20" x2="-20" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15"/>
-        <dynamic_text z="4" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="7" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-7.3334" uuid="{11a32e77-08cb-463c-9e17-0ac6633307ae}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line end1="none" x1="4" x2="4" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
-        <line end1="none" x1="-16" x2="-16" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
-        <line end1="none" x1="-4" x2="4" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
-        <line end1="none" x1="-24" x2="-16" end2="none" length1="1.5" length2="1.5" antialias="false" y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
-        <line end1="none" x1="4" x2="-4" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
-        <line end1="none" x1="-16" x2="-24" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
-        <line end1="none" x1="-24" x2="-24" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
-        <line end1="none" x1="-4" x2="-4" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10"/>
-        <line end1="none" x1="0" x2="-20" end2="none" length1="1.5" length2="1.5" antialias="false" y1="15" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15"/>
-        <terminal x="-20" orientation="n" y="-21"/>
-        <terminal x="-10" orientation="s" y="20"/>
-        <terminal x="0" orientation="n" y="-21"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/casak.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/casak.elmt
@@ -1,31 +0,0 @@
-<definition type="element" orientation="dyyy" height="50" hotspot_y="25" version="0.70" width="40" hotspot_x="23" link_type="master">
-    <uuid uuid="{45a179e7-866e-4756-965f-d2445ced8dd2}"/>
-    <names>
-        <name lang="cs">Časové relé</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="type">coil</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14" height="15" rx="0" width="28" y="-8" ry="0" antialias="false"/>
-        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" x="-20" height="15" rx="0" width="5" y="-8" ry="0" antialias="false"/>
-        <dynamic_text z="3" Valignment="AlignTop" x="-45" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{bf273769-c856-4d5c-a56a-6a014b357999}" y="-12" Halignment="AlignLeft" frame="false" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <text x="2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="A1" color="#000000"/>
-        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="15" text="A2" color="#000000"/>
-        <text x="-9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="S" color="#000000"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="15" end1="none" y1="7" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="-10"/>
-        <dynamic_text z="10" Valignment="AlignTop" x="-9" text_from="UserText" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" uuid="{02030033-c6b1-4a95-b990-74fa2f7d147d}" y="-9" Halignment="AlignLeft" frame="false" text_width="-1">
-            <text>g</text>
-        </dynamic_text>
-        <terminal orientation="s" x="0" y="15"/>
-        <terminal orientation="n" x="0" y="-15"/>
-        <terminal orientation="n" x="-10" y="-15"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/tempo_programmable.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/tempo_programmable.elmt
@@ -1,44 +0,0 @@
-<definition width="50" type="element" version="0.70" hotspot_y="24" orientation="dyyy" hotspot_x="33" height="50" link_type="master">
-    <uuid uuid="{c1d17128-3672-44b5-a1dd-946af2444d6b}"/>
-    <names>
-        <name lang="fr">Relais temporisé</name>
-        <name lang="en">Timed relay</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="type">coil</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line y2="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-20" y1="-20" x2="-20" end1="none" end2="none" antialias="false" length2="1.5"/>
-        <rect width="44" x="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8" height="16" ry="0" antialias="false" rx="0"/>
-        <line y2="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="-20" x2="0" end1="none" end2="none" antialias="false" length2="1.5"/>
-        <dynamic_text x="-2" Valignment="AlignTop" y="6" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_from="UserText" rotation="0" Halignment="AlignLeft" frame="false" uuid="{7c9456fd-7999-4382-b8ca-364e7f56f26b}" text_width="-1" z="3">
-            <text>A2</text>
-        </dynamic_text>
-        <dynamic_text x="-22" Valignment="AlignTop" y="-20" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_from="UserText" rotation="0" Halignment="AlignLeft" frame="false" uuid="{1b2f4273-3fdf-4db0-a089-24ffa51e26a2}" text_width="-1" z="4">
-            <text>Y</text>
-        </dynamic_text>
-        <dynamic_text x="-2" Valignment="AlignTop" y="-20" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_from="UserText" rotation="0" Halignment="AlignLeft" frame="false" uuid="{1b2f4273-3fdf-4db0-a089-24ffa51e26a2}" text_width="-1" z="4">
-            <text>A1</text>
-        </dynamic_text>
-        <dynamic_text x="20" Valignment="AlignTop" y="-15" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_from="ElementInfo" rotation="0" Halignment="AlignLeft" frame="false" uuid="{f4995b5d-50c3-44ed-bf88-0a296ff5f89e}" text_width="-1" z="6">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="8" x2="0" end1="none" end2="none" antialias="false" length2="1.5"/>
-        <line y2="8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-22" y1="-8" x2="-22" end1="none" end2="none" antialias="false" length2="1.5"/>
-        <line y2="8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-14" y1="-8" x2="-14" end1="none" end2="none" antialias="false" length2="1.5"/>
-        <line y2="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-22" y1="8" x2="-14" end1="none" end2="none" antialias="false" length2="1.5"/>
-        <line y2="8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-22" y1="-8" x2="-14" end1="none" end2="none" antialias="false" length2="1.5"/>
-        <dynamic_text x="20" Valignment="AlignTop" y="5" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" text_from="ElementInfo" rotation="0" Halignment="AlignLeft" frame="false" uuid="{2213004b-dac5-4b09-a030-bf2ff66456bd}" text_width="-1" z="12">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <rect width="8" x="-30" style="line-style:normal;line-weight:normal;filling:black;color:black" y="-8" height="16" ry="0" antialias="false" rx="0"/>
-        <terminal x="-20" orientation="n" y="-20"/>
-        <terminal x="0" orientation="s" y="20"/>
-        <terminal x="0" orientation="n" y="-20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/timer816.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/timer816.elmt
@@ -1,28 +0,0 @@
-<definition type="element" orientation="dyyy" height="50" hotspot_y="25" version="0.70" width="40" hotspot_x="23" link_type="master">
-    <uuid uuid="{2abf6e68-2359-4b1b-b468-f7842007f956}"/>
-    <names>
-        <name lang="cs">Timer T 816</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="type">coil</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14" height="15" rx="0" width="28" y="-8" ry="0" antialias="false"/>
-        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" x="-20" height="15" rx="0" width="5" y="-8" ry="0" antialias="false"/>
-        <dynamic_text z="3" Valignment="AlignTop" x="-45" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{9b8efa95-7359-4c1f-84ce-b9787d530cd9}" y="-12" Halignment="AlignLeft" frame="false" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <text x="2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="2" color="#000000"/>
-        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="15" text="10" color="#000000"/>
-        <text x="-9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="5" color="#000000"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="15" end1="none" y1="7" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="-10"/>
-        <terminal orientation="n" x="-10" y="-15"/>
-        <terminal orientation="n" x="0" y="-15"/>
-        <terminal orientation="s" x="0" y="15"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/tmr48.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/tmr48.elmt
@@ -1,28 +0,0 @@
-<definition type="element" orientation="dyyy" height="50" hotspot_y="25" version="0.70" width="40" hotspot_x="23" link_type="master">
-    <uuid uuid="{996f934d-7b3d-40fd-81a5-c62b585d5319}"/>
-    <names>
-        <name lang="cs">Timer TMR48</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="type">coil</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14" height="15" rx="0" width="28" y="-8" ry="0" antialias="false"/>
-        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" x="-20" height="15" rx="0" width="5" y="-8" ry="0" antialias="false"/>
-        <dynamic_text z="3" Valignment="AlignTop" x="-45" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{ec3ddd44-7d10-4947-93f2-d66496e14415}" y="-12" Halignment="AlignLeft" frame="false" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <text x="2" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="2" color="#000000"/>
-        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="15" text="10" color="#000000"/>
-        <text x="-9" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" y="-10" text="6" color="#000000"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="15" end1="none" y1="7" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-15" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="-10"/>
-        <terminal orientation="n" x="0" y="-15"/>
-        <terminal orientation="n" x="-10" y="-15"/>
-        <terminal orientation="s" x="0" y="15"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/zpozdeny_odpad.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/01_coils/zpozdeny_odpad.elmt
@@ -1,31 +0,0 @@
-<definition version="0.70" height="50" type="element" width="30" hotspot_x="12" link_type="slave" hotspot_y="24" orientation="dyyy">
-    <uuid uuid="{90fe1aa6-d017-4064-8ce7-242a4b7b416a}"/>
-    <names>
-        <name lang="cs">Zpožděný odpad </name>
-    </names>
-    <kindInformations>
-        <kindInformation name="state" show="1">NO</kindInformation>
-        <kindInformation name="number" show="1">1</kindInformation>
-        <kindInformation name="type" show="1">delayOff</kindInformation>
-    </kindInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon x3="10" y1="-10" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" antialias="true" y2="10" closed="false" x2="10"/>
-        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="10"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-23" text_from="ElementInfo" y="-12" z="3" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{87554fe0-c02a-4473-81d1-4cb89205402c}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="7" text_from="UserText" y="-26" z="4" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{07fe6bcb-92fd-4fef-bef4-595fab066fa2}" Halignment="AlignLeft">
-            <text>15</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="7" text_from="UserText" y="9" z="5" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{bbc34c0f-1331-4499-8663-978b944c8287}" Halignment="AlignLeft">
-            <text>18</text>
-        </dynamic_text>
-        <line y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="3"/>
-        <arc height="10" x="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" y="-5" width="10" start="270" antialias="true"/>
-        <terminal x="10" y="20" orientation="s"/>
-        <terminal x="10" y="-20" orientation="n"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/inverseur_tempo_repos.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/inverseur_tempo_repos.elmt
@@ -1,38 +0,0 @@
-<definition height="50" link_type="slave" version="0.70" hotspot_y="24" orientation="dyyy" width="40" type="element" hotspot_x="33">
-    <uuid uuid="{e7b66dbd-a6cb-4907-87b2-eda3b4bc3b45}"/>
-    <names>
-        <name lang="en">Timed switch rest </name>
-        <name lang="fr">Inverseur temporisé repos</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="number">1</kindInformation>
-        <kindInformation show="1" name="state">SW</kindInformation>
-        <kindInformation show="1" name="type">delayOff</kindInformation>
-    </kindInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon antialias="true" y3="20" x3="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" y1="-10" x2="0" x1="-15" closed="false"/>
-        <dynamic_text rotation="0" Halignment="AlignLeft" Valignment="AlignTop" uuid="{8e84a620-7969-4787-96bc-ad321e686495}" y="-14" text_width="-1" z="2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="13" frame="false" text_from="ElementInfo">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2" end1="none" length1="1.5" end2="none" y1="2" x2="-8" x1="-20" length2="1.5"/>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" end1="none" length1="1.5" end2="none" y1="-20" x2="0" x1="0" length2="1.5"/>
-        <polygon antialias="false" y3="-8" x3="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8" y1="-20" x2="-20" x1="-20" closed="false"/>
-        <dynamic_text rotation="0" Halignment="AlignLeft" Valignment="AlignTop" uuid="{2b486564-141b-4d6b-b567-70313ba791b1}" y="-28" text_width="-1" z="5" font="Sans Serif,4,-1,5,0,0,0,0,0,0,normal" x="-3" frame="false" text_from="UserText">
-            <text>18</text>
-        </dynamic_text>
-        <dynamic_text rotation="0" Halignment="AlignLeft" Valignment="AlignTop" uuid="{2b486564-141b-4d6b-b567-70313ba791b1}" y="10" text_width="-1" z="5" font="Sans Serif,4,-1,5,0,0,0,0,0,0,normal" x="-2" frame="false" text_from="UserText">
-            <text>15</text>
-        </dynamic_text>
-        <dynamic_text rotation="0" Halignment="AlignLeft" Valignment="AlignTop" uuid="{2b486564-141b-4d6b-b567-70313ba791b1}" y="-28" text_width="-1" z="5" font="Sans Serif,4,-1,5,0,0,0,0,0,0,normal" x="-22" frame="false" text_from="UserText">
-            <text>16</text>
-        </dynamic_text>
-        <line antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0" end1="none" length1="1.5" end2="none" y1="0" x2="-8" x1="-20" length2="1.5"/>
-        <arc height="8" antialias="true" y="-2.95082" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-27.6503" angle="180" start="270" width="8"/>
-        <terminal y="20" x="0" orientation="s"/>
-        <terminal y="-20" x="-20" orientation="n"/>
-        <terminal y="-20" x="0" orientation="n"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/inverseur_tempo_travail.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/inverseur_tempo_travail.elmt
@@ -1,38 +0,0 @@
-<definition height="50" link_type="slave" hotspot_y="24" hotspot_x="26" width="30" type="element" orientation="dyyy" version="0.70">
-    <uuid uuid="{fa856697-4b53-4292-b84b-a16ccfdfbb40}"/>
-    <names>
-        <name lang="en">timed switch work</name>
-        <name lang="fr">Inverseur temporisé travail</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="state">SW</kindInformation>
-        <kindInformation show="1" name="type">delayOn</kindInformation>
-        <kindInformation show="1" name="number">1</kindInformation>
-    </kindInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon closed="false" x2="0" y3="20" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" x3="0" antialias="true" y1="-10"/>
-        <line end1="none" end2="none" length2="1.5" length1="1.5" x2="-8" y2="2" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-20" antialias="false" y1="2"/>
-        <dynamic_text y="-14" text_from="ElementInfo" Valignment="AlignTop" text_width="-1" x="13" rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" uuid="{8e84a620-7969-4787-96bc-ad321e686495}" Halignment="AlignLeft" z="2">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line end1="none" end2="none" length2="1.5" length1="1.5" x2="0" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" antialias="false" y1="-20"/>
-        <polygon closed="false" x2="-20" y3="-8" y2="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x3="-12" antialias="false" y1="-20"/>
-        <dynamic_text y="-28" text_from="UserText" Valignment="AlignTop" text_width="-1" x="-22" rotation="0" font="Sans Serif,4,-1,5,0,0,0,0,0,0,normal" frame="false" uuid="{2b486564-141b-4d6b-b567-70313ba791b1}" Halignment="AlignLeft" z="5">
-            <text>16</text>
-        </dynamic_text>
-        <dynamic_text y="10" text_from="UserText" Valignment="AlignTop" text_width="-1" x="-2" rotation="0" font="Sans Serif,4,-1,5,0,0,0,0,0,0,normal" frame="false" uuid="{2b486564-141b-4d6b-b567-70313ba791b1}" Halignment="AlignLeft" z="5">
-            <text>15</text>
-        </dynamic_text>
-        <dynamic_text y="-28" text_from="UserText" Valignment="AlignTop" text_width="-1" x="-3" rotation="0" font="Sans Serif,4,-1,5,0,0,0,0,0,0,normal" frame="false" uuid="{2b486564-141b-4d6b-b567-70313ba791b1}" Halignment="AlignLeft" z="5">
-            <text>18</text>
-        </dynamic_text>
-        <line end1="none" end2="none" length2="1.5" length1="1.5" x2="-8" y2="0" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-20" antialias="false" y1="0"/>
-        <arc height="8" start="90" y="-2.95082" width="8" angle="180" x="-23.6503" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true"/>
-        <terminal y="-20" x="-20" orientation="n"/>
-        <terminal y="-20" x="0" orientation="n"/>
-        <terminal y="20" x="0" orientation="s"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/inverseur_tempo_travail_repos.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/inverseur_tempo_travail_repos.elmt
@@ -1,39 +0,0 @@
-<definition width="40" type="element" height="50" hotspot_y="24" version="0.70" orientation="dyyy" hotspot_x="33" link_type="slave">
-    <uuid uuid="{9727aab9-91e4-4dfc-864e-8acf32485a7f}"/>
-    <names>
-        <name lang="en">Timed switch rest and work</name>
-        <name lang="fr">Inverseur temporisé repos et travail</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="number">1</kindInformation>
-        <kindInformation show="1" name="state">SW</kindInformation>
-        <kindInformation show="1" name="type">delayOnOff</kindInformation>
-    </kindInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon x2="0" x1="-15" x3="0" y1="-10" closed="false" y3="20" y2="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="8" start="90" y="-2.95082" height="8" angle="180" antialias="true" x="-19.6503" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <dynamic_text uuid="{8e84a620-7969-4787-96bc-ad321e686495}" Valignment="AlignTop" text_width="-1" z="2" y="-14" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_from="ElementInfo" rotation="0" frame="false" x="13" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line x2="-8" length1="1.5" x1="-20" end1="none" end2="none" y1="2" length2="1.5" y2="2" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line x2="0" length1="1.5" x1="0" end1="none" end2="none" y1="-20" length2="1.5" y2="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <dynamic_text uuid="{2b486564-141b-4d6b-b567-70313ba791b1}" Valignment="AlignTop" text_width="-1" z="5" y="-28" font="Sans Serif,4,-1,5,0,0,0,0,0,0,normal" text_from="UserText" rotation="0" frame="false" x="-3" Halignment="AlignLeft">
-            <text>18</text>
-        </dynamic_text>
-        <dynamic_text uuid="{2b486564-141b-4d6b-b567-70313ba791b1}" Valignment="AlignTop" text_width="-1" z="5" y="10" font="Sans Serif,4,-1,5,0,0,0,0,0,0,normal" text_from="UserText" rotation="0" frame="false" x="-2" Halignment="AlignLeft">
-            <text>15</text>
-        </dynamic_text>
-        <dynamic_text uuid="{2b486564-141b-4d6b-b567-70313ba791b1}" Valignment="AlignTop" text_width="-1" z="5" y="-28" font="Sans Serif,4,-1,5,0,0,0,0,0,0,normal" text_from="UserText" rotation="0" frame="false" x="-22" Halignment="AlignLeft">
-            <text>16</text>
-        </dynamic_text>
-        <polygon x2="-20" x1="-20" x3="-12" y1="-20" closed="false" y3="-8" y2="-8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x2="-8" length1="1.5" x1="-20" end1="none" end2="none" y1="0" length2="1.5" y2="0" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="8" start="270" y="-2.95082" height="8" angle="180" antialias="true" x="-27.6503" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal y="20" orientation="s" x="0"/>
-        <terminal y="-20" orientation="n" x="-20"/>
-        <terminal y="-20" orientation="n" x="0"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/tempo_nc_travail_repos.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/tempo_nc_travail_repos.elmt
@@ -1,29 +0,0 @@
-<definition link_type="slave" hotspot_y="24" version="0.70" width="40" type="element" height="50" orientation="dyyy" hotspot_x="29">
-    <uuid uuid="{9bb6f34d-fccd-49a9-9d2b-523eb1e2459f}"/>
-    <names>
-        <name lang="en">Simple contact (NC / switch-on and off delay timer)</name>
-        <name lang="fr">Contact simple NF (tempo travail et repos)</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="number">1</kindInformation>
-        <kindInformation show="1" name="type">delayOnOff</kindInformation>
-        <kindInformation show="1" name="state">NC</kindInformation>
-    </kindInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon x2="0" y2="10" x1="5" y1="-10" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x3="0" y3="20"/>
-        <arc start="90" y="-5" x="-25" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" width="10" angle="-180" height="10"/>
-        <line x2="2" y2="1.5" end1="none" end2="none" x1="-14.8" y1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" length1="1.5"/>
-        <line x2="6" y2="-9" end1="none" end2="none" x1="0" y1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" length1="1.5"/>
-        <line x2="2.5" y2="-1.5" end1="none" end2="none" x1="-14.8" y1="-1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" length1="1.5"/>
-        <dynamic_text z="6" y="-12" rotation="0" x="9" text_width="-1" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" uuid="{eb70ae75-4571-4a6c-912e-492db81b4a97}" Halignment="AlignLeft" text_from="ElementInfo">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <arc start="-90" y="-5" x="-15" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true" width="10" angle="-180" height="10"/>
-        <line x2="0" y2="-10" end1="none" end2="none" x1="0" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" length2="1.5" length1="1.5"/>
-        <terminal y="-20" x="0" orientation="n"/>
-        <terminal y="20" x="0" orientation="s"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/tempo_no_travail_repos.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/11_delayed_contacts/tempo_no_travail_repos.elmt
@@ -1,28 +0,0 @@
-<definition type="element" height="50" width="40" orientation="dyyy" hotspot_x="21" hotspot_y="24" link_type="slave" version="0.70">
-    <uuid uuid="{248ac6e9-3f18-4c6e-8f85-914db7ef49c7}"/>
-    <names>
-        <name lang="fr">Contact simple NO (tempo repos et travail)</name>
-        <name lang="en">Simple contact (switch-on and off delay timer)</name>
-    </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">delayOnOff</kindInformation>
-        <kindInformation name="state" show="1">NO</kindInformation>
-        <kindInformation name="number" show="1">1</kindInformation>
-    </kindInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <arc height="10" style="line-style:normal;line-weight:thin;filling:none;color:black" angle="-180" width="10" x="-14" y="-5" start="90" antialias="true"/>
-        <arc height="10" style="line-style:normal;line-weight:thin;filling:none;color:black" angle="-180" width="10" x="-4" y="-5" start="270" antialias="true"/>
-        <polygon closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" y1="-10" antialias="true" x2="10" y2="10" x3="10" y3="20"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" x1="-4" end2="none" length1="1.5" length2="1.5" y1="1.5" antialias="false" x2="7" y2="1.5"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" x1="-4" end2="none" length1="1.5" length2="1.5" y1="-1.5" antialias="false" x2="7" y2="-1.5"/>
-        <dynamic_text Halignment="AlignLeft" rotation="0" x="12.75" text_from="ElementInfo" y="-8" uuid="{ba372a7c-21f3-4e1e-86bb-03e0e24bbb65}" text_width="-1" Valignment="AlignTop" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" z="5">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" end2="none" length1="1.5" length2="1.5" y1="-20" antialias="false" x2="10" y2="-10"/>
-        <terminal x="10" orientation="n" y="-20"/>
-        <terminal x="10" orientation="s" y="20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/15_protection_contacts/contact_gv_no.elmt
+++ b/elements/10_electric/10_allpole/310_relays_contactors&contacts/02_contacts_cross_referencing/15_protection_contacts/contact_gv_no.elmt
@@ -1,29 +1,26 @@
-<definition orientation="dyyy" type="element" width="50" height="60" link_type="slave" version="0.80" hotspot_x="42" hotspot_y="44">
-    <uuid uuid="{9856a744-050c-4144-9743-a935fcd245ae}"/>
+<definition type="element" hotspot_y="44" version="0.60" hotspot_x="42" link_type="slave" orientation="dyyy" width="50" height="60">
+    <uuid uuid="{ad62e994-1c20-42c4-8a2f-40519cc56f5c}"/>
    <names>
-        <name lang="es">Contacto de disyuntor termico magnetico NA</name>
        <name lang="fr">Contact NO disjoncteur magnéto-thermique GV</name>
+        <name lang="es">Contacto de disyuntor termico magnetico NA</name>
    </names>
    <kindInformations>
-        <kindInformation name="type" show="1">simple</kindInformation>
        <kindInformation name="number" show="1">1</kindInformation>
-        <kindInformation name="state" show="1">NO</kindInformation>
+        <kindInformation name="state" show="1">NC</kindInformation>
+        <kindInformation name="type" show="1">simple</kindInformation>
    </kindInformations>
    <informations></informations>
    <description>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" x3="-22" y2="-20" y6="-30" y7="-30" closed="false" x5="-27" y5="-26" x2="-27" x4="-22" y1="-16" x6="-27" x7="-27" x1="-27" y4="-26" y3="-20"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" ry="0" rx="0" x="-37" width="20" height="28" y="-30"/>
-        <text font="Sans Serif,9,-1,5,50,0,0,0,0,0" text="I>" x="-34" rotation="0" y="-5" color="#000000"/>
-        <dynamic_text font="Sans Serif,8,-1,5,50,0,0,0,0,0" x="4" Valignment="AlignTop" rotation="0" text_from="ElementInfo" y="-24.5" Halignment="AlignLeft" uuid="{56a6a9aa-83b0-4fb3-9934-c55a1d9f5d7e}" z="4" frame="false" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="-16" end2="none" x2="-17" length2="1.5" y1="-16" end1="none" x1="-37" length1="1.5"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="-40" end2="none" x2="0" length2="1.5" y1="-25" end1="none" x1="0" length1="1.5"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="-25" end2="none" x2="-10" length2="1.5" y1="-5" end1="none" x1="0" length1="1.5"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y2="-5" end2="none" x2="0" length2="1.5" y1="10" end1="none" x1="0" length1="1.5"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y2="-15" end2="none" x2="-7" length2="1.5" y1="-15" end1="none" x1="-15" length1="1.5"/>
-        <terminal orientation="n" x="0" y="-40"/>
-        <terminal orientation="s" x="0" y="10"/>
+        <polygon x3="-22" x6="-27" y4="-26" y2="-20" closed="false" x5="-27" y5="-26" y6="-30" x7="-27" x4="-22" x2="-27" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y1="-16" x1="-27" y7="-30"/>
+        <rect y="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-37" width="20" height="28"/>
+        <text y="-5" text="I>" size="9" x="-34"/>
+        <input y="-13.5" text="_" size="8" tagg="label" rotate="true" x="4"/>
+        <line length1="1.5" length2="1.5" y2="-16" end2="none" x2="-17" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="-16" x1="-37"/>
+        <line length1="1.5" length2="1.5" y2="-40" end2="none" x2="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="-25" x1="0"/>
+        <line length1="1.5" length2="1.5" y2="-25" end2="none" x2="-10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="-5" x1="0"/>
+        <line length1="1.5" length2="1.5" y2="-5" end2="none" x2="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="10" x1="0"/>
+        <line length1="1.5" length2="1.5" y2="-15" end2="none" x2="-7" end1="none" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y1="-15" x1="-15"/>
+        <terminal y="-40" orientation="n" x="0"/>
+        <terminal y="10" orientation="s" x="0"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/330_transformers&power_supplies/30_power_supplies/abl8rps24050.elmt
+++ b/elements/10_electric/10_allpole/330_transformers&power_supplies/30_power_supplies/abl8rps24050.elmt
@@ -1,66 +0,0 @@
-<definition orientation="dyyy" version="0.70" height="80" hotspot_x="50" link_type="simple" hotspot_y="39" width="100" type="element">
-    <uuid uuid="{c4ecef4b-8696-443d-9548-83590289d1f6}"/>
-    <names>
-        <name lang="es">Fuente de poder AC/DC 3 polos</name>
-        <name lang="de">Netzteil AC/DC 3-polig</name>
-        <name lang="pl">Zasilacz trójfazowy</name>
-        <name lang="fr">ABL8RPS24050</name>
-        <name lang="en">Power supply AC/DC 3 poles</name>
-    </names>
-    <elementInformations>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="label" show="1"></elementInformation>
-        <elementInformation name="designation" show="1">ABL8RPS24050</elementInformation>
-        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1">schneider</elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-    </elementInformations>
-    <informations>EN 60617: 06-14-03</informations>
-    <description>
-        <text text="AC 3~" y="-7" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="-28"/>
-        <circle diameter="5" y="-32.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="27.5"/>
-        <text text="-" y="24" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="9"/>
-        <text text="-" y="24" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="29"/>
-        <text text="LV" y="-20" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="-14"/>
-        <line length1="1.5" y2="30" length2="1.5" end1="none" antialias="false" x1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x2="27" end2="none"/>
-        <text text="DC" y="12" font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="18"/>
-        <line length1="1.5" y2="30" length2="1.5" end1="none" antialias="false" x1="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x2="7" end2="none"/>
-        <line length1="1.5" y2="30" length2="1.5" end1="none" antialias="false" x1="-27" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x2="-13" end2="none"/>
-        <text text="+" y="24" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="-12"/>
-        <text text="C" y="-20" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="6"/>
-        <circle diameter="5" y="-32.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.5"/>
-        <text text="PE" y="-20" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="-34"/>
-        <text text="HV" y="-20" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="28"/>
-        <circle diameter="5" y="-32.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="7.5"/>
-        <circle diameter="5" y="27.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-32.5"/>
-        <circle diameter="5" y="27.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="27.5"/>
-        <circle diameter="5" y="27.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.5"/>
-        <circle diameter="5" y="27.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="7.5"/>
-        <dynamic_text Valignment="AlignTop" Halignment="AlignLeft" text_width="-1" y="-30" uuid="{85ca85a9-4d65-41f0-bf73-bacf801bfd0e}" text_from="ElementInfo" frame="false" z="20" rotation="0" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-80">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <text text="+" y="24" font="Sans Serif,6,-1,5,50,0,0,0,0,0" rotation="0" color="#000000" x="-32"/>
-        <polygon x3="-45" y2="30" y4="-29.8785" y5="-29.8785" closed="false" x4="-33" y6="-29.8785" x5="-33" x6="-33" antialias="false" x1="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x2="-45" y3="-29.8785"/>
-        <polygon x3="45" y2="-30.1383" y4="30" y5="30" closed="false" x4="33" y6="30" x5="33" x6="33" antialias="false" x1="33" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30.1383" x2="45" y3="30"/>
-        <line length1="1.5" y2="-30" length2="1.5" end1="none" antialias="false" x1="-27" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x2="-13" end2="none"/>
-        <line length1="1.5" y2="-30" length2="1.5" end1="none" antialias="false" x1="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x2="7" end2="none"/>
-        <line length1="1.5" y2="-30" length2="1.5" end1="none" antialias="false" x1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x2="27" end2="none"/>
-        <rect height="30" rx="0" y="-15" width="60" antialias="false" ry="0" style="line-style:normal;line-weight:thin;filling:none;color:black" x="-30"/>
-        <line length1="1.5" y2="15" length2="1.5" end1="none" antialias="false" x1="30" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-15" x2="-30" end2="none"/>
-        <circle diameter="5" y="-32.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-32.5"/>
-        <terminal orientation="n" y="-33" x="-10"/>
-        <terminal orientation="n" y="-33" x="-30"/>
-        <terminal orientation="s" y="33" x="-30"/>
-        <terminal orientation="s" y="33" x="-10"/>
-        <terminal orientation="n" y="-33" x="10"/>
-        <terminal orientation="s" y="33" x="10"/>
-        <terminal orientation="s" y="33" x="30"/>
-        <terminal orientation="n" y="-33" x="30"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/330_transformers&power_supplies/30_power_supplies/power_supply_1_phase_ac_dc.elmt
+++ b/elements/10_electric/10_allpole/330_transformers&power_supplies/30_power_supplies/power_supply_1_phase_ac_dc.elmt
@@ -9,11 +9,11 @@
        <elementInformation show="1" name="plant"></elementInformation>
        <elementInformation show="1" name="quantity"></elementInformation>
        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="machine_manufacturer_reference"></elementInformation>
+        <elementInformation show="1" name="machine-manufacturer-reference"></elementInformation>
        <elementInformation show="1" name="manufacturer"></elementInformation>
        <elementInformation show="1" name="description"></elementInformation>
        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="manufacturer_reference"></elementInformation>
+        <elementInformation show="1" name="manufacturer-reference"></elementInformation>
        <elementInformation show="1" name="designation"></elementInformation>
        <elementInformation show="1" name="comment"></elementInformation>
    </elementInformations>
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/alim.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/alim.elmt
@@ -1,47 +0,0 @@
-<definition type="element" link_type="simple" width="70" height="60" hotspot_y="49" orientation="dyyy" hotspot_x="36" version="0.70">
-    <uuid uuid="{2bb4a252-1a7f-4893-b3bb-8a1c298d19a3}"/>
-    <names>
-        <name lang="pl">Zasilacz</name>
-        <name lang="nl">Gelijkrichter AC1/DC</name>
-        <name lang="en">Rectiﬁer</name>
-        <name lang="it">Raddrizzatore AC/DC</name>
-        <name lang="be">Gelijkrichter AC1/DC</name>
-        <name lang="fr">Redresseur AC/DC</name>
-        <name lang="de">Netzteil AC/DC</name>
-        <name lang="ar">موحد محكوم</name>
-        <name lang="el">Ανορθωτής</name>
-        <name lang="cs">Proudový zdroj</name>
-        <name lang="es">Rectificador</name>
-    </names>
-    <elementInformations/>
-    <informations>EN 60617: 06-14-03</informations>
-    <description>
-        <line x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x2="20" end2="none" y2="-13" end1="none"/>
-        <line x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-15" x2="22" end2="none" y2="-15" end1="none"/>
-        <rect antialias="false" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-40" width="60" rx="0" height="40" x="-30"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{6b3b16fb-bd4b-4639-9469-076599faeba7}" Halignment="AlignLeft" y="-35.45" rotation="0" text_from="ElementInfo" z="2" Valignment="AlignTop" text_width="-1" x="33" frame="false">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line x1="-12" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x2="-8" end2="none" y2="-4" end1="none"/>
-        <line x1="8" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x2="12" end2="none" y2="-4" end1="none"/>
-        <line x1="-30" antialias="true" length1="0" length2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x2="30" end2="simple" y2="-40" end1="simple"/>
-        <arc angle="-175" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35.5" width="5" height="5" start="0" x="-19.5"/>
-        <arc angle="-175" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35.5" width="5" height="5" start="180" x="-24.5"/>
-        <line x1="-25" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28" x2="-14" end2="none" y2="-28" end1="none"/>
-        <line x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x2="10" end2="none" y2="-2" end1="none"/>
-        <line x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x2="-10" end2="none" y2="-40" end1="none"/>
-        <line x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x2="10" end2="none" y2="-40" end1="none"/>
-        <line x1="-10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x2="-10" end2="none" y2="5" end1="none"/>
-        <line x1="10" antialias="false" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x2="10" end2="none" y2="5" end1="none"/>
-        <dynamic_text font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" uuid="{8420c46b-909b-49f8-8bba-fc9aeea69895}" Halignment="AlignLeft" y="-20" rotation="0" text_from="ElementInfo" z="16" Valignment="AlignTop" text_width="-1" x="35" frame="false">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <terminal y="-20" orientation="w" x="-30"/>
-        <terminal y="-45" orientation="n" x="-10"/>
-        <terminal y="-45" orientation="n" x="10"/>
-        <terminal y="5" orientation="s" x="10"/>
-        <terminal y="5" orientation="s" x="-10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/prev_232_485.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/prev_232_485.elmt
@@ -1,52 +0,0 @@
-<definition link_type="simple" height="110" width="90" orientation="dyyy" version="0.80" type="element" hotspot_y="54" hotspot_x="45">
-    <uuid uuid="{80191a66-3b5f-465e-99b1-3479764a0b30}"/>
-    <names>
-        <name lang="cs">Převodník RS232/485 </name>
-        <name lang="fr">Convertiseur RS232/RS485</name>
-    </names>
-    <elementInformations>
-        <elementInformation name="machine-manufacturer-reference" show="1"></elementInformation>
-        <elementInformation name="label" show="1">A</elementInformation>
-        <elementInformation name="designation" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1"></elementInformation>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="manufacturer-reference" show="1"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <rect ry="0" y="-45" rx="0" height="90" style="line-style:normal;line-weight:normal;filling:white;color:black" width="80" antialias="false" x="-40"/>
-        <line x2="40" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-40" y1="45" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
-        <text y="-30" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="RX" color="#000000" rotation="270" x="-26.75"/>
-        <text y="-22" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="GND" color="#000000" rotation="270" x="-13.5"/>
-        <text y="-30" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="TX" color="#000000" rotation="270" x="-3.75"/>
-        <text y="-22.5" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="+Ub" color="#000000" rotation="270" x="16"/>
-        <text y="-26.75" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="-Ub" color="#000000" rotation="270" x="25.25"/>
-        <text y="43" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="DATA+" color="#000000" rotation="270" x="16.25"/>
-        <text y="42.75" font="Sans Serif,7,-1,5,50,0,0,0,0,0" text="DATA-" color="#000000" rotation="270" x="23.5"/>
-        <text y="-5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text="RS232" color="#000000" rotation="0" x="-35"/>
-        <text y="6.75" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text="RS485" color="#000000" rotation="0" x="2.25"/>
-        <line x2="-30" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
-        <line x2="-20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
-        <line x2="-10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
-        <line x2="10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
-        <line x2="20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" y1="-50" length2="1.5" y2="-45" antialias="false" length1="1.5" end2="none"/>
-        <line x2="10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" y1="50" length2="1.5" y2="45" antialias="false" length1="1.5" end2="none"/>
-        <line x2="20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" y1="50" length2="1.5" y2="45" antialias="false" length1="1.5" end2="none"/>
-        <dynamic_text text_width="-1" y="-50" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" text_from="ElementInfo" Halignment="AlignLeft" Valignment="AlignTop" uuid="{ef5d8163-a0af-4a7a-86ea-0f5ef18f6e7e}" frame="false" rotation="0" x="-60" z="19">
-            <text>A</text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <terminal y="50" orientation="s" x="20"/>
-        <terminal y="-50" orientation="n" x="-30"/>
-        <terminal y="-50" orientation="n" x="-20"/>
-        <terminal y="-50" orientation="n" x="20"/>
-        <terminal y="50" orientation="s" x="10"/>
-        <terminal y="-50" orientation="n" x="-10"/>
-        <terminal y="-50" orientation="n" x="10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/prevod_i2c_485.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/prevod_i2c_485.elmt
@@ -1,63 +0,0 @@
-<definition hotspot_x="45" link_type="simple" height="100" type="element" width="90" version="0.80" hotspot_y="49" orientation="dyyy">
-    <uuid uuid="{a9abc5f7-020e-4b5e-b4e8-c0d39290d384}"/>
-    <names>
-        <name lang="cs">Převodník RS485 na I2C</name>
-    </names>
-    <elementInformations>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="designation"></elementInformation>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="machine-manufacturer-reference"></elementInformation>
-        <elementInformation show="1" name="manufacturer"></elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="manufacturer-reference"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <rect antialias="false" y="-40" ry="0" height="80" style="line-style:normal;line-weight:normal;filling:white;color:black" width="80" x="-40" rx="0"/>
-        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="-45" y2="-40" end2="none" length2="1.5"/>
-        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="-45" y2="-40" end2="none" length2="1.5"/>
-        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="-45" y2="-40" end2="none" length2="1.5"/>
-        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="-45" y2="-40" end2="none" length2="1.5"/>
-        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="40" y2="45" end2="none" length2="1.5"/>
-        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="40" y2="45" end2="none" length2="1.5"/>
-        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="40" y2="45" end2="none" length2="1.5"/>
-        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="40" y2="45" end2="none" length2="1.5"/>
-        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="40" y2="45" end2="none" length2="1.5"/>
-        <text y="-5.25" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-17.25" rotation="270" text="DATA+" color="#000000"/>
-        <text y="-5.25" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-4" rotation="270" text="DATA-" color="#000000"/>
-        <text y="-17.75" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="15.5" rotation="270" text="+Ub" color="#000000"/>
-        <text y="-21.5" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="25.75" rotation="270" text="-Ub" color="#000000"/>
-        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-25" rotation="0" text="1" color="#000000"/>
-        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-15" rotation="0" text="2" color="#000000"/>
-        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-5" rotation="0" text="3" color="#000000"/>
-        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="5" rotation="0" text="4" color="#000000"/>
-        <text y="35" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="15" rotation="0" text="5" color="#000000"/>
-        <text y="10" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-30" rotation="0" text="RS485/I2C" color="#000000"/>
-        <dynamic_text y="-40" z="21" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{a709e01c-eb4a-44af-9b5d-c57f1350b98b}" frame="false" x="-65" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <dynamic_text y="-35" z="22" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{ac9ea9a8-85a3-4a84-89c5-9f3af69804b3}" frame="false" x="-65" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <dynamic_text y="-45" z="23" Valignment="AlignTop" text_from="UserText" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{40770369-fcd3-40e2-ac97-1f3b0b903e5e}" frame="false" x="-65" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>A</text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <terminal y="-45" orientation="n" x="10"/>
-        <terminal y="45" orientation="s" x="-10"/>
-        <terminal y="-45" orientation="n" x="20"/>
-        <terminal y="45" orientation="s" x="-20"/>
-        <terminal y="-45" orientation="n" x="-20"/>
-        <terminal y="45" orientation="s" x="10"/>
-        <terminal y="45" orientation="s" x="0"/>
-        <terminal y="-45" orientation="n" x="-10"/>
-        <terminal y="45" orientation="s" x="20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/ts_811.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/ts_811.elmt
@@ -1,61 +0,0 @@
-<definition hotspot_x="26" link_type="simple" height="60" type="element" width="60" version="0.80" hotspot_y="29" orientation="dyyy">
-    <uuid uuid="{f199d479-3cac-4ce9-ac7a-0459fe8fa72e}"/>
-    <names>
-        <name lang="cs">Filtr TS 811 1751</name>
-        <name lang="fr">Filtr TS 811 1751</name>
-    </names>
-    <elementInformations>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="designation">Filtr TS 811 1751</elementInformation>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="manufacturer">Almeto</elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <rect antialias="false" y="-20" ry="0" height="40" style="line-style:normal;line-weight:normal;filling:white;color:black" width="40" x="-20" rx="0"/>
-        <arc antialias="true" y="-5" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="90" x="-8"/>
-        <dynamic_text y="-26" z="3" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{aa988639-f6d4-4274-acc5-6887be575636}" frame="false" x="-45" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <arc antialias="true" y="-5" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="0" x="-8"/>
-        <arc antialias="true" y="-3" height="4" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="180" x="0"/>
-        <arc antialias="true" y="1" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="90" x="-8"/>
-        <arc antialias="true" y="-5" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="270" x="1"/>
-        <arc antialias="true" y="1" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="0" x="-8"/>
-        <arc antialias="true" y="3" height="4" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="180" x="0"/>
-        <arc antialias="true" y="1" height="6" angle="90" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8" start="270" x="1"/>
-        <line antialias="false" x2="1" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-3.94712" y1="-0.90022" y2="-6" end2="none" length2="1.5"/>
-        <line antialias="false" x2="4.70884" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-1.17721" y1="0.276991" y2="-5.88606" end2="none" length2="1.5"/>
-        <dynamic_text y="-31" z="13" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{da9a679c-f119-40fe-acfb-ea8d8c2f5d35}" frame="false" x="-12" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>L'</text>
-        </dynamic_text>
-        <dynamic_text y="-31" z="14" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{283d6346-7d17-40a7-b723-a59101b0b0cc}" frame="false" x="8" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>N'</text>
-        </dynamic_text>
-        <dynamic_text y="17" z="15" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{2b8ed13b-fa20-4e97-94c6-06a03b313872}" frame="false" x="8" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>N</text>
-        </dynamic_text>
-        <dynamic_text y="17" z="16" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{484182d6-2f59-49b0-8887-b832af7ae015}" frame="false" x="-12" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>L</text>
-        </dynamic_text>
-        <dynamic_text y="-3" z="17" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{84aa21a5-df3f-4e52-990c-85873ab34d15}" frame="false" x="18" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>PE</text>
-        </dynamic_text>
-        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="-20" y2="-25" end2="none" length2="1.5"/>
-        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="-20" y2="-25" end2="none" length2="1.5"/>
-        <line antialias="false" x2="25" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="0" y2="0" end2="none" length2="1.5"/>
-        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="20" y2="25" end2="none" length2="1.5"/>
-        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="20" y2="25" end2="none" length2="1.5"/>
-        <terminal y="-25" orientation="n" x="10"/>
-        <terminal y="25" orientation="s" x="-10"/>
-        <terminal y="-25" orientation="n" x="-10"/>
-        <terminal y="25" orientation="s" x="10"/>
-        <terminal y="0" orientation="e" x="25"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/tsk6711.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/tsk6711.elmt
@@ -1,42 +0,0 @@
-<definition hotspot_x="35" link_type="simple" height="80" type="element" width="70" version="0.80" hotspot_y="38" orientation="dyyy">
-    <uuid uuid="{ea7ba465-17d2-4dd0-96f8-4abef454aa76}"/>
-    <names>
-        <name lang="cs">TSK 6711</name>
-        <name lang="fr">TSK 6711</name>
-    </names>
-    <elementInformations>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="designation">TSK 6711</elementInformation>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="manufacturer">Almeto</elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <rect antialias="false" y="-28" ry="0" height="58" style="line-style:normal;line-weight:normal;filling:white;color:black" width="60" x="-30" rx="0"/>
-        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-22" rotation="0" text="L" color="#000000"/>
-        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-3" rotation="0" text="N" color="#000000"/>
-        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="14" rotation="0" text="PE" color="#000000"/>
-        <text y="27" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-12" rotation="0" text="L'" color="#000000"/>
-        <text y="27" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="6" rotation="0" text="N'" color="#000000"/>
-        <text y="-2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-24" rotation="0" text="RFI Filter&#xa;TSK6711" color="#000000"/>
-        <dynamic_text y="-33" z="8" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{73313bd0-f4e7-438c-a074-0d733181576d}" frame="false" x="-48" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="-28" y2="-32" end2="none" length2="1.5"/>
-        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="-28" y2="-32" end2="none" length2="1.5"/>
-        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="-28" y2="-32" end2="none" length2="1.5"/>
-        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="30" y2="34" end2="none" length2="1.5"/>
-        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="30" y2="34" end2="none" length2="1.5"/>
-        <terminal y="-32" orientation="n" x="0"/>
-        <terminal y="-32" orientation="n" x="-20"/>
-        <terminal y="-32" orientation="n" x="20"/>
-        <terminal y="34" orientation="s" x="10"/>
-        <terminal y="34" orientation="s" x="-10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/tsk_6741.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/90_filters/almeto/tsk_6741.elmt
@@ -1,42 +0,0 @@
-<definition hotspot_x="35" link_type="simple" height="80" type="element" width="70" version="0.80" hotspot_y="38" orientation="dyyy">
-    <uuid uuid="{9b6d7261-76a5-46a0-90a4-243589f7ff6d}"/>
-    <names>
-        <name lang="cs">TSK 6741</name>
-        <name lang="fr">TSK 6741</name>
-    </names>
-    <elementInformations>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="designation">TSK 6741</elementInformation>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="manufacturer">Almeto</elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <rect antialias="false" y="-28" ry="0" height="58" style="line-style:normal;line-weight:normal;filling:white;color:black" width="60" x="-30" rx="0"/>
-        <text y="26" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-22" rotation="0" text="L" color="#000000"/>
-        <text y="26" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-4" rotation="0" text="N" color="#000000"/>
-        <text y="26" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="14" rotation="0" text="PE" color="#000000"/>
-        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-22" rotation="0" text="L'" color="#000000"/>
-        <text y="-18" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-4" rotation="0" text="N'" color="#000000"/>
-        <text y="-2" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-24" rotation="0" text="RFI Filter&#xa;TSK6741" color="#000000"/>
-        <dynamic_text y="-33" z="8" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{2ad88ce9-f1f1-425d-a05f-1a50118ebbc9}" frame="false" x="-48" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="-28" y2="-32" end2="none" length2="1.5"/>
-        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="-28" y2="-32" end2="none" length2="1.5"/>
-        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="30" y2="34" end2="none" length2="1.5"/>
-        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="30" y2="34" end2="none" length2="1.5"/>
-        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="30" y2="34" end2="none" length2="1.5"/>
-        <terminal y="34" orientation="s" x="0"/>
-        <terminal y="-32" orientation="n" x="0"/>
-        <terminal y="34" orientation="s" x="20"/>
-        <terminal y="-32" orientation="n" x="-20"/>
-        <terminal y="34" orientation="s" x="-20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/340_converters&inverters/90_filters/schurter/kfs4300.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/90_filters/schurter/kfs4300.elmt
@@ -1,58 +0,0 @@
-<definition hotspot_x="35" link_type="simple" height="80" type="element" width="70" version="0.80" hotspot_y="40" orientation="dyyy">
-    <uuid uuid="{617264c1-5351-4e5e-9a43-eeb1077403ce}"/>
-    <names>
-        <name lang="cs">Filtr KFS 4300</name>
-        <name lang="fr">Filtre KFS 4300</name>
-    </names>
-    <elementInformations>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="designation"></elementInformation>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="manufacturer"></elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <rect antialias="false" y="-30" ry="0" height="60" style="line-style:normal;line-weight:normal;filling:white;color:black" width="60" x="-30" rx="0"/>
-        <arc antialias="true" y="30" height="6" angle="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" start="0" x="-3"/>
-        <dynamic_text y="-33" z="3" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{2a587053-e9d5-486e-8426-2ce8b00de2b3}" frame="false" x="-6" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>N</text>
-        </dynamic_text>
-        <arc antialias="true" y="30" height="6" angle="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" start="0" x="17"/>
-        <dynamic_text y="19" z="5" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{cc5bfc34-c77d-40f2-963e-4415896c4644}" frame="false" x="-6" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>N</text>
-        </dynamic_text>
-        <dynamic_text y="19" z="6" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{044badff-81f8-42b3-ad05-ae83e0130580}" frame="false" x="12" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>PE</text>
-        </dynamic_text>
-        <arc antialias="true" y="30" height="6" angle="180" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" start="0" x="-23"/>
-        <dynamic_text y="-33" z="8" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{ac22be33-0c3a-4800-a4ee-c972333c01ab}" frame="false" x="12" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>PE</text>
-        </dynamic_text>
-        <dynamic_text y="-33" z="9" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{33de4ed1-00ff-4393-80f9-f2fa8047f4ed}" frame="false" x="-26" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>L</text>
-        </dynamic_text>
-        <dynamic_text y="19" z="10" Valignment="AlignTop" text_from="UserText" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{51c4bfff-f3a0-487e-b5c5-a62d5fafd0de}" frame="false" x="-26" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>L</text>
-        </dynamic_text>
-        <dynamic_text y="-16" z="11" Valignment="AlignTop" text_from="UserText" font="Sans Serif,5,-1,5,50,0,0,0,0,0" uuid="{0d659559-bd21-47e3-b9f9-09a21cf1c7ee}" frame="false" x="-18" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text>Schurter
-KFS4300
-5055</text>
-        </dynamic_text>
-        <dynamic_text y="-33" z="12" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{f309ca0f-77ef-4b89-99ae-1b82b81affb3}" frame="false" x="-50" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line antialias="false" x2="-20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-20" y1="-30" y2="-34" end2="none" length2="1.5"/>
-        <line antialias="false" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="0" y1="-30" y2="-34" end2="none" length2="1.5"/>
-        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="-30" y2="-34" end2="none" length2="1.5"/>
-        <terminal y="-34" orientation="n" x="0"/>
-        <terminal y="-34" orientation="n" x="20"/>
-        <terminal y="-34" orientation="n" x="-20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/carte_voyant.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/carte_voyant.elmt
@@ -1,135 +0,0 @@
-<definition version="0.70" orientation="dyyy" type="element" width="450" height="90" hotspot_y="44" hotspot_x="225" link_type="simple">
-    <uuid uuid="{202b43e9-7b17-4df1-8a21-b0bbdd57c9ab}"/>
-    <names>
-        <name lang="fr">Carte à voyant</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="6.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-143.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="66.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="126.465" antialias="false" y="-23.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-170" rx="0" antialias="false" ry="0" width="20" height="10" y="-25"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-123.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="126.465" antialias="false" y="16.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-150" rx="0" antialias="false" ry="0" width="20" height="10" y="-25"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-83.535" antialias="false" y="16.5"/>
-        <text x="-100" color="#000000" text="RD2" rotation="0" y="10" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-83.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-143.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="106.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="6.465" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="186.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-103.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="46.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-163.535" antialias="false" y="16.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="80" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="66.465" antialias="false" y="-23.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-90" rx="0" antialias="false" ry="0" width="20" height="10" y="-25"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-190" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-130" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-130" rx="0" antialias="false" ry="0" width="40" height="10" y="-25"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="20" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-40" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="166.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-163.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="186.465" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-123.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-103.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-183.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="86.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-33.535" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.465" antialias="false" y="16.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="106.465" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="46.465" antialias="false" y="-23.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-40" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="166.465" antialias="false" y="-23.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="80" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="20" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="26.465" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-33.535" antialias="false" y="-23.5"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="86.465" antialias="false" y="-23.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="140" rx="0" antialias="false" ry="0" width="60" height="10" y="-25"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="140" rx="0" antialias="false" ry="0" width="60" height="10" y="15"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="146.465" antialias="false" y="-23.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-220" rx="0" antialias="false" ry="0" width="440" height="80" y="-40"/>
-        <circle diameter="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="146.465" antialias="false" y="16.5"/>
-        <text x="-180" color="#000000" text="NO" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-160" color="#000000" text="C" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-140" color="#000000" text="NF" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-160" color="#000000" text="RD1" rotation="0" y="10" font="Sans Serif,5,-1,5,50,0,0,0,0,0"/>
-        <text x="-120" color="#000000" text="NO" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-100" color="#000000" text="C" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-79" color="#000000" text="NF" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-29.8553" color="#000000" text="24" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-10" color="#000000" text="23" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="10" color="#000000" text="22" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="30" color="#000000" text="21" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="50" color="#000000" text="20" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="70" color="#000000" text="19" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="90" color="#000000" text="18" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="110" color="#000000" text="17" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="130" color="#000000" text="16" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="150" color="#000000" text="15" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="170" color="#000000" text="14" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="190" color="#000000" text="13" rotation="0" y="35" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-30.9073" color="#000000" text="01" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-10" color="#000000" text="02" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="30" color="#000000" text="04" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="50" color="#000000" text="05" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="70" color="#000000" text="06" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="90" color="#000000" text="07" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="110" color="#000000" text="08" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="130" color="#000000" text="09" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="150" color="#000000" text="10" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="170" color="#000000" text="11" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="190" color="#000000" text="12" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="10" color="#000000" text="03" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-165" color="#000000" text="24VTp" rotation="0" y="-30" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-145" color="#000000" text="+24V" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-126" color="#000000" text="24VAC" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-106" color="#000000" text="24VAC" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <text x="-83" color="#000000" text="0V" rotation="0" y="-29" font="Sans Serif,4,-1,5,50,0,0,0,0,0"/>
-        <line x1="-199.776" y2="0" length2="1.5" length1="1.5" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end2="none" x2="-199.776" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-204" rx="0" antialias="false" ry="0" width="0" height="1" y="-17"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-204" rx="0" antialias="false" ry="0" width="8.4474" height="15" y="-17"/>
-        <terminal x="-29.8553" orientation="s" y="40"/>
-        <terminal x="10" orientation="n" y="-40"/>
-        <terminal x="-79.8553" orientation="s" y="40"/>
-        <terminal x="70.1447" orientation="s" y="40"/>
-        <terminal x="-9.8553" orientation="s" y="40"/>
-        <terminal x="-140" orientation="n" y="-40"/>
-        <terminal x="150" orientation="n" y="-40"/>
-        <terminal x="-120" orientation="n" y="-39"/>
-        <terminal x="50.1447" orientation="s" y="40"/>
-        <terminal x="70" orientation="n" y="-40"/>
-        <terminal x="-30" orientation="n" y="-40"/>
-        <terminal x="110" orientation="n" y="-40"/>
-        <terminal x="-119.855" orientation="s" y="40"/>
-        <terminal x="30" orientation="n" y="-40"/>
-        <terminal x="-99.8553" orientation="s" y="40"/>
-        <terminal x="-100" orientation="n" y="-40"/>
-        <terminal x="10.1447" orientation="s" y="40"/>
-        <terminal x="-160" orientation="n" y="-40"/>
-        <terminal x="130.145" orientation="s" y="40"/>
-        <terminal x="190" orientation="n" y="-40"/>
-        <terminal x="-139.855" orientation="s" y="40"/>
-        <terminal x="130" orientation="n" y="-40"/>
-        <terminal x="-180" orientation="s" y="40"/>
-        <terminal x="-160" orientation="s" y="40"/>
-        <terminal x="30.1447" orientation="s" y="40"/>
-        <terminal x="150.145" orientation="s" y="40"/>
-        <terminal x="90" orientation="n" y="-40"/>
-        <terminal x="109.883" orientation="s" y="40"/>
-        <terminal x="-80" orientation="n" y="-39"/>
-        <terminal x="90.1447" orientation="s" y="40"/>
-        <terminal x="50" orientation="n" y="-40"/>
-        <terminal x="170" orientation="n" y="-40"/>
-        <terminal x="190" orientation="s" y="40"/>
-        <terminal x="170.145" orientation="s" y="40"/>
-        <terminal x="-10" orientation="n" y="-40"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/carte_voyant2.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/carte_voyant2.elmt
@@ -1,147 +0,0 @@
-<definition hotspot_y="4" orientation="dyyy" hotspot_x="5" width="560" link_type="simple" type="element" height="150" version="0.70">
-    <uuid uuid="{0393ed13-81ec-405e-ad5b-5f99855e2cf6}"/>
-    <names>
-        <name lang="fr">Carte à voyant</name>
-    </names>
-    <elementInformations>
-        <elementInformation name="machine_manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="designation" show="1"></elementInformation>
-        <elementInformation name="label" show="1"></elementInformation>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="manufacturer_reference" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1">Best</elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <circle diameter="15" x="182.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="182.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="362.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="362.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="452.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="452.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="272.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="272.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="302.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="482.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="302.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="482.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="212.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="212.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="392.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="392.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="422.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="512.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="422.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="332.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="512.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="355" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="76.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="445" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="332.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="355" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="265" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="242.5" y="102.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="445" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="175" y="100" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="265" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="50" y="20" width="20" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="96.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="70" y="20" width="20" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="136.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="120" color="#000000" y="107" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0" text="RD2"/>
-        <circle diameter="7" x="136.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="76.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="15" x="242.5" y="22.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="116.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="56.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="130" y="20" width="20" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="30" y="110" width="60" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="90" y="110" width="60" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="90" y="20" width="40" height="10" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="56.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="96.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="116.5" y="21.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle diameter="7" x="36.5" y="111.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="175" y="20" width="90" height="20" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="0" y="0" width="550" height="140" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="40" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NO"/>
-        <text x="60" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="C"/>
-        <text x="80" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NF"/>
-        <text x="60" color="#000000" y="107" rotation="0" font="Sans Serif,5,-1,5,50,0,0,0,0,0" text="RD1"/>
-        <text x="100" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NO"/>
-        <text x="120" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="C"/>
-        <text x="140" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="NF"/>
-        <text x="190" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24"/>
-        <text x="220" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="23"/>
-        <text x="250" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="22"/>
-        <text x="280" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="21"/>
-        <text x="310" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="20"/>
-        <text x="340" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="19"/>
-        <text x="370" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="18"/>
-        <text x="400" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="17"/>
-        <text x="430" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="16"/>
-        <text x="460" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="15"/>
-        <text x="490" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="14"/>
-        <text x="520" color="#000000" y="135" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="13"/>
-        <text x="190" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="01"/>
-        <text x="220" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="02"/>
-        <text x="280" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="04"/>
-        <text x="310" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="05"/>
-        <text x="340" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="06"/>
-        <text x="370" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="07"/>
-        <text x="400" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="08"/>
-        <text x="430" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="09"/>
-        <text x="460" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="10"/>
-        <text x="490" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="11"/>
-        <text x="520" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="12"/>
-        <text x="250" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="03"/>
-        <text x="60" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VTp"/>
-        <text x="80" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="+24V"/>
-        <text x="100" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VAC"/>
-        <text x="120" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="24VAC"/>
-        <text x="140" color="#000000" y="10" rotation="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" text="0V"/>
-        <line end1="none" end2="none" y1="22" length1="1.5" x2="20" y2="43" length2="1.5" antialias="false" x1="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="16" y="25" width="0" height="1" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect ry="0" x="16" y="25" width="8" height="15" rx="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal orientation="s" x="400" y="140"/>
-        <terminal orientation="s" x="250" y="140"/>
-        <terminal orientation="s" x="190" y="140"/>
-        <terminal orientation="n" x="100" y="0"/>
-        <terminal orientation="s" x="490" y="140"/>
-        <terminal orientation="n" x="80" y="0"/>
-        <terminal orientation="n" x="280" y="0"/>
-        <terminal orientation="s" x="460" y="140"/>
-        <terminal orientation="n" x="340" y="0"/>
-        <terminal orientation="n" x="370" y="0"/>
-        <terminal orientation="s" x="340" y="140"/>
-        <terminal orientation="n" x="220" y="0"/>
-        <terminal orientation="s" x="280" y="140"/>
-        <terminal orientation="n" x="400" y="0"/>
-        <terminal orientation="n" x="490" y="0"/>
-        <terminal orientation="s" x="140" y="140"/>
-        <terminal orientation="n" x="120" y="0"/>
-        <terminal orientation="n" x="430" y="0"/>
-        <terminal orientation="n" x="310" y="0"/>
-        <terminal orientation="s" x="370" y="140"/>
-        <terminal orientation="n" x="460" y="0"/>
-        <terminal orientation="n" x="190" y="0"/>
-        <terminal orientation="s" x="80" y="140"/>
-        <terminal orientation="s" x="40" y="140"/>
-        <terminal orientation="s" x="220" y="140"/>
-        <terminal orientation="s" x="60" y="140"/>
-        <terminal orientation="s" x="310" y="140"/>
-        <terminal orientation="s" x="100" y="140"/>
-        <terminal orientation="n" x="60" y="0"/>
-        <terminal orientation="s" x="520" y="140"/>
-        <terminal orientation="n" x="140" y="0"/>
-        <terminal orientation="s" x="430" y="140"/>
-        <terminal orientation="n" x="520" y="0"/>
-        <terminal orientation="n" x="250" y="0"/>
-        <terminal orientation="s" x="120" y="140"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampe2.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/11_optical_signaling/lampe2.elmt
@@ -13,7 +13,6 @@
        <name lang="en">Light</name>
        <name lang="pl">Lampa</name>
        <name lang="nl">Lamp</name>
-        <name lang="en">Light</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
--- a/elements/10_electric/10_allpole/380_signaling&operating/12_acoustic_signaling/avertisseur.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/12_acoustic_signaling/avertisseur.elmt
@@ -1,29 +1,32 @@
-<definition height="50" hotspot_y="24" version="0.60" width="50" type="element" hotspot_x="10" orientation="dyyy" link_type="simple">
-    <uuid uuid="{b9c6cdc5-159d-458d-95b1-1eb8c4685dd3}"/>
-    <names>
-        <name lang="pl">Buczek</name>
-        <name lang="nl">Toeter</name>
-        <name lang="el">Κόρνα</name>
-        <name lang="pt">Buzina</name>
-        <name lang="fr">Avertisseur</name>
-        <name lang="it">Tromba</name>
-        <name lang="de">Warnhupe</name>
-        <name lang="cs">Houkačka</name>
-        <name lang="en">Horn</name>
-        <name lang="ru">Горн</name>
-        <name lang="es">Bocina</name>
+<definition width="70" version="0.3" hotspot_x="15" hotspot_y="35" height="50" type="element" orientation="dyyy">
+<uuid uuid="{C7BB71E9-DA4F-498D-801B-464A13F85A61}"/><names>
        <name lang="ar">مُنبّه</name>
+        <name lang="de">Warnhupe</name>
+        <name lang="ru">Горн</name>
+        <name lang="pt">Buzina</name>
+        <name lang="el">Κόρνα</name>
+        <name lang="en">Horn</name>
+        <name lang="it">Tromba</name>
+        <name lang="fr">Avertisseur</name>
+        <name lang="pl">Buczek</name>
+        <name lang="es">Corneta</name>
+        <name lang="cs">Houkačka</name>
+        <name lang="nl">Toeter</name>
    </names>
    <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <polygon y1="5" closed="false" y4="-5" antialias="true" y2="10" y3="-10" x1="6" x3="26" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="36" x4="6"/>
-        <input y="3" x="41" tagg="label" size="9" text="_"/>
-        <line length1="1.5" y1="12" antialias="false" y2="12" end1="none" x1="6" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-6" end2="none"/>
-        <line length1="1.5" y1="-12" antialias="false" y2="12" end1="none" x1="6" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="6" end2="none"/>
-        <line length1="1.5" y1="-12" antialias="false" y2="12" end1="none" x1="-6" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-6" end2="none"/>
-        <line length1="1.5" y1="-12" antialias="false" y2="-12" end1="none" x1="-6" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="6" end2="none"/>
-        <terminal y="16" x="0" orientation="s"/>
-        <terminal y="-16" x="0" orientation="n"/>
+        <polygon x4="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5" x1="10" y2="0" x2="40" y3="-20" x3="30" y4="-15"/>
+        <input x="45" y="-7" size="9" text="_" tagg="label"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="10" y2="2" 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="-30" x1="-10" 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="-22" x1="10" y2="2" 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="-22" x1="-2" y2="2" 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="-22" x1="-2" y2="-22" 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="-10" y2="-20" 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="10" x1="-10" y2="0" 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="-10" y2="0" x2="-2"/>
+        <terminal x="-10" y="10" orientation="s"/>
+        <terminal x="-10" y="-30" orientation="n"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/e-stop3p.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/e-stop3p.elmt
@@ -1,56 +0,0 @@
-<definition version="0.70" height="60" type="element" width="70" hotspot_x="17" link_type="master" hotspot_y="30" orientation="dyyy">
-    <uuid uuid="{33213f58-54db-423e-9c10-89ca3adf538b}"/>
-    <names>
-        <name lang="cs">Nouzové zastavení</name>
-        <name lang="ar">زرّ توقف طارئ (NC)</name>
-        <name lang="pt">Paragem de emergência (NC)</name>
-        <name lang="en">Emergency stop (NC)</name>
-        <name lang="nl">Noodstop drukknop (NC)</name>
-        <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
-        <name lang="ru">Аварийный стоп</name>
-        <name lang="it">Arresto d'emergenza</name>
-        <name lang="de">Pilzdrucktaster Öffner</name>
-        <name lang="fr">Arrêt d'urgence (NF)</name>
-        <name lang="es">Parada de emergencia (NC)</name>
-    </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">commutator</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="21" color="#000000" text="1" y="-17" rotation="0"/>
-        <polygon x3="0" y1="-10" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" antialias="true" y2="10" closed="false" x2="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="21" color="#000000" text="2" y="18" rotation="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="41" color="#000000" text="3" y="-17" rotation="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="2" y="18" rotation="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="41" color="#000000" text="4" y="18" rotation="0"/>
-        <line y1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="true" length1="1.5" end2="none" y2="0" end1="none" x2="-1"/>
-        <arc height="10" x="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="-5" width="8" start="-90" antialias="true"/>
-        <line y1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-4"/>
-        <line y1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="6"/>
-        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="0"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-29" text_from="ElementInfo" y="-7" z="12" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{b5b7a461-b739-4958-92ac-3848d0ca99be}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="5" end1="none" x2="-7"/>
-        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="36"/>
-        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="20"/>
-        <line y1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="26"/>
-        <line y1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="20"/>
-        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="25"/>
-        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="40"/>
-        <line y1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="40"/>
-        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="33"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="1" y="-17" rotation="0"/>
-        <line y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-4"/>
-        <terminal x="40" y="-20" orientation="n"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="20" y="-20" orientation="n"/>
-        <terminal x="40" y="20" orientation="s"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="20" y="20" orientation="s"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/e_stop_1p.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/e_stop_1p.elmt
@@ -1,41 +0,0 @@
-<definition version="0.70" height="60" type="element" width="30" hotspot_x="17" link_type="master" hotspot_y="30" orientation="dyyy">
-    <uuid uuid="{0cd260bb-47bb-45ec-9f21-b5426b6587c6}"/>
-    <names>
-        <name lang="cs">Nouzové zastavení 1p</name>
-        <name lang="ar">زرّ توقف طارئ (NC)</name>
-        <name lang="pt">Paragem de emergência (NC)</name>
-        <name lang="en">Emergency stop (NC)</name>
-        <name lang="nl">Noodstop drukknop (NC)</name>
-        <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
-        <name lang="ru">Аварийный стоп</name>
-        <name lang="it">Arresto d'emergenza</name>
-        <name lang="de">Pilzdrucktaster Öffner</name>
-        <name lang="fr">Arrêt d'urgence (NF)</name>
-        <name lang="es">Parada de emergencia (NC)</name>
-    </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">commutator</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon x3="0" y1="-10" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" antialias="true" y2="10" closed="false" x2="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="2" y="18" rotation="0"/>
-        <line y1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="true" length1="1.5" end2="none" y2="0" end1="none" x2="-1"/>
-        <arc height="10" x="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="-5" width="8" start="-90" antialias="true"/>
-        <line y1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-4"/>
-        <line y1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="6"/>
-        <line y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-9" end1="none" x2="0"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-29" text_from="ElementInfo" y="-7" z="8" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{c703c729-03a4-402b-a03a-857a56439457}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-7" length2="1.5" antialias="false" length1="1.5" end2="none" y2="5" end1="none" x2="-7"/>
-        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="2"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="1" y="-17" rotation="0"/>
-        <line y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-4" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-7"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="0" y="-20" orientation="n"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/mag_spinac.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/mag_spinac.elmt
@@ -1,64 +0,0 @@
-<definition orientation="dyyy" hotspot_y="31" hotspot_x="29" width="80" version="0.80" type="element" height="60" link_type="simple">
-    <uuid uuid="{b4edcab9-dda2-4ef4-839d-e3875c61fed7}"/>
-    <names>
-        <name lang="ar">زرّ توقف طارئ (NC)</name>
-        <name lang="es">Parada de emergencia (NC)</name>
-        <name lang="pl">Łącznik przyciskowy (przycisk bezpieczeństwa)</name>
-        <name lang="it">Arresto d'emergenza</name>
-        <name lang="de">Pilzdrucktaster Öffner</name>
-        <name lang="pt">Paragem de emergência (NC)</name>
-        <name lang="fr">Arrêt d'urgence (NF)</name>
-        <name lang="cs">Dveřní spínač magnetický</name>
-        <name lang="en">Emergency stop (NC)</name>
-        <name lang="ru">Аварийный стоп</name>
-        <name lang="nl">Noodstop drukknop (NC)</name>
-    </names>
-    <elementInformations>
-        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="manufacturer"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="designation"></elementInformation>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-    </elementInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <text x="21" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="-17" text="1" rotation="0"/>
-        <polygon x1="5" y1="-10" x2="0" x3="0" closed="false" antialias="true" y2="10" y3="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="21" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="18" text="2" rotation="0"/>
-        <text x="41" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="-17" text="3" rotation="0"/>
-        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="18" text="2" rotation="0"/>
-        <text x="41" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="18" text="4" rotation="0"/>
-        <line x1="0" y1="-9" end1="none" length1="1.5" length2="1.5" x2="6" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="0" y1="-20" end1="none" length1="1.5" length2="1.5" x2="0" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <dynamic_text z="9" text_width="-1" x="-42" uuid="{522765e1-81a1-4dfc-bba6-792fc10a339c}" Halignment="AlignLeft" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" text_from="ElementInfo" Valignment="AlignTop" y="-7" rotation="0">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line x1="20" y1="-18" end1="none" length1="1.5" length2="1.5" x2="20" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="20" y1="-9" end1="none" length1="1.5" length2="1.5" x2="26" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="20" y1="17" end1="none" length1="1.5" length2="1.5" x2="20" antialias="false" end2="none" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="20" y1="10" end1="none" length1="1.5" length2="1.5" x2="25" antialias="false" end2="none" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="40" y1="-16" end1="none" length1="1.5" length2="1.5" x2="40" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="40" y1="16" end1="none" length1="1.5" length2="1.5" x2="40" antialias="false" end2="none" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="40" y1="10" end1="none" length1="1.5" length2="1.5" x2="33" antialias="false" end2="none" y2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="1" font="Sans Serif,5,-1,5,50,0,0,0,0,0" color="#000000" y="-17" text="1" rotation="0"/>
-        <polygon x1="-10" y1="0" y7="0" y6="0" x2="-15" y5="0" x6="-10" x3="-20" x7="-10" closed="false" antialias="false" x5="-10" x4="-15" y2="-5" y3="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="5"/>
-        <line x1="-16" y1="-4" end1="none" length1="1.5" length2="1.5" x2="-16" antialias="false" end2="none" y2="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x1="-14" y1="-4" end1="none" length1="1.5" length2="1.5" x2="-14" antialias="false" end2="none" y2="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x8="-19" y6="-5" x6="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="-24" antialias="false" y7="5" y4="-6" x5="-19" y3="-6" x2="-24" y5="-5" x1="-19" x4="-19" y8="5" x7="-23" closed="false" y2="6" y1="6"/>
-        <line x1="-20" y1="-6" end1="none" length1="1.5" length2="1.5" x2="-23" antialias="false" end2="none" y2="-6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x1="-20" y1="-6" x2="-23" x3="-23" closed="false" antialias="false" x4="-19" y2="-6" y3="6" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="6"/>
-        <line x1="-10" y1="0" end1="none" length1="1.5" length2="1.5" x2="36" antialias="false" end2="none" y2="0" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
-        <terminal orientation="n" x="0" y="-20"/>
-        <terminal orientation="s" x="0" y="20"/>
-        <terminal orientation="s" x="20" y="20"/>
-        <terminal orientation="s" x="40" y="20"/>
-        <terminal orientation="n" x="40" y="-20"/>
-        <terminal orientation="n" x="20" y="-20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/otocny_spinac.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/otocny_spinac.elmt
@@ -1,23 +0,0 @@
-<definition version="0.70" height="50" type="element" width="40" hotspot_x="29" link_type="simple" hotspot_y="25" orientation="dyyy">
-    <uuid uuid="{caef4d22-3e62-462b-9b42-52fe7a7e7e6f}"/>
-    <names>
-        <name lang="cs">Otočný spínač</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="0"/>
-        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="15" end1="none" x2="0"/>
-        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="-5"/>
-        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-5" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-20"/>
-        <polygon x3="-20" y1="-5" y3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" antialias="false" y4="5" y2="-5" x4="-25" closed="false" x2="-20"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="3" y="-12" rotation="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="4" y="13" rotation="0"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-46" text_from="ElementInfo" y="-13" z="8" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{b09e55b6-81c8-438a-9bc4-c40573d99d3d}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <terminal x="0" y="-15" orientation="n"/>
-        <terminal x="0" y="15" orientation="s"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/rozpin_tlacitko.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/rozpin_tlacitko.elmt
@@ -1,24 +0,0 @@
-<definition version="0.70" height="50" type="element" width="30" hotspot_x="22" link_type="simple" hotspot_y="26" orientation="dyyy">
-    <uuid uuid="{26747ab8-68b3-48bc-ba35-994bd72091e1}"/>
-    <names>
-        <name lang="cs">Rozpínací tlačítko</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="0"/>
-        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="15" end1="none" x2="0"/>
-        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-11" end1="none" x2="5"/>
-        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="1" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-20"/>
-        <polygon x3="-20" y1="-5" y3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" antialias="false" y4="5" y2="-5" x4="-15" closed="false" x2="-20"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="1" y="-13" rotation="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="2" y="13" rotation="0"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-46" text_from="ElementInfo" y="-13" z="8" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{b6af45cd-f9bf-429a-83ad-5f06ff421d3b}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="6"/>
-        <terminal x="0" y="-15" orientation="n"/>
-        <terminal x="0" y="15" orientation="s"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/spin_tlacitko.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/20_push_buttons/spin_tlacitko.elmt
@@ -1,23 +0,0 @@
-<definition version="0.70" height="50" type="element" width="30" hotspot_x="22" link_type="simple" hotspot_y="25" orientation="dyyy">
-    <uuid uuid="{9a1d4a4a-3715-4424-9b87-cb14c0e1cf65}"/>
-    <names>
-        <name lang="cs">Spínací tlačítko</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <line y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="0"/>
-        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="15" end1="none" x2="0"/>
-        <line y1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-10" end1="none" x2="-5"/>
-        <line y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-5" length2="1.5" antialias="false" length1="1.5" end2="none" y2="0" end1="none" x2="-20"/>
-        <polygon x3="-20" y1="-5" y3="5" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-15" antialias="false" y4="5" y2="-5" x4="-15" closed="false" x2="-20"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="3" y="-12" rotation="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="1" color="#000000" text="4" y="13" rotation="0"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-46" text_from="ElementInfo" y="-13" z="8" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{6d243ebc-046d-41a5-a109-0885e709b987}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <terminal x="0" y="15" orientation="s"/>
-        <terminal x="0" y="-15" orientation="n"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur-a-3-positions-a-m.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/commutateur-a-3-positions-a-m.elmt
@@ -1,41 +0,0 @@
-<definition height="60" hotspot_x="34" hotspot_y="29" orientation="dyyy" link_type="simple" type="element" version="0.80" width="90">
-    <uuid uuid="{887e3354-30ff-4452-8d9b-aeaff6da29bc}"/>
-    <names>
-        <name lang="it">Commutatore a 3 posizioni </name>
-        <name lang="nl">keuzeschakelaar 3 pos (NO/NO)</name>
-        <name lang="pl">Łącznik obrotowy przełączny z położeniem neutralnym</name>
-        <name lang="de">Drehschalter 2-polig 3 Positionen ein/aus</name>
-        <name lang="cs">Spínač - 3 polohy</name>
-        <name lang="fr">Commutateur a 3 positions A/0/M </name>
-        <name lang="en">3 position  switch</name>
-        <name lang="es">Interruptor de 3 posiciones</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line end1="none" x1="47" x2="23" end2="none" length1="1.5" length2="1.5" antialias="false" y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="0"/>
-        <text rotation="0" x="-24" text="Auto" font="Sans Serif,3,-1,5,50,0,0,0,0,0" color="#000000" y="-7"/>
-        <polygon y3="20" x1="45" x2="50" antialias="true" x3="50" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" closed="false"/>
-        <text rotation="0" x="-13" text="man" font="Sans Serif,3,-1,5,50,0,0,0,0,0" color="#000000" y="-7"/>
-        <line end1="none" x1="50" x2="50" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
-        <line end1="none" x1="-15" x2="-10" end2="none" length1="1.5" length2="1.5" antialias="false" y1="5" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="-5"/>
-        <line end1="none" x1="-20" x2="-15" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-5" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="5"/>
-        <line end1="none" x1="18.9314" x2="-26.0136" end2="none" length1="1.5" length2="1.5" antialias="false" y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="0"/>
-        <text rotation="0" x="-16" text="0" font="Sans Serif,3,-1,5,50,0,0,0,0,0" color="#000000" y="-7"/>
-        <polygon y3="5" x1="-24" x2="-27" antialias="false" x3="-27" y1="-5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-5" y4="5" closed="false" x4="-30"/>
-        <polygon y3="20" x1="-5" x2="0" antialias="true" x3="0" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" closed="false"/>
-        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
-        <dynamic_text z="13" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="55" font="Sans Serif,9,-1,5,50,0,0,0,0,0" y="-10" uuid="{f223e627-8712-4f6f-9c88-ec96bed2375e}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line end1="none" x1="-15" x2="-15" end2="none" length1="1.5" length2="1.5" antialias="false" y1="5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-6"/>
-        <line end1="none" x1="20" x2="22" end2="none" length1="1.5" length2="1.5" antialias="false" y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="13"/>
-        <line end1="none" x1="23" x2="22" end2="none" length1="1.5" length2="1.5" antialias="false" y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="12"/>
-        <terminal x="0" orientation="n" y="-21"/>
-        <terminal x="0" orientation="s" y="21"/>
-        <terminal x="50" orientation="s" y="21"/>
-        <terminal x="50" orientation="n" y="-21"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comut_ppe1_ppe2.elmt
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comut_ppe1_ppe2.elmt
@@ -1,46 +0,0 @@
-<definition height="60" hotspot_x="34" hotspot_y="29" orientation="dyyy" link_type="simple" type="element" version="0.80" width="120">
-    <uuid uuid="{f5a479cc-76d2-4ab9-8d43-ba447656bb7a}"/>
-    <names>
-        <name lang="it">Commutatore a 3 posizioni </name>
-        <name lang="nl">keuzeschakelaar 3 pos (NO/NO)</name>
-        <name lang="pl">Łącznik obrotowy przełączny z położeniem neutralnym</name>
-        <name lang="cs">Spínač - 3 polohy</name>
-        <name lang="de">Drehschalter 2-polig 3 Positionen ein/aus</name>
-        <name lang="fr">Commutateur Ppe1/Ppe2 </name>
-        <name lang="en">3 position  switch</name>
-        <name lang="es">Interruptor de 3 posiciones</name>
-    </names>
-    <elementInformations/>
-    <informations>s.deffaux</informations>
-    <description>
-        <line end1="none" x1="76" x2="41" end2="none" length1="1.5" length2="1.5" antialias="false" y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="0"/>
-        <text rotation="0" x="-22" text="1" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000" y="-7"/>
-        <polygon y3="20" x1="75" x2="80" antialias="true" x3="80" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" closed="false"/>
-        <text rotation="0" x="-12" text="2" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000" y="-7"/>
-        <line end1="none" x1="80" x2="80" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
-        <line end1="none" x1="-15" x2="-10" end2="none" length1="1.5" length2="1.5" antialias="false" y1="5" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="-5"/>
-        <line end1="none" x1="-20" x2="-15" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-5" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="5"/>
-        <line end1="none" x1="38" x2="-26.0136" end2="none" length1="1.5" length2="1.5" antialias="false" y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="0"/>
-        <text rotation="0" x="-17" text="0" font="Sans Serif,4,-1,5,50,0,0,0,0,0" color="#000000" y="-7"/>
-        <polygon y3="5" x1="-24" x2="-27" antialias="false" x3="-27" y1="-5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-5" y4="5" closed="false" x4="-30"/>
-        <polygon y3="20" x1="-5" x2="0" antialias="true" x3="0" y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" closed="false"/>
-        <line end1="none" x1="0" x2="0" end2="none" length1="1.5" length2="1.5" antialias="false" y1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10"/>
-        <dynamic_text z="13" text_from="ElementInfo" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="90" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" y="-10" uuid="{8421b800-f8e5-4f1f-b0a2-0f1e893c8b14}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line end1="none" x1="-15" x2="-15" end2="none" length1="1.5" length2="1.5" antialias="false" y1="5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-6"/>
-        <line end1="none" x1="38" x2="40" end2="none" length1="1.5" length2="1.5" antialias="false" y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="13"/>
-        <line end1="none" x1="41" x2="40" end2="none" length1="1.5" length2="1.5" antialias="false" y1="0" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="12"/>
-        <dynamic_text z="17" text_from="UserText" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="-30" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" y="15" uuid="{3aac8cf1-b07d-41a2-a3f7-57b19217324b}" Halignment="AlignLeft">
-            <text>PPE1</text>
-        </dynamic_text>
-        <dynamic_text z="18" text_from="UserText" rotation="0" text_width="-1" Valignment="AlignTop" frame="false" x="80" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" y="15" uuid="{c9d3c9f8-041e-4d5b-96fd-357a38119021}" Halignment="AlignLeft">
-            <text>PPE2</text>
-        </dynamic_text>
-        <terminal x="0" orientation="n" y="-21"/>
-        <terminal x="0" orientation="s" y="21"/>
-        <terminal x="80" orientation="n" y="-20"/>
-        <terminal x="80" orientation="s" y="20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/390_sensors&instruments/15_sensors_temperature/sonde_temperature_4fils.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/15_sensors_temperature/sonde_temperature_4fils.elmt
@@ -1,42 +0,0 @@
-<definition hotspot_x="24" orientation="dyyy" link_type="simple" width="60" version="0.70" type="element" hotspot_y="15" height="40">
-    <uuid uuid="{ddfbbfd8-54dd-4078-adc4-6fba6b977894}"/>
-    <names>
-        <name lang="cs">Teplotní čidlo</name>
-        <name lang="pl">Czujnik temperatury</name>
-        <name lang="en">Temperature sensor 4 wire</name>
-        <name lang="fr">Sonde de temperature 4 fils</name>
-        <name lang="it">Sonda di temperatura</name>
-        <name lang="de">Temperaturfühler</name>
-        <name lang="nl">Temperatuur sensor</name>
-        <name lang="es">Sensor de temperatura</name>
-        <name lang="el">Αισθητήρας θερμοκρασίας</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <dynamic_text text_from="ElementInfo" Valignment="AlignTop" x="-7" z="1" frame="false" y="-15.5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" rotation="0" uuid="{e858b8a4-392c-4210-9875-5c5b9d4474d2}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y2="10" end2="none" length1="1.5" x1="-10" y1="10" x2="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length2="1.5" antialias="false"/>
-        <line y2="10" end2="none" length1="1.5" x1="20" y1="10" x2="16" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length2="1.5" antialias="false"/>
-        <dynamic_text text_from="UserText" Valignment="AlignTop" x="-5" z="4" frame="false" y="23" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" rotation="0" uuid="{248791a5-4c4b-4f63-82c0-4b3fe8bfa7ac}" Halignment="AlignLeft">
-            <text>S_</text>
-        </dynamic_text>
-        <rect ry="0" x="-5" y="5" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" antialias="false" height="10"/>
-        <polygon x3="10" y2="20" y4="0" y3="0" x4="15" x1="-5" closed="false" y1="20" x2="0" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="true"/>
-        <line y2="10" end2="none" length1="1.5" x1="-6" y1="10" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length2="1.5" antialias="false"/>
-        <line y2="-9" end2="none" length1="1.5" x1="-20" y1="10" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length2="1.5" antialias="false"/>
-        <line y2="10" end2="none" length1="1.5" x1="15" y1="10" x2="30" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length2="1.5" antialias="false"/>
-        <line y2="10" end2="none" length1="1.5" x1="30" y1="-10" x2="30" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length2="1.5" antialias="false"/>
-        <text x="-18" color="#000000" text="+" y="19" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0"/>
-        <text x="21" color="#000000" text="-" y="19" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0"/>
-        <polygon x3="-10" y2="0" y4="-10" y3="-10" x4="-10" x1="-5" closed="false" y1="10" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false"/>
-        <polygon x3="15" x5="15" y2="0" y4="10" y3="10" x4="15" y5="10" x1="20" closed="false" y6="10" y1="-10" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x6="15"/>
-        <terminal x="20" orientation="n" y="-10"/>
-        <terminal x="-20" orientation="n" y="-10"/>
-        <terminal x="30" orientation="n" y="-10"/>
-        <terminal x="-10" orientation="n" y="-10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/390_sensors&instruments/80_encoder/codeur.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/80_encoder/codeur.elmt
@@ -1,70 +0,0 @@
-<definition hotspot_y="47" width="160" height="80" link_type="simple" version="0.80" hotspot_x="66" orientation="dyyy" type="element">
-    <uuid uuid="{5d1564dc-9b28-4465-be38-9ce9c2ff656b}"/>
-    <names>
-        <name lang="fr">Codeur incrémental</name>
-        <name lang="en">Incremental encoder</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <circle diameter="50" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20" antialias="false" x="-15"/>
-        <dynamic_text Halignment="AlignLeft" text_from="ElementInfo" rotation="0" text_width="-1" z="2" y="10" frame="false" font="Sans Serif,9,-1,5,0,0,0,0,0,0,normal" uuid="{b07f7ea6-b556-4c38-b219-f227baaabeed}" x="-5" Valignment="AlignTop">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="0" x2="0" y1="-40" y2="-18" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="20" x2="20" y1="-40" y2="-18" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="40" x2="40" y1="-40" y2="-30" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-20" x2="-20" y1="-40" y2="-30" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-40" x2="-40" y1="-40" y2="-30" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-60" x2="-60" y1="-40" y2="-30" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="60" x2="60" y1="-40" y2="-30" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="80" x2="80" y1="-40" y2="-30" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-20" x2="-5" y1="-30" y2="-15" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-40" x2="-10" y1="-30" y2="-10" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-60" x2="-14" y1="-30" y2="-3" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="40" x2="25" y1="-30" y2="-15" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="60" x2="30" y1="-30" y2="-10" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="80" x2="34" y1="-30" y2="-3" length1="1.5" end1="none"/>
-        <dynamic_text Halignment="AlignLeft" text_from="UserText" rotation="0" text_width="-1" z="17" y="-50" frame="false" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" uuid="{7375d377-e382-4123-80a2-0342b209d8c6}" x="40" Valignment="AlignTop">
-            <text>+</text>
-        </dynamic_text>
-        <dynamic_text Halignment="AlignLeft" text_from="UserText" rotation="0" text_width="-1" z="17" y="-50" frame="false" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" uuid="{7375d377-e382-4123-80a2-0342b209d8c6}" x="-40" Valignment="AlignTop">
-            <text>A</text>
-        </dynamic_text>
-        <dynamic_text Halignment="AlignLeft" text_from="UserText" rotation="0" text_width="-1" z="17" y="-50" frame="false" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" uuid="{7375d377-e382-4123-80a2-0342b209d8c6}" x="60" Valignment="AlignTop">
-            <text>0</text>
-        </dynamic_text>
-        <dynamic_text Halignment="AlignLeft" text_from="UserText" rotation="0" text_width="-1" z="17" y="-50" frame="false" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" uuid="{7375d377-e382-4123-80a2-0342b209d8c6}" x="0" Valignment="AlignTop">
-            <text>B</text>
-        </dynamic_text>
-        <dynamic_text Halignment="AlignLeft" text_from="UserText" rotation="0" text_width="-1" z="17" y="-50" frame="false" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" uuid="{7375d377-e382-4123-80a2-0342b209d8c6}" x="-60" Valignment="AlignTop">
-            <text>A</text>
-        </dynamic_text>
-        <dynamic_text Halignment="AlignLeft" text_from="UserText" rotation="0" text_width="-1" z="17" y="-50" frame="false" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" uuid="{7375d377-e382-4123-80a2-0342b209d8c6}" x="-20" Valignment="AlignTop">
-            <text>B</text>
-        </dynamic_text>
-        <dynamic_text Halignment="AlignLeft" text_from="UserText" rotation="0" text_width="-1" z="17" y="-50" frame="false" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" uuid="{7375d377-e382-4123-80a2-0342b209d8c6}" x="80" Valignment="AlignTop">
-            <text>0</text>
-        </dynamic_text>
-        <dynamic_text Halignment="AlignLeft" text_from="UserText" rotation="0" text_width="-1" z="17" y="-50" frame="false" font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" uuid="{7375d377-e382-4123-80a2-0342b209d8c6}" x="20" Valignment="AlignTop">
-            <text>0V</text>
-        </dynamic_text>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-35" x2="-30" y1="-45" y2="-45" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="5" x2="10" y1="-45" y2="-45" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="85" x2="90" y1="-45" y2="-45" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="-5" x2="5" y1="10" y2="10" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="5" x2="5" y1="10" y2="-5" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="15" x2="15" y1="-5" y2="10" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="25" x2="15" y1="10" y2="10" length1="1.5" end1="none"/>
-        <line end2="none" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x1="15" x2="5" y1="-5" y2="-5" length1="1.5" end1="none"/>
-        <terminal y="-40" orientation="n" x="-60"/>
-        <terminal y="-40" orientation="n" x="-20"/>
-        <terminal y="-40" orientation="n" x="20"/>
-        <terminal y="-40" orientation="n" x="0"/>
-        <terminal y="-40" orientation="n" x="80"/>
-        <terminal y="-40" orientation="n" x="-40"/>
-        <terminal y="-40" orientation="n" x="40"/>
-        <terminal y="-40" orientation="n" x="60"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/390_sensors&instruments/80_encoder/qet_directory
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/80_encoder/qet_directory
@@ -1,6 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="en">Encoder</name>
-        <name lang="fr">Codeur</name>
-   </names>
-</qet-directory>
--- a/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/jednofaz.motor.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/jednofaz.motor.elmt
@@ -1,58 +0,0 @@
-<definition version="0.70" height="80" type="element" width="80" hotspot_x="28" link_type="simple" hotspot_y="57" orientation="dyyy">
-    <uuid uuid="{9f3d68cf-4c3e-40b1-9331-ebcff6b3a54b}"/>
-    <names>
-        <name lang="cs">Jednofázový motor</name>
-        <name lang="ar">محرّك ثلاثي الأوجه</name>
-        <name lang="pt">Motor trifásico</name>
-        <name lang="en">One-phase engine</name>
-        <name lang="pl">Silnik trójfazowy</name>
-        <name lang="nl">Draaistroommotor</name>
-        <name lang="ru">Однофазный эл. мотор</name>
-        <name lang="de">Drehstrom Motor</name>
-        <name lang="it">Motore trifase</name>
-        <name lang="fr">Moteur triphasé</name>
-        <name lang="es">Motor trifásico</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="2" color="#000000" text="U2" y="-45" rotation="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="22" color="#000000" text="PE" y="-45" rotation="0"/>
-        <text font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-5" color="#000000" text="M" y="-2" rotation="0"/>
-        <circle x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20" antialias="true" diameter="40"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-51" text_from="ElementInfo" y="-11.5" z="5" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{3afac6d2-0ab0-4395-883d-25092cbcf9f0}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="-51" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-30" end1="none" x2="0"/>
-        <line y1="-51" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-23" end1="none" x2="-20"/>
-        <text font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-8" color="#000000" text="1 ~" y="8" rotation="0"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-18" color="#000000" text="U1" y="-45" rotation="0"/>
-        <line y1="-45" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-23" end1="none" x2="20"/>
-        <line y1="-40" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-40" end1="none" x2="40"/>
-        <line y1="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-22" end1="none" x2="40"/>
-        <line y1="-40" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-31" end1="none" x2="40"/>
-        <circle x="-21" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-41" antialias="false" diameter="2"/>
-        <line y1="-51" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-46" end1="none" x2="20"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-9" end1="none" x2="18"/>
-        <line y1="-31" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="35" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-31" end1="none" x2="45"/>
-        <line y1="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="35" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-29" end1="none" x2="45"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-30" text_from="ElementInfo" y="99" z="19" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{82cbe610-484f-4b00-977a-774877ace119}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>function</info_name>
-        </dynamic_text>
-        <line y1="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="-14"/>
-        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="0"/>
-        <line y1="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="14"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-25" text_from="UserText" y="23" z="23" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{786fb0d7-59c9-4f4f-913b-d023822c8ddb}" Halignment="AlignLeft">
-            <text>0,37kW
-2800 rpm
-2,4A
-230V/50Hz</text>
-        </dynamic_text>
-        <terminal x="0" y="-50" orientation="n"/>
-        <terminal x="-20" y="-50" orientation="n"/>
-        <terminal x="20" y="-50" orientation="n"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_mono1.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_mono1.elmt
@@ -1,27 +0,0 @@
-<definition width="50" type="element" link_type="simple" height="60" version="0.80" orientation="dyyy" hotspot_y="27" hotspot_x="24">
-    <uuid uuid="{e00c09f2-96d8-4b0c-beba-b358d41b52c5}"/>
-    <names>
-        <name lang="nl">Motor  1fase</name>
-        <name lang="it">Motore monofase</name>
-        <name lang="en">Motor single phase</name>
-        <name lang="fr">Moteur monophasé</name>
-        <name lang="es">Motormonofásico</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon y1="-20" y3="9" closed="false" y2="9" x3="15" antialias="false" x1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="15" x2="20" y4="9"/>
-        <polygon y1="-20" y3="10" closed="false" y2="10" x3="-15" antialias="false" x1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-20"/>
-        <circle diameter="30" y="-5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-15"/>
-        <text y="17" color="#000000" rotation="0" x="-11" text="1 ~" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-        <text y="7" color="#000000" rotation="0" x="-4" text="M" font="Sans Serif,8,-1,5,50,0,0,0,0,0"/>
-        <dynamic_text Halignment="AlignLeft" text_from="ElementInfo" frame="false" Valignment="AlignTop" y="4" rotation="0" x="18" text_width="-1" z="9" font="MS Shell Dlg 2,9,-1,5,50,0,0,0,0,0,Normal" uuid="{02168a47-380e-4a8b-94ba-48ae684a0b3d}">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <terminal y="25" orientation="s" x="10"/>
-        <terminal y="-20" orientation="n" x="-20"/>
-        <terminal y="-20" orientation="n" x="20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_mono_2.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_mono_2.elmt
@@ -1,26 +0,0 @@
-<definition orientation="dyyy" type="element" height="50" width="40" link_type="simple" version="0.70" hotspot_x="14" hotspot_y="17">
-    <uuid uuid="{4c8df704-fb5c-4d79-b690-d178a6fdf5bc}"/>
-    <names>
-        <name lang="cs">Jednofázový motor</name>
-        <name lang="es">Motor monofásico</name>
-        <name lang="ru">Однофазный эл. мотор</name>
-        <name lang="pt">Motor monofásico</name>
-        <name lang="en">One-phase engine</name>
-        <name lang="fr">Moteur monophasé</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <text font="Sans Serif,18,-1,5,50,0,0,0,0,0" y="21" x="-6" text="M" rotation="0" color="#000000"/>
-        <circle antialias="true" y="-3" diameter="30" x="-10.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line x2="20" y2="6.75" end2="none" length2="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" y1="-5" x1="20" length1="1.5"/>
-        <line x2="-10" y2="7" end2="none" length2="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" y1="-7" x1="-10" length1="1.5"/>
-        <dynamic_text frame="false" font="Sans Serif,6,-1,5,50,0,0,0,0,0" y="7" uuid="{928dba5a-fd90-44a4-835b-b64f7fe1f6a9}" x="19" z="5" Halignment="AlignLeft" Valignment="AlignTop" text_width="-1" text_from="ElementInfo" rotation="0">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <terminal orientation="n" y="-10" x="20"/>
-        <terminal orientation="n" y="-10" x="-10"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_tri_2.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/moteur_tri_2.elmt
@@ -1,41 +1,36 @@
-<definition width="70" type="element" link_type="simple" height="70" version="0.80" orientation="dyyy" hotspot_y="28" hotspot_x="29">
-    <uuid uuid="{1111b8d4-9778-4a75-9aec-0d628403a318}"/>
-    <names>
-        <name lang="cs">Trojfázový motor</name>
-        <name lang="nl">Draaistroommotor</name>
-        <name lang="it">Motore trifase</name>
-        <name lang="pl">Silnik trójfazowy</name>
-        <name lang="en">Three-phase engine</name>
-        <name lang="fr">Moteur triphasé</name>
+<definition width="70" version="0.4" hotspot_x="28" hotspot_y="28" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
+<uuid uuid="{DAFD5CF7-6568-46A8-B0DD-55988B413332}"/><names>
        <name lang="ar">محرّك ثلاثي الأوجه</name>
+        <name lang="de">Drehstrom Motor</name>
        <name lang="ru">Трёхфазный эл. мотор</name>
        <name lang="pt">Motor trifásico</name>
+        <name lang="en">Three-phase engine</name>
+        <name lang="it">Motore trifase</name>
+        <name lang="fr">Moteur triphasé</name>
+        <name lang="pl">Silnik trójfazowy</name>
        <name lang="es">Motor trifásico</name>
-        <name lang="de">Drehstrom Motor</name>
+        <name lang="nl">Draaistroommotor</name>
+        <name lang="cs">Trojfázový motor</name>
    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;&#xd;
+    <informations>Author: The QElectroTech team&#xd;
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
    <description>
-        <text y="-12" color="#000000" rotation="0" x="22" text="W1" font="Sans Serif,6,-1,5,50,0,0,0,0,0"/>
-        <text y="-12" color="#000000" rotation="0" x="2" text="V1" font="Sans Serif,6,-1,5,50,0,0,0,0,0"/>
-        <text y="30" color="#000000" rotation="0" x="23" text="PE" font="Sans Serif,6,-1,5,50,0,0,0,0,0"/>
-        <arc width="9" height="8" y="21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x="0" angle="180" start="180"/>
-        <arc width="9" height="8" y="21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-9" angle="180" start="0"/>
-        <text y="18" color="#000000" rotation="0" x="-10.25" text="M" font="Sans Serif,18,-1,5,50,0,0,0,0,0"/>
-        <ellipse width="46" height="42" y="-5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-23"/>
-        <dynamic_text Halignment="AlignLeft" text_from="ElementInfo" frame="false" Valignment="AlignTop" y="-5" rotation="0" x="25" text_width="-1" z="8" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{6f1d2176-1c58-420d-8496-c54c4b134371}">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="-20" end1="none" y2="-5" antialias="false" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="0" length2="1.5" length1="1.5" end2="none"/>
-        <line y1="-19.6172" end1="none" y2="5.08526" antialias="false" x1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="20" length2="1.5" length1="1.5" end2="none"/>
-        <line y1="-19.6" end1="none" y2="5.06667" antialias="false" x1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-20" length2="1.5" length1="1.5" end2="none"/>
-        <text y="27" color="#000000" rotation="0" x="-17" text="3" font="Sans Serif,9,-1,5,50,0,0,0,0,0"/>
-        <text y="-12" color="#000000" rotation="0" x="-18" text="U1" font="Sans Serif,6,-1,5,50,0,0,0,0,0"/>
-        <terminal y="-21" orientation="n" x="-20"/>
-        <terminal y="-21" orientation="n" x="20"/>
-        <terminal y="-21" orientation="n" x="0"/>
-        <terminal y="20" orientation="e" x="27"/>
+        <text x="22" y="-12" size="6" text="W1"/>
+        <text x="2" y="-12" size="6" text="V1"/>
+        <text x="23" y="30" size="6" text="PE"/>
+        <arc width="9" x="0" y="21" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="180"/>
+        <arc width="9" x="-9" y="21" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="180"/>
+        <text x="-10.25" y="18" size="18" text="M"/>
+        <ellipse width="46" x="-23" y="-5" antialias="true" height="42" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input x="-51" y="15.5" size="9" text="M_" tagg="label"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-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="-19.6172" x1="20" y2="5.08526" 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="-19.6" x1="-20" y2="5.06667" x2="-20"/>
+        <text x="-17" y="27" size="9" text="3"/>
+        <text x="-18" y="-12" size="6" text="U1"/>
+        <terminal x="-20" y="-21" orientation="n"/>
+        <terminal x="20" y="-21" orientation="n"/>
+        <terminal x="0" y="-21" orientation="n"/>
+        <terminal x="27" y="20" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor018.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor018.elmt
@@ -1,61 +0,0 @@
-<definition type="element" link_type="simple" hotspot_y="62" orientation="dyyy" hotspot_x="65" width="190" height="100" version="0.80">
-    <uuid uuid="{36bee958-905e-4ab9-80a4-03ddd1de1d2b}"/>
-    <names>
-        <name lang="cs">Jednofázový motor 0,18kW</name>
-        <name lang="ru">Однофазный эл. мотор</name>
-        <name lang="pl">Silnik trójfazowy</name>
-        <name lang="fr">Moteur triphasé</name>
-        <name lang="it">Motore trifase</name>
-        <name lang="ar">محرّك ثلاثي الأوجه</name>
-        <name lang="nl">Draaistroommotor</name>
-        <name lang="en">One-phase engine</name>
-        <name lang="pt">Motor trifásico</name>
-        <name lang="es">Motor trifásico</name>
-        <name lang="de">Drehstrom Motor</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="2" text="Z1" y="-50" color="#000000"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="42" text="PE" y="-49" color="#000000"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="0" start="180" angle="180" y="5" width="9" height="8" antialias="true"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="-9" start="0" angle="180" y="5" width="9" height="8" antialias="true"/>
-        <text font="Sans Serif,18,-1,5,50,0,0,0,0,0" rotation="0" x="-10.25" text="M" y="2" color="#000000"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" x="-30" diameter="60" y="-30" antialias="true"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="7" frame="false" uuid="{6e9844dc-4ef7-4d45-8a6b-5c34cb2227ac}" rotation="0" x="-51" Halignment="AlignLeft" text_from="ElementInfo" y="-11.5" text_width="-1" Valignment="AlignTop">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="-55" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="0" y2="-30" length2="1.5" x2="0" antialias="false"/>
-        <line y1="-56" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="-20" y2="-22.8213" length2="1.5" x2="-20.067" antialias="false"/>
-        <text font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" x="-17" text="1" y="11" color="#000000"/>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="-18" text="U1" y="-50" color="#000000"/>
-        <line y1="-55" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="20" y2="-22.7651" length2="1.5" x2="20.0143" antialias="false"/>
-        <line y1="-56" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="20" y2="-51" length2="1.5" x2="20" antialias="false"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="40" y2="-16" length2="1.5" x2="26" antialias="true"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" z="19" frame="false" uuid="{40bbd647-1335-44e7-8727-8b665b9b4805}" rotation="0" x="-30" Halignment="AlignLeft" text_from="ElementInfo" y="99" text_width="-1" Valignment="AlignTop">
-            <text></text>
-            <info_name>function</info_name>
-        </dynamic_text>
-        <text font="Sans Serif,5,-1,5,50,0,0,0,0,0" rotation="0" x="21.6246" text="U2" y="-49.6447" color="#000000"/>
-        <line y1="-55" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="40" y2="-22" length2="1.5" x2="40" antialias="false"/>
-        <polygon y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="40" closed="false" y3="5" x3="45" y5="-10" x1="40" y2="10" x4="45" y4="-5" x2="40" antialias="false"/>
-        <polygon y1="0" style="line-style:dashed;line-weight:normal;filling:none;color:black" closed="false" x1="45" y2="0" x2="60" antialias="false"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0" x="60" y="-10" width="40" height="20" rx="0" antialias="false"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0" x="60" y="-55" width="15" height="35" rx="0" antialias="false"/>
-        <polygon y1="-50" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y3="-45" x3="60" x1="-20" y2="-45" x2="-15" antialias="false"/>
-        <polygon y1="-35" y6="-30" y7="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="60" x5="60" closed="false" y3="-30" x3="55" y5="-30" x1="20" y2="-30" x4="55" x7="60" y4="-30" x2="25" antialias="false"/>
-        <polygon y1="-41" style="line-style:normal;line-weight:normal;filling:none;color:black" x5="80" closed="false" y3="20" x3="105" y5="10" x1="75" y2="-41" x4="80" y4="20" x2="105" antialias="false"/>
-        <polygon y1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y3="-34" x3="75" x1="80" y2="-34" x2="80" antialias="false"/>
-        <rect style="line-style:dashed;line-weight:normal;filling:none;color:black" ry="0" x="-60" y="-60" width="180" height="95" rx="0" antialias="false"/>
-        <line y1="-42" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="69" y2="-34" length2="1.5" x2="69" antialias="false"/>
-        <line y1="-38" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="69" y2="-38" length2="1.5" x2="72" antialias="false"/>
-        <line y1="-38" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" end1="none" x1="65" y2="-38" length2="1.5" x2="62" antialias="false"/>
-        <polygon y1="-38" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y3="-42" x3="65" x1="69" y2="-34" x4="69" y4="-38" x2="65" antialias="false"/>
-        <terminal x="40" orientation="n" y="-55"/>
-        <terminal x="0" orientation="n" y="-55"/>
-        <terminal x="20" orientation="n" y="-55"/>
-        <terminal x="-20" orientation="n" y="-55"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor_bez_kondu.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor_bez_kondu.elmt
@@ -1,54 +0,0 @@
-<definition hotspot_x="36" link_type="simple" height="80" type="element" width="100" version="0.80" hotspot_y="55" orientation="dyyy">
-    <uuid uuid="{baf2df44-6d28-4ff3-8893-c3acc532b464}"/>
-    <names>
-        <name lang="ru">Однофазный эл. мотор</name>
-        <name lang="it">Motore trifase</name>
-        <name lang="en">One-phase engine</name>
-        <name lang="pl">Silnik trójfazowy</name>
-        <name lang="de">Drehstrom Motor</name>
-        <name lang="cs">Jednofázový motor bez kondu</name>
-        <name lang="es">Motor trifásico</name>
-        <name lang="fr">Moteur triphasé</name>
-        <name lang="nl">Draaistroommotor</name>
-        <name lang="ar">محرّك ثلاثي الأوجه</name>
-        <name lang="pt">Motor trifásico</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <text y="-44" font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="31" rotation="0" text="Z2" color="#000000"/>
-        <text y="-44" font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="12" rotation="0" text="Z1" color="#000000"/>
-        <text y="-44" font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-8" rotation="0" text="U2" color="#000000"/>
-        <text y="-44" font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="51" rotation="0" text="PE" color="#000000"/>
-        <text y="-3" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-5" rotation="0" text="M" color="#000000"/>
-        <circle antialias="true" y="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="40" x="-20"/>
-        <dynamic_text y="-11.5" z="7" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{46ee6f24-8507-47e3-b3e0-0be0d2e6758d}" frame="false" x="-61" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line antialias="false" x2="-10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="-50" y2="-30" end2="none" length2="1.5"/>
-        <line antialias="false" x2="-30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-30" y1="-50" y2="-23" end2="none" length2="1.5"/>
-        <text y="9" font="Sans Serif,7,-1,5,50,0,0,0,0,0" x="-8" rotation="0" text="1 ~" color="#000000"/>
-        <text y="-44" font="Sans Serif,5,-1,5,50,0,0,0,0,0" x="-28" rotation="0" text="U1" color="#000000"/>
-        <line antialias="false" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="-50" y2="-23" end2="none" length2="1.5"/>
-        <line antialias="false" x2="30" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="30" y1="-50" y2="-22" end2="none" length2="1.5"/>
-        <line antialias="true" x2="16" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="30" y1="-22" y2="-12" end2="none" length2="1.5"/>
-        <dynamic_text y="99" z="15" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{178f74cc-65b3-449a-98de-77ab48dd8156}" frame="false" x="-30" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>function</info_name>
-        </dynamic_text>
-        <line antialias="false" x2="-16" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-30" y1="-23" y2="-12" end2="none" length2="1.5"/>
-        <line antialias="false" x2="-7" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="-10" y1="-30" y2="-19" end2="none" length2="1.5"/>
-        <line antialias="false" x2="8" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="10" y1="-23" y2="-19" end2="none" length2="1.5"/>
-        <arc antialias="true" y="-23" height="46" angle="28" style="line-style:normal;line-weight:normal;filling:none;color:black" width="46" start="300" x="-23"/>
-        <line antialias="false" x2="20" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="16" y1="17" y2="20" end2="none" length2="1.5"/>
-        <line antialias="false" x2="50" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="20" y1="20" y2="20" end2="none" length2="1.5"/>
-        <line antialias="false" x2="50" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x1="50" y1="20" y2="-50" end2="none" length2="1.5"/>
-        <terminal y="-50" orientation="n" x="10"/>
-        <terminal y="-50" orientation="n" x="-30"/>
-        <terminal y="-50" orientation="n" x="-10"/>
-        <terminal y="-50" orientation="n" x="50"/>
-        <terminal y="-50" orientation="n" x="30"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor_spoustec_3p.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/motor_spoustec_3p.elmt
@@ -1,78 +0,0 @@
-<definition version="0.70" height="90" type="element" width="100" hotspot_x="39" link_type="simple" hotspot_y="44" orientation="dyyy">
-    <uuid uuid="{1dc359e3-f208-4598-b694-3e3a3b5305c2}"/>
-    <names>
-        <name lang="cs">Motorový spouštěč</name>
-        <name lang="el">Θερμομαγνητικό</name>
-        <name lang="ar">قاطع مغناطيسي-حراري GV</name>
-        <name lang="en">Magneto-thermal circuit breaker </name>
-        <name lang="pl">Wyłącznik silnikowy</name>
-        <name lang="it">Int. magneto-termico 3P+N</name>
-        <name lang="de">Motorschutzschalter</name>
-        <name lang="fr">Disjoncteur Magnéto-thermique </name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <line y1="39" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="28" end1="none" x2="40"/>
-        <polygon x3="45" y1="14" y3="10" y6="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" y5="4" x7="33" antialias="true" y4="4" y7="-25" y2="10" x4="45" x5="40" x6="40" closed="false" x2="40"/>
-        <line y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="30" length2="1.5" antialias="false" length1="1.5" end2="none" y2="28" end1="none" x2="30"/>
-        <text font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="36" color="#000000" text="I>" y="25" rotation="0"/>
-        <polygon x3="25" y1="14" y3="10" y6="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" y5="4" x7="13" antialias="true" y4="4" y7="-25" y2="10" x4="25" x5="20" x6="20" closed="false" x2="20"/>
-        <line y1="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="42" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-25" end1="none" x2="38"/>
-        <polygon x3="5" y1="14" y3="10" y6="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y5="4" x7="-7" antialias="true" y4="4" y7="-25" y2="10" x4="5" x5="0" x6="0" closed="false" x2="0"/>
-        <line y1="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="38" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-25" end1="none" x2="42"/>
-        <text font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="16" color="#000000" text="I>" y="25" rotation="0"/>
-        <line y1="-27" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="40" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-40" end1="none" x2="40"/>
-        <rect height="28" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y="0" rx="0" width="60" antialias="false" ry="0"/>
-        <text font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-4" color="#000000" text="I>" y="25" rotation="0"/>
-        <line y1="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="2" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-25" end1="none" x2="-2"/>
-        <line y1="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-2" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-25" end1="none" x2="2"/>
-        <line y1="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="22" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-25" end1="none" x2="18"/>
-        <line y1="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="18" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-25" end1="none" x2="22"/>
-        <dynamic_text font="Sans Serif,8,-1,5,50,0,0,0,0,0" frame="false" x="-57.2888" text_from="ElementInfo" y="-24.4792" z="17" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{686f7173-763b-4c32-be08-225e2dad9901}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line y1="14" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="14" end1="none" x2="49.5887"/>
-        <line y1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="28" end1="none" x2="10"/>
-        <line y1="40" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="29" end1="none" x2="0"/>
-        <line y1="40" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="29" end1="none" x2="20"/>
-        <line y1="-27" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-40" end1="none" x2="0"/>
-        <line y1="-27" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-40" end1="none" x2="20"/>
-        <rect height="12" x="-26" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21" rx="0" width="12" antialias="false" ry="0"/>
-        <line y1="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-14" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="-33"/>
-        <line y1="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-33" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-11" end1="none" x2="-33"/>
-        <line y1="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="-20" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-21" end1="none" x2="-20"/>
-        <line y1="-15" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-13.5883" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-15" end1="none" x2="53.554"/>
-        <polygon x3="-20" y1="21" y3="-10" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-10" antialias="false" y2="21" closed="false" x2="-20"/>
-        <line y1="8" style="line-style:dashed;line-weight:normal;filling:none;color:black" x1="-10" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="-20"/>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-3" text_from="UserText" y="-46" z="31" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{0f2a983e-22d1-47b5-a236-92162ee72893}" Halignment="AlignLeft">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="17" text_from="UserText" y="-46" z="32" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{2190f748-9053-4e24-ad92-f2f8e7b2d1f8}" Halignment="AlignLeft">
-            <text>3</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="37" text_from="UserText" y="-46" z="33" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{87821190-b735-4126-9125-9f4fd0c9508c}" Halignment="AlignLeft">
-            <text>5</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-3" text_from="UserText" y="29" z="34" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{80504c8a-745e-44e9-a059-9e479372faa2}" Halignment="AlignLeft">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="17" text_from="UserText" y="29" z="35" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{a1eb632f-d207-4a29-982d-8206fb22ea3c}" Halignment="AlignLeft">
-            <text>4</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="37" text_from="UserText" y="28" z="36" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{63693833-6560-4ecf-b53b-c9d516b59048}" Halignment="AlignLeft">
-            <text>6</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" frame="false" x="-65" text_from="ElementInfo" y="-5" z="37" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{fe3e1a25-b058-460d-9210-28db267cfe2a}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <terminal x="20" y="40" orientation="s"/>
-        <terminal x="0" y="40" orientation="s"/>
-        <terminal x="40" y="39" orientation="s"/>
-        <terminal x="40" y="-40" orientation="n"/>
-        <terminal x="20" y="-40" orientation="n"/>
-        <terminal x="0" y="-40" orientation="n"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/stepper.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/10_engines/stepper.elmt
@@ -1,44 +0,0 @@
-<definition hotspot_x="34" link_type="simple" height="60" type="element" width="70" version="0.80" hotspot_y="38" orientation="dyyy">
-    <uuid uuid="{fc322143-365e-480b-a75c-89171b76cf32}"/>
-    <names>
-        <name lang="cs">Krokový motor</name>
-        <name lang="fr">moteur pas à pas</name>
-    </names>
-    <elementInformations>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="designation"></elementInformation>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="manufacturer"></elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="comment"></elementInformation>
-    </elementInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <circle antialias="true" y="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="30" x="-15"/>
-        <text y="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-5" rotation="0" text="M" color="#000000"/>
-        <dynamic_text y="-3" z="3" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{5d6b4935-398b-4999-ae36-818b4796a984}" frame="false" x="-46" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <dynamic_text y="24" z="4" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,7,-1,5,50,0,0,0,0,0" uuid="{3f25d559-525f-4f82-ac21-8a51e33d9a4a}" frame="false" x="-20" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-        </dynamic_text>
-        <dynamic_text y="69" z="5" Valignment="AlignTop" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{d2f22986-69e5-4e41-97b6-d9e2805837e7}" frame="false" x="-10" Halignment="AlignLeft" rotation="0" text_width="-1">
-            <text></text>
-            <info_name>tension-protocol</info_name>
-        </dynamic_text>
-        <polygon antialias="false" x2="-7" y5="2" y4="2" x5="6" x3="6" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="5" x1="-7" y1="8" closed="false" y2="5" x4="6"/>
-        <polygon antialias="false" x2="-10" x3="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-14" x1="-10" y1="-30" closed="false" y2="-20"/>
-        <polygon antialias="false" x2="10" x3="7" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-14" x1="10" y1="-30" closed="false" y2="-20"/>
-        <polygon antialias="false" x2="30" x3="13" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-8" x1="30" y1="-30" closed="false" y2="-20"/>
-        <polygon antialias="false" x2="-30" x3="-13" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-8" x1="-30" y1="-30" closed="false" y2="-20"/>
-        <terminal y="-30" orientation="n" x="30"/>
-        <terminal y="-30" orientation="n" x="-10"/>
-        <terminal y="-30" orientation="n" x="10"/>
-        <terminal y="-30" orientation="n" x="-30"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/391_consumers&actuators/30_brakes/brzda_motoru.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/30_brakes/brzda_motoru.elmt
@@ -1,48 +0,0 @@
-<definition type="element" orientation="dyyy" height="80" hotspot_y="57" version="0.70" width="60" hotspot_x="37" link_type="simple">
-    <uuid uuid="{405b76b2-7aea-44a4-9248-386c70bd81ef}"/>
-    <names>
-        <name lang="en">Magnetic brake</name>
-        <name lang="el">Μαγνητικό φρένο</name>
-        <name lang="nl">Rem Magnetic</name>
-        <name lang="it">Freno elettromagnetico</name>
-        <name lang="pl">Hamulec elektromagnetyczny</name>
-        <name lang="de">Bremse magnetisch</name>
-        <name lang="ar">مكبح مغناطيسي</name>
-        <name lang="fr">Frein magnetique</name>
-        <name lang="cs">Elektromagnetická brzda Lenze</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line style="line-style:dashed;line-weight:normal;filling:none;color:black" end2="none" x1="-30" y2="0" end1="none" y1="0" length1="1.5" length2="1.5" antialias="false" x2="-14"/>
-        <polygon y5="6" x5="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" y6="6" x4="-35" x1="-30" x6="-30" y2="-6" y1="6" x3="-35" y4="10" antialias="true" x2="-30" y3="-10"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="-8" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="20" end1="none" y1="9" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="14" y2="-8" end1="none" y1="8" length1="1.5" length2="1.5" antialias="false" x2="14"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-14" y2="8" end1="none" y1="8" length1="1.5" length2="1.5" antialias="false" x2="14"/>
-        <dynamic_text z="7" Valignment="AlignTop" x="-18" text_from="ElementInfo" font="Sans Serif,9,-1,5,50,0,0,0,0,0" rotation="0" uuid="{8c284d0f-0e54-4a83-8f45-ed4bb2347e8a}" y="9" Halignment="AlignLeft" frame="false" text_width="-1">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="14" y2="-8" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="-14"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-14" y2="8" end1="none" y1="-8" length1="1.5" length2="1.5" antialias="false" x2="-14"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-20" height="38" rx="0" width="10" y="-54" ry="0" antialias="false"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10" y2="-30" end1="none" y1="-30" length1="1.5" length2="1.5" antialias="false" x2="0"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="0" y2="20" end1="none" y1="20" length1="1.5" length2="1.5" antialias="false" x2="20"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="20" y2="-40" end1="none" y1="20" length1="1.5" length2="1.5" antialias="false" x2="20"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="20" y2="-40" end1="none" y1="-40" length1="1.5" length2="1.5" antialias="false" x2="-10"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" x="-18" diameter="6" y="-44" antialias="false"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" x="-18" diameter="6" y="-33" antialias="false"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" x="-18" diameter="6" y="-23" antialias="false"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" x="-18" diameter="6" y="-53" antialias="false"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-17" y2="-52" end1="none" y1="-48" length1="1.5" length2="1.5" antialias="false" x2="-13"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-17" y2="-43" end1="none" y1="-39" length1="1.5" length2="1.5" antialias="false" x2="-13"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-17" y2="-32" end1="none" y1="-28" length1="1.5" length2="1.5" antialias="false" x2="-13"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-17" y2="-22" end1="none" y1="-18" length1="1.5" length2="1.5" antialias="false" x2="-13"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="-50" end1="none" y1="-50" length1="1.5" length2="1.5" antialias="false" x2="-25"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-20" y2="-20" end1="none" y1="-20" length1="1.5" length2="1.5" antialias="false" x2="-25"/>
-        <terminal orientation="w" x="-25" y="-20"/>
-        <terminal orientation="w" x="-25" y="-50"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/395_electronics&semiconductors/11_diodes/graetz.elmt
+++ b/elements/10_electric/10_allpole/395_electronics&semiconductors/11_diodes/graetz.elmt
@@ -1,44 +0,0 @@
-<definition link_type="simple" height="40" width="40" orientation="dyyy" version="0.80" type="element" hotspot_y="19" hotspot_x="19">
-    <uuid uuid="{3b52c7d1-d848-4b39-be83-98dfb325fab7}"/>
-    <names>
-        <name lang="en">Graetz</name>
-        <name lang="cs">Graetz</name>
-        <name lang="fr">Pont de Graetz</name>
-    </names>
-    <elementInformations>
-        <elementInformation name="label" show="1"></elementInformation>
-        <elementInformation name="designation" show="1"></elementInformation>
-        <elementInformation name="unity" show="1"></elementInformation>
-        <elementInformation name="plant" show="1"></elementInformation>
-        <elementInformation name="manufacturer" show="1"></elementInformation>
-        <elementInformation name="comment" show="1"></elementInformation>
-        <elementInformation name="description" show="1"></elementInformation>
-        <elementInformation name="supplier" show="1"></elementInformation>
-        <elementInformation name="quantity" show="1"></elementInformation>
-    </elementInformations>
-    <informations></informations>
-    <description>
-        <line x2="-3" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-3" y1="-3" length2="1.5" y2="3" antialias="false" length1="1.5" end2="none"/>
-        <line x2="2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-3" y1="3" length2="1.5" y2="0" antialias="false" length1="1.5" end2="none"/>
-        <line x2="-3" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="2" y1="0" length2="1.5" y2="-3" antialias="false" length1="1.5" end2="none"/>
-        <line x2="2" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="2" y1="-3" length2="1.5" y2="3" antialias="false" length1="1.5" end2="none"/>
-        <line x2="-4" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-6" y1="0" length2="1.5" y2="0" antialias="false" length1="1.5" end2="none"/>
-        <line x2="5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="2" y1="0" length2="1.5" y2="0" antialias="false" length1="1.5" end2="none"/>
-        <line x2="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y1="0" length2="1.5" y2="-10" antialias="false" length1="1.5" end2="none"/>
-        <line x2="10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y1="-10" length2="1.5" y2="0" antialias="false" length1="1.5" end2="none"/>
-        <line x2="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" y1="0" length2="1.5" y2="10" antialias="false" length1="1.5" end2="none"/>
-        <line x2="-10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y1="10" length2="1.5" y2="0" antialias="false" length1="1.5" end2="none"/>
-        <dynamic_text text_width="-1" y="-22" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_from="ElementInfo" Halignment="AlignLeft" Valignment="AlignTop" uuid="{36037412-7fa8-4e88-8188-7675ed4ff88e}" frame="false" rotation="0" x="-23" z="11">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <line x2="-10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-14" y1="0" length2="1.5" y2="0" antialias="false" length1="1.5" end2="none"/>
-        <line x2="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y1="-14" length2="1.5" y2="-10" antialias="false" length1="1.5" end2="none"/>
-        <line x2="14" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" y1="0" length2="1.5" y2="0" antialias="false" length1="1.5" end2="none"/>
-        <line x2="0" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" y1="10" length2="1.5" y2="14" antialias="false" length1="1.5" end2="none"/>
-        <terminal y="0" orientation="w" x="-15"/>
-        <terminal y="15" orientation="s" x="0"/>
-        <terminal y="-14" orientation="n" x="0"/>
-        <terminal y="0" orientation="e" x="15"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/395_electronics&semiconductors/11_diodes/pontdiode2.elmt
+++ b/elements/10_electric/10_allpole/395_electronics&semiconductors/11_diodes/pontdiode2.elmt
@@ -1,41 +0,0 @@
-<definition hotspot_y="60" link_type="simple" hotspot_x="53" orientation="dyyy" width="70" type="element" version="0.80" height="80">
-    <uuid uuid="{04cd2f29-05b2-4e0f-8f97-7937adf58522}"/>
-    <names>
-        <name lang="de">Gleichrichter in Brückenschaltung</name>
-        <name lang="fr">Pont de diodes</name>
-    </names>
-    <elementInformations>
-        <elementInformation show="1" name="comment"></elementInformation>
-        <elementInformation show="1" name="manufacturer_reference"></elementInformation>
-        <elementInformation show="1" name="quantity"></elementInformation>
-        <elementInformation show="1" name="unity"></elementInformation>
-        <elementInformation show="1" name="designation"></elementInformation>
-        <elementInformation show="1" name="machine_manufacturer_reference"></elementInformation>
-        <elementInformation show="1" name="label"></elementInformation>
-        <elementInformation show="1" name="description"></elementInformation>
-        <elementInformation show="1" name="manufacturer"></elementInformation>
-        <elementInformation show="1" name="plant"></elementInformation>
-        <elementInformation show="1" name="supplier"></elementInformation>
-    </elementInformations>
-    <informations>S.Deffaux
-Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <dynamic_text text_width="-1" rotation="0" y="24" font="Sans Serif,9,-1,5,50,0,0,0,0,0" uuid="{64a7d575-5d70-4476-9ac2-3ce2b5dffc08}" Valignment="AlignTop" text_from="ElementInfo" frame="false" x="5" z="1" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x5="-20" x3="-20" y2="-20" x1="-20" y4="-20" antialias="false" y3="-40" y5="0" x2="-40" x4="0" closed="false"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" y2="-10" end2="none" x1="-20" length1="1.5" antialias="false" x2="-20" end1="none"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" y2="-15" end2="none" x1="-25" length1="1.5" antialias="false" x2="-15" end1="none"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x3="-20" y2="-25" x1="-25" y4="-25" antialias="false" y3="-15" x2="-15" x4="-25" closed="false"/>
-        <text text="~" rotation="0" color="#000000" y="-5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="5"/>
-        <text text="+" rotation="0" color="#000000" y="-40" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-35"/>
-        <text text="-" rotation="0" color="#000000" y="10" font="Sans Serif,10,-1,5,50,0,0,0,0,0" x="-35"/>
-        <text text="~" rotation="0" color="#000000" y="-5" font="Sans Serif,9,-1,5,50,0,0,0,0,0" x="-50"/>
-        <terminal orientation="e" y="-20" x="0"/>
-        <terminal orientation="w" y="-20" x="-40"/>
-        <terminal orientation="s" y="0" x="-20"/>
-        <terminal orientation="n" y="-40" x="-20"/>
-    </description>
-</definition>
--- a/elements/10_electric/10_allpole/395_electronics&semiconductors/12_transistors/optoclen.elmt
+++ b/elements/10_electric/10_allpole/395_electronics&semiconductors/12_transistors/optoclen.elmt
@@ -1,41 +0,0 @@
-<definition link_type="simple" height="50" width="50" orientation="dyyy" version="0.80" type="element" hotspot_y="24" hotspot_x="17">
-    <uuid uuid="{e9b44fe1-2a19-4d3a-95d9-22cb54906f8b}"/>
-    <names>
-        <name lang="pl">Transoptor 2</name>
-        <name lang="en">Optocoupler 2</name>
-        <name lang="ar">رابط ضوئي</name>
-        <name lang="cs">Optický vazební člen 2</name>
-        <name lang="de">Optokoppler 2</name>
-        <name lang="nl">Opto koppelaar 2</name>
-        <name lang="it">Accoppiatore ottico Fotoaccoppiatore 2</name>
-        <name lang="el">Οπτοζεύκτης 2</name>
-        <name lang="fr">Interface optocoupleur 2</name>
-    </names>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon x2="4" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="8" y1="-5" y2="-1" y3="-4" antialias="true" x3="13"/>
-        <rect ry="0" y="-10" rx="0" height="21" style="line-style:normal;line-weight:thin;filling:none;color:black" width="45" antialias="false" x="-15"/>
-        <line x2="-2" end1="none" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="8" y1="-5" length2="0.5" y2="-2" antialias="true" length1="1.5" end2="triangle"/>
-        <line x2="-10" end1="none" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="-5" y1="3" length2="1" y2="5" antialias="true" length1="1.5" end2="triangle"/>
-        <line x2="-5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y1="-5" length2="1.5" y2="-4" antialias="true" length1="1.5" end2="none"/>
-        <line x2="-5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-5" y1="-7" length2="1.5" y2="7" antialias="false" length1="1.5" end2="none"/>
-        <polygon x2="4" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="7" y1="1" y2="4" y3="1" antialias="true" x3="13"/>
-        <line x2="-10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y1="-20" length2="1.5" y2="-5" antialias="false" length1="1.5" end2="none"/>
-        <line x2="20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" y1="-20" length2="1.5" y2="-5" antialias="false" length1="1.5" end2="none"/>
-        <line x2="-2" end1="none" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="7" y1="1" length2="0.5" y2="4" antialias="true" length1="1.5" end2="triangle"/>
-        <line x2="-10" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y1="20" length2="1.5" y2="5" antialias="false" length1="1.5" end2="none"/>
-        <line x2="20" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" y1="20" length2="1.5" y2="5" antialias="false" length1="1.5" end2="none"/>
-        <polygon x2="25" x4="15" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="15" y4="-5" y1="-5" y2="-5" y3="5" antialias="true" x3="20"/>
-        <line x2="25" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="15" y1="5" length2="1.5" y2="5" antialias="false" length1="1.5" end2="none"/>
-        <dynamic_text text_width="-1" y="-40" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_from="ElementInfo" Halignment="AlignLeft" Valignment="AlignTop" uuid="{944d4139-4c85-4637-9d2c-929d88cf5052}" frame="false" rotation="0" x="-30" z="15">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <terminal y="20" orientation="s" x="-10"/>
-        <terminal y="-20" orientation="n" x="20"/>
-        <terminal y="-20" orientation="n" x="-10"/>
-        <terminal y="20" orientation="s" x="20"/>
-    </description>
-</definition>
--- a/elements/10_electric/11_singlepole/200_fuses&protective_gears/11_circuit_breakers/jistic_1p.elmt
+++ b/elements/10_electric/11_singlepole/200_fuses&protective_gears/11_circuit_breakers/jistic_1p.elmt
@@ -1,47 +0,0 @@
-<definition version="0.70" height="60" type="element" width="20" hotspot_x="10" link_type="master" hotspot_y="34" orientation="dyyy">
-    <uuid uuid="{820edcf9-d719-4728-bf86-d497c4994ce2}"/>
-    <names>
-        <name lang="cs">Jednopólový jistič</name>
-        <name lang="ar">قاطع أحدي القطب</name>
-        <name lang="en">Circuit-breaker</name>
-        <name lang="nl">Lastscheider 1</name>
-        <name lang="pl">Wyłącznik</name>
-        <name lang="it">Int. Aut. Magneto-termico 1P</name>
-        <name lang="de">Leitungsschutzschalter 1P</name>
-        <name lang="fr">Disjoncteur unipolaire</name>
-    </names>
-    <kindInformations>
-        <kindInformation name="type" show="1">protection</kindInformation>
-    </kindInformations>
-    <elementInformations/>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line y1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="20" end1="none" x2="0"/>
-        <polygon x3="-5" y1="3" y3="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" antialias="true" y2="0" closed="false" x2="0"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" x="-34" text_from="ElementInfo" y="-22" z="3" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{4f18ba79-2f81-40eb-b34a-e0fa9b32537f}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <arc height="5" x="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="-180" y="10.5" width="8" start="90" antialias="true"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="10" end1="none" x2="0"/>
-        <line y1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" length2="1.5" antialias="false" length1="1.5" end2="none" y2="8" end1="none" x2="5"/>
-        <line y1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="3" end1="none" x2="5"/>
-        <line y1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" length2="1.5" antialias="false" length1="1.5" end2="none" y2="-20" end1="none" x2="0"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="-2"/>
-        <line y1="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-2" length2="1.5" antialias="true" length1="1.5" end2="none" y2="-18" end1="none" x2="2"/>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="-2" text_from="UserText" y="-36" z="12" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{6fcf35c5-27f9-4bfc-981e-558a8b81f94e}" Halignment="AlignLeft">
-            <text>1</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,5,-1,5,25,0,0,0,0,0" frame="false" x="0" text_from="UserText" y="9" z="13" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{9dcbca2c-150b-4185-b3b0-969bafa07f27}" Halignment="AlignLeft">
-            <text>2</text>
-        </dynamic_text>
-        <dynamic_text font="Sans Serif,7,-1,5,0,0,0,0,0,0,normal" frame="false" x="-40" text_from="ElementInfo" y="-2" z="14" rotation="0" Valignment="AlignTop" text_width="-1" uuid="{838aaa47-a755-43e3-9584-95a7de914c0b}" Halignment="AlignLeft">
-            <text></text>
-            <info_name>comment</info_name>
-        </dynamic_text>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
-    </description>
-</definition>
--- a/elements/10_electric/11_singlepole/500_home_installation/25_V.D.I/Terrestrial_reception/sockets/prise_tv_fm.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/25_V.D.I/Terrestrial_reception/sockets/prise_tv_fm.elmt
@@ -1,20 +1,24 @@
-<definition orientation="dyyy" type="element" width="30" hotspot_y="6" hotspot_x="15" height="30" link_type="simple" version="0.80">
-    <uuid uuid="{a755a740-0b10-4aad-877b-9c111f5471ca}"/>
+<definition width="30" link_type="simple" orientation="dyyy" hotspot_y="6" version="0.51" type="element" height="30" hotspot_x="15">
+    <uuid uuid="{757403cc-0287-489f-9143-5d31134a7728}"/>
    <names>
        <name lang="fr">Prise TV-FM</name>
    </names>
-    <elementInformations/>
    <informations>Baboune41</informations>
    <description>
-        <dynamic_text y="22" text_from="ElementInfo" x="-15" uuid="{e6e4e792-aa91-4a2e-802c-4961f39682f9}" Valignment="AlignTop" Halignment="AlignLeft" z="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" rotation="0" frame="false">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <circle y="7" antialias="false" x="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6"/>
-        <circle y="9.5" antialias="false" x="-5.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
-        <circle y="7" antialias="false" x="3" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6"/>
-        <circle y="9" antialias="false" x="5" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <rect y="0" antialias="false" x="-10" width="20" style="line-style:normal;line-weight:thin;filling:none;color:black" rx="2" height="20" ry="2"/>
-        <terminal orientation="n" y="0" x="0"/>
+        <input size="9" tagg="label" x="-15" text="_" rotate="true" y="33"/>
+        <rect width="20" antialias="false" x="-10" style="line-style:normal;line-weight:thin;filling:white;color:none" height="20" y="0"/>
+        <circle antialias="false" x="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6" y="7"/>
+        <circle antialias="false" x="-5.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1" y="9.5"/>
+        <arc width="4" start="90" angle="90" antialias="true" x="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="0"/>
+        <arc width="4" start="0" angle="90" antialias="true" x="6" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="0"/>
+        <arc width="4" start="270" angle="90" antialias="true" x="6" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="16"/>
+        <arc width="4" start="180" angle="90" antialias="true" x="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="16"/>
+        <line x1="-8" x2="8" end2="none" y2="0" antialias="false" y1="0" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <line x1="10" x2="10" end2="none" y2="18" antialias="false" y1="2" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <line x1="8" x2="-8" end2="none" y2="20" antialias="false" y1="20" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <line x1="-10" x2="-10" end2="none" y2="2" antialias="false" y1="18" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <circle antialias="false" x="3" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6" y="7"/>
+        <circle antialias="false" x="5" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2" y="9"/>
+        <terminal orientation="n" x="0" y="0"/>
    </description>
 </definition>
--- a/elements/10_electric/11_singlepole/500_home_installation/25_V.D.I/Terrestrial_reception/sockets/prise_tv_fm_sat.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/25_V.D.I/Terrestrial_reception/sockets/prise_tv_fm_sat.elmt
@@ -1,22 +1,26 @@
-<definition orientation="dyyy" type="element" width="30" hotspot_y="6" hotspot_x="15" height="30" link_type="simple" version="0.80">
-    <uuid uuid="{481bb89d-1c7a-477b-a301-c4c457b678a8}"/>
+<definition width="30" link_type="simple" orientation="dyyy" hotspot_y="6" version="0.51" type="element" height="30" hotspot_x="15">
+    <uuid uuid="{60928c5c-a3ab-4cad-80e2-39f6c4e8b7fa}"/>
    <names>
        <name lang="fr">Prise TV-FM-Sat</name>
    </names>
-    <elementInformations/>
    <informations>Baboune41</informations>
    <description>
-        <dynamic_text y="22" text_from="ElementInfo" x="-14" uuid="{012a1b74-6514-4ad8-8203-39f26d06eb76}" Valignment="AlignTop" Halignment="AlignLeft" z="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" rotation="0" frame="false">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <circle y="11" antialias="false" x="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6"/>
-        <circle y="13.5" antialias="false" x="-5.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
-        <circle y="11" antialias="false" x="2" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6"/>
-        <circle y="2" antialias="false" x="-3" style="line-style:normal;line-weight:normal;filling:lightgray;color:black" diameter="6"/>
-        <circle y="13" antialias="false" x="4" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <circle y="4.5" antialias="false" x="-0.5" style="line-style:normal;line-weight:thin;filling:white;color:black" diameter="1"/>
-        <rect y="0" antialias="false" x="-10" width="20" style="line-style:normal;line-weight:thin;filling:none;color:black" rx="2" height="20" ry="2"/>
-        <terminal orientation="n" y="0" x="0"/>
+        <input size="9" tagg="label" x="-14" text="_" rotate="true" y="33"/>
+        <rect width="20" antialias="false" x="-10" style="line-style:normal;line-weight:thin;filling:white;color:none" height="20" y="0"/>
+        <circle antialias="false" x="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6" y="11"/>
+        <circle antialias="false" x="-5.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1" y="13.5"/>
+        <arc width="4" start="90" angle="90" antialias="true" x="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="0"/>
+        <arc width="4" start="0" angle="90" antialias="true" x="6" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="0"/>
+        <arc width="4" start="270" angle="90" antialias="true" x="6" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="16"/>
+        <arc width="4" start="180" angle="90" antialias="true" x="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="16"/>
+        <line x1="-8" x2="8" end2="none" y2="0" antialias="false" y1="0" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <line x1="10" x2="10" end2="none" y2="18" antialias="false" y1="2" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <line x1="8" x2="-8" end2="none" y2="20" antialias="false" y1="20" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <line x1="-10" x2="-10" end2="none" y2="2" antialias="false" y1="18" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <circle antialias="false" x="2" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6" y="11"/>
+        <circle antialias="false" x="-3" style="line-style:normal;line-weight:normal;filling:lightgray;color:black" diameter="6" y="2"/>
+        <circle antialias="false" x="4" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2" y="13"/>
+        <circle antialias="false" x="-0.5" style="line-style:normal;line-weight:thin;filling:white;color:black" diameter="1" y="4.5"/>
+        <terminal orientation="n" x="0" y="0"/>
    </description>
 </definition>
--- a/elements/10_electric/11_singlepole/500_home_installation/25_V.D.I/Terrestrial_reception/sockets/prise_tv_simple.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/25_V.D.I/Terrestrial_reception/sockets/prise_tv_simple.elmt
@@ -1,18 +1,22 @@
-<definition orientation="dyyy" type="element" width="30" hotspot_y="5" hotspot_x="15" height="30" link_type="simple" version="0.80">
-    <uuid uuid="{324a8011-3323-478f-b241-39146dc885dd}"/>
+<definition width="30" link_type="simple" orientation="dyyy" hotspot_y="5" version="0.51" type="element" height="30" hotspot_x="15">
+    <uuid uuid="{1df920b5-f85b-4051-8e13-3c777dce30a8}"/>
    <names>
        <name lang="fr">Prise TV simple</name>
    </names>
-    <elementInformations/>
    <informations>Baboune41</informations>
    <description>
-        <dynamic_text y="23" text_from="ElementInfo" x="-15" uuid="{215bf6d2-0166-48bd-a986-851eb99e4014}" Valignment="AlignTop" Halignment="AlignLeft" z="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" text_width="-1" rotation="0" frame="false">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <circle y="7" antialias="false" x="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6"/>
-        <circle y="9.5" antialias="false" x="-0.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
-        <rect y="0" antialias="false" x="-10" width="20" style="line-style:normal;line-weight:thin;filling:none;color:black" rx="2" height="20" ry="2"/>
-        <terminal orientation="n" y="5" x="0"/>
+        <input size="9" tagg="label" x="-15" text="_" rotate="true" y="34"/>
+        <rect width="20" antialias="false" x="-10" style="line-style:normal;line-weight:thin;filling:white;color:none" height="20" y="0"/>
+        <circle antialias="false" x="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6" y="7"/>
+        <circle antialias="false" x="-0.5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1" y="9.5"/>
+        <arc width="4" start="90" angle="90" antialias="true" x="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="0"/>
+        <arc width="4" start="0" angle="90" antialias="true" x="6" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="0"/>
+        <arc width="4" start="270" angle="90" antialias="true" x="6" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="16"/>
+        <arc width="4" start="180" angle="90" antialias="true" x="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" height="4" y="16"/>
+        <line x1="-8" x2="8" end2="none" y2="0" antialias="false" y1="0" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <line x1="10" x2="10" end2="none" y2="18" antialias="false" y1="2" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <line x1="8" x2="-8" end2="none" y2="20" antialias="false" y1="20" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <line x1="-10" x2="-10" end2="none" y2="2" antialias="false" y1="18" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length2="1.5"/>
+        <terminal orientation="n" x="0" y="5"/>
    </description>
 </definition>
--- a/elements/10_electric/11_singlepole/500_home_installation/25_V.D.I/network/brassage/switch_12_ports.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/25_V.D.I/network/brassage/switch_12_ports.elmt
@@ -1,226 +0,0 @@
-<definition width="560" type="element" version="0.80" height="60" hotspot_x="45" hotspot_y="25" link_type="simple" orientation="dyyy">
-    <uuid uuid="{18743b96-51c1-4399-a117-e659a1871430}"/>
-    <names>
-        <name lang="fr">Switch 12 ports</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <rect width="550" antialias="false" style="line-style:normal;line-weight:normal;filling:gray;color:black" height="50" y="-20" ry="0" x="-40" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="464" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="434" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="206" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="404" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="176" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="374" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="146" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="334" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="116" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="304" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="76" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="274" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="46" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="244" rx="0"/>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="16" rx="0"/>
-        <dynamic_text font="Sans Serif,9,-1,5,50,0,0,0,0,0" Valignment="AlignTop" frame="false" text_width="-1" text_from="ElementInfo" z="17" Halignment="AlignLeft" y="-46" rotation="0" uuid="{ac8599fc-af53-4a58-9c4d-ce72f39620d7}" x="12">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <rect width="28" antialias="false" style="line-style:normal;line-weight:normal;filling:white;color:black" height="20" y="-5" ry="0" x="-14" rx="0"/>
-        <polygon y13="1" x6="329" x5="329" y12="1" x7="323" x13="314" x10="321" x1="313" x2="313" x14="314" y1="1" x3="307" antialias="false" y6="3" x9="321" y7="3" y9="1" y4="12" y5="12" y14="1" x4="307" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="315" y8="1" x11="315" y11="-2" y3="3" y10="-2" x8="323" y2="3"/>
-        <polygon y13="1" x6="71" x5="71" y12="1" x7="65" x13="56" x10="63" x1="55" x2="55" x14="56" y1="1" x3="49" antialias="false" y6="3" x9="63" y7="3" y9="1" y4="12" y5="12" y14="1" x4="49" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="57" y8="1" x11="57" y11="-2" y3="3" y10="-2" x8="65" y2="3"/>
-        <polygon y13="1" x6="299" x5="299" y12="1" x7="293" x13="284" x10="291" x1="283" x2="283" x14="284" y1="1" x3="277" antialias="false" y6="3" x9="291" y7="3" y9="1" y4="12" y5="12" y14="1" x4="277" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="285" y8="1" x11="285" y11="-2" y3="3" y10="-2" x8="293" y2="3"/>
-        <polygon y13="1" x6="41" x5="41" y12="1" x7="35" x13="26" x10="33" x1="25" x2="25" x14="26" y1="1" x3="19" antialias="false" y6="3" x9="33" y7="3" y9="1" y4="12" y5="12" y14="1" x4="19" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="27" y8="1" x11="27" y11="-2" y3="3" y10="-2" x8="35" y2="3"/>
-        <polygon y13="1" x6="429" x5="429" y12="1" x7="423" x13="414" x10="421" x1="413" x2="413" x14="414" y1="1" x3="407" antialias="false" y6="3" x9="421" y7="3" y9="1" y4="12" y5="12" y14="1" x4="407" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="415" y8="1" x11="415" y11="-2" y3="3" y10="-2" x8="423" y2="3"/>
-        <polygon y13="1" x6="171" x5="171" y12="1" x7="165" x13="156" x10="163" x1="155" x2="155" x14="156" y1="1" x3="149" antialias="false" y6="3" x9="163" y7="3" y9="1" y4="12" y5="12" y14="1" x4="149" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="157" y8="1" x11="157" y11="-2" y3="3" y10="-2" x8="165" y2="3"/>
-        <polygon y13="1" x6="269" x5="269" y12="1" x7="263" x13="254" x10="261" x1="253" x2="253" x14="254" y1="1" x3="247" antialias="false" y6="3" x9="261" y7="3" y9="1" y4="12" y5="12" y14="1" x4="247" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="255" y8="1" x11="255" y11="-2" y3="3" y10="-2" x8="263" y2="3"/>
-        <polygon y13="1" x6="359" x5="359" y12="1" x7="353" x13="344" x10="351" x1="343" x2="343" x14="344" y1="1" x3="337" antialias="false" y6="3" x9="351" y7="3" y9="1" y4="12" y5="12" y14="1" x4="337" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="345" y8="1" x11="345" y11="-2" y3="3" y10="-2" x8="353" y2="3"/>
-        <polygon y13="1" x6="11" x5="11" y12="1" x7="5" x13="-4" x10="3" x1="-5" x2="-5" x14="-4" y1="1" x3="-11" antialias="false" y6="3" x9="3" y7="3" y9="1" y4="12" y5="12" y14="1" x4="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="-3" y8="1" x11="-3" y11="-2" y3="3" y10="-2" x8="5" y2="3"/>
-        <polygon y13="1" x6="101" x5="101" y12="1" x7="95" x13="86" x10="93" x1="85" x2="85" x14="86" y1="1" x3="79" antialias="false" y6="3" x9="93" y7="3" y9="1" y4="12" y5="12" y14="1" x4="79" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="87" y8="1" x11="87" y11="-2" y3="3" y10="-2" x8="95" y2="3"/>
-        <line antialias="false" x1="317" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="317" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="59" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="59" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="287" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="287" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="347" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="347" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="29" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="29" end2="none" length2="1.5" end1="none"/>
-        <polygon y13="1" x6="489" x5="489" y12="1" x7="483" x13="474" x10="481" x1="473" x2="473" x14="474" y1="1" x3="467" antialias="false" y6="3" x9="481" y7="3" y9="1" y4="12" y5="12" y14="1" x4="467" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="475" y8="1" x11="475" y11="-2" y3="3" y10="-2" x8="483" y2="3"/>
-        <line antialias="false" x1="315" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="315" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="89" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="89" end2="none" length2="1.5" end1="none"/>
-        <polygon y13="1" x6="231" x5="231" y12="1" x7="225" x13="216" x10="223" x1="215" x2="215" x14="216" y1="1" x3="209" antialias="false" y6="3" x9="223" y7="3" y9="1" y4="12" y5="12" y14="1" x4="209" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="217" y8="1" x11="217" y11="-2" y3="3" y10="-2" x8="225" y2="3"/>
-        <line antialias="false" x1="345" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="345" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="57" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="57" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="285" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="285" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="87" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="87" end2="none" length2="1.5" end1="none"/>
-        <polygon y13="1" x6="459" x5="459" y12="1" x7="453" x13="444" x10="451" x1="443" x2="443" x14="444" y1="1" x3="437" antialias="false" y6="3" x9="451" y7="3" y9="1" y4="12" y5="12" y14="1" x4="437" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="445" y8="1" x11="445" y11="-2" y3="3" y10="-2" x8="453" y2="3"/>
-        <line antialias="false" x1="27" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="27" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="257" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="257" end2="none" length2="1.5" end1="none"/>
-        <polygon y13="1" x6="201" x5="201" y12="1" x7="195" x13="186" x10="193" x1="185" x2="185" x14="186" y1="1" x3="179" antialias="false" y6="3" x9="193" y7="3" y9="1" y4="12" y5="12" y14="1" x4="179" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="187" y8="1" x11="187" y11="-2" y3="3" y10="-2" x8="195" y2="3"/>
-        <line antialias="false" x1="255" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="255" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="-1" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="-1" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="343" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="343" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="-3" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="-3" end2="none" length2="1.5" end1="none"/>
-        <polygon y13="1" x6="399" x5="399" y12="1" x7="393" x13="384" x10="391" x1="383" x2="383" x14="384" y1="1" x3="377" antialias="false" y6="3" x9="391" y7="3" y9="1" y4="12" y5="12" y14="1" x4="377" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="385" y8="1" x11="385" y11="-2" y3="3" y10="-2" x8="393" y2="3"/>
-        <line antialias="false" x1="85" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="85" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="313" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="313" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="283" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="283" end2="none" length2="1.5" end1="none"/>
-        <polygon y13="1" x6="141" x5="141" y12="1" x7="135" x13="126" x10="133" x1="125" x2="125" x14="126" y1="1" x3="119" antialias="false" y6="3" x9="133" y7="3" y9="1" y4="12" y5="12" y14="1" x4="119" style="line-style:normal;line-weight:normal;filling:none;color:black" x12="127" y8="1" x11="127" y11="-2" y3="3" y10="-2" x8="135" y2="3"/>
-        <line antialias="false" x1="55" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="55" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="311" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="311" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="25" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="25" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="253" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="253" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="477" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="477" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="53" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="53" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="341" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="341" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="-5" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="-5" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="219" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="219" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="281" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="281" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="289" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="289" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="83" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="83" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="23" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="23" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="349" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="349" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="31" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="31" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="251" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="251" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="91" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="91" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="319" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="319" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="-7" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="-7" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="417" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="417" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="61" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="61" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="259" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="259" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="447" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="447" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="159" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="159" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="1" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="1" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="321" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="321" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="189" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="189" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="351" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="351" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="63" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="63" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="291" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="291" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="93" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="93" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="353" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="353" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="293" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="293" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="33" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="33" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="95" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="95" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="323" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="323" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="261" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="261" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="35" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="35" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="415" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="415" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="65" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="65" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="445" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="445" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="3" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="3" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="157" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="157" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="295" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="295" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="187" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="187" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="263" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="263" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="37" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="37" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="325" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="325" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="5" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="5" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="355" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="355" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="387" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="387" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="67" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="67" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="97" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="97" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="265" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="265" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="475" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="475" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="129" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="129" end2="none" length2="1.5" end1="none"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="325" rx="0"/>
-        <line antialias="false" x1="7" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="7" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="217" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="217" end2="none" length2="1.5" end1="none"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="295" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="355" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="67" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="277" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="37" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="337" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="97" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="19" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="307" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="265" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="79" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="49" rx="0"/>
-        <line antialias="false" x1="443" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="443" end2="none" length2="1.5" end1="none"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="7" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="247" rx="0"/>
-        <line antialias="false" x1="413" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="413" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="185" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="185" end2="none" length2="1.5" end1="none"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="-11" rx="0"/>
-        <line antialias="false" x1="473" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="473" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="155" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="155" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="385" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="385" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="383" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="383" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="215" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="215" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="441" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="441" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="127" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="127" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="411" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="411" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="125" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="125" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="183" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="183" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="471" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="471" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="153" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="153" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="381" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="381" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="419" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="419" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="213" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="213" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="123" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="123" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="479" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="479" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="161" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="161" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="449" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="449" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="451" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="451" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="221" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="221" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="191" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="191" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="481" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="481" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="193" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="193" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="389" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="389" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="223" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="223" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="421" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="421" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="131" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="131" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="423" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="423" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="163" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="163" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="391" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="391" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="165" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="165" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="453" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="453" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="483" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="483" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="133" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="133" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="393" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="393" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="195" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="195" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="455" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="455" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="225" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="225" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="135" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="135" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="485" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="485" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="197" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="197" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="425" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="425" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="227" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="227" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="395" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="395" end2="none" length2="1.5" end1="none"/>
-        <line antialias="false" x1="167" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="167" end2="none" length2="1.5" end1="none"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="455" rx="0"/>
-        <line antialias="false" x1="137" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y1="10" y2="12" x2="137" end2="none" length2="1.5" end1="none"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="485" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="197" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="425" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="407" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="227" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="437" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="167" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="395" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="149" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="467" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="179" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="377" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:orange;color:orange" height="2" y="-3" ry="0" x="137" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="209" rx="0"/>
-        <rect width="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:green" height="2" y="-3" ry="0" x="119" rx="0"/>
-        <circle diameter="4" antialias="false" style="line-style:normal;line-weight:normal;filling:green;color:black" y="3" x="-27"/>
-        <arc width="6" antialias="true" angle="-270" style="line-style:normal;line-weight:normal;filling:none;color:black" height="6" y="11" start="45" x="-28"/>
-        <line antialias="false" x1="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y1="10" y2="13" x2="-25" end2="none" length2="1.5" end1="none"/>
-        <terminal y="17" x="318" orientation="s"/>
-        <terminal y="17" x="258" orientation="s"/>
-        <terminal y="17" x="418" orientation="s"/>
-        <terminal y="17" x="288" orientation="s"/>
-        <terminal y="17" x="478" orientation="s"/>
-        <terminal y="17" x="348" orientation="s"/>
-        <terminal y="17" x="448" orientation="s"/>
-        <terminal y="17" x="388" orientation="s"/>
-        <terminal y="17" x="60" orientation="s"/>
-        <terminal y="17" x="0" orientation="s"/>
-        <terminal y="17" x="190" orientation="s"/>
-        <terminal y="17" x="220" orientation="s"/>
-        <terminal y="17" x="90" orientation="s"/>
-        <terminal y="17" x="160" orientation="s"/>
-        <terminal y="17" x="30" orientation="s"/>
-        <terminal y="17" x="130" orientation="s"/>
-    </description>
-</definition>
--- a/Show More
+++ b/Show More