From a5e81723759b74d8c47fa17e87b25e1f64aa36f0 Mon Sep 17 00:00:00 2001
From: scorpio810
 <scorpio810@r995  scorpio810  2010-05-20 11:17:04 +0200 (jeu. 20 mai 2010)>
Date: Thu, 27 Aug 2015 18:48:36 +0000
Subject: [PATCH] Add tag label

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4170 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 .../10_converters/ac1_ac1.elmt                |  54 +++---
 .../10_converters/ac1_dc.elmt                 |  58 ++++---
 .../10_converters/ac1_dc1.elmt                |  64 +++----
 .../10_converters/convertisseur_dc_dc.elmt    |  40 +++--
 .../convertisseur_tri_ac_dc.elmt              |  50 +++---
 .../10_converters/convertisseur_tri_mono.elmt |  52 +++---
 .../10_converters/dc_ac1.elmt                 |  58 ++++---
 .../10_converters/dc_dc.elmt                  |  62 +++----
 .../10_converters/inverseur_mono.elmt         |  32 ++--
 .../10_converters/inverter.elmt               |  86 +++++-----
 .../10_converters/rectifier.elmt              | 128 +++++++-------
 .../10_converters/redresseur.elmt             |  38 ++--
 .../10_converters/static_freq_converter.elmt  | 162 +++++++++---------
 .../ampereheuremetre.elmt                     |  24 +--
 .../amperemetre-h.elmt                        |  40 +++--
 .../amperemetre-v.elmt                        |  40 +++--
 .../capteur_debit.elmt                        |  50 +++---
 .../compteur_220v_monophase.elmt              |  30 ++--
 .../compteur_energie.elmt                     |  30 ++--
 ...gie_active_a_depassement_de_puissance.elmt |  30 ++--
 .../compteur_horaire.elmt                     |  24 +--
 .../compteur_horaire_08-04-03_en60617.elmt    |  24 +--
 .../frequencemetre-h.elmt                     |  36 ++--
 .../frequencemetre-v.elmt                     |  36 ++--
 .../galvanometre-h.elmt                       |  36 ++--
 .../galvanometre-v.elmt                       |  36 ++--
 .../ohmmetre-h.elmt                           |  46 ++---
 .../ohmmetre-v.elmt                           |  46 ++---
 .../varh_08-04-15_en60617.elmt                |  22 +--
 .../varheuremetre.elmt                        |  30 ++--
 .../voltmetre-h.elmt                          |  38 ++--
 .../voltmetre-v.elmt                          |  38 ++--
 .../wattheuremetre.elmt                       |  24 +--
 .../wattheuremetre_08-04-03_en60617.elmt      |  24 +--
 .../wattmetre-h.elmt                          |  46 ++---
 .../wattmetre-v.elmt                          |  46 ++---
 36 files changed, 876 insertions(+), 804 deletions(-)

diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_ac1.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_ac1.elmt
index 55d7c6d43..78184680b 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_ac1.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_ac1.elmt
@@ -1,35 +1,37 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn">
-<uuid uuid="{34543D92-2D3E-43B0-A49E-59BB756BB655}"/><names>
-        <name lang="ar">حاكم جهد أحادي الوجه</name>
-        <name lang="de">Umformer AC/AC</name>
-        <name lang="ru">Однофазный перем. ток > Однофазный перем. ток</name>
-        <name lang="pt">Alterna monofásica > Alterna monofásica</name>
-        <name lang="el">Μονοφασικό εναλλασσόμενο > Μονοφασικό εναλλασσόμενο</name>
-        <name lang="en">One-phase alternating > One-phase alternating</name>
-        <name lang="it">AC monofase > AC monofase</name>
-        <name lang="fr">Alternatif monophasé > Alternatif monophasé</name>
-        <name lang="pl">Przekształtnik prądu przemiennego</name>
-        <name lang="es">Alterna monofásica > Alterna monofásica</name>
+<definition hotspot_y="25" type="element" height="40" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{44d49199-2c96-4ce6-bab3-2b210bd469fe}"/>
+    <names>
         <name lang="cs">Střídavý proud > stejnosměrný proud</name>
         <name lang="nl">Wisselspanning > Wisselspanning  AC1 > AC1</name>
+        <name lang="it">AC monofase > AC monofase</name>
+        <name lang="ru">Однофазный перем. ток > Однофазный перем. ток</name>
+        <name lang="pt">Alterna monofásica > Alterna monofásica</name>
+        <name lang="de">Umformer AC/AC</name>
+        <name lang="el">Μονοφασικό εναλλασσόμενο > Μονοφασικό εναλλασσόμενο</name>
+        <name lang="en">One-phase alternating > One-phase alternating</name>
+        <name lang="fr">Alternatif monophasé > Alternatif monophasé</name>
+        <name lang="es">Alterna monofásica > Alterna monofásica</name>
+        <name lang="pl">Przekształtnik prądu przemiennego</name>
         <name lang="be">Wisselspanning > Wisselspanning  AC1 > AC1</name>
+        <name lang="ar">حاكم جهد أحادي الوجه</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="-10" x2="-20"/>
-        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10"/>
-        <arc width="5" x="-7.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <arc width="5" x="7.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" 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="0" x1="-20" y2="0" x2="-15"/>
-        <arc width="5" x="-12.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <arc width="5" x="2.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="14.5" y2="9.5" x2="-14.5"/>
-        <terminal x="-21" y="-10" orientation="w"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="-10" orientation="e"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <input text="_" rotate="true" y="-29.5" size="9" x="-7" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-15" y2="-10" end1="none" y1="-10" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="15" x4="-15" y3="10" antialias="false" x1="-15" y2="-20" y1="-20" x2="15" y4="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-17.5" width="5" start="0" x="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="2.5" width="5" start="0" x="7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="20" y2="0" end1="none" y1="0" x2="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15" y2="-10" end1="none" y1="-10" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-20" y2="0" end1="none" y1="0" x2="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-17.5" width="5" start="180" x="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="2.5" width="5" start="180" x="2.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="14.5" y2="9.5" end1="none" y1="-19.5" x2="-14.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-10" orientation="w" x="-21"/>
+        <terminal y="0" orientation="w" x="-21"/>
+        <terminal y="-10" orientation="e" x="21"/>
+        <terminal y="0" orientation="e" x="21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_dc.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_dc.elmt
index 0a3c2444f..2fe1edf98 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_dc.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_dc.elmt
@@ -1,37 +1,39 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn">
-<uuid uuid="{1990CD76-09FE-4470-BEB4-9872FB48F278}"/><names>
-        <name lang="ar">موحد أحادي الوجه</name>
-        <name lang="de">Umformer AC/DC</name>
-        <name lang="ru">Однофазный перем. ток > Пост. ток</name>
-        <name lang="pt">Alterna monofásica > Continua</name>
-        <name lang="el">Μονοφασικό εναλλασσόμενο > Συνεχές</name>
-        <name lang="en">One-phase alternating > Direct</name>
-        <name lang="it">Convertitore AC monofase / DC</name>
-        <name lang="fr">Alternatif monophasé > Continu</name>
-        <name lang="pl">Prostownik</name>
-        <name lang="es">Alterna monofásica > Continua</name>
+<definition hotspot_y="25" type="element" height="40" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{74293231-f4e0-48f7-b647-3bfe9b79ccdd}"/>
+    <names>
         <name lang="cs">Usměrňovač - jednofázový střídavý proud > stejnosměrný proud</name>
         <name lang="nl">Wisselspanning > gelijkspanning  AC1 > DC</name>
+        <name lang="it">Convertitore AC monofase / DC</name>
+        <name lang="ru">Однофазный перем. ток > Пост. ток</name>
+        <name lang="pt">Alterna monofásica > Continua</name>
+        <name lang="de">Umformer AC/DC</name>
+        <name lang="el">Μονοφασικό εναλλασσόμενο > Συνεχές</name>
+        <name lang="en">One-phase alternating > Direct</name>
+        <name lang="fr">Alternatif monophasé > Continu</name>
+        <name lang="es">Alterna monofásica > Continua</name>
+        <name lang="pl">Prostownik</name>
         <name lang="be">Wisselspanning > gelijkspanning  AC1 > DC</name>
+        <name lang="ar">موحد أحادي الوجه</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="-10" x2="-20"/>
-        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10"/>
-        <arc width="5" x="-7.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" 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="0" x1="-20" y2="0" x2="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="11" y2="4" x2="12.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="8" y2="4" x2="9.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="5" y2="4" x2="6.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="5" y2="6" x2="12.5"/>
-        <arc width="5" x="-12.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="14.5" y2="9.5" x2="-14.5"/>
-        <terminal x="-21" y="-10" orientation="w"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="-10" orientation="e"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <input text="_" rotate="true" y="-29.5" size="9" x="-8" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-15" y2="-10" end1="none" y1="-10" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="15" x4="-15" y3="10" antialias="false" x1="-15" y2="-20" y1="-20" x2="15" y4="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-17.5" width="5" start="0" x="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="20" y2="0" end1="none" y1="0" x2="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15" y2="-10" end1="none" y1="-10" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-20" y2="0" end1="none" y1="0" x2="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="11" y2="4" end1="none" y1="4" x2="12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="8" y2="4" end1="none" y1="4" x2="9.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="5" y2="4" end1="none" y1="4" x2="6.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="5" y2="6" end1="none" y1="6" x2="12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-17.5" width="5" start="180" x="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="14.5" y2="9.5" end1="none" y1="-19.5" x2="-14.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-10" orientation="w" x="-21"/>
+        <terminal y="0" orientation="w" x="-21"/>
+        <terminal y="-10" orientation="e" x="21"/>
+        <terminal y="0" orientation="e" x="21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_dc1.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_dc1.elmt
index 40eb2254d..637eebc14 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_dc1.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/ac1_dc1.elmt
@@ -1,40 +1,42 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="30" height="50" type="element" orientation="dnnn">
-<uuid uuid="{4BE801A4-5D47-4C70-B0D0-2B8FE0D80002}"/><names>
-        <name lang="ar">موحد أحادي الوجه</name>
-        <name lang="de">Umformer AC/DC</name>
-        <name lang="ru">Однофазный перем. ток > Пост. ток</name>
-        <name lang="pt">Alterna monofásica > Continua</name>
-        <name lang="el">Μονοφασικό εναλλασσόμενο > Συνεχές</name>
-        <name lang="en">One-phase alternating > Direct</name>
-        <name lang="it">Alternata monofase > Continua</name>
-        <name lang="fr">Alternatif monophasé > Continu</name>
-        <name lang="pl">Prostownik</name>
-        <name lang="es">Alterna monofásica > Continua</name>
+<definition hotspot_y="29" type="element" height="50" width="50" hotspot_x="28" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{f19f2a12-0955-499b-aee0-b140e8a13d24}"/>
+    <names>
         <name lang="cs">Usměrňovač - jednofázový střídavý proud > stejnosměrný proud</name>
         <name lang="nl">wisselspanning > gelijkspanning AC1 > DC</name>
+        <name lang="it">Alternata monofase > Continua</name>
+        <name lang="ru">Однофазный перем. ток > Пост. ток</name>
+        <name lang="pt">Alterna monofásica > Continua</name>
+        <name lang="de">Umformer AC/DC</name>
+        <name lang="el">Μονοφασικό εναλλασσόμενο > Συνεχές</name>
+        <name lang="en">One-phase alternating > Direct</name>
+        <name lang="fr">Alternatif monophasé > Continu</name>
+        <name lang="es">Alterna monofásica > Continua</name>
+        <name lang="pl">Prostownik</name>
         <name lang="be">wisselspanning > gelijkspanning AC1 > DC</name>
+        <name lang="ar">موحد أحادي الوجه</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10"/>
-        <arc width="5" x="-7.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="11" y2="4" x2="12.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="8" y2="4" x2="9.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="5" y2="4" x2="6.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="5" y2="6" x2="12.5"/>
-        <arc width="5" x="-12.5" y="-17.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="14.5" y2="9.5" x2="-14.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-16" y2="-6" x2="-18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-10" y2="-25" 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="-24" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-10" y2="15" 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="11" x1="10" y2="15" 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="-6" x1="-19" y2="-6" x2="-18"/>
-        <terminal x="10" y="-25" orientation="n"/>
-        <terminal x="-10" y="-25" orientation="n"/>
-        <terminal x="10" y="15" orientation="s"/>
-        <terminal x="-10" y="15" orientation="s"/>
-        <terminal x="-19" y="-6" orientation="w"/>
+        <input text="_" rotate="true" y="-14.45" size="9" x="13" tagg="label"/>
+        <polygon x3="15" x4="-15" y3="10" antialias="false" x1="-15" y2="-20" y1="-20" x2="15" y4="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-17.5" width="5" start="0" x="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="11" y2="4" end1="none" y1="4" x2="12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="8" y2="4" end1="none" y1="4" x2="9.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="5" y2="4" end1="none" y1="4" x2="6.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="5" y2="6" end1="none" y1="6" x2="12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-17.5" width="5" start="180" x="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="14.5" y2="9.5" end1="none" y1="-19.5" x2="-14.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-16" y2="-6" end1="none" y1="-6" x2="-18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-10" y2="-25" end1="none" y1="-20" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10" y2="-24" end1="none" y1="-20" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-10" y2="15" end1="none" y1="10" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10" y2="15" end1="none" y1="11" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-19" y2="-6" end1="none" y1="-6" x2="-18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-6" orientation="w" x="-19"/>
+        <terminal y="-25" orientation="n" x="10"/>
+        <terminal y="-25" orientation="n" x="-10"/>
+        <terminal y="15" orientation="s" x="10"/>
+        <terminal y="15" orientation="s" x="-10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_dc_dc.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_dc_dc.elmt
index b1739119f..c5153b6e0 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_dc_dc.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_dc_dc.elmt
@@ -1,30 +1,32 @@
-<definition width="50" version="0.4" hotspot_x="35" hotspot_y="44" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E02EF37E-A8F0-4887-B3FC-31C7456D6A16}"/><names>
-        <name lang="ar">مقطع : محول مستمر / مستمر</name>
+<definition hotspot_y="44" type="element" height="50" width="50" hotspot_x="34" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{8326e12d-d015-48a6-8731-125daca056b5}"/>
+    <names>
+        <name lang="nl">Gelijkspanning > gelijkspanning DC > DC</name>
+        <name lang="cs">Měnič stejnosměrného proudu</name>
+        <name lang="it">Convertitore DC/DC</name>
         <name lang="de">Umrichter DC/DC</name>
         <name lang="el">Μετατροπέας DC/DC</name>
         <name lang="en">DC/DC converter</name>
-        <name lang="it">Convertitore DC/DC</name>
         <name lang="fr">Convertisseur DC/DC</name>
         <name lang="pl">Zasilacz prądu stałego</name>
-        <name lang="nl">Gelijkspanning > gelijkspanning DC > DC</name>
-        <name lang="cs">Měnič stejnosměrného proudu</name>
         <name lang="be">Gelijkspanning > gelijkspanning DC > DC</name>
+        <name lang="ar">مقطع : محول مستمر / مستمر</name>
     </names>
     <informations>EN 60617: 06-14-02</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="-25" y2="-33" x2="-21"/>
-        <rect width="40" x="-30" y="-40" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="-18" y2="-33" x2="-14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-6" y2="-5" 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="-35" x1="-25" y2="-35" x2="-14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="1" y2="-5" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="-6" y2="-7" x2="5"/>
-        <line length1="0" length2="0" antialias="true" end1="simple" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="-40" x2="10"/>
-        <terminal x="-30" y="-30" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="-30" y="-10" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="10" y="-30" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="10" y="-10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="-10" y="0" nameHidden="0" number="" name="" orientation="s"/>
+        <input text="_" rotate="true" y="-49.45" size="9" x="-25" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-25" y2="-33" end1="none" y1="-33" x2="-21" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="40" antialias="false" y="-40" width="40" x="-30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-18" y2="-33" end1="none" y1="-33" x2="-14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-6" y2="-5" end1="none" y1="-5" x2="-2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-25" y2="-35" end1="none" y1="-35" x2="-14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="1" y2="-5" end1="none" y1="-5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-6" y2="-7" end1="none" y1="-7" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="simple" length2="0" length1="0" antialias="true" x1="-30" y2="-40" end1="simple" y1="0" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-10" orientation="e" x="10"/>
+        <terminal y="0" orientation="s" x="-10"/>
+        <terminal y="-30" orientation="w" x="-30"/>
+        <terminal y="-10" orientation="w" x="-30"/>
+        <terminal y="-30" orientation="e" x="10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_tri_ac_dc.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_tri_ac_dc.elmt
index 0f2ea6b7f..3c9fec190 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_tri_ac_dc.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_tri_ac_dc.elmt
@@ -1,33 +1,35 @@
-<definition width="60" version="0.4" hotspot_x="30" hotspot_y="35" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E9AE851A-19D6-44FC-8832-341DAE9E30AD}"/><names>
-        <name lang="ar">موحد ثلاثي الأوجه</name>
-        <name lang="el">Μετατροπέας τριφασικό AC/DC</name>
-        <name lang="en">AC/DC tri converter</name>
-        <name lang="de">Umrichter AC/DC 3-phasig</name>
-        <name lang="it">Convertitore AC trifase / DC</name>
-        <name lang="fr">Convertisseur tri AC/DC</name>
-        <name lang="pl">Prostownik</name>
+<definition hotspot_y="35" type="element" height="70" width="60" hotspot_x="30" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{ba37456e-e7a9-423d-a75d-4d5e8f0cbd22}"/>
+    <names>
         <name lang="nl">Wisselspanning driefase > gelijkspanning  AC3 > DC</name>
         <name lang="cs">Usměrňovač - měnič třífázový střídavý proud/stejnosměrný proud</name>
+        <name lang="it">Convertitore AC trifase / DC</name>
+        <name lang="el">Μετατροπέας τριφασικό AC/DC</name>
+        <name lang="de">Umrichter AC/DC 3-phasig</name>
+        <name lang="en">AC/DC tri converter</name>
+        <name lang="fr">Convertisseur tri AC/DC</name>
+        <name lang="pl">Prostownik</name>
         <name lang="be">Wisselspanning driefasen > gelijkspanning  AC3 > DC</name>
+        <name lang="ar">موحد ثلاثي الأوجه</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="40" x="-20" y="-30" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="30" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-25" y2="0" 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="24" x1="6" y2="24" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-20" y2="-20" x2="-25"/>
-        <arc width="5" x="-11.5" y="-25.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="25" y2="10" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-10" x2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-25" y2="20" x2="-20"/>
-        <arc width="5" x="-16.5" y="-25.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <terminal x="-25" y="-20" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="25" y="-10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="25" y="10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="-25" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="-26" y="20" nameHidden="0" number="" name="" orientation="w"/>
+        <input text="_" rotate="true" y="-39.45" size="9" x="-12" tagg="label"/>
+        <rect height="60" antialias="false" y="-30" width="40" x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="20" y2="30" end1="none" y1="-30" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-25" y2="0" end1="none" y1="0" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="6" y2="24" end1="none" y1="24" x2="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-20" y2="-20" end1="none" y1="-20" x2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-25.5" width="5" start="0" x="-11.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="25" y2="10" end1="none" y1="10" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="20" y2="-10" end1="none" y1="-10" x2="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-25" y2="20" end1="none" y1="20" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-25.5" width="5" start="180" x="-16.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-10" orientation="e" x="25"/>
+        <terminal y="10" orientation="e" x="25"/>
+        <terminal y="0" orientation="w" x="-25"/>
+        <terminal y="20" orientation="w" x="-26"/>
+        <terminal y="-20" orientation="w" x="-25"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_tri_mono.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_tri_mono.elmt
index 3aa850b96..f812c3224 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_tri_mono.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/convertisseur_tri_mono.elmt
@@ -1,34 +1,36 @@
-<definition width="60" version="0.4" hotspot_x="30" hotspot_y="35" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{4A038C39-E100-48E8-A673-D47404EBBE12}"/><names>
-        <name lang="ar">محول ثلاثي الأوجه - أحادي الوجه</name>
-        <name lang="el">Μετατροπέας τριφασικό AC/ μονοφασικό AC</name>
-        <name lang="en">Three phase converter single phase</name>
-        <name lang="de">Umrichter AC/AC 3-phasig</name>
-        <name lang="it">Convertitore AC trifase / AC monofase</name>
-        <name lang="fr">Convertisseur tri mono</name>
-        <name lang="pl">Przekształtnik prądu przemiennego</name>
+<definition hotspot_y="35" type="element" height="70" width="60" hotspot_x="30" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{ad88d374-e4a5-4af7-8b15-717363f0b3f8}"/>
+    <names>
         <name lang="nl">Wisselspanning driefase > wisselspanning eenfase AC3>AC1</name>
         <name lang="cs">Měnič třífázový/jednofázový proud</name>
+        <name lang="it">Convertitore AC trifase / AC monofase</name>
+        <name lang="el">Μετατροπέας τριφασικό AC/ μονοφασικό AC</name>
+        <name lang="de">Umrichter AC/AC 3-phasig</name>
+        <name lang="en">Three phase converter single phase</name>
+        <name lang="fr">Convertisseur tri mono</name>
+        <name lang="pl">Przekształtnik prądu przemiennego</name>
         <name lang="be">Wisselspanning drie fasen > wisselspanning een fase AC3>AC1</name>
+        <name lang="ar">محول ثلاثي الأوجه - أحادي الوجه</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="40" x="-20" y="-30" antialias="false" height="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="5" x="11.5" y="10.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="20" y2="30" x2="-20"/>
-        <arc width="5" x="6.5" y="10.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-25" y2="0" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-20" y2="-20" x2="-25"/>
-        <arc width="5" x="-11.5" y="-25.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="25" y2="10" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="20" y2="-10" x2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20" x1="-25" y2="20" x2="-20"/>
-        <arc width="5" x="-16.5" y="-25.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <terminal x="-25" y="-20" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="25" y="-10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="25" y="10" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="-25" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="-26" y="20" nameHidden="0" number="" name="" orientation="w"/>
+        <input text="_" rotate="true" y="-44.45" size="9" x="-17" tagg="label"/>
+        <rect height="60" antialias="false" y="-30" width="40" x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="10.5" width="5" start="0" x="11.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="20" y2="30" end1="none" y1="-30" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="10.5" width="5" start="180" x="6.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-25" y2="0" end1="none" y1="0" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-20" y2="-20" end1="none" y1="-20" x2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-25.5" width="5" start="0" x="-11.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="25" y2="10" end1="none" y1="10" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="20" y2="-10" end1="none" y1="-10" x2="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-25" y2="20" end1="none" y1="20" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-25.5" width="5" start="180" x="-16.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-20" orientation="w" x="-25"/>
+        <terminal y="20" orientation="w" x="-26"/>
+        <terminal y="-10" orientation="e" x="25"/>
+        <terminal y="10" orientation="e" x="25"/>
+        <terminal y="0" orientation="w" x="-25"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/dc_ac1.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/dc_ac1.elmt
index e6b0c4920..d991b2016 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/dc_ac1.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/dc_ac1.elmt
@@ -1,37 +1,39 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn">
-<uuid uuid="{287A4E3A-69FC-49E5-8FB9-71A19049F216}"/><names>
-        <name lang="ar">عاكس أحادي الوجه</name>
-        <name lang="de">Wechselrichter</name>
-        <name lang="ru">Пост. ток > Однофазный перем. ток</name>
-        <name lang="pt">Contínua > Alterna monofásica</name>
-        <name lang="el">Συνεχές > Μονοφασικό εναλλασσόμενο</name>
-        <name lang="en">Direct > One-phase alternating</name>
-        <name lang="it">DC / AC monofase</name>
-        <name lang="fr">Continu > Alternatif monophasé</name>
-        <name lang="pl">Falownik</name>
-        <name lang="es">Continua > Alterna monofásica</name>
+<definition hotspot_y="25" type="element" height="40" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{c8219681-b937-465a-8d2f-b7fe69870cde}"/>
+    <names>
         <name lang="cs">Stejnosměrný proud > střídavý proud</name>
         <name lang="nl">Gelijkspanning > Wisselspanning DC > AC1</name>
+        <name lang="it">DC / AC monofase</name>
+        <name lang="ru">Пост. ток > Однофазный перем. ток</name>
+        <name lang="pt">Contínua > Alterna monofásica</name>
+        <name lang="de">Wechselrichter</name>
+        <name lang="el">Συνεχές > Μονοφασικό εναλλασσόμενο</name>
+        <name lang="en">Direct > One-phase alternating</name>
+        <name lang="fr">Continu > Alternatif monophasé</name>
+        <name lang="es">Continua > Alterna monofásica</name>
+        <name lang="pl">Falownik</name>
         <name lang="be">Gelijkspanning > Wisselspanning DC > AC1</name>
+        <name lang="ar">عاكس أحادي الوجه</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="-10" x2="-20"/>
-        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="10"/>
-        <arc width="5" x="7.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" 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="0" x1="-20" y2="0" x2="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-11" y2="-17" x2="-12.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-8" y2="-17" x2="-9.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-5" y2="-17" x2="-6.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-5" y2="-15" x2="-12.5"/>
-        <arc width="5" x="2.5" y="2.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="14.5" y2="9.5" x2="-14.5"/>
-        <terminal x="-21" y="-10" orientation="w"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="-10" orientation="e"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <input text="_" rotate="true" y="-30.45" size="9" x="-12" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-15" y2="-10" end1="none" y1="-10" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="15" x4="-15" y3="10" antialias="false" x1="-15" y2="-20" y1="-20" x2="15" y4="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="2.5" width="5" start="0" x="7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="20" y2="0" end1="none" y1="0" x2="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15" y2="-10" end1="none" y1="-10" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-20" y2="0" end1="none" y1="0" x2="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-11" y2="-17" end1="none" y1="-17" x2="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-8" y2="-17" end1="none" y1="-17" x2="-9.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-5" y2="-17" end1="none" y1="-17" x2="-6.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-5" y2="-15" end1="none" y1="-15" x2="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="2.5" width="5" start="180" x="2.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="14.5" y2="9.5" end1="none" y1="-19.5" x2="-14.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-10" orientation="w" x="-21"/>
+        <terminal y="-10" orientation="e" x="21"/>
+        <terminal y="0" orientation="e" x="21"/>
+        <terminal y="0" orientation="w" x="-21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/dc_dc.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/dc_dc.elmt
index 2a43783c9..63fffb946 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/dc_dc.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/dc_dc.elmt
@@ -1,39 +1,41 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="40" type="element" orientation="dnnn">
-<uuid uuid="{DBBF378C-FB25-4068-BB72-86EC6E2B6B5D}"/><names>
-        <name lang="ar">مقطع : محول مستمر/ مستمر</name>
-        <name lang="de">Umformer DC/DC</name>
-        <name lang="ru">Пост. ток > Пост. ток</name>
-        <name lang="pt">Contínua > Contínua</name>
-        <name lang="el">Συνεχές > Συνεχές</name>
-        <name lang="en">Direct > Direct</name>
-        <name lang="it">DC > DC</name>
-        <name lang="fr">Continu > Continu</name>
-        <name lang="pl">Przekształtnik prądu stałego</name>
-        <name lang="es">Continua > Continua</name>
+<definition hotspot_y="25" type="element" height="40" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{33a8fa7a-83b4-4d15-a257-6ca35628b1f5}"/>
+    <names>
         <name lang="cs">Stejnosměrný proud > stejnosměrný proud</name>
         <name lang="nl">Gelijkspanning > gelijkspanning DC>DC</name>
+        <name lang="it">DC > DC</name>
+        <name lang="ru">Пост. ток > Пост. ток</name>
+        <name lang="pt">Contínua > Contínua</name>
+        <name lang="de">Umformer DC/DC</name>
+        <name lang="el">Συνεχές > Συνεχές</name>
+        <name lang="en">Direct > Direct</name>
+        <name lang="fr">Continu > Continu</name>
+        <name lang="es">Continua > Continua</name>
+        <name lang="pl">Przekształtnik prądu stałego</name>
         <name lang="be">Gelijkspanning > gelijkspanning DC>DC</name>
+        <name lang="ar">مقطع : محول مستمر/ مستمر</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="-10" x2="-20"/>
-        <polygon x4="-15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-15" y2="-20" x2="15" y3="10" x3="15" y4="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="20" y2="0" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="15" 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="0" x1="-20" y2="0" x2="-15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="11" y2="4" x2="12.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="8" y2="4" x2="9.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="5" y2="4" x2="6.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="5" y2="6" x2="12.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-11" y2="-17" x2="-12.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-8" y2="-17" x2="-9.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-5" y2="-17" x2="-6.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-5" y2="-15" x2="-12.5"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.5" x1="14.5" y2="9.5" x2="-14.5"/>
-        <terminal x="-21" y="-10" orientation="w"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="-10" orientation="e"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <input text="_" rotate="true" y="-29.45" size="9" x="-11" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-15" y2="-10" end1="none" y1="-10" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="15" x4="-15" y3="10" antialias="false" x1="-15" y2="-20" y1="-20" x2="15" y4="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="20" y2="0" end1="none" y1="0" x2="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15" y2="-10" end1="none" y1="-10" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-20" y2="0" end1="none" y1="0" x2="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="11" y2="4" end1="none" y1="4" x2="12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="8" y2="4" end1="none" y1="4" x2="9.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="5" y2="4" end1="none" y1="4" x2="6.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="5" y2="6" end1="none" y1="6" x2="12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-11" y2="-17" end1="none" y1="-17" x2="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-8" y2="-17" end1="none" y1="-17" x2="-9.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-5" y2="-17" end1="none" y1="-17" x2="-6.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-5" y2="-15" end1="none" y1="-15" x2="-12.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="14.5" y2="9.5" end1="none" y1="-19.5" x2="-14.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-10" orientation="e" x="21"/>
+        <terminal y="0" orientation="e" x="21"/>
+        <terminal y="-10" orientation="w" x="-21"/>
+        <terminal y="0" orientation="w" x="-21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/inverseur_mono.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/inverseur_mono.elmt
index 0ed913b87..21a85f77f 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/inverseur_mono.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/inverseur_mono.elmt
@@ -1,23 +1,25 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="15" height="30" type="element" orientation="dnny">
-<uuid uuid="{438E0E32-B14B-4134-A9D8-95A9EB7E947D}"/><names>
-        <name lang="ar">عاكس اتجاه الوجه أحادي الخط</name>
-        <name lang="de">Phasenumkehrer</name>
-        <name lang="pt">Inversor de sentido de fase monofilar</name>
-        <name lang="en">Single line phases direction inverter</name>
-        <name lang="it">Invertitore di fase monofilare</name>
-        <name lang="fr">Inverseur de sens des phases unifilaire</name>
-        <name lang="pl">Inwerter jednofazowy</name>
-        <name lang="es">Inversor de fase monohilo</name>
+<definition hotspot_y="19" type="element" height="40" width="20" hotspot_x="10" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{f2412508-8fc1-4349-b4ca-0e31cddf2e4a}"/>
+    <names>
         <name lang="cs">Přepínač směru fáze jednoduchého spojení</name>
         <name lang="nl">Fasendraaier</name>
+        <name lang="it">Invertitore di fase monofilare</name>
+        <name lang="pt">Inversor de sentido de fase monofilar</name>
+        <name lang="de">Phasenumkehrer</name>
+        <name lang="en">Single line phases direction inverter</name>
+        <name lang="fr">Inverseur de sens des phases unifilaire</name>
+        <name lang="es">Inversor de fase monohilo</name>
+        <name lang="pl">Inwerter jednofazowy</name>
+        <name lang="ar">عاكس اتجاه الوجه أحادي الخط</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="-5" x2="-5" y3="5" x3="5" y4="10"/>
-        <polygon x4="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="-5" x2="5" y3="5" x3="-5" y4="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="10" x2="0"/>
-        <terminal x="0" y="-11" orientation="n"/>
-        <terminal x="0" y="11" orientation="s"/>
+        <polygon x3="5" x4="5" closed="false" y3="5" antialias="false" x1="-5" y2="-5" y1="-10" x2="-5" y4="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input text="_" rotate="true" y="-2.45" size="9" x="4" tagg="label"/>
+        <polygon x3="-5" x4="-5" closed="false" y3="5" antialias="false" x1="5" y2="-5" y1="-10" x2="5" y4="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="10" end1="none" y1="-10" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="11" orientation="s" x="0"/>
+        <terminal y="-11" orientation="n" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/inverter.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/inverter.elmt
index 9be5073bc..0c172cf62 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/inverter.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/inverter.elmt
@@ -1,51 +1,53 @@
-<definition width="130" version="0.4" hotspot_x="33" hotspot_y="62" height="150" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D9C45990-CE4A-4D52-B137-D815D17AEABA}"/><names>
-        <name lang="en">Inverter</name>
-        <name lang="de">Wechselrichter</name>
-        <name lang="fr">Onduleur</name>
-        <name lang="it">Inverter</name>
-        <name lang="pl">Falownik</name>
+<definition hotspot_y="62" type="element" height="150" width="130" hotspot_x="33" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{85aaac96-da53-4c45-9e27-baeb656b4a15}"/>
+    <names>
         <name lang="cs">Střídač</name>
+        <name lang="it">Inverter</name>
+        <name lang="de">Wechselrichter</name>
+        <name lang="en">Inverter</name>
+        <name lang="fr">Onduleur</name>
+        <name lang="pl">Falownik</name>
     </names>
     <informations>Author: Arun Kishore Eswara
 
 License: Creative Commons By 3.0 
 Quote Author and use for free : strictly non-commercial</informations>
     <description>
-        <text x="-20" y="-33" size="4" text="DC Voltage"/>
-        <text x="37" y="-47" size="7" text="Inverter"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.1004" x1="33.6462" y2="28.1004" x2="36.45"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26.8996" x1="32.4962" y2="-26.8996" x2="35.3"/>
-        <rect width="51.75" x="29.55" y="-36" antialias="true" height="71" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-27" y="81" size="4" text="Control Signals"/>
-        <text x="-26" y="49" size="4" text="Actual Signals"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35.8671" x1="70" y2="50.144" x2="70"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28.0401" x1="33.8982" y2="-25.7524" x2="33.8982"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35.8671" x1="40" y2="50.144" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="circle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="11.0497" y2="24.1275" x2="69.937"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.14443" x1="70.95" y2="-24" x2="70.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="70.95" y2="6.86063" x2="70.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23.9065" x1="58.3" y2="-0.0784918" x2="58.3"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.566" x1="69.8" y2="4.292" x2="74.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.22286" x1="58.3" y2="-23.7943" x2="58.3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12.8757" x1="44.5" y2="-23.9057" x2="44.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="circle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="10.8466" y2="-24" x2="69.937"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="44.5" y2="-4.96905" x2="44.5"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13.65" x1="43.35" y2="-10.2" x2="47.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.2" x1="48.0247" y2="-10.2" x2="90.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.292" x1="74.5852" y2="4.292" x2="90.2994"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.411111" x1="57.15" y2="-3.07667" x2="62.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.0767" x1="62.9057" y2="-3.07667" x2="90.4938"/>
-        <rect width="78.3871" x="13.6129" y="51" antialias="false" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="16" y="66" size="6" text="Control Electronics"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="58" x1="4.29867" y2="58" x2="13.4395"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="circle" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="68" x1="3.65273" y2="68" x2="13.5012"/>
-        <terminal x="89.35" y="-10.2" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="89.35" y="-3.0767" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="89.35" y="4.292" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="6" y="58" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="4.07931" y="68" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="14" y="-24" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="14" y="24" nameHidden="1" number="" name="" orientation="w"/>
+        <input text="_" rotate="true" y="-49.45" size="9" x="83" tagg="label"/>
+        <text text="DC Voltage" y="-33" size="4" x="-20"/>
+        <text text="Inverter" y="-47" size="7" x="37"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="33.6462" y2="28.1004" end1="none" y1="28.1004" x2="36.45" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="32.4962" y2="-26.8996" end1="none" y1="-26.8996" x2="35.3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="71" antialias="true" y="-36" width="51.75" x="29.55" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="Control Signals" y="81" size="4" x="-27"/>
+        <text text="Actual Signals" y="49" size="4" x="-26"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="70" y2="50.144" end1="simple" y1="35.8671" x2="70" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="33.8982" y2="-25.7524" end1="none" y1="-28.0401" x2="33.8982" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="simple" length2="1.5" length1="1.5" antialias="false" x1="40" y2="50.144" end1="none" y1="35.8671" x2="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="11.0497" y2="24.1275" end1="circle" y1="24.1275" x2="69.937" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="70.95" y2="-24" end1="none" y1="1.14443" x2="70.95" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="70.95" y2="6.86063" end1="none" y1="24.1275" x2="70.95" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="58.3" y2="-0.0784918" end1="none" y1="23.9065" x2="58.3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="69.8" y2="4.292" end1="none" y1="0.566" x2="74.4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="58.3" y2="-23.7943" end1="none" y1="-6.22286" x2="58.3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="44.5" y2="-23.9057" end1="none" y1="-12.8757" x2="44.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10.8466" y2="-24" end1="circle" y1="-24" x2="69.937" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="44.5" y2="-4.96905" end1="none" y1="24.1275" x2="44.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="43.35" y2="-10.2" end1="none" y1="-13.65" x2="47.95" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="48.0247" y2="-10.2" end1="none" y1="-10.2" x2="90.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="74.5852" y2="4.292" end1="none" y1="4.292" x2="90.2994" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="57.15" y2="-3.07667" end1="none" y1="0.411111" x2="62.9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="62.9057" y2="-3.07667" end1="none" y1="-3.0767" x2="90.4938" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="24" antialias="false" y="51" width="78.3871" x="13.6129" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="Control Electronics" y="66" size="6" x="16"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="4.29867" y2="58" end1="simple" y1="58" x2="13.4395" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="simple" length2="1.5" length1="1.5" antialias="false" x1="3.65273" y2="68" end1="circle" y1="68" x2="13.5012" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-10.2" orientation="e" x="89.35"/>
+        <terminal y="-3.0767" orientation="e" x="89.35"/>
+        <terminal y="4.292" orientation="e" x="89.35"/>
+        <terminal y="68" orientation="w" x="4.07931"/>
+        <terminal y="-24" orientation="w" x="14"/>
+        <terminal y="24" orientation="w" x="14"/>
+        <terminal y="58" orientation="w" x="6"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/rectifier.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/rectifier.elmt
index 4620bd1e1..fce8d4c50 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/rectifier.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/rectifier.elmt
@@ -1,72 +1,74 @@
-<definition width="170" version="0.4" hotspot_x="109" hotspot_y="57" height="140" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{8D1C290A-6570-4F8C-B55A-77845CE934E4}"/><names>
-        <name lang="el">Ανορθωτής</name>
-        <name lang="en">Rectifier</name>
-        <name lang="de">Gleichrichter</name>
-        <name lang="it">Raddrizzatore</name>
-        <name lang="pl">Prostownik</name>
-        <name lang="fr">Redresseur</name>
+<definition hotspot_y="58" type="element" height="140" width="180" hotspot_x="113" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{be202355-eff4-431d-9092-e9b760fdc23d}"/>
+    <names>
         <name lang="cs">Usměrňovač</name>
+        <name lang="it">Raddrizzatore</name>
+        <name lang="el">Ανορθωτής</name>
+        <name lang="de">Gleichrichter</name>
+        <name lang="en">Rectifier</name>
+        <name lang="fr">Redresseur</name>
+        <name lang="pl">Prostownik</name>
     </names>
     <informations>Author: Arun Kishore Eswara
 
 License: Creative Commons By 3.0 
 Quote Author and use for free : strictly non-commercial</informations>
     <description>
-        <polygon x4="-52.0954" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20.1659" x1="-52.0954" y2="-13.3024" x2="-56.7" y3="-13.3024" x3="-47.4908" y4="-20.1659"/>
-        <text x="-48" y="-41" size="8" text="Rectifier"/>
-        <text x="21" y="-35" size="5" text="DC Voltage"/>
-        <polygon x4="-39.4454" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20.1659" x1="-39.4454" y2="-13.3024" x2="-44.05" y3="-13.3024" x3="-34.8408" y4="-20.1659"/>
-        <polygon x4="-26.7954" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20.1659" x1="-26.7954" y2="-13.3024" x2="-31.4" y3="-13.3024" x3="-22.1908" y4="-20.1659"/>
-        <text x="-106" y="75" size="4" text="Control Signals"/>
-        <text x="-106" y="54" size="4" text="Actual Signals"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35.8671" x1="-24" y2="50.144" x2="-24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.53719" x1="15.75" y2="23.3722" x2="15.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="-51.7374" y2="24.1275" x2="28.3642"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="10" y2="-24" x2="10"/>
-        <arc width="4.6" x="0.8" y="-31" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-183" angle="-180"/>
-        <arc width="4.6" x="-3.8" y="-31" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-183" angle="-180"/>
-        <arc width="4.6" x="5.4" y="-31" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-183" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.65506" x1="12.3" y2="1.65506" x2="19.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="28.1004" x1="14.0962" y2="28.1004" x2="16.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="4.25" y2="-33" 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="-19.8508" x1="-56.7" y2="-19.8508" x2="-47.4908"/>
-        <polygon x4="-52.0954" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="8.83413" x1="-52.0954" y2="15.6976" x2="-56.7" y3="15.6976" x3="-47.4908" y4="8.83413"/>
-        <rect width="51.75" x="-64.75" y="-36" antialias="true" height="71" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="-39.45" y2="-24" x2="-39.45"/>
-        <polygon x4="-39.4454" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="8.83413" x1="-39.4454" y2="15.6976" x2="-44.05" y3="15.6976" x3="-34.8408" y4="8.83413"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="-26.8" y2="-24" x2="-26.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="9.05816" x1="-31.2439" y2="9.05816" x2="-22.3691"/>
-        <polygon x4="-26.7954" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="8.83413" x1="-26.7954" y2="15.6976" x2="-31.4" y3="15.6976" x3="-22.1908" y4="8.83413"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.05816" x1="-43.8939" y2="9.05816" x2="-35.0191"/>
-        <line 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.8508" x1="-44.05" y2="-19.8508" x2="-34.8408"/>
-        <line 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.8508" x1="-31.4" y2="-19.8508" x2="-22.1908"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="-52.1" y2="-24" x2="-52.1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.80976" x1="-56.544" y2="8.80976" x2="-47.669"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-52.1" y2="-24" x2="-9.55"/>
-        <arc width="4.6" x="-8.4" y="-31" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-183" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="-8.4" y2="-24" x2="-8.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="9.96387" y2="-24" x2="28.8933"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23.6484" x1="15.75" y2="-2.19487" x2="15.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.57894" x1="12.3" y2="-1.57894" x2="19.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="-33" x1="-8.4" y2="-33" x2="-2.65"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-52.1" y2="-10" x2="-80.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-39.45" y2="-4" x2="-80.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-26.8" y2="2" x2="-80.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26.8996" x1="14.0962" y2="-26.8996" x2="16.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28.0401" x1="15.4981" y2="-25.7524" x2="15.4981"/>
-        <rect width="82" x="-65" y="51" antialias="false" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-61" y="66" size="6" text="Control Electronics"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35.8671" x1="-54" y2="50.144" x2="-54"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="58" x1="-80.9314" y2="58" x2="-65.0743"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="circle" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="68" x1="-83.8054" y2="68" x2="-65.2108"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="circle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="58" x1="-84" y2="58" x2="-80"/>
-        <terminal x="-79.7" y="-10" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-79.7" y="-4" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-79.7" y="2" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-84" y="58" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-83" y="68" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="26" y="-24" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="25" y="24" nameHidden="1" number="" name="" orientation="e"/>
+        <polygon x3="-47.4908" x4="-52.0954" closed="false" y3="-13.3024" antialias="true" x1="-52.0954" y2="-13.3024" y1="-20.1659" x2="-56.7" y4="-20.1659" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input text="_" rotate="true" y="-59.45" size="9" x="3" tagg="label"/>
+        <text text="Rectifier" y="-41" size="8" x="-48"/>
+        <text text="DC Voltage" y="-35" size="5" x="21"/>
+        <polygon x3="-34.8408" x4="-39.4454" closed="false" y3="-13.3024" antialias="true" x1="-39.4454" y2="-13.3024" y1="-20.1659" x2="-44.05" y4="-20.1659" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="-22.1908" x4="-26.7954" closed="false" y3="-13.3024" antialias="true" x1="-26.7954" y2="-13.3024" y1="-20.1659" x2="-31.4" y4="-20.1659" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="Control Signals" y="75" size="4" x="-106"/>
+        <text text="Actual Signals" y="54" size="4" x="-106"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-24" y2="50.144" end1="simple" y1="35.8671" x2="-24" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15.75" y2="23.3722" end1="none" y1="1.53719" x2="15.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="true" x1="-51.7374" y2="24.1275" end1="none" y1="24.1275" x2="28.3642" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="10" y2="-24" end1="none" y1="-29" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-180" height="3" antialias="true" y="-31" width="4.6" start="-183" x="0.8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-180" height="3" antialias="true" y="-31" width="4.6" start="-183" x="-3.8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-180" height="3" antialias="true" y="-31" width="4.6" start="-183" x="5.4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="12.3" y2="1.65506" end1="none" y1="1.65506" x2="19.2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="14.0962" y2="28.1004" end1="none" y1="28.1004" x2="16.9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="4.25" y2="-33" end1="none" y1="-33" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-56.7" y2="-19.8508" end1="none" y1="-19.8508" x2="-47.4908" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="-47.4908" x4="-52.0954" closed="false" y3="15.6976" antialias="true" x1="-52.0954" y2="15.6976" y1="8.83413" x2="-56.7" y4="8.83413" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="71" antialias="true" y="-36" width="51.75" x="-64.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-39.45" y2="-24" end1="none" y1="24.1275" x2="-39.45" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="-34.8408" x4="-39.4454" closed="false" y3="15.6976" antialias="true" x1="-39.4454" y2="15.6976" y1="8.83413" x2="-44.05" y4="8.83413" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-26.8" y2="-24" end1="none" y1="24.1275" x2="-26.8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-31.2439" y2="9.05816" end1="none" y1="9.05816" x2="-22.3691" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="-22.1908" x4="-26.7954" closed="false" y3="15.6976" antialias="true" x1="-26.7954" y2="15.6976" y1="8.83413" x2="-31.4" y4="8.83413" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-43.8939" y2="9.05816" end1="none" y1="9.05816" x2="-35.0191" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-44.05" y2="-19.8508" end1="none" y1="-19.8508" x2="-34.8408" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-31.4" y2="-19.8508" end1="none" y1="-19.8508" x2="-22.1908" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-52.1" y2="-24" end1="none" y1="24.1275" x2="-52.1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-56.544" y2="8.80976" end1="none" y1="8.80976" x2="-47.669" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-52.1" y2="-24" end1="none" y1="-24" x2="-9.55" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-180" height="3" antialias="true" y="-31" width="4.6" start="-183" x="-8.4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="-8.4" y2="-24" end1="none" y1="-29" x2="-8.4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="9.96387" y2="-24" end1="none" y1="-24" x2="28.8933" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15.75" y2="-2.19487" end1="none" y1="-23.6484" x2="15.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="12.3" y2="-1.57894" end1="none" y1="-1.57894" x2="19.2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-8.4" y2="-33" end1="none" y1="-33" x2="-2.65" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="-52.1" y2="-10" end1="none" y1="-10" x2="-80.85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="-39.45" y2="-4" end1="none" y1="-4" x2="-80.85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="-26.8" y2="2" end1="none" y1="2" x2="-80.85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="14.0962" y2="-26.8996" end1="none" y1="-26.8996" x2="16.9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15.4981" y2="-25.7524" end1="none" y1="-28.0401" x2="15.4981" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="24" antialias="false" y="51" width="82" x="-65" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="Control Electronics" y="66" size="6" x="-61"/>
+        <line end2="simple" length2="1.5" length1="1.5" antialias="false" x1="-54" y2="50.144" end1="none" y1="35.8671" x2="-54" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-80.9314" y2="58" end1="simple" y1="58" x2="-65.0743" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="simple" length2="1.5" length1="1.5" antialias="false" x1="-83.8054" y2="68" end1="circle" y1="68" x2="-65.2108" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-84" y2="58" end1="circle" y1="58" x2="-80" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="2" orientation="w" x="-79.7"/>
+        <terminal y="58" orientation="w" x="-84"/>
+        <terminal y="68" orientation="w" x="-83"/>
+        <terminal y="-24" orientation="e" x="26"/>
+        <terminal y="24" orientation="e" x="25"/>
+        <terminal y="-10" orientation="w" x="-79.7"/>
+        <terminal y="-4" orientation="w" x="-79.7"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/redresseur.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/redresseur.elmt
index 7539fbab9..d60b416b4 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/redresseur.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/redresseur.elmt
@@ -1,29 +1,31 @@
-<definition width="50" version="0.3" hotspot_x="35" hotspot_y="45" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{ED2F66B9-B73C-48A9-A724-262181AB786F}"/><names>
-        <name lang="ar">موحد محكوم</name>
+<definition hotspot_y="44" type="element" height="50" width="50" hotspot_x="34" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{f466b24f-cdb3-468d-8076-f5931f5aa644}"/>
+    <names>
+        <name lang="cs">Usměrňovač proudu</name>
+        <name lang="nl">Gelijkrichter AC1/DC</name>
+        <name lang="it">Raddrizzatore AC/DC</name>
         <name lang="de">Gleichrichter</name>
         <name lang="el">Ανορθωτής</name>
         <name lang="en">Rectifier</name>
-        <name lang="it">Raddrizzatore AC/DC</name>
         <name lang="fr">Redresseur</name>
         <name lang="pl">Zasilacz</name>
-        <name lang="cs">Usměrňovač proudu</name>
-        <name lang="nl">Gelijkrichter AC1/DC</name>
         <name lang="be">Gelijkrichter AC1/DC</name>
+        <name lang="ar">موحد محكوم</name>
     </names>
     <informations>EN 60617: 06-14-03</informations>
     <description>
-        <rect width="40" x="-30" y="-40" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-6" y2="-5" 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="-5" x1="1" y2="-5" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="-6" y2="-7" x2="5"/>
-        <line length1="0" length2="0" antialias="true" end1="simple" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-30" y2="-40" x2="10"/>
-        <arc width="5" x="-19.5" y="-35.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-175"/>
-        <arc width="5" x="-24.5" y="-35.5" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="180" angle="-175"/>
-        <terminal x="-30" y="-30" orientation="w"/>
-        <terminal x="-30" y="-10" orientation="w"/>
-        <terminal x="10" y="-30" orientation="e"/>
-        <terminal x="10" y="-10" orientation="e"/>
-        <terminal x="-10" y="0" orientation="s"/>
+        <input text="_" rotate="true" y="-49.5" size="9" x="-22" tagg="label"/>
+        <rect height="40" antialias="false" y="-40" width="40" x="-30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-6" y2="-5" end1="none" y1="-5" x2="-2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="1" y2="-5" end1="none" y1="-5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-6" y2="-7" end1="none" y1="-7" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="simple" length2="0" length1="0" antialias="true" x1="-30" y2="-40" end1="simple" y1="0" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-35.5" width="5" start="0" x="-19.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-175" height="5" antialias="true" y="-35.5" width="5" start="180" x="-24.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="0" orientation="s" x="-10"/>
+        <terminal y="-30" orientation="w" x="-30"/>
+        <terminal y="-10" orientation="e" x="10"/>
+        <terminal y="-30" orientation="e" x="10"/>
+        <terminal y="-10" orientation="w" x="-30"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/static_freq_converter.elmt b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/static_freq_converter.elmt
index 3528740c8..900d0f50e 100644
--- a/elements/10_electric/10_allpole/340_converters&inverters/10_converters/static_freq_converter.elmt
+++ b/elements/10_electric/10_allpole/340_converters&inverters/10_converters/static_freq_converter.elmt
@@ -1,91 +1,93 @@
-<definition width="210" version="0.4" hotspot_x="113" hotspot_y="57" height="140" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D99B61B0-C3D2-4B6B-99DC-7399F3867006}"/><names>
-        <name lang="en">Frequency_converter</name>
+<definition hotspot_y="56" type="element" height="140" width="210" hotspot_x="112" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{fe8918d6-68c7-476b-8393-bbf223f2f472}"/>
+    <names>
+        <name lang="cs">Měnič kmitočtu</name>
+        <name lang="it">Convertitore di frequenza</name>
         <name lang="de">Frequenzumformer</name>
+        <name lang="en">Frequency_converter</name>
         <name lang="fr">Convertisseur de fréquence</name>
         <name lang="pl">Pośredni przetwornik częstotliwości</name>
-        <name lang="it">Convertitore di frequenza</name>
-        <name lang="cs">Měnič kmitočtu</name>
     </names>
     <informations>Author: Arun Kishore Eswara
 
 License: Creative Commons By 3.0 
 Quote Author and use for free : strictly non-commercial</informations>
     <description>
-        <polygon x4="-52.0954" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20.1659" x1="-52.0954" y2="-13.3024" x2="-56.7" y3="-13.3024" x3="-47.4908" y4="-20.1659"/>
-        <text x="-62" y="-41" size="4" text="Rectifier"/>
-        <text x="-9" y="-44" size="4" text="DC Voltage&#xa;Intermediate"/>
-        <text x="42" y="-41" size="4" text="Inverter"/>
-        <polygon x4="-39.4454" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20.1659" x1="-39.4454" y2="-13.3024" x2="-44.05" y3="-13.3024" x3="-34.8408" y4="-20.1659"/>
-        <polygon x4="-26.7954" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-20.1659" x1="-26.7954" y2="-13.3024" x2="-31.4" y3="-13.3024" x3="-22.1908" y4="-20.1659"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.1004" x1="33.6462" y2="28.1004" x2="36.45"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26.8996" x1="32.4962" y2="-26.8996" x2="35.3"/>
-        <rect width="51.75" x="29.55" y="-36" antialias="true" height="71" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-106" y="75" size="4" text="Control Signals"/>
-        <text x="-106" y="54" size="4" text="Actual Signals"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35.8671" x1="-24" y2="50.144" x2="-24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35.8671" x1="70" y2="50.144" x2="70"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.53719" x1="15.75" y2="23.3722" x2="15.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28.0401" x1="33.8982" y2="-25.7524" x2="33.8982"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35.8671" x1="40" y2="50.144" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="-51.3301" y2="24.1275" x2="69.923"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="10" y2="-24" x2="10"/>
-        <arc width="4.6" x="0.8" y="-31" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-183" angle="-180"/>
-        <arc width="4.6" x="-3.8" y="-31" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-183" angle="-180"/>
-        <arc width="4.6" x="5.4" y="-31" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-183" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.65506" x1="12.3" y2="1.65506" x2="19.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="28.1004" x1="14.0962" y2="28.1004" x2="16.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.14443" x1="70.95" y2="-24" x2="70.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="4.25" y2="-33" 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="24.1275" x1="70.95" y2="6.86063" x2="70.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23.9065" x1="58.3" y2="-0.0784918" x2="58.3"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.566" x1="69.8" y2="4.292" x2="74.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.8508" x1="-56.7" y2="-19.8508" x2="-47.4908"/>
-        <polygon x4="-52.0954" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="8.83413" x1="-52.0954" y2="15.6976" x2="-56.7" y3="15.6976" x3="-47.4908" y4="8.83413"/>
-        <rect width="51.75" x="-64.75" y="-36" antialias="true" height="71" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.22286" x1="58.3" y2="-23.7943" x2="58.3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="-39.45" y2="-24" x2="-39.45"/>
-        <polygon x4="-39.4454" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="8.83413" x1="-39.4454" y2="15.6976" x2="-44.05" y3="15.6976" x3="-34.8408" y4="8.83413"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="-26.8" y2="-24" x2="-26.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="9.05816" x1="-31.2439" y2="9.05816" x2="-22.3691"/>
-        <line 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.8757" x1="44.5" y2="-23.9057" x2="44.5"/>
-        <polygon x4="-26.7954" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="8.83413" x1="-26.7954" y2="15.6976" x2="-31.4" y3="15.6976" x3="-22.1908" y4="8.83413"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.05816" x1="-43.8939" y2="9.05816" x2="-35.0191"/>
-        <line 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.8508" x1="-44.05" y2="-19.8508" x2="-34.8408"/>
-        <line 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.8508" x1="-31.4" y2="-19.8508" x2="-22.1908"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.1275" x1="-52.1" y2="-24" x2="-52.1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.80976" x1="-56.544" y2="8.80976" x2="-47.669"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-52.1" y2="-24" x2="-9.55"/>
-        <arc width="4.6" x="-8.4" y="-31" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-183" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29" x1="-8.4" y2="-24" x2="-8.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="10.8466" y2="-24" x2="69.937"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23.6484" x1="15.75" y2="-2.19487" x2="15.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.57894" x1="12.3" y2="-1.57894" x2="19.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="24.1275" x1="44.5" y2="-4.96905" x2="44.5"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13.65" x1="43.35" y2="-10.2" x2="47.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.2" x1="48.0247" y2="-10.2" x2="90.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.292" x1="74.5852" y2="4.292" x2="90.2994"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.411111" x1="57.15" y2="-3.07667" x2="62.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.0767" x1="62.9057" y2="-3.07667" x2="90.4938"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="-8.4" y2="-33" x2="-2.65"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-52.1" y2="-10" x2="-80.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-39.45" y2="-4" x2="-80.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="circle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-26.8" y2="2" x2="-80.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26.8996" x1="14.0962" y2="-26.8996" x2="16.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28.0401" x1="15.4981" y2="-25.7524" x2="15.4981"/>
-        <rect width="148" x="-65" y="51" antialias="false" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-48" y="67" size="9" text="Control Electronics"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35.8671" x1="-54" y2="50.144" x2="-54"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="58" x1="-80.9314" y2="58" x2="-65.0743"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="circle" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="68" x1="-83.8054" y2="68" x2="-65.2108"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="circle" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="58" x1="-84" y2="58" x2="-80"/>
-        <terminal x="-79.7" y="-10" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-79.7" y="-4" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-79.7" y="2" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="89.35" y="-10.2" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="89.35" y="-3.0767" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="89.35" y="4.292" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="-84" y="58" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-83" y="68" nameHidden="1" number="" name="" orientation="w"/>
+        <input text="_" rotate="true" y="-69.45" size="9" x="-7" tagg="label"/>
+        <polygon x3="-47.4908" x4="-52.0954" closed="false" y3="-13.3024" antialias="true" x1="-52.0954" y2="-13.3024" y1="-20.1659" x2="-56.7" y4="-20.1659" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="Rectifier" y="-41" size="4" x="-62"/>
+        <text text="DC Voltage&#xa;Intermediate" y="-44" size="4" x="-9"/>
+        <text text="Inverter" y="-41" size="4" x="42"/>
+        <polygon x3="-34.8408" x4="-39.4454" closed="false" y3="-13.3024" antialias="true" x1="-39.4454" y2="-13.3024" y1="-20.1659" x2="-44.05" y4="-20.1659" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="-22.1908" x4="-26.7954" closed="false" y3="-13.3024" antialias="true" x1="-26.7954" y2="-13.3024" y1="-20.1659" x2="-31.4" y4="-20.1659" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="33.6462" y2="28.1004" end1="none" y1="28.1004" x2="36.45" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="32.4962" y2="-26.8996" end1="none" y1="-26.8996" x2="35.3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="71" antialias="true" y="-36" width="51.75" x="29.55" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="Control Signals" y="75" size="4" x="-106"/>
+        <text text="Actual Signals" y="54" size="4" x="-106"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-24" y2="50.144" end1="simple" y1="35.8671" x2="-24" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="70" y2="50.144" end1="simple" y1="35.8671" x2="70" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15.75" y2="23.3722" end1="none" y1="1.53719" x2="15.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="33.8982" y2="-25.7524" end1="none" y1="-28.0401" x2="33.8982" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="simple" length2="1.5" length1="1.5" antialias="false" x1="40" y2="50.144" end1="none" y1="35.8671" x2="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-51.3301" y2="24.1275" end1="none" y1="24.1275" x2="69.923" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="10" y2="-24" end1="none" y1="-29" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-180" height="3" antialias="true" y="-31" width="4.6" start="-183" x="0.8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-180" height="3" antialias="true" y="-31" width="4.6" start="-183" x="-3.8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-180" height="3" antialias="true" y="-31" width="4.6" start="-183" x="5.4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="12.3" y2="1.65506" end1="none" y1="1.65506" x2="19.2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="14.0962" y2="28.1004" end1="none" y1="28.1004" x2="16.9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="70.95" y2="-24" end1="none" y1="1.14443" x2="70.95" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="4.25" y2="-33" end1="none" y1="-33" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="70.95" y2="6.86063" end1="none" y1="24.1275" x2="70.95" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="58.3" y2="-0.0784918" end1="none" y1="23.9065" x2="58.3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="69.8" y2="4.292" end1="none" y1="0.566" x2="74.4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-56.7" y2="-19.8508" end1="none" y1="-19.8508" x2="-47.4908" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="-47.4908" x4="-52.0954" closed="false" y3="15.6976" antialias="true" x1="-52.0954" y2="15.6976" y1="8.83413" x2="-56.7" y4="8.83413" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="71" antialias="true" y="-36" width="51.75" x="-64.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="58.3" y2="-23.7943" end1="none" y1="-6.22286" x2="58.3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-39.45" y2="-24" end1="none" y1="24.1275" x2="-39.45" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="-34.8408" x4="-39.4454" closed="false" y3="15.6976" antialias="true" x1="-39.4454" y2="15.6976" y1="8.83413" x2="-44.05" y4="8.83413" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-26.8" y2="-24" end1="none" y1="24.1275" x2="-26.8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-31.2439" y2="9.05816" end1="none" y1="9.05816" x2="-22.3691" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="44.5" y2="-23.9057" end1="none" y1="-12.8757" x2="44.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="-22.1908" x4="-26.7954" closed="false" y3="15.6976" antialias="true" x1="-26.7954" y2="15.6976" y1="8.83413" x2="-31.4" y4="8.83413" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-43.8939" y2="9.05816" end1="none" y1="9.05816" x2="-35.0191" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-44.05" y2="-19.8508" end1="none" y1="-19.8508" x2="-34.8408" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-31.4" y2="-19.8508" end1="none" y1="-19.8508" x2="-22.1908" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-52.1" y2="-24" end1="none" y1="24.1275" x2="-52.1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-56.544" y2="8.80976" end1="none" y1="8.80976" x2="-47.669" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-52.1" y2="-24" end1="none" y1="-24" x2="-9.55" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-180" height="3" antialias="true" y="-31" width="4.6" start="-183" x="-8.4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="-8.4" y2="-24" end1="none" y1="-29" x2="-8.4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10.8466" y2="-24" end1="none" y1="-24" x2="69.937" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15.75" y2="-2.19487" end1="none" y1="-23.6484" x2="15.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="12.3" y2="-1.57894" end1="none" y1="-1.57894" x2="19.2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="44.5" y2="-4.96905" end1="none" y1="24.1275" x2="44.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="43.35" y2="-10.2" end1="none" y1="-13.65" x2="47.95" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="48.0247" y2="-10.2" end1="none" y1="-10.2" x2="90.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="74.5852" y2="4.292" end1="none" y1="4.292" x2="90.2994" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="true" x1="57.15" y2="-3.07667" end1="none" y1="0.411111" x2="62.9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="62.9057" y2="-3.07667" end1="none" y1="-3.0767" x2="90.4938" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-8.4" y2="-33" end1="none" y1="-33" x2="-2.65" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="-52.1" y2="-10" end1="none" y1="-10" x2="-80.85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="-39.45" y2="-4" end1="none" y1="-4" x2="-80.85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="circle" length2="1.5" length1="1.5" antialias="false" x1="-26.8" y2="2" end1="none" y1="2" x2="-80.85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="14.0962" y2="-26.8996" end1="none" y1="-26.8996" x2="16.9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="15.4981" y2="-25.7524" end1="none" y1="-28.0401" x2="15.4981" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="24" antialias="false" y="51" width="148" x="-65" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="Control Electronics" y="67" size="9" x="-48"/>
+        <line end2="simple" length2="1.5" length1="1.5" antialias="false" x1="-54" y2="50.144" end1="none" y1="35.8671" x2="-54" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-80.9314" y2="58" end1="simple" y1="58" x2="-65.0743" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="simple" length2="1.5" length1="1.5" antialias="false" x1="-83.8054" y2="68" end1="circle" y1="68" x2="-65.2108" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-84" y2="58" end1="circle" y1="58" x2="-80" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-10" orientation="w" x="-79.7"/>
+        <terminal y="-4" orientation="w" x="-79.7"/>
+        <terminal y="2" orientation="w" x="-79.7"/>
+        <terminal y="-10.2" orientation="e" x="89.35"/>
+        <terminal y="-3.0767" orientation="e" x="89.35"/>
+        <terminal y="4.292" orientation="e" x="89.35"/>
+        <terminal y="58" orientation="w" x="-84"/>
+        <terminal y="68" orientation="w" x="-83"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ampereheuremetre.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ampereheuremetre.elmt
index 203b7e3ec..cb55807a1 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ampereheuremetre.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ampereheuremetre.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{4D492106-B25A-4FA2-81BA-3A4D5CC768F4}"/><names>
-        <name lang="ar">أمبيرساعة متر </name>
+<definition hotspot_y="28" type="element" height="50" width="40" hotspot_x="20" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{06087d5d-6b03-463e-b400-51ffcdf5c16d}"/>
+    <names>
+        <name lang="cs">Ampérmetr</name>
+        <name lang="nl">Ampere uur meter</name>
+        <name lang="it">Misuratore di Ah</name>
         <name lang="de">Amperestundenzähler</name>
         <name lang="el">Μετρητής κατανάλωσης, Αμπερώρια (Ah)</name>
         <name lang="en">Ampere Hour Meter</name>
-        <name lang="it">Misuratore di Ah</name>
         <name lang="fr">Ampèreheuremètre</name>
         <name lang="pl">Licznik amperogodzin</name>
-        <name lang="cs">Ampérmetr</name>
-        <name lang="nl">Ampere uur meter</name>
+        <name lang="ar">أمبيرساعة متر </name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-8" y="2.3333" size="9" text="Ah"/>
-        <rect width="30" x="-15" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-19" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-23" orientation="n"/>
-        <terminal x="0" y="15" orientation="s"/>
+        <text text="Ah" y="2.3333" size="9" x="-8"/>
+        <rect height="22" antialias="false" y="-11" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="8" antialias="false" y="-19" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input text="_" rotate="true" y="-25" size="9" x="15" tagg="label"/>
+        <terminal y="-23" orientation="n" x="0"/>
+        <terminal y="15" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/amperemetre-h.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/amperemetre-h.elmt
index 1fdffd222..1a62bfa80 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/amperemetre-h.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/amperemetre-h.elmt
@@ -1,27 +1,29 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn">
-<uuid uuid="{57BC97E6-6F82-4D94-9FE4-405C8396F81F}"/><names>
-        <name lang="ar">أمبيرمتر أفقي</name>
-        <name lang="de">Amperemeter waagerecht</name>
-        <name lang="ru">Амперметр (горизонтальный)</name>
-        <name lang="pt">Amperímetro horizontal</name>
-        <name lang="el">Αμπερόμετρο οριζόντιο</name>
-        <name lang="en">Horizontal ammeter</name>
-        <name lang="it">Amperometro orizzontale</name>
-        <name lang="fr">Ampèremètre horizontal</name>
-        <name lang="pl">Amperomierz (poziomo)</name>
-        <name lang="es">Amperímetro horizontal</name>
+<definition hotspot_y="15" type="element" height="30" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{3408823a-37c5-436e-9770-9214313ce209}"/>
+    <names>
         <name lang="cs">Vodorovný ampérmetr</name>
         <name lang="nl">Amperemeter</name>
+        <name lang="it">Amperometro orizzontale</name>
+        <name lang="ru">Амперметр (горизонтальный)</name>
+        <name lang="pt">Amperímetro horizontal</name>
+        <name lang="de">Amperemeter waagerecht</name>
+        <name lang="el">Αμπερόμετρο οριζόντιο</name>
+        <name lang="en">Horizontal ammeter</name>
+        <name lang="fr">Ampèremètre horizontal</name>
+        <name lang="es">Amperímetro horizontal</name>
+        <name lang="pl">Amperomierz (poziomo)</name>
+        <name lang="ar">أمبيرمتر أفقي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-1.75" y2="0" x2="1.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-21" y2="0" x2="-10"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-5" y2="-6" x2="0" y3="6" x3="5"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <input text="_" rotate="true" y="-12.5" size="9" x="9" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-1.75" y2="0" end1="none" y1="0" x2="1.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10" y2="0" end1="none" y1="0" x2="21" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-21" y2="0" end1="none" y1="0" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="5" closed="false" y3="6" antialias="true" x1="-5" y2="-6" y1="6" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="0" orientation="w" x="-21"/>
+        <terminal y="0" orientation="e" x="21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/amperemetre-v.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/amperemetre-v.elmt
index 5922623f1..7e05db38c 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/amperemetre-v.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/amperemetre-v.elmt
@@ -1,27 +1,29 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn">
-<uuid uuid="{72253A16-992B-49C5-80BB-8918E3504A1B}"/><names>
-        <name lang="ar">أمبيرمتر عمودي</name>
-        <name lang="de">Amperemeter senkrecht</name>
-        <name lang="ru">Амперметр (вертикальный)</name>
-        <name lang="pt">Amperímetro vertical</name>
-        <name lang="el">Αμπερόμετρο κατακόρυφο</name>
-        <name lang="en">Vertical ammeter</name>
-        <name lang="it">Amperometro verticale</name>
-        <name lang="fr">Ampèremètre vertical</name>
-        <name lang="pl">Amperomierz (pionowo)</name>
-        <name lang="es">Amperímetro vertical</name>
+<definition hotspot_y="29" type="element" height="60" width="30" hotspot_x="15" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{5372758b-421b-4c93-b357-776137202ca4}"/>
+    <names>
         <name lang="cs">Svislý ampérmetr</name>
         <name lang="nl">Amperemeter</name>
+        <name lang="it">Amperometro verticale</name>
+        <name lang="ru">Амперметр (вертикальный)</name>
+        <name lang="pt">Amperímetro vertical</name>
+        <name lang="de">Amperemeter senkrecht</name>
+        <name lang="el">Αμπερόμετρο κατακόρυφο</name>
+        <name lang="en">Vertical ammeter</name>
+        <name lang="fr">Ampèremètre vertical</name>
+        <name lang="es">Amperímetro vertical</name>
+        <name lang="pl">Amperomierz (pionowo)</name>
+        <name lang="ar">أمبيرمتر عمودي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-1.75" y2="0" x2="1.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="21" 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="-21" x1="0" y2="-10" x2="0"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="6" x1="-5" y2="-6" x2="0" y3="6" x3="5"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <input text="_" rotate="true" y="-14.45" size="9" x="8" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-1.75" y2="0" end1="none" y1="0" x2="1.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="21" end1="none" y1="10" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="-10" end1="none" y1="-21" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="5" closed="false" y3="6" antialias="true" x1="-5" y2="-6" y1="6" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-21" orientation="n" x="0"/>
+        <terminal y="21" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/capteur_debit.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/capteur_debit.elmt
index c953f1b41..79724d650 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/capteur_debit.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/capteur_debit.elmt
@@ -1,32 +1,34 @@
-<definition width="110" version="0.3" hotspot_x="37" hotspot_y="32" height="60" type="element" orientation="dyyy">
-<uuid uuid="{0CA3E42E-025F-4B0E-A8BF-33DBDA331327}"/><names>
-        <name lang="el">Αισθητήρας ροής</name>
-        <name lang="en">Flow sensor pulsmeter</name>
-        <name lang="de">Durchfluss Impulszähler</name>
-        <name lang="it">Sensore di flusso</name>
-        <name lang="fr">Capteur Debit</name>
-        <name lang="pl">Czujnik przepływu</name>
-        <name lang="es">Sensor de flujo</name>
+<definition hotspot_y="32" type="element" height="60" width="110" hotspot_x="37" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{1d13f47e-2002-4ed7-9979-c9386d119907}"/>
+    <names>
         <name lang="cs">Průtokové čidlo</name>
         <name lang="nl">Debiet  puls</name>
+        <name lang="it">Sensore di flusso</name>
+        <name lang="el">Αισθητήρας ροής</name>
+        <name lang="de">Durchfluss Impulszähler</name>
+        <name lang="en">Flow sensor pulsmeter</name>
+        <name lang="fr">Capteur Debit</name>
+        <name lang="es">Sensor de flujo</name>
+        <name lang="pl">Czujnik przepływu</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="105" x="-35" y="-25" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="56" y="-17" size="5" text="0V"/>
-        <circle x="-31.5" y="-8.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-17" y2="8" x2="-25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28" x1="30" y2="-26" x2="30"/>
-        <text x="-4" y="-17" size="5" text="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="-28" x1="60" y2="-26" x2="60"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-10" y2="24" 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="-28" x1="0" y2="-26" x2="0"/>
-        <text x="26" y="-17" size="5" text="L+"/>
-        <line 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="-17" y2="-8" x2="-25"/>
-        <polygon y21="10" x15="39" y22="10" x16="41" x17="41" x18="49" x19="49" x20="51" x21="51" x22="58" style="line-style:normal;line-weight:thin;filling:none;color:black" x1="0" x2="9" x3="9" x4="11" x5="11" x6="19" closed="false" x7="19" x8="21" x9="21" y1="10" y2="10" y3="0" y4="0" y5="10" y6="10" y7="0" y8="0" y10="10" y9="10" y11="0" y12="0" y13="10" y14="10" y15="0" y16="0" y17="10" y18="10" y19="0" x10="29" x11="29" x12="31" antialias="false" x13="31" x14="39" y20="0"/>
-        <terminal x="0" y="-28" orientation="n"/>
-        <terminal x="30" y="-28" orientation="n"/>
-        <terminal x="60" y="-28" orientation="n"/>
+        <input text="_" rotate="true" y="-19.45" size="9" x="73" tagg="label"/>
+        <rect height="50" antialias="false" y="-25" width="105" x="-35" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="0V" y="-17" size="5" x="56"/>
+        <circle diameter="17" antialias="true" y="-8.5" x="-31.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-17" y2="8" end1="none" y1="0" x2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="30" y2="-26" end1="none" y1="-28" x2="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="S+" y="-17" size="5" x="-4"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="60" y2="-26" end1="none" y1="-28" x2="60" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-10" y2="24" end1="none" y1="-24" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="-26" end1="none" y1="-28" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="L+" y="-17" size="5" x="26"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-17" y2="-8" end1="none" y1="0" x2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x22="58" y21="10" y8="0" y3="0" y2="10" y12="0" y10="10" x11="29" x4="11" closed="false" y14="10" x21="51" y1="10" x18="49" x19="49" x3="9" x7="19" y16="0" y4="0" x8="21" y5="10" y22="10" y17="10" y13="10" x17="41" x13="31" x16="41" x1="0" x15="39" x5="11" y7="0" style="line-style:normal;line-weight:thin;filling:none;color:black" y15="0" y6="10" x9="21" x12="31" y18="10" x10="29" antialias="false" y20="0" y9="10" x20="51" x14="39" y19="0" x6="19" y11="0" x2="9"/>
+        <terminal y="-28" orientation="n" x="0"/>
+        <terminal y="-28" orientation="n" x="30"/>
+        <terminal y="-28" orientation="n" x="60"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_220v_monophase.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_220v_monophase.elmt
index 8bd512e9d..f82c39ea0 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_220v_monophase.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_220v_monophase.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="60" type="element" orientation="dyyy">
-<uuid uuid="{25B52559-E715-4571-A89A-D50A2674A843}"/><names>
-        <name lang="ar">عدّاد أحادي الوجه 220V </name>
-        <name lang="el">Μονοφασικός μετρητής</name>
-        <name lang="en">220V single phase meter</name>
-        <name lang="de">Stromzähler einphasig</name>
-        <name lang="it">Contatore monofase 230V</name>
-        <name lang="fr">Compteur 220V monophase</name>
-        <name lang="pl">Licznik jednofazowy</name>
+<definition hotspot_y="35" type="element" height="60" width="40" hotspot_x="20" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{1c771334-c532-435b-9225-847ba99104dc}"/>
+    <names>
         <name lang="cs">Jednofázové počítadlo 220V</name>
         <name lang="nl">KWh meter 230V</name>
+        <name lang="it">Contatore monofase 230V</name>
+        <name lang="el">Μονοφασικός μετρητής</name>
+        <name lang="de">Stromzähler einphasig</name>
+        <name lang="en">220V single phase meter</name>
+        <name lang="fr">Compteur 220V monophase</name>
+        <name lang="pl">Licznik jednofazowy</name>
+        <name lang="ar">عدّاد أحادي الوجه 220V </name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="20" x="-10" y="5" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20" x="-10" y="-20" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-25" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-29" orientation="n"/>
-        <terminal x="0" y="18" orientation="s"/>
+        <rect height="9" antialias="false" y="5" width="20" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input text="_" rotate="true" y="-13.45" size="9" x="15" tagg="label"/>
+        <rect height="8" antialias="false" y="-20" width="20" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="30" antialias="false" y="-25" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="18" orientation="s" x="0"/>
+        <terminal y="-29" orientation="n" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_energie.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_energie.elmt
index a76b16114..497d911cf 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_energie.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_energie.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.3" hotspot_x="15" hotspot_y="5" height="50" type="element" orientation="dyyy">
-<uuid uuid="{8A64507E-B57E-47B9-8836-B266211C47AD}"/><names>
-        <name lang="ar">عدّاد طاقة</name>
-        <name lang="el">Μετρητής ενέργειας, Κιλοβατώρες (KWh)</name>
-        <name lang="en">Energy meter</name>
-        <name lang="de">Energiezähler</name>
-        <name lang="it">Misuratore di Kwh</name>
-        <name lang="fr">Compteur d’énergie</name>
-        <name lang="pl">Licznik energii</name>
+<definition hotspot_y="4" type="element" height="50" width="40" hotspot_x="10" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{7dfdf66d-a525-4cac-bf6b-4ae4177ccaf5}"/>
+    <names>
         <name lang="cs">Počítadlo energie</name>
         <name lang="nl">Energiemeter</name>
+        <name lang="it">Misuratore di Kwh</name>
+        <name lang="el">Μετρητής ενέργειας, Κιλοβατώρες (KWh)</name>
+        <name lang="de">Energiezähler</name>
+        <name lang="en">Energy meter</name>
+        <name lang="fr">Compteur d’énergie</name>
+        <name lang="pl">Licznik energii</name>
+        <name lang="ar">عدّاد طاقة</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-6" y2="10" x2="26"/>
-        <rect width="32" x="-6" y="0" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-4" y="30" size="10" text="kWh"/>
-        <terminal x="0" y="40" orientation="s"/>
-        <terminal x="20" y="40" orientation="s"/>
+        <input text="_" rotate="true" y="17.55" size="9" x="26" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-6" y2="10" end1="none" y1="10" x2="26" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="40" antialias="false" y="0" width="32" x="-6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="kWh" y="30" size="10" x="-4"/>
+        <terminal y="40" orientation="s" x="0"/>
+        <terminal y="40" orientation="s" x="20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_energie_active_a_depassement_de_puissance.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_energie_active_a_depassement_de_puissance.elmt
index b818f8079..2dcfae509 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_energie_active_a_depassement_de_puissance.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_energie_active_a_depassement_de_puissance.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{03DDA1A0-A780-421C-A95B-BFC94978B335}"/><names>
-        <name lang="ar">عدّاد طاقة فعّالة مع تجاوز قدرة</name>
-        <name lang="de">Überverbrauchszähler, Spitzenzähler&#xd;</name>
-        <name lang="en"> Excess watt-hour meter&#xd;</name>
-        <name lang="it">Contatore di energia attiva a supero di potenza</name>
-        <name lang="fr">Compteur à énergie active à dépassement de puissance</name>
-        <name lang="pl">Licznik watogodzin szczytowy</name>
+<definition hotspot_y="29" type="element" height="50" width="40" hotspot_x="20" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{5d2fbcc2-bb81-4457-9560-44f42101a63e}"/>
+    <names>
         <name lang="cs">Počítadlo překročení spotřeby watthodin</name>
         <name lang="nl">Overcapaciteit teller</name>
+        <name lang="it">Contatore di energia attiva a supero di potenza</name>
+        <name lang="de">Überverbrauchszähler, Spitzenzähler&#xd;</name>
+        <name lang="en"> Excess watt-hour meter&#xd;</name>
+        <name lang="fr">Compteur à énergie active à dépassement de puissance</name>
+        <name lang="pl">Licznik watogodzin szczytowy</name>
+        <name lang="ar">عدّاد طاقة فعّالة مع تجاوز قدرة</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-10" y="7" size="9" text="P &gt;"/>
-        <text x="-10" y="-3" size="9" text="Wh"/>
-        <rect width="30" x="-15" y="-12" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-20" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-24" orientation="n"/>
-        <terminal x="0" y="14" orientation="s"/>
+        <text text="P >" y="7" size="9" x="-10"/>
+        <input text="_" rotate="true" y="-6.5" size="9" x="14" tagg="label"/>
+        <text text="Wh" y="-3" size="9" x="-10"/>
+        <rect height="22" antialias="false" y="-12" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="8" antialias="false" y="-20" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-24" orientation="n" x="0"/>
+        <terminal y="14" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_horaire.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_horaire.elmt
index 1eb629202..4174efbe1 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_horaire.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_horaire.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{168DCE69-C638-46A5-B7EA-70C1C44A7165}"/><names>
-        <name lang="ar">عدّاد زمني</name>
+<definition hotspot_y="28" type="element" height="50" width="40" hotspot_x="20" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{083c8381-29d4-418f-91b1-580b258e4a0f}"/>
+    <names>
+        <name lang="cs">Počítadlo hodin</name>
+        <name lang="nl">Bedrijfsurenteller</name>
+        <name lang="it">Conta tempo</name>
         <name lang="de">Betriebsstundenzähler</name>
         <name lang="el">Ωρόμετρο</name>
         <name lang="en">Hour counter</name>
-        <name lang="it">Conta tempo</name>
         <name lang="fr">Compteur horaire</name>
         <name lang="pl">Licznik godzin</name>
-        <name lang="cs">Počítadlo hodin</name>
-        <name lang="nl">Bedrijfsurenteller</name>
+        <name lang="ar">عدّاد زمني</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-3" y="2.3333" size="9" text="h"/>
-        <rect width="30" x="-15" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-19" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-23" orientation="n"/>
-        <terminal x="0" y="15" orientation="s"/>
+        <input text="_" rotate="true" y="-6.5" size="9" x="16" tagg="label"/>
+        <text text="h" y="2.3333" size="9" x="-3"/>
+        <rect height="22" antialias="false" y="-11" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="8" antialias="false" y="-19" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-23" orientation="n" x="0"/>
+        <terminal y="15" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_horaire_08-04-03_en60617.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_horaire_08-04-03_en60617.elmt
index 81e41cd4f..6733c3c65 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_horaire_08-04-03_en60617.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/compteur_horaire_08-04-03_en60617.elmt
@@ -1,22 +1,24 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{F03B0B46-4738-40F1-9D30-6F69148D719F}"/><names>
-        <name lang="ar">عدّاد زمني(en_60617)</name>
+<definition hotspot_y="39" type="element" height="80" width="50" hotspot_x="25" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{4f029867-b53e-4c2c-beec-87f65fa30f4e}"/>
+    <names>
+        <name lang="cs">Počítadlo hodin (en_60617)</name>
+        <name lang="nl">Bedrijfsurenteller (en_60617)</name>
+        <name lang="it">Conta tempo (en_60617)</name>
         <name lang="de">Betriebsstundenzähler (en_60617)</name>
         <name lang="el">Ωρόμετρο (en_60617)</name>
         <name lang="en">Hour counter(en_60617) </name>
-        <name lang="it">Conta tempo (en_60617)</name>
         <name lang="fr">Compteur horaire (en_60617)</name>
         <name lang="pl">Licznik godzin (en_60617)</name>
-        <name lang="cs">Počítadlo hodin (en_60617)</name>
-        <name lang="nl">Bedrijfsurenteller (en_60617)</name>
+        <name lang="ar">عدّاد زمني(en_60617)</name>
     </names>
     <informations>https://github.com/jonasstein/qelectrotech-symbols
 EN 60617</informations>
     <description>
-        <text x="-4" y="12" size="9" text="h"/>
-        <rect width="40" x="-20" y="-10" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="40" x="-20" y="-30" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-34" orientation="n"/>
-        <terminal x="0" y="34" orientation="s"/>
+        <text text="h" y="12" size="9" x="-4"/>
+        <input text="_" rotate="true" y="4.5" size="9" x="18" tagg="label"/>
+        <rect height="40" antialias="false" y="-10" width="40" x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="20" antialias="false" y="-30" width="40" x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="34" orientation="s" x="0"/>
+        <terminal y="-34" orientation="n" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/frequencemetre-h.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/frequencemetre-h.elmt
index eb7a03b59..5bcbc6dd8 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/frequencemetre-h.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/frequencemetre-h.elmt
@@ -1,25 +1,27 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn">
-<uuid uuid="{73633145-924F-44B3-A483-64A45FE76CA8}"/><names>
-        <name lang="ar">مقياس تردد أفقي</name>
-        <name lang="de">Frequenzmessgerät waagerecht</name>
-        <name lang="pt">Frequenciómetro horizontal</name>
-        <name lang="el">Συχνόμετρο οριζόντιο</name>
-        <name lang="en">Frequency meter h</name>
-        <name lang="it">Frequenzimetro orizzontale</name>
-        <name lang="fr">Fréquencemètre horizontal</name>
-        <name lang="pl">Częstotliwościomierz (poziomo)</name>
-        <name lang="es">Frecuencímetro horizontal</name>
+<definition hotspot_y="16" type="element" height="30" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{8b9c0435-1430-4840-8353-bb80d85f285a}"/>
+    <names>
         <name lang="cs">Měřič kmitočtu, vodorovný</name>
         <name lang="nl">Frequentiemeter</name>
+        <name lang="it">Frequenzimetro orizzontale</name>
+        <name lang="pt">Frequenciómetro horizontal</name>
+        <name lang="de">Frequenzmessgerät waagerecht</name>
+        <name lang="el">Συχνόμετρο οριζόντιο</name>
+        <name lang="en">Frequency meter h</name>
+        <name lang="fr">Fréquencemètre horizontal</name>
+        <name lang="es">Frecuencímetro horizontal</name>
+        <name lang="pl">Częstotliwościomierz (poziomo)</name>
+        <name lang="ar">مقياس تردد أفقي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-8" y="2.3333" size="9" text="Hz"/>
-        <line 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="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-21" y2="0" x2="-10"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <input text="_" rotate="true" y="-13.5" size="9" x="7" tagg="label"/>
+        <text text="Hz" y="2.3333" size="9" x="-8"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10" y2="0" end1="none" y1="0" x2="21" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-21" y2="0" end1="none" y1="0" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="0" orientation="w" x="-21"/>
+        <terminal y="0" orientation="e" x="21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/frequencemetre-v.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/frequencemetre-v.elmt
index 9a7add47b..3db525c5f 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/frequencemetre-v.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/frequencemetre-v.elmt
@@ -1,25 +1,27 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn">
-<uuid uuid="{8DFD178A-082F-4A9B-B24D-0B1340954A47}"/><names>
-        <name lang="ar">مقياس تردد عمودي</name>
-        <name lang="de">Frequenzmessgerät senkrecht</name>
-        <name lang="pt">Frequenciómetro vertical</name>
-        <name lang="el">Συχνόμετρο κατακόρυφο</name>
-        <name lang="en">Frequency meter v</name>
-        <name lang="it">Frequenzimetro verticale</name>
-        <name lang="fr">Fréquencemètre vertical</name>
-        <name lang="pl">Częstotliwościomierz (pionowo)</name>
-        <name lang="es">Frecuencímetro vertical</name>
+<definition hotspot_y="29" type="element" height="60" width="30" hotspot_x="15" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{a1221111-5f95-4f4c-ba82-a2e482ce36b8}"/>
+    <names>
         <name lang="cs">Měřič kmitočtu, svislý</name>
         <name lang="nl">Frequentiemeter</name>
+        <name lang="it">Frequenzimetro verticale</name>
+        <name lang="pt">Frequenciómetro vertical</name>
+        <name lang="de">Frequenzmessgerät senkrecht</name>
+        <name lang="el">Συχνόμετρο κατακόρυφο</name>
+        <name lang="en">Frequency meter v</name>
+        <name lang="fr">Fréquencemètre vertical</name>
+        <name lang="es">Frecuencímetro vertical</name>
+        <name lang="pl">Częstotliwościomierz (pionowo)</name>
+        <name lang="ar">مقياس تردد عمودي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="21" 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="-21" x1="0" y2="-10" x2="0"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <text x="-8" y="2.8333" size="9" text="Hz"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="21" end1="none" y1="10" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input text="_" rotate="true" y="-14.5" size="9" x="9" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="-10" end1="none" y1="-21" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="Hz" y="2.8333" size="9" x="-8"/>
+        <terminal y="-21" orientation="n" x="0"/>
+        <terminal y="21" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/galvanometre-h.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/galvanometre-h.elmt
index e43c91c4f..86deb98f0 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/galvanometre-h.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/galvanometre-h.elmt
@@ -1,25 +1,27 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn">
-<uuid uuid="{813C1D4B-6AE4-4A8A-BFA8-B5B37D92E123}"/><names>
-        <name lang="ar">جلفانومتر أفقي</name>
-        <name lang="de">Galvanometer waagerecht</name>
-        <name lang="pt">Galvanómetro horizontal</name>
-        <name lang="el">Γαλβανόμετρο οριζόντιο</name>
-        <name lang="en">Galvanometer h</name>
-        <name lang="it">Galvanometro orizzontale</name>
-        <name lang="fr">Galvanomètre horizontal</name>
-        <name lang="pl">Galwanomert (poziomo)</name>
-        <name lang="es">Galvanómetro horizontal</name>
+<definition hotspot_y="15" type="element" height="30" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{0f708ead-9e6a-4f84-a04e-c4b44452f308}"/>
+    <names>
         <name lang="cs">Galvanometr, vodorovný</name>
         <name lang="nl">Galvanometer</name>
+        <name lang="it">Galvanometro orizzontale</name>
+        <name lang="pt">Galvanómetro horizontal</name>
+        <name lang="de">Galvanometer waagerecht</name>
+        <name lang="el">Γαλβανόμετρο οριζόντιο</name>
+        <name lang="en">Galvanometer h</name>
+        <name lang="fr">Galvanomètre horizontal</name>
+        <name lang="es">Galvanómetro horizontal</name>
+        <name lang="pl">Galwanomert (poziomo)</name>
+        <name lang="ar">جلفانومتر أفقي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <line length1="1.5" length2="3" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="0" y2="-8" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-21" y2="0" x2="-10"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <input text="_" rotate="true" y="-12.5" size="9" x="8" tagg="label"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="simple" length2="3" length1="1.5" antialias="false" x1="0" y2="-8" end1="none" y1="7" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10" y2="0" end1="none" y1="0" x2="21" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-21" y2="0" end1="none" y1="0" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="0" orientation="e" x="21"/>
+        <terminal y="0" orientation="w" x="-21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/galvanometre-v.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/galvanometre-v.elmt
index 970e28d9e..980baf792 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/galvanometre-v.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/galvanometre-v.elmt
@@ -1,25 +1,27 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn">
-<uuid uuid="{401A2EDB-7934-468A-B75F-1D2F3AC43CFB}"/><names>
-        <name lang="ar">جلفانومتر عمودي</name>
-        <name lang="de">Galvanometer senkrecht</name>
-        <name lang="pt">Galvanómetro vertical</name>
-        <name lang="el">Γαλβανόμετρο κατακόρυφο</name>
-        <name lang="en">galvanometer v</name>
-        <name lang="it">Galvanometro verticale</name>
-        <name lang="fr">Galvanomètre vertical</name>
-        <name lang="pl">Galwanometr (pionowo)</name>
-        <name lang="es">Galvanómetro vertical</name>
+<definition hotspot_y="29" type="element" height="60" width="30" hotspot_x="15" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{a15f0265-254c-4156-b5aa-f78786a3e219}"/>
+    <names>
         <name lang="cs">Galvanometr, svislý</name>
         <name lang="nl">Galvanometer</name>
+        <name lang="it">Galvanometro verticale</name>
+        <name lang="pt">Galvanómetro vertical</name>
+        <name lang="de">Galvanometer senkrecht</name>
+        <name lang="el">Γαλβανόμετρο κατακόρυφο</name>
+        <name lang="en">galvanometer v</name>
+        <name lang="fr">Galvanomètre vertical</name>
+        <name lang="es">Galvanómetro vertical</name>
+        <name lang="pl">Galwanometr (pionowo)</name>
+        <name lang="ar">جلفانومتر عمودي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="3" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.45" x1="0" y2="-7.55" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="21" 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="-21" x1="0" y2="-10" x2="0"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <input text="_" rotate="true" y="-13.5" size="9" x="8" tagg="label"/>
+        <line end2="simple" length2="3" length1="1.5" antialias="false" x1="0" y2="-7.55" end1="none" y1="7.45" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="21" end1="none" y1="10" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="-10" end1="none" y1="-21" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="21" orientation="s" x="0"/>
+        <terminal y="-21" orientation="n" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ohmmetre-h.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ohmmetre-h.elmt
index 62be870c8..a201f7d3c 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ohmmetre-h.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ohmmetre-h.elmt
@@ -1,30 +1,32 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn">
-<uuid uuid="{1B9498CB-8FFB-4FEF-89CF-FAA037F11608}"/><names>
-        <name lang="ar">أوميتر أفقي</name>
-        <name lang="de">Ohmmeter waagerecht</name>
-        <name lang="ru">Омметр (горизонтальный)</name>
-        <name lang="pt">Ohmímetro horizontal</name>
-        <name lang="el">Ωμόμετρο οριζόντιο</name>
-        <name lang="en">Horizontal ohmmeter</name>
-        <name lang="it">Ohmmetro orizzontale</name>
-        <name lang="fr">Ohmmètre horizontal</name>
-        <name lang="pl">Omomierz (poziomo)</name>
-        <name lang="es">Óhmetro horizontal</name>
+<definition hotspot_y="15" type="element" height="30" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{7e69af84-b00f-4ffa-8ef1-48d63f966eb4}"/>
+    <names>
         <name lang="cs">Ohmmetr, vodorovný</name>
         <name lang="nl">Ohmmeter</name>
+        <name lang="it">Ohmmetro orizzontale</name>
+        <name lang="ru">Омметр (горизонтальный)</name>
+        <name lang="pt">Ohmímetro horizontal</name>
+        <name lang="de">Ohmmeter waagerecht</name>
+        <name lang="el">Ωμόμετρο οριζόντιο</name>
+        <name lang="en">Horizontal ohmmeter</name>
+        <name lang="fr">Ohmmètre horizontal</name>
+        <name lang="es">Óhmetro horizontal</name>
+        <name lang="pl">Omomierz (poziomo)</name>
+        <name lang="ar">أوميتر أفقي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-5" y2="5" x2="-3.25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="3.25" y2="5" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-3.25" y2="3" x2="-3.25"/>
-        <arc width="10" x="-5" y="-6" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="225" angle="-270"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="3.25" y2="5" x2="3.25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-21" y2="0" x2="-10"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <input text="_" rotate="true" y="-13.5" size="9" x="8" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-5" y2="5" end1="none" y1="5" x2="-3.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="3.25" y2="5" end1="none" y1="5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-3.25" y2="3" end1="none" y1="5" x2="-3.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-270" height="10" antialias="true" y="-6" width="10" start="225" x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="3.25" y2="5" end1="none" y1="3" x2="3.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10" y2="0" end1="none" y1="0" x2="21" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-21" y2="0" end1="none" y1="0" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="0" orientation="w" x="-21"/>
+        <terminal y="0" orientation="e" x="21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ohmmetre-v.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ohmmetre-v.elmt
index e51a1e621..7f8952fd4 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ohmmetre-v.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/ohmmetre-v.elmt
@@ -1,30 +1,32 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn">
-<uuid uuid="{D262B1CD-DAF2-4F20-8D59-6F6C7083AF65}"/><names>
-        <name lang="ar">أوميتر عمودي</name>
-        <name lang="de">Ohmmeter senkrecht</name>
-        <name lang="ru">Омметр (вертикальный)</name>
-        <name lang="pt">Ohmímetro vertical</name>
-        <name lang="el">Ωμόμετρο κατακόρυφο</name>
-        <name lang="en">Vertical ohmmeter</name>
-        <name lang="it">Ohmmetro verticale</name>
-        <name lang="fr">Ohmmètre vertical</name>
-        <name lang="pl">Omomierz (pionowo)</name>
-        <name lang="es">Óhmetro vertical</name>
+<definition hotspot_y="29" type="element" height="60" width="30" hotspot_x="15" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{8aa7d09a-e49e-43bd-84ac-3f9e891d6a0f}"/>
+    <names>
         <name lang="cs">Ohmmetr, svislý</name>
         <name lang="nl">Ohmmeter</name>
+        <name lang="it">Ohmmetro verticale</name>
+        <name lang="ru">Омметр (вертикальный)</name>
+        <name lang="pt">Ohmímetro vertical</name>
+        <name lang="de">Ohmmeter senkrecht</name>
+        <name lang="el">Ωμόμετρο κατακόρυφο</name>
+        <name lang="en">Vertical ohmmeter</name>
+        <name lang="fr">Ohmmètre vertical</name>
+        <name lang="es">Óhmetro vertical</name>
+        <name lang="pl">Omomierz (pionowo)</name>
+        <name lang="ar">أوميتر عمودي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-5" y2="5" x2="-3.25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="3.25" y2="5" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-3.25" y2="3" x2="-3.25"/>
-        <arc width="10" x="-5" y="-6" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="225" angle="-270"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="3.25" y2="5" x2="3.25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="21" 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="-21" x1="0" y2="-10" x2="0"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <input text="_" rotate="true" y="-14.5" size="9" x="6" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-5" y2="5" end1="none" y1="5" x2="-3.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="3.25" y2="5" end1="none" y1="5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-3.25" y2="3" end1="none" y1="5" x2="-3.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <arc angle="-270" height="10" antialias="true" y="-6" width="10" start="225" x="-5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="3.25" y2="5" end1="none" y1="3" x2="3.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="21" end1="none" y1="10" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="-10" end1="none" y1="-21" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-21" orientation="n" x="0"/>
+        <terminal y="21" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/varh_08-04-15_en60617.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/varh_08-04-15_en60617.elmt
index 1e93ec9dc..b38c4cec3 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/varh_08-04-15_en60617.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/varh_08-04-15_en60617.elmt
@@ -1,21 +1,23 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{54D5AB84-F9A6-4633-9A9A-400CEFDD1536}"/><names>
+<definition hotspot_y="34" type="element" height="60" width="40" hotspot_x="20" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{a11d1aac-1f77-4300-b214-2c1e4a3d8d1e}"/>
+    <names>
+        <name lang="cs">Měřič hodin jalového výkonu (varhodin)</name>
+        <name lang="nl">VAr energie meter</name>
+        <name lang="it">Misuratore di varh</name>
         <name lang="de">Blindverbrauchszähler</name>
         <name lang="el">Μετρητής αέργου ισχύος (βαρόμετρο)</name>
         <name lang="en">reactive energy meter</name>
-        <name lang="it">Misuratore di varh</name>
         <name lang="fr">Varheuremètre</name>
         <name lang="pl">Licznik warogodzin</name>
-        <name lang="cs">Měřič hodin jalového výkonu (varhodin)</name>
-        <name lang="nl">VAr energie meter</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <rect width="30" x="-15" y="-14" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-22" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-12" y="4" size="8" text="varh"/>
-        <terminal x="0" y="-27" orientation="n"/>
-        <terminal x="0" y="17" orientation="s"/>
+        <input text="_" rotate="true" y="-13.45" size="9" x="15" tagg="label"/>
+        <rect height="26" antialias="false" y="-14" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="8" antialias="false" y="-22" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="varh" y="4" size="8" x="-12"/>
+        <terminal y="-27" orientation="n" x="0"/>
+        <terminal y="17" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/varheuremetre.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/varheuremetre.elmt
index dbfb1a7d8..b6f6cf5cb 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/varheuremetre.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/varheuremetre.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.3" hotspot_x="20" hotspot_y="30" height="50" type="element" orientation="dyyy">
-<uuid uuid="{08EB5BB4-013C-4823-9B70-E20A5C0CDE5B}"/><names>
-        <name lang="ar">عدّد طاقة تفاعليّة - فارساعة متر-</name>
-        <name lang="el">Μετρητής, Βαρώρια</name>
-        <name lang="en">Var hour meter</name>
-        <name lang="de">Blindverbrauchszähler</name>
-        <name lang="it">Misuratore di varh</name>
-        <name lang="fr">Varheuremètre</name>
-        <name lang="pl">Licznik warogodzin</name>
+<definition hotspot_y="28" type="element" height="50" width="40" hotspot_x="19" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{e8e1f7f1-95b7-4f25-bce5-5e32bff5a6da}"/>
+    <names>
         <name lang="cs">Počítadlo varhodin</name>
         <name lang="nl">VAr energie meter</name>
+        <name lang="it">Misuratore di varh</name>
+        <name lang="el">Μετρητής, Βαρώρια</name>
+        <name lang="de">Blindverbrauchszähler</name>
+        <name lang="en">Var hour meter</name>
+        <name lang="fr">Varheuremètre</name>
+        <name lang="pl">Licznik warogodzin</name>
+        <name lang="ar">عدّد طاقة تفاعليّة - فارساعة متر-</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <text x="-13" y="2.3333" size="9" text="Varh"/>
-        <rect width="30" x="-15" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-15" y="-19" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-23" orientation="n"/>
-        <terminal x="0" y="15" orientation="s"/>
+        <input text="_" rotate="true" y="-18.5" size="9" x="15" tagg="label"/>
+        <text text="Varh" y="2.3333" size="9" x="-13"/>
+        <rect height="22" antialias="false" y="-11" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="8" antialias="false" y="-19" width="30" x="-15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-23" orientation="n" x="0"/>
+        <terminal y="15" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/voltmetre-h.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/voltmetre-h.elmt
index 9f294f55e..abcf156f4 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/voltmetre-h.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/voltmetre-h.elmt
@@ -1,26 +1,28 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="30" type="element" orientation="dnnn">
-<uuid uuid="{69EB0C1C-34E0-44AB-99D8-2EF22206B785}"/><names>
-        <name lang="ar">فولتمتر أفقي</name>
-        <name lang="de">Voltmeter waagerecht</name>
-        <name lang="ru">Вольтметр (горизонтальный)</name>
-        <name lang="pt">Voltímetro horizontal</name>
-        <name lang="el">Βολτόμετρο οριζόντιο</name>
-        <name lang="en">Horizontal voltmeter</name>
-        <name lang="it">Volmetro orizzontale</name>
-        <name lang="fr">Voltmètre horizontal</name>
-        <name lang="pl">Woltomierz (poziomo)</name>
-        <name lang="es">Voltímetro horizontal</name>
+<definition hotspot_y="15" type="element" height="30" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{37112168-7375-4e19-b6af-fb5b00c41489}"/>
+    <names>
         <name lang="cs">Voltmetr, vodorovný</name>
         <name lang="nl">Voltmeter</name>
+        <name lang="it">Volmetro orizzontale</name>
+        <name lang="ru">Вольтметр (горизонтальный)</name>
+        <name lang="pt">Voltímetro horizontal</name>
+        <name lang="de">Voltmeter waagerecht</name>
+        <name lang="el">Βολτόμετρο οριζόντιο</name>
+        <name lang="en">Horizontal voltmeter</name>
+        <name lang="fr">Voltmètre horizontal</name>
+        <name lang="es">Voltímetro horizontal</name>
+        <name lang="pl">Woltomierz (poziomo)</name>
+        <name lang="ar">فولتمتر أفقي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-21" y2="0" x2="-10"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="0" y3="-6" x3="5"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <input text="_" rotate="true" y="-13.5" size="9" x="9" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10" y2="0" end1="none" y1="0" x2="21" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-21" y2="0" end1="none" y1="0" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="5" closed="false" y3="-6" antialias="true" x1="-5" y2="6" y1="-6" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="0" orientation="w" x="-21"/>
+        <terminal y="0" orientation="e" x="21"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/voltmetre-v.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/voltmetre-v.elmt
index 96a49bc56..faf875e72 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/voltmetre-v.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/voltmetre-v.elmt
@@ -1,26 +1,28 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" orientation="dnnn">
-<uuid uuid="{AFDE8211-B6C1-469F-9D1B-F671F58C7DD0}"/><names>
-        <name lang="ar">فولتمتر عمودي</name>
-        <name lang="de">Voltmeter senkrecht</name>
-        <name lang="ru">Вольтметр (вертикальный)</name>
-        <name lang="pt">Voltímetro vertical</name>
-        <name lang="el">Βολτόμετρο κατακόρυφο</name>
-        <name lang="en">Vertical voltmeter</name>
-        <name lang="it">Volmetro verticale</name>
-        <name lang="fr">Voltmètre vertical</name>
-        <name lang="pl">Woltomierz (pionowo)</name>
-        <name lang="es">Voltímetro vertical</name>
+<definition hotspot_y="29" type="element" height="60" width="30" hotspot_x="15" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{3f85e6af-e598-41b1-be6f-24a8a9ef0b6e}"/>
+    <names>
         <name lang="cs">Voltmetr, svislý</name>
         <name lang="nl">Voltmeter</name>
+        <name lang="it">Volmetro verticale</name>
+        <name lang="ru">Вольтметр (вертикальный)</name>
+        <name lang="pt">Voltímetro vertical</name>
+        <name lang="de">Voltmeter senkrecht</name>
+        <name lang="el">Βολτόμετρο κατακόρυφο</name>
+        <name lang="en">Vertical voltmeter</name>
+        <name lang="fr">Voltmètre vertical</name>
+        <name lang="es">Voltímetro vertical</name>
+        <name lang="pl">Woltomierz (pionowo)</name>
+        <name lang="ar">فولتمتر عمودي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="21" 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="-21" x1="0" y2="-10" x2="0"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="0" y3="-6" x3="5"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="21" end1="none" y1="10" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input text="_" rotate="true" y="-10.5" size="9" x="8" tagg="label"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="-10" end1="none" y1="-21" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="5" closed="false" y3="-6" antialias="true" x1="-5" y2="6" y1="-6" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-21" orientation="n" x="0"/>
+        <terminal y="21" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattheuremetre.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattheuremetre.elmt
index 2164e9102..b05b108e6 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattheuremetre.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattheuremetre.elmt
@@ -1,21 +1,23 @@
-<definition width="50" version="0.3" hotspot_x="15" hotspot_y="5" height="60" type="element" orientation="dyyy">
-<uuid uuid="{56DB1038-6720-48A2-A3BB-7C392A7C3A9A}"/><names>
-        <name lang="ar">عدّاد طاقة فعّالة - وات ساعة متر -</name>
+<definition hotspot_y="4" type="element" height="60" width="40" hotspot_x="10" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{2fd8a667-aea7-479c-aadd-2a0b91856e88}"/>
+    <names>
+        <name lang="cs">Počítadlo watthodin</name>
+        <name lang="nl">Watt uur meter</name>
+        <name lang="it">Misuratore di Wh</name>
         <name lang="de">Wattstundenzähler</name>
         <name lang="el">Μετρητής βατ/ώρα</name>
         <name lang="en">Watt hour meter</name>
-        <name lang="it">Misuratore di Wh</name>
         <name lang="fr">Compteur d'énergie active Wattheuremètre</name>
         <name lang="pl">Licznik watogodzin</name>
-        <name lang="cs">Počítadlo watthodin</name>
-        <name lang="nl">Watt uur meter</name>
+        <name lang="ar">عدّاد طاقة فعّالة - وات ساعة متر -</name>
     </names>
     <informations>EN 60617: 08-04-03</informations>
     <description>
-        <rect width="32" x="-6" y="0" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14" x1="-6" y2="14" x2="26"/>
-        <text x="0" y="35" size="10" text="Wh"/>
-        <terminal x="0" y="50" orientation="s"/>
-        <terminal x="20" y="50" orientation="s"/>
+        <input text="_" rotate="true" y="10.5" size="9" x="28" tagg="label"/>
+        <rect height="50" antialias="false" y="0" width="32" x="-6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-6" y2="14" end1="none" y1="14" x2="26" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <text text="Wh" y="35" size="10" x="0"/>
+        <terminal y="50" orientation="s" x="0"/>
+        <terminal y="50" orientation="s" x="20"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattheuremetre_08-04-03_en60617.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattheuremetre_08-04-03_en60617.elmt
index 3725c18f4..166d05e61 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattheuremetre_08-04-03_en60617.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattheuremetre_08-04-03_en60617.elmt
@@ -1,21 +1,23 @@
-<definition width="60" version="0.3" hotspot_x="30" hotspot_y="40" height="80" type="element" orientation="dyyy">
-<uuid uuid="{F4370B50-2B4D-4164-B2B8-9C53163A9194}"/><names>
-        <name lang="ar">عدّاد طاقة فعّالة - وات ساعة متر -(en_60617) </name>
+<definition hotspot_y="39" type="element" height="80" width="50" hotspot_x="25" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{da2fc8c2-5a5f-48f4-9bf5-88cd6048fb3f}"/>
+    <names>
+        <name lang="cs">Počítadlo watthodin(en_60617) </name>
+        <name lang="nl">Watt uur meter (en_60617)</name>
+        <name lang="it">Misuratore di Wh (en_60617)</name>
         <name lang="de">Wattstundenzähler (EN 60617)</name>
         <name lang="en">Watt hour meter (en_60617)</name>
         <name lang="fr">Compteur d'énergie active Wattheuremètre (en_60617)</name>
         <name lang="pl">Licznik watogodzin (en_60617)</name>
-        <name lang="cs">Počítadlo watthodin(en_60617) </name>
-        <name lang="it">Misuratore di Wh (en_60617)</name>
-        <name lang="nl">Watt uur meter (en_60617)</name>
+        <name lang="ar">عدّاد طاقة فعّالة - وات ساعة متر -(en_60617) </name>
     </names>
     <informations>https://github.com/jonasstein/qelectrotech-symbols
 EN 60617</informations>
     <description>
-        <text x="-10" y="12" size="9" text="Wh"/>
-        <rect width="40" x="-20" y="-10" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="40" x="-20" y="-30" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="-34" orientation="n"/>
-        <terminal x="0" y="34" orientation="s"/>
+        <input text="_" rotate="true" y="-19.45" size="9" x="23" tagg="label"/>
+        <text text="Wh" y="12" size="9" x="-10"/>
+        <rect height="40" antialias="false" y="-10" width="40" x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect height="20" antialias="false" y="-30" width="40" x="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="-34" orientation="n" x="0"/>
+        <terminal y="34" orientation="s" x="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattmetre-h.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattmetre-h.elmt
index 0568661cd..0cf7ce939 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattmetre-h.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattmetre-h.elmt
@@ -1,30 +1,32 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="15" height="40" type="element" ic="true" orientation="dnnn">
-<uuid uuid="{BFA54DAA-F82C-4030-BF63-A6B09B0CC594}"/><names>
-        <name lang="ar">واتميتر أفقي</name>
-        <name lang="de">Wattmeter waagerecht</name>
-        <name lang="ru">Ватметр (горизонтальный)</name>
-        <name lang="pt">Wattímetro horizontal</name>
-        <name lang="el">Βατόμετρο οριζόντιο</name>
-        <name lang="en">Horizontal wattmeter</name>
-        <name lang="it">Wattmetro orizzontale</name>
-        <name lang="fr">Wattmètre horizontal</name>
-        <name lang="pl">Watomierz (poziomo)</name>
-        <name lang="es">Vatímetro horizontal</name>
+<definition hotspot_y="14" type="element" height="40" width="60" hotspot_x="29" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{e0881d80-0699-4eab-a837-bbd1c8a11558}"/>
+    <names>
         <name lang="cs">Wattmetr, vodorovný</name>
         <name lang="nl">Wattmeter</name>
+        <name lang="it">Wattmetro orizzontale</name>
+        <name lang="ru">Ватметр (горизонтальный)</name>
+        <name lang="pt">Wattímetro horizontal</name>
+        <name lang="de">Wattmeter waagerecht</name>
+        <name lang="el">Βατόμετρο οριζόντιο</name>
+        <name lang="en">Horizontal wattmeter</name>
+        <name lang="fr">Wattmètre horizontal</name>
+        <name lang="es">Vatímetro horizontal</name>
+        <name lang="pl">Watomierz (poziomo)</name>
+        <name lang="ar">واتميتر أفقي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="7.5" y2="15" x2="10" y3="20" x3="10"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="-7.5" y2="15" x2="-10" y3="20" x3="-10"/>
-        <polygon x4="2.5" y5="-6" x5="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="-2.5" y3="0" x3="0" y4="6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="0" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-21" y2="0" x2="-10"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="0" orientation="e"/>
-        <terminal x="-10" y="20" orientation="s"/>
-        <terminal x="10" y="20" orientation="s"/>
+        <polygon x3="10" closed="false" y3="20" antialias="true" x1="7.5" y2="15" y1="7.5" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <input text="_" rotate="true" y="-13.5" size="9" x="7" tagg="label"/>
+        <polygon x3="-10" closed="false" y3="20" antialias="true" x1="-7.5" y2="15" y1="7.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="0" x4="2.5" closed="false" y3="0" y5="-6" antialias="true" x1="-5" y2="6" y1="-6" x2="-2.5" x5="5" y4="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="10" y2="0" end1="none" y1="0" x2="21" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="-21" y2="0" end1="none" y1="0" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="0" orientation="w" x="-21"/>
+        <terminal y="0" orientation="e" x="21"/>
+        <terminal y="20" orientation="s" x="-10"/>
+        <terminal y="20" orientation="s" x="10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattmetre-v.elmt b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattmetre-v.elmt
index 94cef651d..abe5bf09d 100644
--- a/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattmetre-v.elmt
+++ b/elements/10_electric/10_allpole/390_sensors&instruments/70_meters&measuring_indicators/wattmetre-v.elmt
@@ -1,30 +1,32 @@
-<definition width="40" version="0.3" hotspot_x="15" hotspot_y="25" height="50" type="element" ic="true" orientation="dnnn">
-<uuid uuid="{6BBCA5FA-8C69-43CC-A0DE-DC271598A09C}"/><names>
-        <name lang="ar">واتميتر عمودي</name>
-        <name lang="de">Wattmeter senkrecht</name>
-        <name lang="ru">Ватметр (вертикальный)</name>
-        <name lang="pt">Wattímetro vertical</name>
-        <name lang="el">Βατόμετρο κατακόρυφο</name>
-        <name lang="en">Vertical wattmeter</name>
-        <name lang="it">Wattmetro verticale</name>
-        <name lang="fr">Wattmètre vertical</name>
-        <name lang="pl">Watomierz (pionowo)</name>
-        <name lang="es">Vatímetro vertical</name>
+<definition hotspot_y="29" type="element" height="60" width="40" hotspot_x="14" orientation="dyyy" link_type="simple" version="0.5">
+    <uuid uuid="{e23817d5-48e7-43da-be33-6b4907a9a9dd}"/>
+    <names>
         <name lang="cs">Wattmetr, svislý</name>
         <name lang="nl">Wattmeter</name>
+        <name lang="it">Wattmetro verticale</name>
+        <name lang="ru">Ватметр (вертикальный)</name>
+        <name lang="pt">Wattímetro vertical</name>
+        <name lang="de">Wattmeter senkrecht</name>
+        <name lang="el">Βατόμετρο κατακόρυφο</name>
+        <name lang="en">Vertical wattmeter</name>
+        <name lang="fr">Wattmètre vertical</name>
+        <name lang="es">Vatímetro vertical</name>
+        <name lang="pl">Watomierz (pionowo)</name>
+        <name lang="ar">واتميتر عمودي</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="7.5" x1="7.5" y2="10" x2="15" y3="10" x3="20"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-7.5" x1="7.5" y2="-10" x2="15" y3="-10" x3="20"/>
-        <polygon x4="2.5" y5="-6" x5="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-6" x1="-5" y2="6" x2="-2.5" y3="0" x3="0" y4="6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="21" 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="-21" x1="0" y2="-10" x2="0"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
-        <terminal x="20" y="-10" orientation="e"/>
-        <terminal x="20" y="10" orientation="e"/>
+        <input text="_" rotate="true" y="-21.5" size="9" x="2" tagg="label"/>
+        <polygon x3="20" closed="false" y3="10" antialias="true" x1="7.5" y2="10" y1="7.5" x2="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="20" closed="false" y3="-10" antialias="true" x1="7.5" y2="-10" y1="-7.5" x2="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <polygon x3="0" x4="2.5" closed="false" y3="0" y5="-6" antialias="true" x1="-5" y2="6" y1="-6" x2="-2.5" x5="5" y4="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="21" end1="none" y1="10" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line end2="none" length2="1.5" length1="1.5" antialias="false" x1="0" y2="-10" end1="none" y1="-21" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle diameter="20" antialias="true" y="-10" x="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <terminal y="21" orientation="s" x="0"/>
+        <terminal y="-10" orientation="e" x="20"/>
+        <terminal y="10" orientation="e" x="20"/>
+        <terminal y="-21" orientation="n" x="0"/>
     </description>
 </definition>