From a177a59d4536b16f6723b97dea171ebf9c990cc7 Mon Sep 17 00:00:00 2001
From: scorpio810
 <scorpio810@r995  scorpio810  2010-05-20 11:17:04 +0200 (jeu. 20 mai 2010)>
Date: Sat, 29 Aug 2015 21:44:49 +0000
Subject: [PATCH] Add tag label

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4181 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 .../50_heatings/element_chauffant.elmt        |  40 ++---
 .../50_heatings/resistance_chauffante.elmt    |  39 ++---
 .../50_heatings/resistances-chauffantes.elmt  |  45 +++---
 .../20_home_appliances/eclairage.elmt         |  71 +++++----
 .../20_home_appliances/gestion-energie.elmt   |  53 ++++---
 .../20_home_appliances/lave-linge.elmt        |  51 +++---
 .../20_home_appliances/terre.elmt             |  47 +++---
 .../01_thumbnails_mounting_plate/605573.elmt  | 118 +++++++-------
 .../01_thumbnails_mounting_plate/666128.elmt  | 134 ++++++++--------
 .../01_thumbnails_mounting_plate/666131.elmt  | 112 ++++++-------
 .../01_thumbnails_mounting_plate/666165.elmt  | 150 +++++++++---------
 .../01_thumbnails_mounting_plate/666166.elmt  | 150 +++++++++---------
 .../11_water/cuivre/te-22-15-22.elmt          |  44 ++---
 .../11_water/cuivre/te-22-18-22.elmt          |  44 ++---
 elements/60_energy/11_water/cuivre/te15.elmt  |  44 ++---
 elements/60_energy/11_water/cuivre/te18.elmt  |  44 ++---
 elements/60_energy/11_water/cuivre/te22.elmt  |  44 ++---
 .../11_water/fittings/colector-aseo.elmt      |  52 +++---
 .../11_water/fittings/colector-aseo20-16.elmt | 102 ++++++------
 .../11_water/fittings/tealpex16.elmt          |  48 +++---
 .../11_water/fittings/tealpex20-16-20.elmt    |  48 +++---
 .../11_water/fittings/tealpex20.elmt          |  48 +++---
 .../11_water/fittings/tealpex25-20-25.elmt    |  48 +++---
 .../11_water/fittings/tealpex25.elmt          |  48 +++---
 .../11_water/fittings/tealpex32-25-32.elmt    |  48 +++---
 .../11_water/fittings/tealpex32.elmt          |  48 +++---
 .../11_water/fittings/tuboalpex16.elmt        |  18 ++-
 .../11_water/fittings/tuboalpex20.elmt        |  18 ++-
 .../11_water/fittings/tuboalpex25.elmt        |  18 ++-
 .../11_water/fittings/tuboalpex32.elmt        |  18 ++-
 .../11_water/valves/manguito-rosca1.elmt      |  39 ++---
 .../11_water/valves/manguito-rosca1_2.elmt    |  39 ++---
 .../11_water/valves/manguito-rosca3_4.elmt    |  39 ++---
 .../60_energy/11_water/valves/termometro.elmt |  48 +++---
 .../11_water/valves/tubo-rosca1.elmt          |  40 ++---
 .../11_water/valves/tubo-rosca1_1_2.elmt      |  40 ++---
 .../11_water/valves/tubo-rosca3_4.elmt        |  40 ++---
 37 files changed, 1071 insertions(+), 1006 deletions(-)

diff --git a/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/element_chauffant.elmt b/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/element_chauffant.elmt
index d1865cf30..f8d431d1e 100644
--- a/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/element_chauffant.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/element_chauffant.elmt
@@ -1,26 +1,28 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="35" height="60" type="element" orientation="dyyy">
-<uuid uuid="{60C75AC9-6570-4587-944E-0544B45EDDC1}"/><names>
-        <name lang="ar">عنصر تسخين</name>
-        <name lang="de">Heizelement</name>
-        <name lang="el">Θερμαντικό στοιχείο</name>
-        <name lang="en">Heating element</name>
-        <name lang="it">Riscaldatore</name>
-        <name lang="fr">Elément chauffant</name>
-        <name lang="pl">Grzejnik</name>
+<definition width="20" hotspot_x="10" type="element" link_type="simple" orientation="dyyy" version="0.5" height="60" hotspot_y="34">
+    <uuid uuid="{2f8f1abc-ebce-4928-ba16-f96b18df4d14}"/>
+    <names>
         <name lang="cs">Topný článek</name>
+        <name lang="it">Riscaldatore</name>
+        <name lang="pl">Grzejnik</name>
+        <name lang="en">Heating element</name>
         <name lang="nl">Verwarming</name>
+        <name lang="de">Heizelement</name>
+        <name lang="ar">عنصر تسخين</name>
+        <name lang="fr">Elément chauffant</name>
+        <name lang="el">Θερμαντικό στοιχείο</name>
     </names>
     <informations>EN 60617 : 04-01-12</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="0" y2="-20" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0"/>
-        <rect width="10" x="-5" y="-20" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-5" y2="-10" 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="-16" x1="-5" y2="-16" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-5" y2="0" 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="-5" y2="5" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-5" y2="-5" x2="5"/>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-30" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="0" x2="0"/>
+        <rect width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-20" x="-5" height="30"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="-5" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-16" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-16" x1="-5" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-5" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5" x1="-5" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5" x1="-5" x2="5"/>
+        <input tagg="label" rotate="true" size="9" y="-9.5" x="5" text="_"/>
+        <terminal y="-30" x="0" orientation="n"/>
+        <terminal y="20" x="0" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/resistance_chauffante.elmt b/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/resistance_chauffante.elmt
index 25bfcfc75..982d34640 100644
--- a/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/resistance_chauffante.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/resistance_chauffante.elmt
@@ -1,26 +1,27 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="10" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{961AEE40-4728-4B3F-923E-F08993065F3D}"/><names>
-        <name lang="ar">مقاومة تسخين</name>
-        <name lang="el">Αντίσταση θέρμανσης</name>
-        <name lang="en">Resistance heating</name>
-        <name lang="de">Heizwiderstand</name>
-        <name lang="it">Resistenza di riscaldamento</name>
-        <name lang="fr">Résistance chauffante</name>
-        <name lang="pl">Grzejnik rezystancyjny</name>
-        <name lang="nl">Verwarmingsweerstand</name>
+<definition width="60" hotspot_x="29" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="10">
+    <uuid uuid="{9abf8967-4c0a-466c-918d-68bff2e5c820}"/>
+    <names>
         <name lang="cs">Vytápěcí odpor</name>
+        <name lang="it">Resistenza di riscaldamento</name>
+        <name lang="pl">Grzejnik rezystancyjny</name>
+        <name lang="en">Resistance heating</name>
+        <name lang="nl">Verwarmingsweerstand</name>
+        <name lang="de">Heizwiderstand</name>
+        <name lang="ar">مقاومة تسخين</name>
+        <name lang="fr">Résistance chauffante</name>
+        <name lang="el">Αντίσταση θέρμανσης</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="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10" y2="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="-4" x1="-5" y2="4" x2="-5"/>
-        <rect width="20" x="-10" y="-4" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="5" y2="4" 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="-4" x1="0" y2="4" x2="0"/>
-        <input x="-10.5" y="-9.6667" size="9" rotate="true" text="R_" tagg="label"/>
-        <terminal x="-21" y="0" orientation="w"/>
-        <terminal x="21" y="0" orientation="e"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-10" x2="-20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="10" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4" x1="-5" x2="-5"/>
+        <rect width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-4" x="-10" height="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4" x1="5" x2="5"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4" x1="0" x2="0"/>
+        <input tagg="label" rotate="true" size="9" y="-13.5" x="-7" text="_"/>
+        <terminal y="0" x="-21" orientation="w"/>
+        <terminal y="0" x="21" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/resistances-chauffantes.elmt b/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/resistances-chauffantes.elmt
index 029a7a47e..6e6371869 100644
--- a/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/resistances-chauffantes.elmt
+++ b/elements/10_electric/10_allpole/391_consumers&actuators/50_heatings/resistances-chauffantes.elmt
@@ -1,29 +1,30 @@
-<definition width="20" version="0.4" hotspot_x="10" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{2D04E0D1-1620-41BF-8818-A276C5B49A0B}"/><names>
-        <name lang="ar">مقاومة تسخين</name>
-        <name lang="el">Αντίσταση θέρμανσης</name>
-        <name lang="en">Resistances heating</name>
-        <name lang="de">Heizwiderstand</name>
-        <name lang="it">Resistenza di riscaldamento</name>
-        <name lang="fr">Resistances chauffantes</name>
-        <name lang="pl">Grzejnik</name>
-        <name lang="nl">Verwarmingsweerstand</name>
+<definition width="20" hotspot_x="10" type="element" link_type="simple" orientation="dyyy" version="0.5" height="60" hotspot_y="29">
+    <uuid uuid="{32742dca-1c26-4b37-860a-4db71252a3ec}"/>
+    <names>
         <name lang="cs">Vytápěcí odpory</name>
+        <name lang="it">Resistenza di riscaldamento</name>
+        <name lang="pl">Grzejnik</name>
+        <name lang="en">Resistances heating</name>
+        <name lang="nl">Verwarmingsweerstand</name>
+        <name lang="de">Heizwiderstand</name>
+        <name lang="ar">مقاومة تسخين</name>
+        <name lang="fr">Resistances chauffantes</name>
+        <name lang="el">Αντίσταση θέρμανσης</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="-4" y2="5" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-4" y2="0" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-4" y2="-5" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-20" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="20" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="4" y2="-10" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-4" y2="10" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="4" y2="-10" x2="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-4" y2="10" x2="-4"/>
-        <input x="17" y="0" size="9" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5" x1="-4" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-4" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-5" x1="-4" x2="3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="0" x2="0"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="4" x2="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="-4" x2="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="4" x2="-4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10" x1="-4" x2="-4"/>
+        <input tagg="label" rotate="true" size="9" y="-0.5" x="5" text="_"/>
+        <terminal y="-21" x="0" orientation="n"/>
+        <terminal y="21" x="0" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/eclairage.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/eclairage.elmt
index 237b71785..a3a1d8527 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/eclairage.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/eclairage.elmt
@@ -1,42 +1,43 @@
-<definition width="130" version="0.3" hotspot_x="6" hotspot_y="185" height="190" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{7408C4F4-56C3-4985-B436-6D86E2A2A180}"/><names>
-        <name lang="en">Lighting</name>
-        <name lang="de">Beleuchtung</name>
-        <name lang="it">Illuminazione</name>
-        <name lang="fr">Éclairage</name>
-        <name lang="pl">Oświetlenie</name>
+<definition width="130" hotspot_x="5" type="element" link_type="simple" orientation="dyyy" version="0.5" height="190" hotspot_y="185">
+    <uuid uuid="{47307e4c-feba-49e2-ac12-8fddb580fae6}"/>
+    <names>
         <name lang="cs">Osvětlení</name>
+        <name lang="it">Illuminazione</name>
+        <name lang="pl">Oświetlenie</name>
+        <name lang="en">Lighting</name>
         <name lang="nl">Verlichting</name>
+        <name lang="de">Beleuchtung</name>
+        <name lang="fr">Éclairage</name>
     </names>
     <informations>cbh41</informations>
     <description>
-        <rect width="120" x="0" y="-85" antialias="false" height="85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="-15" x2="120"/>
-        <input x="29" y="-33" size="7" rotate="true" text="10"/>
-        <input x="-2" y="-53.5" size="7" rotate="true" text="Local"/>
-        <text x="42" y="-18" size="5" text="4.5 kA C"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="0" y2="-45" x2="120"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-65" x1="0" y2="-65" x2="120"/>
-        <text x="66" y="-30" size="7" text="A"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-170" x1="0" y2="-170" x2="120"/>
-        <text x="2" y="-69" size="7" text="Éclairage"/>
-        <text x="36" y="-2" size="5" text="3 G 1.5 mm²"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-123" x1="48" y2="-100" x2="48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-123" x1="72" y2="-100" x2="72"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="48" y2="-97" x2="56"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="72" y2="-97" x2="63"/>
-        <arc width="40" x="40" y="-160" antialias="true" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-280"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-124" x1="48" y2="-124" x2="72"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-176" x1="60" y2="-161" x2="60"/>
-        <arc width="8" x="56" y="-99" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:black;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-97" x1="56" y2="-97" x2="63"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="48" y2="-100" x2="72"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="48" y2="-104" x2="72"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-104" x1="48" y2="-108" x2="72"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-108" x1="48" y2="-112" x2="72"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-112" x1="48" y2="-116" x2="72"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-116" x1="48" y2="-120" x2="72"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-120" x1="48" y2="-122" x2="59"/>
-        <terminal x="60" y="-180" nameHidden="0" number="" name="" orientation="n"/>
+        <rect width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-85" x="0" height="85"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-15" x1="0" x2="120"/>
+        <input tagg="none" rotate="true" size="7" y="-33" x="29" text="10"/>
+        <input tagg="label" rotate="true" size="7" y="-53.5" x="-2" text="Local"/>
+        <text size="5" y="-18" x="42" text="4.5 kA C"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-45" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-45" x1="0" x2="120"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-65" x1="0" x2="120"/>
+        <text size="7" y="-30" x="66" text="A"/>
+        <line end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y2="-170" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-170" x1="0" x2="120"/>
+        <text size="7" y="-69" x="2" text="Éclairage"/>
+        <text size="5" y="-2" x="36" text="3 G 1.5 mm²"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-100" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-123" x1="48" x2="48"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-100" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-123" x1="72" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-97" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-100" x1="48" x2="56"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-97" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-100" x1="72" x2="63"/>
+        <arc width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" antialias="true" angle="-280" y="-160" x="40" height="40"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-124" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-124" x1="48" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-161" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-176" x1="60" x2="60"/>
+        <arc width="8" style="line-style:normal;line-weight:normal;filling:black;color:black" start="0" antialias="true" angle="-180" y="-99" x="56" height="4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-97" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-97" x1="56" x2="63"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-100" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-100" x1="48" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-104" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-100" x1="48" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-108" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-104" x1="48" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-112" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-108" x1="48" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-116" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-112" x1="48" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-120" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-116" x1="48" x2="72"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-122" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-120" x1="48" x2="59"/>
+        <terminal y="-180" x="60" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/gestion-energie.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/gestion-energie.elmt
index b23e9baa4..17cff169c 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/gestion-energie.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/gestion-energie.elmt
@@ -1,33 +1,34 @@
-<definition width="130" version="0.3" hotspot_x="6" hotspot_y="185" height="190" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E48C9390-D06B-4020-9CF7-9698C391627B}"/><names>
-        <name lang="en">Energy management</name>
-        <name lang="it">Gestione Energia</name>
-        <name lang="fr">Gestion Énergie</name>
-        <name lang="de">Energieverwaltung</name>
-        <name lang="pl">Zarządzanie enerią</name>
+<definition width="130" hotspot_x="5" type="element" link_type="simple" orientation="dyyy" version="0.5" height="190" hotspot_y="185">
+    <uuid uuid="{dc59e27d-43e5-4968-bdce-3adf61da149c}"/>
+    <names>
         <name lang="cs">Hospodaření s energií</name>
+        <name lang="it">Gestione Energia</name>
+        <name lang="pl">Zarządzanie enerią</name>
+        <name lang="en">Energy management</name>
         <name lang="nl">Energiemanagement</name>
+        <name lang="de">Energieverwaltung</name>
+        <name lang="fr">Gestion Énergie</name>
     </names>
     <informations>cbh41</informations>
     <description>
-        <rect width="120" x="0" y="-85" antialias="false" height="85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="-15" x2="120"/>
-        <input x="29" y="-33" size="7" rotate="true" text="2"/>
-        <input x="-2" y="-53.5" size="7" rotate="true" text="Coffret"/>
-        <text x="42" y="-18" size="5" text="4.5 kA C"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="0" y2="-45" x2="120"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-65" x1="0" y2="-65" x2="120"/>
-        <text x="66" y="-30" size="7" text="A"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-170" x1="0" y2="-170" x2="120"/>
-        <text x="2" y="-69" size="7" text="Gestion Énergie"/>
-        <text x="36" y="-2" size="5" text="3 G 1.5 mm²"/>
-        <arc width="6" x="57" y="-154" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="54" y="-116" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-150" x1="57" y2="-116" x2="57"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-150" x1="63" y2="-116" x2="63"/>
-        <rect width="6" x="57" y="-130" antialias="false" height="15" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <text x="73" y="-135" size="9" text="°C"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-179" x1="60" y2="-155" x2="60"/>
-        <terminal x="60" y="-180" nameHidden="0" number="" name="" orientation="n"/>
+        <rect width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-85" x="0" height="85"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-15" x1="0" x2="120"/>
+        <input tagg="none" rotate="true" size="7" y="-33" x="29" text="2"/>
+        <input tagg="label" rotate="true" size="7" y="-53.5" x="-2" text="Coffret"/>
+        <text size="5" y="-18" x="42" text="4.5 kA C"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-45" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-45" x1="0" x2="120"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-65" x1="0" x2="120"/>
+        <text size="7" y="-30" x="66" text="A"/>
+        <line end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y2="-170" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-170" x1="0" x2="120"/>
+        <text size="7" y="-69" x="2" text="Gestion Énergie"/>
+        <text size="5" y="-2" x="36" text="3 G 1.5 mm²"/>
+        <arc width="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="-154" x="57" height="6"/>
+        <circle style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="true" diameter="12" y="-116" x="54"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-116" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-150" x1="57" x2="57"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-116" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-150" x1="63" x2="63"/>
+        <rect width="6" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-130" x="57" height="15"/>
+        <text size="9" y="-135" x="73" text="°C"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-155" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-179" x1="60" x2="60"/>
+        <terminal y="-180" x="60" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave-linge.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave-linge.elmt
index 60c5f9c79..0fff19454 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave-linge.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/lave-linge.elmt
@@ -1,35 +1,36 @@
-<definition width="130" version="0.3" hotspot_x="6" hotspot_y="185" height="190" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C21F05C5-C699-440D-863F-92DB0D52D2C3}"/><names>
-        <name lang="en">Washing machine</name>
-        <name lang="de">Waschmaschine</name>
-        <name lang="fr">Lave-Linge</name>
+<definition width="130" hotspot_x="5" type="element" link_type="simple" orientation="dyyy" version="0.5" height="190" hotspot_y="185">
+    <uuid uuid="{03c43e59-ebfa-44fc-8293-823c54a5f544}"/>
+    <names>
+        <name lang="cs">Pračka</name>
         <name lang="it">Lavatrice</name>
         <name lang="pl">Pralka</name>
-        <name lang="cs">Pračka</name>
+        <name lang="en">Washing machine</name>
         <name lang="nl">Wasmachine</name>
+        <name lang="de">Waschmaschine</name>
+        <name lang="fr">Lave-Linge</name>
         <name lang="el">Πλυντήριο</name>
     </names>
     <informations>
 CBH41</informations>
     <description>
-        <rect width="120" x="0" y="-85" antialias="false" height="85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="-15" x2="120"/>
-        <input x="28" y="-33" size="7" rotate="true" text="20"/>
-        <input x="-2" y="-53.5" size="7" rotate="true" text="Local"/>
-        <text x="42" y="-18" size="5" text="4.5 kA C"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="0" y2="-45" x2="120"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-65" x1="0" y2="-65" x2="120"/>
-        <text x="66" y="-30" size="7" text="A"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-170" x1="0" y2="-170" x2="120"/>
-        <text x="2" y="-69" size="7" text="Lave-Linge"/>
-        <text x="36" y="-2" size="5" text="3 G 2.5 mm²"/>
-        <rect width="60" x="30" y="-160" antialias="false" height="70" 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="-180" x1="60" y2="-160" 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="-144" x1="30" y2="-144" x2="89"/>
-        <circle x="44" y="-136" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="32"/>
-        <circle x="46.5" y="-133.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="27"/>
-        <circle x="77.5" y="-155.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <rect width="13" x="33" y="-157" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="60" y="-180" nameHidden="0" number="" name="" orientation="n"/>
+        <rect width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-85" x="0" height="85"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-15" x1="0" x2="120"/>
+        <input tagg="none" rotate="true" size="7" y="-33" x="28" text="20"/>
+        <input tagg="label" rotate="true" size="7" y="-53.5" x="-2" text="Local"/>
+        <text size="5" y="-18" x="42" text="4.5 kA C"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-45" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-45" x1="0" x2="120"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-65" x1="0" x2="120"/>
+        <text size="7" y="-30" x="66" text="A"/>
+        <line end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y2="-170" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-170" x1="0" x2="120"/>
+        <text size="7" y="-69" x="2" text="Lave-Linge"/>
+        <text size="5" y="-2" x="36" text="3 G 2.5 mm²"/>
+        <rect width="60" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-160" x="30" height="70"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-160" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-180" x1="60" x2="60"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-144" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-144" x1="30" x2="89"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="32" y="-136" x="44"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="27" y="-133.5" x="46.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="-155.5" x="77.5"/>
+        <rect width="13" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-157" x="33" height="10"/>
+        <terminal y="-180" x="60" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/terre.elmt b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/terre.elmt
index 7f862b901..4eaba27da 100644
--- a/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/terre.elmt
+++ b/elements/10_electric/11_singlepole/500_home_installation/20_home_appliances/terre.elmt
@@ -1,31 +1,32 @@
-<definition width="130" version="0.3" hotspot_x="6" hotspot_y="183" height="190" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{898D8977-2D09-4185-A2F6-AA1A5ABBD89E}"/><names>
-        <name lang="en">Ground</name>
-        <name lang="de">Fundamenterder</name>
-        <name lang="it">Terra</name>
-        <name lang="fr">Terre</name>
-        <name lang="pl">Uziemienie</name>
+<definition width="130" hotspot_x="5" type="element" link_type="simple" orientation="dyyy" version="0.5" height="190" hotspot_y="183">
+    <uuid uuid="{88dced0e-1866-45c6-9c0d-5d311bba970d}"/>
+    <names>
         <name lang="cs">Uzemnění</name>
+        <name lang="it">Terra</name>
+        <name lang="pl">Uziemienie</name>
+        <name lang="en">Ground</name>
         <name lang="nl">Aarde meting</name>
+        <name lang="de">Fundamenterder</name>
+        <name lang="fr">Terre</name>
         <name lang="el">Γείωση</name>
     </names>
     <informations>cbh41</informations>
     <description>
-        <rect width="120" x="0" y="-85" antialias="false" height="85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="-15" x2="120"/>
-        <input x="29" y="-34.5" size="7" rotate="true" text="100"/>
-        <input x="-2" y="-53.5" size="7" rotate="true" text="Valeur Mesurée"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-45" x1="0" y2="-45" x2="120"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-65" x1="0" y2="-65" x2="120"/>
-        <text x="66" y="-30" size="7" text="Ohms"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-170" x1="60" y2="-170" x2="120"/>
-        <text x="2" y="-69" size="7" text="Terre Générale"/>
-        <text x="36" y="-2" size="5" text="01/01/2012"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-176" x1="60" y2="-140" 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="-140" x1="30" y2="-140" x2="91"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-130" x1="40" y2="-130" x2="80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-120" x1="50" y2="-120" 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="-110" x1="59" y2="-110" x2="61"/>
-        <terminal x="60" y="-176" nameHidden="0" number="" name="" orientation="n"/>
+        <rect width="120" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-85" x="0" height="85"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-15" x1="0" x2="120"/>
+        <input tagg="label" rotate="true" size="7" y="-34.5" x="29" text="100"/>
+        <input tagg="none" rotate="true" size="7" y="-53.5" x="-2" text="Valeur Mesurée"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-45" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-45" x1="0" x2="120"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-65" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-65" x1="0" x2="120"/>
+        <text size="7" y="-30" x="66" text="Ohms"/>
+        <line end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y2="-170" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-170" x1="60" x2="120"/>
+        <text size="7" y="-69" x="2" text="Terre Générale"/>
+        <text size="5" y="-2" x="36" text="01/01/2012"/>
+        <line end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y2="-140" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-176" x1="60" x2="60"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-140" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-140" x1="30" x2="91"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-130" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-130" x1="40" x2="80"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-120" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-120" x1="50" x2="70"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-110" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-110" x1="59" x2="61"/>
+        <terminal y="-176" x="60" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/605573.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/605573.elmt
index abb253c00..d477a03ec 100644
--- a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/605573.elmt
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/605573.elmt
@@ -1,63 +1,65 @@
-<definition width="90" version="0.4" hotspot_x="5" hotspot_y="5" height="210" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B5E445D2-B83B-4B69-93F8-D3E4D7C41348}"/><names>
+<definition width="90" hotspot_x="5" type="element" link_type="simple" orientation="dyyy" version="0.5" height="210" hotspot_y="5">
+    <uuid uuid="{bdc1e85e-bd6c-48ba-a60f-99c4f4b80cf6}"/>
+    <names>
         <name lang="fr">FP63/30mA-A</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <circle x="15" y="170" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <rect width="80" x="0" y="0" antialias="false" height="200" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <circle x="55" y="170" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <rect width="35" x="43" y="110" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="173" x1="18" y2="177" x2="22"/>
-        <rect width="80" x="0" y="50" antialias="false" height="100" style="line-style:normal;line-weight:thin;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="173" x1="22" y2="177" x2="18"/>
-        <line length1="1" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="83" x1="0" y2="83" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="173" x1="20" y2="177" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="83" x1="0" y2="83" x2="80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="175" x1="18" y2="175" x2="22"/>
-        <rect width="25" x="48" y="83" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:white;color:white" y1="112" x1="48" y2="112" x2="73"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="173" x1="58" y2="177" x2="62"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:black;color:white" y1="114" x1="48" y2="114" x2="73"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="173" x1="62" y2="177" x2="58"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="60" x1="17" y2="60" x2="51"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="173" x1="60" y2="177" x2="60"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="175" x1="58" y2="175" x2="62"/>
-        <text x="53" y="89" size="3" text="0-OFF"/>
-        <rect width="25" x="48" y="91" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <text x="2" y="75" size="3" text="30 mA"/>
-        <text x="2" y="80" size="1" text="230 V"/>
-        <arc width="1" x="8" y="79" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="1" x="9" y="79" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="116" x1="0" y2="116" x2="80"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="49" x2="47" x3="44" x4="46" antialias="false" x5="47" x6="49" x7="50" x8="44" x9="43" closed="false" y1="51" y10="55" y2="51" y11="51" y3="57" y4="57" y12="51" y5="55" x10="47" y6="55" x11="49" y7="53" x12="49" y8="53" y9="55"/>
-        <input x="0" y="124.5" size="4" rotate="true" text="Nom" tagg="none"/>
-        <text x="26" y="64" size="2" text="FPA"/>
-        <circle x="15" y="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="55" y="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="13.0584" x1="22" y2="17.0584" 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="13.0584" x1="18" y2="17.0584" x2="22"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13" x1="20" y2="17" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15.0584" x1="18" y2="15.0584" x2="22"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" x1="57.9416" y2="17" x2="61.9416"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" x1="62" y2="17" x2="58"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13" x1="59.9416" y2="17" x2="59.9416"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="15" x1="58" y2="15" x2="62"/>
-        <text x="56" y="64" size="2" text="Test"/>
-        <circle x="2" y="51" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
-        <text x="3" y="59" size="4" text="GE"/>
-        <text x="40" y="79" size="1" text="605573"/>
-        <text x="1" y="71" size="5" text="63A"/>
-        <arc width="15" x="52.5" y="42.5" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <text x="58" y="56" size="4" text="T"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="116" x1="43" y2="83" x2="43"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="116" x1="78" y2="83" x2="78"/>
-        <rect width="3" x="43" y="96" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="3" x="75" y="96" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="4" x="27" y="69.5" antialias="true" height="3" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="4" x="31" y="69.5" antialias="true" height="3" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="4" x="27" y="73.5" antialias="true" height="3" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="4" x="31" y="73.5" antialias="true" height="3" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="10" x="26" y="69" antialias="false" height="7" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="170" x="15"/>
+        <input tagg="label" rotate="true" size="9" y="-9.45" x="3" text="_"/>
+        <rect width="80" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="0" x="0" height="200"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="170" x="55"/>
+        <rect width="35" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="110" x="43" height="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="177" antialias="false" length2="1.5" end1="none" length1="1.5" y1="173" x1="18" x2="22"/>
+        <rect width="80" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="50" x="0" height="100"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="177" antialias="false" length2="1.5" end1="none" length1="1.5" y1="173" x1="22" x2="18"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1" y1="83" x1="0" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="177" antialias="false" length2="1.5" end1="none" length1="1.5" y1="173" x1="20" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1.5" y1="83" x1="0" x2="80"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="175" antialias="false" length2="1.5" end1="none" length1="1.5" y1="175" x1="18" x2="22"/>
+        <rect width="25" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="83" x="48" height="25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:white;color:white" y2="112" antialias="false" length2="1.5" end1="none" length1="1.5" y1="112" x1="48" x2="73"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="177" antialias="false" length2="1.5" end1="none" length1="1.5" y1="173" x1="58" x2="62"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:black;color:white" y2="114" antialias="false" length2="1.5" end1="none" length1="1.5" y1="114" x1="48" x2="73"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="177" antialias="false" length2="1.5" end1="none" length1="1.5" y1="173" x1="62" x2="58"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="60" x1="17" x2="51"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="177" antialias="false" length2="1.5" end1="none" length1="1.5" y1="173" x1="60" x2="60"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="175" antialias="false" length2="1.5" end1="none" length1="1.5" y1="175" x1="58" x2="62"/>
+        <text size="3" y="89" x="53" text="0-OFF"/>
+        <rect width="25" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="91" x="48" height="18"/>
+        <text size="3" y="75" x="2" text="30 mA"/>
+        <text size="1" y="80" x="2" text="230 V"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" antialias="true" angle="-180" y="79" x="8" height="1"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" antialias="true" angle="-180" y="79" x="9" height="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="116" antialias="false" length2="1.5" end1="none" length1="1.5" y1="116" x1="0" x2="80"/>
+        <polygon y3="57" x7="50" y9="55" closed="false" y8="53" x8="44" x12="49" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="51" x6="49" x9="43" y4="57" x1="49" x4="46" y10="55" y6="55" x5="47" y5="55" y2="51" x2="47" x3="44" x11="49" y11="51" y7="53" y1="51" x10="47"/>
+        <input tagg="none" rotate="true" size="4" y="124.5" x="0" text="Nom"/>
+        <text size="2" y="64" x="26" text="FPA"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="10" x="15"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="10" x="55"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17.0584" antialias="false" length2="1.5" end1="none" length1="1.5" y1="13.0584" x1="22" x2="18"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17.0584" antialias="false" length2="1.5" end1="none" length1="1.5" y1="13.0584" x1="18" x2="22"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="17" antialias="false" length2="1.5" end1="none" length1="1.5" y1="13" x1="20" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="15.0584" antialias="false" length2="1.5" end1="none" length1="1.5" y1="15.0584" x1="18" x2="22"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17" antialias="false" length2="1.5" end1="none" length1="1.5" y1="13" x1="57.9416" x2="61.9416"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="17" antialias="false" length2="1.5" end1="none" length1="1.5" y1="13" x1="62" x2="58"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="17" antialias="false" length2="1.5" end1="none" length1="1.5" y1="13" x1="59.9416" x2="59.9416"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="15" antialias="false" length2="1.5" end1="none" length1="1.5" y1="15" x1="58" x2="62"/>
+        <text size="2" y="64" x="56" text="Test"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="12" y="51" x="2"/>
+        <text size="4" y="59" x="3" text="GE"/>
+        <text size="1" y="79" x="40" text="605573"/>
+        <text size="5" y="71" x="1" text="63A"/>
+        <arc width="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="42.5" x="52.5" height="15"/>
+        <text size="4" y="56" x="58" text="T"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1.5" y1="116" x1="43" x2="43"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1.5" y1="116" x1="78" x2="78"/>
+        <rect width="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="96" x="43" height="2"/>
+        <rect width="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="96" x="75" height="2"/>
+        <arc width="4" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" antialias="true" angle="-180" y="69.5" x="27" height="3"/>
+        <arc width="4" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" antialias="true" angle="-180" y="69.5" x="31" height="3"/>
+        <arc width="4" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" antialias="true" angle="-180" y="73.5" x="27" height="3"/>
+        <arc width="4" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" antialias="true" angle="-180" y="73.5" x="31" height="3"/>
+        <rect width="10" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="69" x="26" height="7"/>
     </description>
 </definition>
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666128.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666128.elmt
index 68904334d..4e23a5ef3 100644
--- a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666128.elmt
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666128.elmt
@@ -1,72 +1,74 @@
-<definition width="50" version="0.4" hotspot_x="5" hotspot_y="5" height="210" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C81DD8A7-99A3-477A-8610-3C30328986BD}"/><names>
+<definition width="50" hotspot_x="5" type="element" link_type="simple" orientation="dyyy" version="0.5" height="210" hotspot_y="5">
+    <uuid uuid="{14604bd5-b562-47d2-b2f0-38f760fc14fc}"/>
+    <names>
         <name lang="fr">CTX 20 20 230A</name>
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="71" x1="28" y2="72" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="72" x1="27" y2="72" x2="26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="72" x1="26" y2="71" x2="26"/>
-        <arc width="7" x="2.5" y="182.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="40" x="0" y="0" antialias="false" height="200" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="5" x="32.5" y="182.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="40" x="0" y="50" antialias="false" height="100" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="182.5" x1="6" y2="182.5" x2="35"/>
-        <line length1="1" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="83" x1="0" y2="83" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="83" x1="0" y2="83" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="197.5" x1="6.05843" y2="197.5" x2="35.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="60" x1="15" y2="60" x2="35"/>
-        <text x="1" y="71" size="5" text="20A"/>
-        <text x="4" y="75" size="1" text="230 V"/>
-        <arc width="1" x="10" y="74" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="1" x="11" y="74" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="116" x1="0" y2="116" x2="40"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="38" x2="36" x3="33" x4="35" antialias="false" x5="36" x6="38" x7="39" x8="33" x9="32" closed="false" y1="51" y10="55" y2="51" y11="51" y3="57" y4="57" y12="51" y5="55" x10="36" y6="55" x11="38" y7="53" x12="38" y8="53" y9="55"/>
-        <input x="0" y="124.5" size="4" rotate="true" text="Nom" tagg="none"/>
-        <text x="30" y="64" size="2" text="CTX "/>
-        <circle x="5" y="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="25" y="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="5" y="185" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="25" y="185" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="8" x1="12" y2="12" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="8" y2="12" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="28" y2="12" x2="32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="32" y2="12" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="30" y2="12" x2="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="28" y2="10" x2="32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="10" y2="12" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="8" y2="10" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="8" y2="192" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="12" y2="192" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="10" y2="192" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="190" x1="8" y2="190" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="28" y2="192" x2="32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="32" y2="192" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="30" y2="192" x2="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="190" x1="28" y2="190" x2="32"/>
-        <text x="32" y="81" size="1" text="66128"/>
-        <circle x="2" y="51" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
-        <text x="3" y="59" size="4" text="GE"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="175" x1="0" y2="175" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="25" x1="0" y2="25" x2="40"/>
-        <text x="2" y="81" size="1" text="UC 240"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="80" x1="15" y2="80" x2="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="81" x1="15" y2="81" x2="18"/>
-        <rect width="10" x="15" y="106" antialias="false" height="5" style="line-style:normal;line-weight:thin;filling:black;color:black"/>
-        <arc width="7" x="2.5" y="2.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="5" x="32.5" y="2.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2.5" x1="6" y2="2.5" x2="35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="17.5" x1="6.05843" y2="17.5" x2="35.0584"/>
-        <circle x="17.5" y="33.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="17.5" y="162.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <rect width="3" x="20" y="73" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="73" x1="21.5" y2="72" x2="21.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="75" x1="21.5" y2="76" x2="21.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="76" x1="26" y2="77" x2="26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="76" x1="28" y2="77" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="72" x1="29" y2="72" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="76" x1="26" y2="72" x2="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="76" x1="28" y2="72" x2="29"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="74" x1="23.16" y2="74" x2="28.8267"/>
+        <input tagg="label" rotate="true" size="9" y="-10.5" x="-1" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="72" antialias="false" length2="1.5" end1="none" length1="1.5" y1="71" x1="28" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="72" antialias="false" length2="1.5" end1="none" length1="1.5" y1="72" x1="27" x2="26"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="71" antialias="false" length2="1.5" end1="none" length1="1.5" y1="72" x1="26" x2="26"/>
+        <arc width="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" antialias="true" angle="-180" y="182.5" x="2.5" height="15"/>
+        <rect width="40" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="0" x="0" height="200"/>
+        <arc width="5" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" antialias="true" angle="-180" y="182.5" x="32.5" height="15"/>
+        <rect width="40" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="50" x="0" height="100"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="182.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="182.5" x1="6" x2="35"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1" y1="83" x1="0" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1.5" y1="83" x1="0" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="197.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="197.5" x1="6.05843" x2="35.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="60" x1="15" x2="35"/>
+        <text size="5" y="71" x="1" text="20A"/>
+        <text size="1" y="75" x="4" text="230 V"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" antialias="true" angle="-180" y="74" x="10" height="1"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" antialias="true" angle="-180" y="74" x="11" height="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="116" antialias="false" length2="1.5" end1="none" length1="1.5" y1="116" x1="0" x2="40"/>
+        <polygon y3="57" x7="39" y9="55" closed="false" y8="53" x8="33" x12="38" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="51" x6="38" x9="32" y4="57" x1="38" x4="35" y10="55" y6="55" x5="36" y5="55" y2="51" x2="36" x3="33" x11="38" y11="51" y7="53" y1="51" x10="36"/>
+        <input tagg="none" rotate="true" size="4" y="124.5" x="0" text="Nom"/>
+        <text size="2" y="64" x="30" text="CTX "/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="5" x="5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="5" x="25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="185" x="5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="185" x="25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="12" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="28" x2="32"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="32" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="30" x2="30"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="28" x2="32"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="12" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="190" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="28" x2="32"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="32" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="30" x2="30"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="190" x1="28" x2="32"/>
+        <text size="1" y="81" x="32" text="66128"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="12" y="51" x="2"/>
+        <text size="4" y="59" x="3" text="GE"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="175" antialias="false" length2="1.5" end1="none" length1="1.5" y1="175" x1="0" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="25" x1="0" x2="40"/>
+        <text size="1" y="81" x="2" text="UC 240"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="80" antialias="false" length2="1.5" end1="none" length1="1.5" y1="80" x1="15" x2="18"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="81" antialias="false" length2="1.5" end1="none" length1="1.5" y1="81" x1="15" x2="18"/>
+        <rect width="10" style="line-style:normal;line-weight:thin;filling:black;color:black" antialias="false" y="106" x="15" height="5"/>
+        <arc width="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" antialias="true" angle="-180" y="2.5" x="2.5" height="15"/>
+        <arc width="5" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" antialias="true" angle="-180" y="2.5" x="32.5" height="15"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="2.5" x1="6" x2="35"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="17.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17.5" x1="6.05843" x2="35.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="33.5" x="17.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="162.5" x="17.5"/>
+        <rect width="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="73" x="20" height="2"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="72" antialias="false" length2="1.5" end1="none" length1="1.5" y1="73" x1="21.5" x2="21.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="76" antialias="false" length2="1.5" end1="none" length1="1.5" y1="75" x1="21.5" x2="21.5"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="77" antialias="false" length2="1.5" end1="none" length1="1.5" y1="76" x1="26" x2="26"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="77" antialias="false" length2="1.5" end1="none" length1="1.5" y1="76" x1="28" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="72" antialias="false" length2="1.5" end1="none" length1="1.5" y1="72" x1="29" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="72" antialias="false" length2="1.5" end1="none" length1="1.5" y1="76" x1="26" x2="27"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="72" antialias="false" length2="1.5" end1="none" length1="1.5" y1="76" x1="28" x2="29"/>
+        <line end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y2="74" antialias="false" length2="1.5" end1="none" length1="1.5" y1="74" x1="23.16" x2="28.8267"/>
     </description>
 </definition>
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666131.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666131.elmt
index 0b2d8c15d..41eb83497 100644
--- a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666131.elmt
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666131.elmt
@@ -1,61 +1,63 @@
-<definition width="50" version="0.4" hotspot_x="5" hotspot_y="5" height="210" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EB4C965C-6137-477B-9683-B84C72A21BA0}"/><names>
+<definition width="50" hotspot_x="5" type="element" link_type="simple" orientation="dyyy" version="0.5" height="210" hotspot_y="5">
+    <uuid uuid="{51ee994d-737f-4ef5-830e-8c6991564d8b}"/>
+    <names>
         <name lang="fr">CTX DN20 20 230A</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="7" x="2.5" y="182.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="40" x="0" y="0" antialias="false" height="200" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="5" x="32.5" y="182.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="40" x="0" y="50" antialias="false" height="100" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="182.5" x1="6" y2="182.5" x2="35"/>
-        <line length1="1" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="83" x1="0" y2="83" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="83" x1="0" y2="83" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="197.5" x1="6.05843" y2="197.5" x2="35.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="60" x1="15" y2="60" x2="35"/>
-        <text x="1" y="71" size="5" text="20A"/>
-        <text x="4" y="75" size="1" text="230 V"/>
-        <arc width="1" x="10" y="74" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="1" x="11" y="74" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="116" x1="0" y2="116" x2="40"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="38" x2="36" x3="33" x4="35" antialias="false" x5="36" x6="38" x7="39" x8="33" x9="32" closed="false" y1="51" y10="55" y2="51" y11="51" y3="57" y4="57" y12="51" y5="55" x10="36" y6="55" x11="38" y7="53" x12="38" y8="53" y9="55"/>
-        <input x="0" y="124.5" size="4" rotate="true" text="Nom" tagg="none"/>
-        <text x="24" y="64" size="2" text="CTX DN"/>
-        <circle x="5" y="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="25" y="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="5" y="185" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="25" y="185" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="8" x1="12" y2="12" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="8" y2="12" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="28" y2="12" x2="32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="32" y2="12" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="30" y2="12" x2="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="28" y2="10" x2="32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="10" y2="12" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="8" y2="10" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="8" y2="192" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="12" y2="192" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="10" y2="192" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="190" x1="8" y2="190" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="28" y2="192" x2="32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="32" y2="192" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="30" y2="192" x2="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="190" x1="28" y2="190" x2="32"/>
-        <text x="32" y="81" size="1" text="66131"/>
-        <circle x="2" y="51" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
-        <text x="3" y="59" size="4" text="GE"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="175" x1="0" y2="175" x2="40"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="25" x1="0" y2="25" x2="40"/>
-        <text x="2" y="81" size="1" text="UC 240"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="80" x1="15" y2="80" x2="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="81" x1="15" y2="81" x2="18"/>
-        <rect width="29" x="5" y="87" antialias="false" height="26" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="29" x="5" y="96" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="7" x="2.5" y="2.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="5" x="32.5" y="2.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2.5" x1="6" y2="2.5" x2="35"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="17.5" x1="6.05843" y2="17.5" x2="35.0584"/>
-        <circle x="17.5" y="33.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="17.5" y="162.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <arc width="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" antialias="true" angle="-180" y="182.5" x="2.5" height="15"/>
+        <rect width="40" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="0" x="0" height="200"/>
+        <arc width="5" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" antialias="true" angle="-180" y="182.5" x="32.5" height="15"/>
+        <rect width="40" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="50" x="0" height="100"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="182.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="182.5" x1="6" x2="35"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1" y1="83" x1="0" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1.5" y1="83" x1="0" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="197.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="197.5" x1="6.05843" x2="35.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="60" x1="15" x2="35"/>
+        <text size="5" y="71" x="1" text="20A"/>
+        <text size="1" y="75" x="4" text="230 V"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" antialias="true" angle="-180" y="74" x="10" height="1"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" antialias="true" angle="-180" y="74" x="11" height="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="116" antialias="false" length2="1.5" end1="none" length1="1.5" y1="116" x1="0" x2="40"/>
+        <polygon y3="57" x7="39" y9="55" closed="false" y8="53" x8="33" x12="38" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="51" x6="38" x9="32" y4="57" x1="38" x4="35" y10="55" y6="55" x5="36" y5="55" y2="51" x2="36" x3="33" x11="38" y11="51" y7="53" y1="51" x10="36"/>
+        <input tagg="none" rotate="true" size="4" y="124.5" x="0" text="Nom"/>
+        <text size="2" y="64" x="24" text="CTX DN"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="5" x="5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="5" x="25"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="185" x="5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="185" x="25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="12" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="28" x2="32"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="32" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="30" x2="30"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="28" x2="32"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="12" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="190" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="28" x2="32"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="32" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="30" x2="30"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="190" x1="28" x2="32"/>
+        <text size="1" y="81" x="32" text="66131"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="12" y="51" x="2"/>
+        <text size="4" y="59" x="3" text="GE"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="175" antialias="false" length2="1.5" end1="none" length1="1.5" y1="175" x1="0" x2="40"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="25" x1="0" x2="40"/>
+        <text size="1" y="81" x="2" text="UC 240"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="80" antialias="false" length2="1.5" end1="none" length1="1.5" y1="80" x1="15" x2="18"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="81" antialias="false" length2="1.5" end1="none" length1="1.5" y1="81" x1="15" x2="18"/>
+        <rect width="29" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="87" x="5" height="26"/>
+        <rect width="29" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="96" x="5" height="7"/>
+        <arc width="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" antialias="true" angle="-180" y="2.5" x="2.5" height="15"/>
+        <arc width="5" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" antialias="true" angle="-180" y="2.5" x="32.5" height="15"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="2.5" x1="6" x2="35"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="17.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17.5" x1="6.05843" x2="35.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="33.5" x="17.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="162.5" x="17.5"/>
+        <input tagg="label" rotate="true" size="9" y="-10" x="0" text="_"/>
     </description>
 </definition>
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666165.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666165.elmt
index 09251596d..79a37d363 100644
--- a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666165.elmt
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666165.elmt
@@ -1,80 +1,82 @@
-<definition width="90" version="0.4" hotspot_x="5" hotspot_y="5" height="210" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3F2C82D1-A6E8-453E-AEC9-4C88F3E54A5A}"/><names>
+<definition width="90" hotspot_x="5" type="element" link_type="simple" orientation="dyyy" version="0.5" height="210" hotspot_y="5">
+    <uuid uuid="{471e7b19-f429-453f-bf83-703a4538b674}"/>
+    <names>
         <name lang="fr">CTX DN24 30 230A</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="7" x="2.5" y="180.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
-        <circle x="65.0584" y="183" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="45.0584" y="183" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="45.0584" y="7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="65.0584" y="7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <rect width="80" x="0.0584346" y="0" antialias="false" height="200" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="48.0584" y2="14" x2="52.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="186" x1="48.0584" y2="190" x2="52.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="186" x1="68.0584" y2="190" x2="72.0584"/>
-        <line 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="68.0584" y2="14" x2="72.0584"/>
-        <arc width="5" x="72.5" y="180.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" 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="10" x1="52" y2="14" x2="48"/>
-        <rect width="80" x="0" y="50" antialias="false" height="100" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="72" y2="14" x2="68"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="186" x1="52" y2="190" x2="48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="186" x1="72" y2="190" x2="68"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="186" x1="50.0584" y2="190" x2="50.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="186" x1="70.0584" y2="190" x2="70.0584"/>
-        <line length1="1" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="83" x1="0" y2="83" x2="80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="50.0584" y2="14" x2="50.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="70.0584" y2="14" x2="70.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="12" x1="48.0584" y2="12" x2="52.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="48.0584" y2="188" x2="52.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="12" x1="68.0584" y2="12" x2="72.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="68.0584" y2="188" x2="72.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="180.5" x1="6" y2="180.5" x2="75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="195.5" x1="6" y2="195.5" x2="75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="60" x1="15" y2="60" x2="75"/>
-        <text x="1" y="71" size="5" text="24A"/>
-        <text x="4" y="75" size="1" text="230 V"/>
-        <arc width="1" x="10" y="74" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="1" x="11" y="74" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="116" x1="0" y2="116" x2="80"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="75" x2="73" x3="70" x4="72" antialias="false" x5="73" x6="75" x7="76" x8="70" x9="69" closed="false" y1="51" y10="55" y2="51" y11="51" y3="57" y4="57" y12="51" y5="55" x10="73" y6="55" x11="75" y7="53" x12="75" y8="53" y9="55"/>
-        <input x="0" y="124.5" size="4" rotate="true" text="Nom" tagg="none"/>
-        <text x="63" y="65" size="2" text="CTX DN"/>
-        <circle x="5" y="7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="25.0584" y="7" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="5" y="183" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="25" y="183" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="12" y2="14" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="8" y2="14" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="28.0584" y2="14" x2="32.0584"/>
-        <line 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="32" y2="14" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="30.0584" y2="14" x2="30.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="12" x1="28.0584" y2="12" x2="32.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="10" y2="14" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="12" x1="8" y2="12" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="186" x1="8" y2="190" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="186" x1="12" y2="190" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="186" x1="10" y2="190" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="8" y2="188" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="186" x1="28" y2="190" x2="32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="186" x1="32" y2="190" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="186" x1="30" y2="190" x2="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="28" y2="188" x2="32"/>
-        <text x="66" y="81" size="1" text="666165"/>
-        <circle x="2" y="51" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
-        <text x="3" y="59" size="4" text="GE"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="175" x1="0" y2="175" x2="80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="25" x1="0" y2="25" x2="80"/>
-        <text x="2" y="81" size="1" text="UC 240"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="80" x1="15" y2="80" x2="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="81" x1="15" y2="81" x2="18"/>
-        <rect width="29" x="25" y="87" antialias="false" height="26" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="29" x="25" y="96" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="7" x="2.5" y="4.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="5" x="72.5" y="4.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.5" x1="6" y2="4.5" x2="75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="19.5" x1="6" y2="19.5" x2="75"/>
-        <circle x="37.5" y="32.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="37.5" y="161.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <arc width="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" antialias="true" angle="-180" y="180.5" x="2.5" height="15"/>
+        <input tagg="label" rotate="true" size="9" y="-9.45" x="3" text="_"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="183" x="65.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="183" x="45.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="7" x="45.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="7" x="65.0584"/>
+        <rect width="80" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="0" x="0.0584346" height="200"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="48.0584" x2="52.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="48.0584" x2="52.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="68.0584" x2="72.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="68.0584" x2="72.0584"/>
+        <arc width="5" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" antialias="true" angle="-180" y="180.5" x="72.5" height="15"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="52" x2="48"/>
+        <rect width="80" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="50" x="0" height="100"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="72" x2="68"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="52" x2="48"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="72" x2="68"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="50.0584" x2="50.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="70.0584" x2="70.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1" y1="83" x1="0" x2="80"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="50.0584" x2="50.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="70.0584" x2="70.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="48.0584" x2="52.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="188" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="48.0584" x2="52.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="68.0584" x2="72.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="188" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="68.0584" x2="72.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="180.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="180.5" x1="6" x2="75"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="195.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="195.5" x1="6" x2="75"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="60" x1="15" x2="75"/>
+        <text size="5" y="71" x="1" text="24A"/>
+        <text size="1" y="75" x="4" text="230 V"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" antialias="true" angle="-180" y="74" x="10" height="1"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" antialias="true" angle="-180" y="74" x="11" height="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="116" antialias="false" length2="1.5" end1="none" length1="1.5" y1="116" x1="0" x2="80"/>
+        <polygon y3="57" x7="76" y9="55" closed="false" y8="53" x8="70" x12="75" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="51" x6="75" x9="69" y4="57" x1="75" x4="72" y10="55" y6="55" x5="73" y5="55" y2="51" x2="73" x3="70" x11="75" y11="51" y7="53" y1="51" x10="73"/>
+        <input tagg="none" rotate="true" size="4" y="124.5" x="0" text="Nom"/>
+        <text size="2" y="65" x="63" text="CTX DN"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="7" x="5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="7" x="25.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="183" x="5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="183" x="25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="12" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="28.0584" x2="32.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="32" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="30.0584" x2="30.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="28.0584" x2="32.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="14" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="12" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="12" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="188" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="28" x2="32"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="32" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="186" x1="30" x2="30"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="188" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="28" x2="32"/>
+        <text size="1" y="81" x="66" text="666165"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="12" y="51" x="2"/>
+        <text size="4" y="59" x="3" text="GE"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="175" antialias="false" length2="1.5" end1="none" length1="1.5" y1="175" x1="0" x2="80"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="25" x1="0" x2="80"/>
+        <text size="1" y="81" x="2" text="UC 240"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="80" antialias="false" length2="1.5" end1="none" length1="1.5" y1="80" x1="15" x2="18"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="81" antialias="false" length2="1.5" end1="none" length1="1.5" y1="81" x1="15" x2="18"/>
+        <rect width="29" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="87" x="25" height="26"/>
+        <rect width="29" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="96" x="25" height="7"/>
+        <arc width="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" antialias="true" angle="-180" y="4.5" x="2.5" height="15"/>
+        <arc width="5" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" antialias="true" angle="-180" y="4.5" x="72.5" height="15"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="4.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="4.5" x1="6" x2="75"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="19.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="19.5" x1="6" x2="75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="32.5" x="37.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="161.5" x="37.5"/>
     </description>
 </definition>
diff --git a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666166.elmt b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666166.elmt
index 7601ebeed..eb806cf97 100644
--- a/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666166.elmt
+++ b/elements/10_electric/98_graphics/99_assembly_plan/01_thumbnails_mounting_plate/666166.elmt
@@ -1,80 +1,82 @@
-<definition width="90" version="0.4" hotspot_x="5" hotspot_y="5" height="210" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9551C1E0-BCCD-417E-9FF1-60AB3F4F4070}"/><names>
+<definition width="90" hotspot_x="5" type="element" link_type="simple" orientation="dyyy" version="0.5" height="210" hotspot_y="5">
+    <uuid uuid="{f5fb5499-1da1-4156-8cdf-78de0a072592}"/>
+    <names>
         <name lang="fr">CTX DN24 40 230A</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="7" x="2.5" y="182.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
-        <circle x="65.0584" y="185" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="45.0584" y="185" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="45.0584" y="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="65.0584" y="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <rect width="80" x="0.0584346" y="0" antialias="false" height="200" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="48.0584" y2="12" x2="52.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="48.0584" y2="192" x2="52.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="68.0584" y2="192" x2="72.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="68.0584" y2="12" x2="72.0584"/>
-        <arc width="5" x="72.5" y="182.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" 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="8" x1="52" y2="12" x2="48"/>
-        <rect width="80" x="0" y="50" antialias="false" height="100" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="72" y2="12" x2="68"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="52" y2="192" x2="48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="72" y2="192" x2="68"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="50.0584" y2="192" x2="50.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="70.0584" y2="192" x2="70.0584"/>
-        <line length1="1" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="83" x1="0" y2="83" x2="80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="50.0584" y2="12" x2="50.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="70.0584" y2="12" x2="70.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="48.0584" y2="10" x2="52.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="190" x1="48.0584" y2="190" x2="52.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="68.0584" y2="10" x2="72.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="190" x1="68.0584" y2="190" x2="72.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="182.5" x1="6" y2="182.5" x2="75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="197.5" x1="6" y2="197.5" x2="75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="60" x1="15" y2="60" x2="75"/>
-        <text x="1" y="71" size="5" text="24A"/>
-        <text x="4" y="75" size="1" text="230 V"/>
-        <arc width="1" x="10" y="74" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="1" x="11" y="74" antialias="true" height="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="116" x1="0" y2="116" x2="80"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="75" x2="73" x3="70" x4="72" antialias="false" x5="73" x6="75" x7="76" x8="70" x9="69" closed="false" y1="51" y10="55" y2="51" y11="51" y3="57" y4="57" y12="51" y5="55" x10="73" y6="55" x11="75" y7="53" x12="75" y8="53" y9="55"/>
-        <input x="0" y="124.5" size="4" rotate="true" text="Nom" tagg="none"/>
-        <text x="65" y="64" size="2" text="CTX DN"/>
-        <circle x="5" y="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="25.0584" y="5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="5" y="185" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
-        <circle x="25" y="185" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="8" x1="12" y2="12" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="8" y2="12" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="28.0584" y2="12" x2="32.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="32" y2="12" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="30.0584" y2="12" x2="30.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="28.0584" y2="10" x2="32.0584"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="10" y2="12" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10" x1="8" y2="10" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="8" y2="192" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="12" y2="192" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="10" y2="192" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="190" x1="8" y2="190" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="28" y2="192" x2="32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="188" x1="32" y2="192" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="188" x1="30" y2="192" x2="30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="190" x1="28" y2="190" x2="32"/>
-        <text x="66" y="81" size="1" text="666166"/>
-        <circle x="2" y="51" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="12"/>
-        <text x="3" y="59" size="4" text="GE"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="175" x1="0" y2="175" x2="80"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="25" x1="0" y2="25" x2="80"/>
-        <text x="2" y="81" size="1" text="UC 240"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="80" x1="15" y2="80" x2="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="81" x1="15" y2="81" x2="18"/>
-        <rect width="29" x="25" y="87" antialias="false" height="26" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="29" x="25" y="96" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="7" x="2.5" y="2.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="5" x="72.5" y="2.5" antialias="true" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2.5" x1="6" y2="2.5" x2="75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="17.5" x1="6" y2="17.5" x2="75"/>
-        <circle x="37.5" y="32.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="37.5" y="161.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <arc width="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" antialias="true" angle="-180" y="182.5" x="2.5" height="15"/>
+        <input tagg="label" rotate="true" size="9" y="-15.5" x="2" text="_"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="185" x="65.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="185" x="45.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="5" x="45.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="5" x="65.0584"/>
+        <rect width="80" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="0" x="0.0584346" height="200"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="48.0584" x2="52.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="48.0584" x2="52.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="68.0584" x2="72.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="68.0584" x2="72.0584"/>
+        <arc width="5" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" antialias="true" angle="-180" y="182.5" x="72.5" height="15"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="52" x2="48"/>
+        <rect width="80" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="50" x="0" height="100"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="72" x2="68"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="52" x2="48"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="72" x2="68"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="50.0584" x2="50.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="70.0584" x2="70.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="83" antialias="false" length2="1.5" end1="none" length1="1" y1="83" x1="0" x2="80"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="50.0584" x2="50.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="70.0584" x2="70.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="48.0584" x2="52.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="190" x1="48.0584" x2="52.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="68.0584" x2="72.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="190" x1="68.0584" x2="72.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="182.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="182.5" x1="6" x2="75"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="197.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="197.5" x1="6" x2="75"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y2="60" antialias="false" length2="1.5" end1="none" length1="1.5" y1="60" x1="15" x2="75"/>
+        <text size="5" y="71" x="1" text="24A"/>
+        <text size="1" y="75" x="4" text="230 V"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" antialias="true" angle="-180" y="74" x="10" height="1"/>
+        <arc width="1" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" antialias="true" angle="-180" y="74" x="11" height="1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="116" antialias="false" length2="1.5" end1="none" length1="1.5" y1="116" x1="0" x2="80"/>
+        <polygon y3="57" x7="76" y9="55" closed="false" y8="53" x8="70" x12="75" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y12="51" x6="75" x9="69" y4="57" x1="75" x4="72" y10="55" y6="55" x5="73" y5="55" y2="51" x2="73" x3="70" x11="75" y11="51" y7="53" y1="51" x10="73"/>
+        <input tagg="none" rotate="true" size="4" y="124.5" x="0" text="Nom"/>
+        <text size="2" y="64" x="65" text="CTX DN"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="5" x="5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="5" x="25.0584"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="185" x="5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="10" y="185" x="25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="12" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="28.0584" x2="32.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="32" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="30.0584" x2="30.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="28.0584" x2="32.0584"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="10" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="12" x2="8"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="190" x1="8" x2="12"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="28" x2="32"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="32" x2="28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="192" antialias="false" length2="1.5" end1="none" length1="1.5" y1="188" x1="30" x2="30"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="190" antialias="false" length2="1.5" end1="none" length1="1.5" y1="190" x1="28" x2="32"/>
+        <text size="1" y="81" x="66" text="666166"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="12" y="51" x="2"/>
+        <text size="4" y="59" x="3" text="GE"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="175" antialias="false" length2="1.5" end1="none" length1="1.5" y1="175" x1="0" x2="80"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="25" antialias="false" length2="1.5" end1="none" length1="1.5" y1="25" x1="0" x2="80"/>
+        <text size="1" y="81" x="2" text="UC 240"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="80" antialias="false" length2="1.5" end1="none" length1="1.5" y1="80" x1="15" x2="18"/>
+        <line end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y2="81" antialias="false" length2="1.5" end1="none" length1="1.5" y1="81" x1="15" x2="18"/>
+        <rect width="29" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" y="87" x="25" height="26"/>
+        <rect width="29" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="96" x="25" height="7"/>
+        <arc width="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-90" antialias="true" angle="-180" y="2.5" x="2.5" height="15"/>
+        <arc width="5" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" antialias="true" angle="-180" y="2.5" x="72.5" height="15"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="2.5" x1="6" x2="75"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="17.5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="17.5" x1="6" x2="75"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="32.5" x="37.5"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5" y="161.5" x="37.5"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/cuivre/te-22-15-22.elmt b/elements/60_energy/11_water/cuivre/te-22-15-22.elmt
index c685a1f19..427573b5c 100644
--- a/elements/60_energy/11_water/cuivre/te-22-15-22.elmt
+++ b/elements/60_energy/11_water/cuivre/te-22-15-22.elmt
@@ -1,27 +1,29 @@
-<definition width="60" version="0.4" hotspot_x="27" hotspot_y="29" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{98470CED-68BD-4620-B578-B96921FC0B8D}"/><names>
-        <name lang="en">Te 22-15-22 copper</name>
-        <name lang="it">T rame 22-15-22</name>
-        <name lang="fr">Te 22-15-22 cuivre</name>
-        <name lang="pl">Trójnik 22 - 15 - 22</name>
-        <name lang="es">Te cobre 22-15-22</name>
+<definition width="60" hotspot_x="26" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="28">
+    <uuid uuid="{c3270485-4255-4a1e-a3b3-53ae64c1d867}"/>
+    <names>
         <name lang="cs">T 22 - 15 - 22 měď</name>
+        <name lang="it">T rame 22-15-22</name>
+        <name lang="pl">Trójnik 22 - 15 - 22</name>
+        <name lang="en">Te 22-15-22 copper</name>
+        <name lang="es">Te cobre 22-15-22</name>
+        <name lang="fr">Te 22-15-22 cuivre</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="8.55" x="16.44" y="-9.83725" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.55" x="-18.9" y="-10.4326" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="14.52" x="-3.93" y="-22.935" antialias="false" height="7.73955" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.02325" x1="-9.66948" y2="8.02325" x2="16.3202"/>
-        <line 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.5833" x1="-1.51" y2="-8.66471" x2="-1.51"/>
-        <line 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.0512" x1="-9.88115" y2="-8.0512" x2="-2.0179"/>
-        <line 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.0512" x1="8.58625" y2="-8.0512" x2="15.9891"/>
-        <line 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.5833" x1="8.17" y2="-8.66471" x2="8.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="-2.69305" x1="1.62" y2="-8.0512" x2="-1.51"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.69305" x1="5.61" y2="-8.0512" x2="8.17"/>
-        <text x="-10" y="16" size="4" text="Te22-15-22"/>
-        <terminal x="-18.9" y="-0.311652" orientation="w"/>
-        <terminal x="24.99" y="-0.311652" orientation="e"/>
-        <terminal x="3" y="-24" orientation="n"/>
+        <rect width="8.55" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9.83725" x="16.44" height="20.8373"/>
+        <input tagg="label" rotate="true" size="9" y="15.55" x="-7" text="_"/>
+        <rect width="8.55" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.4326" x="-18.9" height="20.8373"/>
+        <rect width="14.52" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-22.935" x="-3.93" height="7.73955"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="8.02325" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8.02325" x1="-9.66948" x2="16.3202"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.66471" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14.5833" x1="-1.51" x2="-1.51"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.0512" x1="-9.88115" x2="-2.0179"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.0512" x1="8.58625" x2="15.9891"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.66471" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14.5833" x1="8.17" x2="8.17"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2.69305" x1="1.62" x2="-1.51"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2.69305" x1="5.61" x2="8.17"/>
+        <text size="4" y="16" x="-10" text="Te22-15-22"/>
+        <terminal y="-0.311652" x="24.99" orientation="e"/>
+        <terminal y="-24" x="3" orientation="n"/>
+        <terminal y="-0.311652" x="-18.9" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/cuivre/te-22-18-22.elmt b/elements/60_energy/11_water/cuivre/te-22-18-22.elmt
index de9d98ba9..f9a2ca987 100644
--- a/elements/60_energy/11_water/cuivre/te-22-18-22.elmt
+++ b/elements/60_energy/11_water/cuivre/te-22-18-22.elmt
@@ -1,27 +1,29 @@
-<definition width="60" version="0.4" hotspot_x="27" hotspot_y="28" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{4BD76E6F-CEE4-4D30-914B-677D13AD519C}"/><names>
-        <name lang="en">Te 22-18-22 copper</name>
-        <name lang="it">T rame 22-18-22</name>
-        <name lang="fr">Te 22-18-22 cuivre</name>
-        <name lang="pl">Trójnik 22 - 18 - 22</name>
-        <name lang="es">Te cobre 22-18-22</name>
+<definition width="60" hotspot_x="26" type="element" link_type="simple" orientation="dyyy" version="0.5" height="60" hotspot_y="33">
+    <uuid uuid="{f5426d15-2bb7-4fa0-a809-24b5fe951522}"/>
+    <names>
         <name lang="cs">T 22 - 18 - 22 měď</name>
+        <name lang="it">T rame 22-18-22</name>
+        <name lang="pl">Trójnik 22 - 18 - 22</name>
+        <name lang="en">Te 22-18-22 copper</name>
+        <name lang="es">Te cobre 22-18-22</name>
+        <name lang="fr">Te 22-18-22 cuivre</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="8.55" x="16.44" y="-9.83725" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.55" x="-18.9" y="-10.4326" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="16.52" x="-4.93" y="-22.935" antialias="false" height="7.73955" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.02325" x1="-9.66948" y2="8.02325" x2="16.3202"/>
-        <line 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.5833" x1="-2.51" y2="-8.66471" x2="-2.51"/>
-        <line 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.0512" x1="-10.1127" y2="-8.0512" x2="-3.76701"/>
-        <line 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.0512" x1="10.3439" y2="-8.0512" x2="16.2517"/>
-        <line 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.5833" x1="9.17" y2="-8.66471" x2="9.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="-2.69305" x1="1.62" y2="-8.0512" x2="-2.51"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.69305" x1="5.61" y2="-8.0512" x2="9.17"/>
-        <text x="-12" y="17" size="4" text="Te 22-18-22"/>
-        <terminal x="-18.9" y="-0.311652" orientation="w"/>
-        <terminal x="24.99" y="-0.311652" orientation="e"/>
-        <terminal x="3" y="-24" orientation="n"/>
+        <input tagg="label" rotate="true" size="9" y="15.55" x="-7" text="_"/>
+        <rect width="8.55" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9.83725" x="16.44" height="20.8373"/>
+        <rect width="8.55" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.4326" x="-18.9" height="20.8373"/>
+        <rect width="16.52" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-22.935" x="-4.93" height="7.73955"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="8.02325" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8.02325" x1="-9.66948" x2="16.3202"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.66471" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14.5833" x1="-2.51" x2="-2.51"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.0512" x1="-10.1127" x2="-3.76701"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.0512" x1="10.3439" x2="16.2517"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.66471" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14.5833" x1="9.17" x2="9.17"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2.69305" x1="1.62" x2="-2.51"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2.69305" x1="5.61" x2="9.17"/>
+        <text size="4" y="17" x="-12" text="Te 22-18-22"/>
+        <terminal y="-0.311652" x="24.99" orientation="e"/>
+        <terminal y="-24" x="3" orientation="n"/>
+        <terminal y="-0.311652" x="-18.9" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/cuivre/te15.elmt b/elements/60_energy/11_water/cuivre/te15.elmt
index 6c2bd6fc5..3b76afb98 100644
--- a/elements/60_energy/11_water/cuivre/te15.elmt
+++ b/elements/60_energy/11_water/cuivre/te15.elmt
@@ -1,27 +1,29 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="20" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{7B2E056A-59CF-4980-9674-C5AD58B32A7D}"/><names>
-        <name lang="en">Te 15 copper</name>
-        <name lang="it">T rame 15</name>
-        <name lang="fr">te 15 cuivre</name>
-        <name lang="pl">Trójnik 15</name>
-        <name lang="es">Te cobre 15</name>
+<definition width="50" hotspot_x="25" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="20">
+    <uuid uuid="{f5a57679-e7fc-4003-85af-10f8c73a00ea}"/>
+    <names>
         <name lang="cs">T 15 měď</name>
+        <name lang="it">T rame 15</name>
+        <name lang="pl">Trójnik 15</name>
+        <name lang="en">Te 15 copper</name>
+        <name lang="es">Te cobre 15</name>
+        <name lang="fr">te 15 cuivre</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="7.425" x="9.115" y="-5.37316" antialias="false" height="11.3732" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7.425" x="-18.11" y="-5.37316" antialias="false" height="11.3732" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.365" x="-7.22" y="-13.7977" antialias="false" height="5.47596" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.31509" x1="-10.685" y2="4.31509" x2="8.62"/>
-        <line 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.32175" x1="-5.735" y2="-4.10947" x2="-5.735"/>
-        <line 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.10947" x1="-10.19" y2="-4.10947" x2="-5.735"/>
-        <line 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.10947" x1="4.165" y2="-4.10947" x2="8.62"/>
-        <line 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.32175" x1="4.165" y2="-4.10947" x2="4.165"/>
-        <line 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.5821" x1="-2.765" y2="-4.10947" x2="-5.735"/>
-        <line 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.5821" x1="1.195" y2="-4.10947" x2="4.165"/>
-        <text x="-7" y="3" size="4" text="Te 15"/>
-        <terminal x="-18.2" y="0.220053" orientation="w"/>
-        <terminal x="17.8" y="0.220053" orientation="e"/>
-        <terminal x="-0.785" y="-14.2189" orientation="n"/>
+        <input tagg="label" rotate="true" size="9" y="4.55" x="-8" text="_"/>
+        <rect width="7.425" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-5.37316" x="9.115" height="11.3732"/>
+        <rect width="7.425" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-5.37316" x="-18.11" height="11.3732"/>
+        <rect width="13.365" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-13.7977" x="-7.22" height="5.47596"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4.31509" antialias="false" length2="1.5" end1="none" length1="1.5" y1="4.31509" x1="-10.685" x2="8.62"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4.10947" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.32175" x1="-5.735" x2="-5.735"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4.10947" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4.10947" x1="-10.19" x2="-5.735"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4.10947" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-4.10947" x1="4.165" x2="8.62"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4.10947" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.32175" x1="4.165" x2="4.165"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4.10947" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-1.5821" x1="-2.765" x2="-5.735"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-4.10947" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-1.5821" x1="1.195" x2="4.165"/>
+        <text size="4" y="3" x="-7" text="Te 15"/>
+        <terminal y="0.220053" x="-18.2" orientation="w"/>
+        <terminal y="-14.2189" x="-0.785" orientation="n"/>
+        <terminal y="0.220053" x="17.8" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/cuivre/te18.elmt b/elements/60_energy/11_water/cuivre/te18.elmt
index e05349f43..07234d817 100644
--- a/elements/60_energy/11_water/cuivre/te18.elmt
+++ b/elements/60_energy/11_water/cuivre/te18.elmt
@@ -1,27 +1,29 @@
-<definition width="50" version="0.4" hotspot_x="23" hotspot_y="26" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E8146889-8B2B-41AE-9667-4249C021C4B6}"/><names>
-        <name lang="en">Te 18 copper</name>
-        <name lang="it">T rame 18</name>
-        <name lang="fr">te 18 cuivre</name>
-        <name lang="pl">Trójnik 18</name>
-        <name lang="es">Te cobre 18</name>
+<definition width="50" hotspot_x="23" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="26">
+    <uuid uuid="{9d781a4a-0d07-4716-91c9-0b9e11de43cd}"/>
+    <names>
         <name lang="cs">T 18 měď</name>
+        <name lang="it">T rame 18</name>
+        <name lang="pl">Trójnik 18</name>
+        <name lang="en">Te 18 copper</name>
+        <name lang="es">Te cobre 18</name>
+        <name lang="fr">te 18 cuivre</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="7.65" x="11.44" y="-8.24137" antialias="false" height="16.2414" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7.65" x="-16.61" y="-8.24137" antialias="false" height="16.2414" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="16.32" x="-6.92" y="-17.6718" antialias="false" height="6.8109" 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.38042" x1="-8.96" y2="5.38042" x2="10.93"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.9615" x1="-4.37" y2="-6.56065" x2="-4.37"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.14571" x1="-8.55644" y2="-6.14571" x2="-4.76469"/>
-        <line 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.14571" x1="7.25356" y2="-6.14571" x2="11.0453"/>
-        <line 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.9615" x1="6.85" y2="-6.56065" x2="6.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="-3.00222" x1="-1.31" y2="-6.14571" x2="-4.37"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.00222" x1="3.79" y2="-6.14571" x2="6.85"/>
-        <text x="-6" y="2" size="4" text="Te 18"/>
-        <terminal x="-17" y="0" orientation="w"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="1.24" y="-18.1958" orientation="n"/>
+        <rect width="7.65" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.24137" x="11.44" height="16.2414"/>
+        <input tagg="label" rotate="true" size="9" y="3.55" x="-5" text="_"/>
+        <rect width="7.65" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.24137" x="-16.61" height="16.2414"/>
+        <rect width="16.32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-17.6718" x="-6.92" height="6.8109"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5.38042" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.38042" x1="-8.96" x2="10.93"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6.56065" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10.9615" x1="-4.37" x2="-4.37"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6.14571" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-6.14571" x1="-8.55644" x2="-4.76469"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6.14571" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-6.14571" x1="7.25356" x2="11.0453"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6.56065" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-10.9615" x1="6.85" x2="6.85"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6.14571" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3.00222" x1="-1.31" x2="-4.37"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6.14571" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3.00222" x1="3.79" x2="6.85"/>
+        <text size="4" y="2" x="-6" text="Te 18"/>
+        <terminal y="0" x="-17" orientation="w"/>
+        <terminal y="0" x="20" orientation="e"/>
+        <terminal y="-18.1958" x="1.24" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/cuivre/te22.elmt b/elements/60_energy/11_water/cuivre/te22.elmt
index 3cd6e19f3..5421499a6 100644
--- a/elements/60_energy/11_water/cuivre/te22.elmt
+++ b/elements/60_energy/11_water/cuivre/te22.elmt
@@ -1,27 +1,29 @@
-<definition width="60" version="0.4" hotspot_x="27" hotspot_y="32" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A2270E3A-C6B5-4A0A-B840-C72EC28548D6}"/><names>
-        <name lang="en">Te 22 copper</name>
-        <name lang="it">T rame 22</name>
-        <name lang="fr">te 22 cuivre</name>
-        <name lang="pl">Trójnik 22</name>
-        <name lang="es">Te cobre 22</name>
+<definition width="60" hotspot_x="26" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="32">
+    <uuid uuid="{3c091481-46f3-4c9b-a2ff-a2ca7e2df6a4}"/>
+    <names>
         <name lang="cs">T 22 měď</name>
+        <name lang="it">T rame 22</name>
+        <name lang="pl">Trójnik 22</name>
+        <name lang="en">Te 22 copper</name>
+        <name lang="es">Te cobre 22</name>
+        <name lang="fr">te 22 cuivre</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="8.55" x="16.44" y="-9.83725" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.55" x="-18.9" y="-10.4326" antialias="false" height="20.8373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20.52" x="-6.93" y="-22.935" antialias="false" height="7.73955" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.02325" x1="-9.66948" y2="8.02325" x2="16.3202"/>
-        <line 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.5833" x1="-3.51" y2="-8.66471" x2="-3.51"/>
-        <line 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.0512" x1="-10.1501" y2="-8.0512" x2="-3.72654"/>
-        <line 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.0512" x1="10.3138" y2="-8.0512" x2="16.2843"/>
-        <line 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.5833" x1="10.17" y2="-8.66471" x2="10.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="-2.69305" x1="1.62" y2="-8.0512" x2="-3.51"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.69305" x1="5.61" y2="-8.0512" x2="10.17"/>
-        <text x="-5" y="5" size="4" text="Te 22"/>
-        <terminal x="-18.9" y="-0.311652" orientation="w"/>
-        <terminal x="24.99" y="-0.311652" orientation="e"/>
-        <terminal x="3" y="-24" orientation="n"/>
+        <input tagg="label" rotate="true" size="9" y="6.55" x="-3" text="_"/>
+        <rect width="8.55" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9.83725" x="16.44" height="20.8373"/>
+        <rect width="8.55" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.4326" x="-18.9" height="20.8373"/>
+        <rect width="20.52" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-22.935" x="-6.93" height="7.73955"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="8.02325" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8.02325" x1="-9.66948" x2="16.3202"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.66471" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14.5833" x1="-3.51" x2="-3.51"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.0512" x1="-10.1501" x2="-3.72654"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-8.0512" x1="10.3138" x2="16.2843"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.66471" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-14.5833" x1="10.17" x2="10.17"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2.69305" x1="1.62" x2="-3.51"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.0512" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-2.69305" x1="5.61" x2="10.17"/>
+        <text size="4" y="5" x="-5" text="Te 22"/>
+        <terminal y="-0.311652" x="24.99" orientation="e"/>
+        <terminal y="-0.311652" x="-18.9" orientation="w"/>
+        <terminal y="-24" x="3" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/colector-aseo.elmt b/elements/60_energy/11_water/fittings/colector-aseo.elmt
index 2f1d8ad2f..d0e6238ef 100644
--- a/elements/60_energy/11_water/fittings/colector-aseo.elmt
+++ b/elements/60_energy/11_water/fittings/colector-aseo.elmt
@@ -1,33 +1,35 @@
-<definition width="100" version="0.4" hotspot_x="47" hotspot_y="41" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B7461B30-BEBA-4D32-8705-F94BC58B256C}"/><names>
-        <name lang="en">Te Alpex 20-16-20</name>
-        <name lang="fr">Te Alpex 20-16-20</name>
-        <name lang="es">Te Alpex 20-16-20</name>
+<definition width="100" hotspot_x="46" type="element" link_type="simple" orientation="dyyy" version="0.5" height="60" hotspot_y="40">
+    <uuid uuid="{a3787b82-1c52-4da0-a98c-995890126df5}"/>
+    <names>
+        <name lang="cs">T Alpex 20-16-20</name>
         <name lang="pl">Trójnik Alpex 20-16-20</name>
         <name lang="it">T Alpex 20-16-20</name>
-        <name lang="cs">T Alpex 20-16-20</name>
+        <name lang="en">Te Alpex 20-16-20</name>
+        <name lang="es">Te Alpex 20-16-20</name>
+        <name lang="fr">Te Alpex 20-16-20</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="14.8323" x="-6.03731" y="-33.5547" antialias="false" height="16.6377" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.8" x="-5.35" y="-16.3123" antialias="false" height="3.72834" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="15.35" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="8.45" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.73" x="43.685" y="-6.6128" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.59738" x="-3.41984" y="-35.8823" antialias="false" height="2.32754" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="-15.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.79693" x="-40.2906" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.7937" x="-37.4937" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.735" x="21.95" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="-16.85" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-12.25" y="14.5144" size="4" text="Te 20-16-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="6.05777" x1="-9.95" y2="6.05777" x2="15.35"/>
-        <rect width="2" x="-18" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="20" y="-14" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="20" x="-9" y="-17" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-40" y="0" orientation="w"/>
-        <terminal x="0.9426" y="-35.8823" orientation="n"/>
-        <terminal x="46.415" y="-0.39891" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="15.55" x="-7" text="_"/>
+        <rect width="14.8323" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-33.5547" x="-6.03731" height="16.6377"/>
+        <rect width="13.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-16.3123" x="-5.35" height="3.72834"/>
+        <rect width="4.6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.37002" x="15.35" height="12.4278"/>
+        <arc width="11.5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="-17.555" x="8.45" height="11.185"/>
+        <rect width="2.73" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.6128" x="43.685" height="12.4278"/>
+        <rect width="9.59738" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-35.8823" x="-3.41984" height="2.32754"/>
+        <rect width="4.6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.37002" x="-15.7" height="12.4278"/>
+        <rect width="2.79693" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.37002" x="-40.2906" height="12.4278"/>
+        <rect width="19.7937" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.3411" x="-37.4937" height="19.8845"/>
+        <rect width="21.735" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.3411" x="21.95" height="19.8845"/>
+        <arc width="11.5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-17.555" x="-16.85" height="11.185"/>
+        <text size="4" y="14.5144" x="-12.25" text="Te 20-16-20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6.05777" antialias="false" length2="1.5" end1="none" length1="1.5" y1="6.05777" x1="-9.95" x2="15.35"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-13" x="-18" height="25"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-14" x="20" height="27"/>
+        <rect width="20" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-17" x="-9" height="2"/>
+        <terminal y="-0.39891" x="46.415" orientation="e"/>
+        <terminal y="0" x="-40" orientation="w"/>
+        <terminal y="-35.8823" x="0.9426" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/colector-aseo20-16.elmt b/elements/60_energy/11_water/fittings/colector-aseo20-16.elmt
index 38dd33ecd..39aa0414e 100644
--- a/elements/60_energy/11_water/fittings/colector-aseo20-16.elmt
+++ b/elements/60_energy/11_water/fittings/colector-aseo20-16.elmt
@@ -1,58 +1,60 @@
-<definition width="100" version="0.4" hotspot_x="45" hotspot_y="73" height="120" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E4481734-0458-4A08-B16E-1E1698FCFED7}"/><names>
-        <name lang="en">collector Aeo20-16</name>
-        <name lang="fr">collecteur Aeo20-16</name>
-        <name lang="es">Colecto Aeo20-16</name>
+<definition width="100" hotspot_x="44" type="element" link_type="simple" orientation="dyyy" version="0.5" height="120" hotspot_y="73">
+    <uuid uuid="{1d627b8b-b27e-40a3-b7c6-7f745950da71}"/>
+    <names>
+        <name lang="cs">Sběrač Aeo 20-16</name>
         <name lang="pl">Kolektor Aeo 20-16</name>
         <name lang="it">Collettore Aeo20-16</name>
-        <name lang="cs">Sběrač Aeo 20-16</name>
+        <name lang="en">collector Aeo20-16</name>
+        <name lang="es">Colecto Aeo20-16</name>
+        <name lang="fr">collecteur Aeo20-16</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</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="-37.1559" x1="-3" y2="-24.9144" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="10" y2="23" 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="-24" x1="11" y2="-24" x2="22"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-15" y2="-12" x2="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-15" y2="-24" x2="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="-12" x2="-3"/>
-        <text x="30" y="-16" size="4" text="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="7" y2="-12" x2="10"/>
-        <text x="29" y="32" size="4" text="16"/>
-        <rect width="1.79693" x="43.7094" y="24.63" antialias="false" height="9.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.79693" x="-37.2906" y="24.63" antialias="false" height="9.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-27" y="31" size="4" text="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="11" y2="-12" x2="22"/>
-        <text x="0" y="-47" size="4" text="20"/>
-        <rect width="23.8323" x="-9.03731" y="-61.7658" antialias="false" height="19.8488" 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="-12" x1="-3" y2="22" x2="-3"/>
-        <rect width="19.7937" x="23.5063" y="21.393" antialias="false" height="15.896" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.8" x="-3.35" y="-41.3123" antialias="false" height="3.72834" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.7937" x="-35.4937" y="21.393" antialias="false" height="15.896" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-16" y="18" antialias="false" height="22.5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="22" y="17" antialias="false" height="22.5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2.73" x="45.685" y="-24.6128" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.59738" x="-1.41984" y="-64.5426" antialias="false" height="2.77675" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.79693" x="-37.2906" y="-23.37" antialias="false" height="9.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.7937" x="-35.4937" y="-26.607" antialias="false" height="15.896" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.735" x="23.95" y="-28.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35.0578" x1="-7.95" y2="35.0578" x2="17.35"/>
-        <rect width="2" x="-16" y="-30" antialias="false" height="22.5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="22" y="-32" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="32" x="-13" y="-42" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="10" y2="22" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-14" y2="35" x2="23"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="-14" y2="23" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="-3" y2="27" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="10" y2="27" x2="6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-37.1559" x1="10" y2="-24.9144" 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" x1="10" y2="-21" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-3" y2="-21" x2="0"/>
-        <text x="-27" y="-16" size="4" text="16"/>
-        <terminal x="-38" y="-18" orientation="w"/>
-        <terminal x="2.9426" y="-64.5426" orientation="n"/>
-        <terminal x="48.415" y="-18.3989" orientation="e"/>
-        <terminal x="-38" y="30" orientation="w"/>
-        <terminal x="47" y="30" orientation="e"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-24.9144" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-37.1559" x1="-3" x2="-3"/>
+        <input tagg="label" rotate="true" size="9" y="40.55" x="-7" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="23" antialias="false" length2="1.5" end1="none" length1="1.5" y1="23" x1="10" x2="21"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-24" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="11" x2="22"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="-15" x2="-4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-24" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="-15" x2="-4"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-15" x1="0" x2="-3"/>
+        <text size="4" y="-16" x="30" text="20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-15" x1="7" x2="10"/>
+        <text size="4" y="32" x="29" text="16"/>
+        <rect width="1.79693" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="24.63" x="43.7094" height="9.4278"/>
+        <rect width="1.79693" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="24.63" x="-37.2906" height="9.4278"/>
+        <text size="4" y="31" x="-27" text="16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-12" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="11" x2="22"/>
+        <text size="4" y="-47" x="0" text="20"/>
+        <rect width="23.8323" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-61.7658" x="-9.03731" height="19.8488"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="22" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="-3" x2="-3"/>
+        <rect width="19.7937" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="21.393" x="23.5063" height="15.896"/>
+        <rect width="13.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-41.3123" x="-3.35" height="3.72834"/>
+        <rect width="19.7937" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="21.393" x="-35.4937" height="15.896"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="18" x="-16" height="22.5"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="17" x="22" height="22.5"/>
+        <rect width="2.73" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-24.6128" x="45.685" height="12.4278"/>
+        <rect width="9.59738" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-64.5426" x="-1.41984" height="2.77675"/>
+        <rect width="1.79693" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-23.37" x="-37.2906" height="9.4278"/>
+        <rect width="19.7937" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-26.607" x="-35.4937" height="15.896"/>
+        <rect width="21.735" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-28.3411" x="23.95" height="19.8845"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="35.0578" antialias="false" length2="1.5" end1="none" length1="1.5" y1="35.0578" x1="-7.95" x2="17.35"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-30" x="-16" height="22.5"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-32" x="22" height="27"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-42" x="-13" height="2"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="22" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-12" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="35" antialias="false" length2="1.5" end1="none" length1="1.5" y1="35" x1="-14" x2="23"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="23" antialias="false" length2="1.5" end1="none" length1="1.5" y1="23" x1="-14" x2="-3"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="27" antialias="false" length2="1.5" end1="none" length1="1.5" y1="23" x1="-3" x2="1"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="27" antialias="false" length2="1.5" end1="none" length1="1.5" y1="23" x1="10" x2="6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-24.9144" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-37.1559" x1="10" x2="10"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="10" x2="7"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-24" x1="-3" x2="0"/>
+        <text size="4" y="-16" x="-27" text="16"/>
+        <terminal y="-64.5426" x="2.9426" orientation="n"/>
+        <terminal y="30" x="47" orientation="e"/>
+        <terminal y="-18" x="-38" orientation="w"/>
+        <terminal y="-18.3989" x="48.415" orientation="e"/>
+        <terminal y="30" x="-38" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tealpex16.elmt b/elements/60_energy/11_water/fittings/tealpex16.elmt
index d141b3d83..921043805 100644
--- a/elements/60_energy/11_water/fittings/tealpex16.elmt
+++ b/elements/60_energy/11_water/fittings/tealpex16.elmt
@@ -1,31 +1,33 @@
-<definition width="80" version="0.4" hotspot_x="31" hotspot_y="40" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{7296B0EB-DFEB-44B8-AA93-5F5D353D2207}"/><names>
-        <name lang="es">Te Alpex 16</name>
+<definition width="90" hotspot_x="35" type="element" link_type="simple" orientation="dyyy" version="0.5" height="60" hotspot_y="40">
+    <uuid uuid="{1b0678c4-42e9-4617-b9d3-4c2624ba1363}"/>
+    <names>
+        <name lang="cs">T Alpex 16</name>
         <name lang="it">T Alpex 16</name>
         <name lang="pl">Trójnik Alpex 16</name>
-        <name lang="cs">T Alpex 16</name>
+        <name lang="es">Te Alpex 16</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="17" x="-1" y="-30.8835" antialias="false" height="15.8835" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="12" x="2" y="-13" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="20" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="14" y="-14" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.09" x="42.81" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11" x="2" y="-33.0013" antialias="false" height="2.1178" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-5" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-27" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18" x="-25" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.81" x="24" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="-8" y="-14" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="2" y="12" size="4" text="Te 16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-2" y2="5" x2="20"/>
-        <rect width="2" x="-7" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="22" x="-3" y="-15" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="22" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-27" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="8" y="-33.0013" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="44.9" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="10.55" x="3" text="_"/>
+        <rect width="17" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-30.8835" x="-1" height="15.8835"/>
+        <rect width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-13" x="2" height="3"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-5" x="20" height="10"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="-14" x="14" height="9"/>
+        <rect width="2.09" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-5" x="42.81" height="10"/>
+        <rect width="11" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-33.0013" x="2" height="2.1178"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-5" x="-5" height="10"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-5" x="-27" height="10"/>
+        <rect width="18" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8" x="-25" height="16"/>
+        <rect width="18.81" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8" x="24" height="16"/>
+        <arc width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-14" x="-8" height="9"/>
+        <text size="4" y="12" x="2" text="Te 16"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5" x1="-2" x2="20"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-10" x="-7" height="20"/>
+        <rect width="22" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-15" x="-3" height="2"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-10" x="22" height="20"/>
+        <terminal y="0" x="44.9" orientation="e"/>
+        <terminal y="-33.0013" x="8" orientation="n"/>
+        <terminal y="0" x="-27" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tealpex20-16-20.elmt b/elements/60_energy/11_water/fittings/tealpex20-16-20.elmt
index feeaad309..cf069716a 100644
--- a/elements/60_energy/11_water/fittings/tealpex20-16-20.elmt
+++ b/elements/60_energy/11_water/fittings/tealpex20-16-20.elmt
@@ -1,31 +1,33 @@
-<definition width="100" version="0.4" hotspot_x="47" hotspot_y="41" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{6BC30FE4-9FED-4628-8F91-2C43164780F5}"/><names>
-        <name lang="es">Te Alpex 20-16-20</name>
+<definition width="100" hotspot_x="46" type="element" link_type="simple" orientation="dyyy" version="0.5" height="60" hotspot_y="40">
+    <uuid uuid="{a1c76a5f-6430-4789-9362-0ca8b0524f18}"/>
+    <names>
+        <name lang="cs">T Alpex 20-16-20</name>
         <name lang="it">T Alpex 20-16-20</name>
         <name lang="pl">Trójnik Alpex 20-16-20</name>
-        <name lang="cs">T Alpex 20-16-20</name>
+        <name lang="es">Te Alpex 20-16-20</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="14.8323" x="-6.03731" y="-33.5547" antialias="false" height="16.6377" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.8" x="-5.35" y="-16.3123" antialias="false" height="3.72834" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="15.35" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="8.45" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.73" x="43.685" y="-6.6128" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.59738" x="-3.41984" y="-35.8823" antialias="false" height="2.32754" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="-15.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.79693" x="-40.2906" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.7937" x="-37.4937" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.735" x="21.95" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="-16.85" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-12.25" y="14.5144" size="4" text="Te 20-16-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="6.05777" x1="-9.95" y2="6.05777" x2="15.35"/>
-        <rect width="2" x="-18" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="20" y="-14" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="20" x="-9" y="-17" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-40" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="0.9426" y="-35.8823" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="46.415" y="-0.39891" nameHidden="1" number="" name="" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="15.55" x="-7" text="_"/>
+        <rect width="14.8323" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-33.5547" x="-6.03731" height="16.6377"/>
+        <rect width="13.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-16.3123" x="-5.35" height="3.72834"/>
+        <rect width="4.6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.37002" x="15.35" height="12.4278"/>
+        <arc width="11.5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="-17.555" x="8.45" height="11.185"/>
+        <rect width="2.73" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.6128" x="43.685" height="12.4278"/>
+        <rect width="9.59738" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-35.8823" x="-3.41984" height="2.32754"/>
+        <rect width="4.6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.37002" x="-15.7" height="12.4278"/>
+        <rect width="2.79693" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.37002" x="-40.2906" height="12.4278"/>
+        <rect width="19.7937" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.3411" x="-37.4937" height="19.8845"/>
+        <rect width="21.735" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.3411" x="21.95" height="19.8845"/>
+        <arc width="11.5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-17.555" x="-16.85" height="11.185"/>
+        <text size="4" y="14.5144" x="-12.25" text="Te 20-16-20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6.05777" antialias="false" length2="1.5" end1="none" length1="1.5" y1="6.05777" x1="-9.95" x2="15.35"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-13" x="-18" height="25"/>
+        <rect width="2" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-14" x="20" height="27"/>
+        <rect width="20" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-17" x="-9" height="2"/>
+        <terminal y="-35.8823" x="0.9426" orientation="n"/>
+        <terminal y="-0.39891" x="46.415" orientation="e"/>
+        <terminal y="0" x="-40" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tealpex20.elmt b/elements/60_energy/11_water/fittings/tealpex20.elmt
index 422f018d2..689c7a212 100644
--- a/elements/60_energy/11_water/fittings/tealpex20.elmt
+++ b/elements/60_energy/11_water/fittings/tealpex20.elmt
@@ -1,31 +1,33 @@
-<definition width="100" version="0.4" hotspot_x="48" hotspot_y="47" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{6AD9624B-6DF2-443B-A769-84BE28A801D3}"/><names>
-        <name lang="es">Te Alpex 20</name>
+<definition width="100" hotspot_x="47" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="47">
+    <uuid uuid="{becdeb38-7bae-4804-8177-4f2d7007a2ba}"/>
+    <names>
+        <name lang="cs">T Alpex 20</name>
         <name lang="it">T Alpex 20</name>
         <name lang="pl">Trójnik Alpex 20</name>
-        <name lang="cs">T Alpex 20</name>
+        <name lang="es">Te Alpex 20</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="3" x="18" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="21.8323" x="-10.0373" y="-37.7314" antialias="false" height="18.8161" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.8" x="-6.35" y="-17.3123" antialias="false" height="4.72834" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="14.35" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="7.45" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.6" x="41.65" y="-6.6128" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="14.5974" x="-6.41984" y="-40.0946" antialias="false" height="2.36322" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="-16.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.6" x="-39.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.4" x="-38.1" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20.7" x="20.95" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="-17.85" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-5" y="16" size="4" text="Te 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="6.05777" x1="-10.95" y2="6.05777" x2="14.35"/>
-        <rect width="3" x="-20" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="28" x="-13" y="-19" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-40" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-0.0574" y="-40.0946" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="44.25" y="-0.39891" nameHidden="1" number="" name="" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="15.55" x="-7" text="_"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-13" x="18" height="25"/>
+        <rect width="21.8323" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-37.7314" x="-10.0373" height="18.8161"/>
+        <rect width="13.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-17.3123" x="-6.35" height="4.72834"/>
+        <rect width="4.6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.37002" x="14.35" height="12.4278"/>
+        <arc width="11.5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="-17.555" x="7.45" height="11.185"/>
+        <rect width="2.6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.6128" x="41.65" height="12.4278"/>
+        <rect width="14.5974" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-40.0946" x="-6.41984" height="2.36322"/>
+        <rect width="4.6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.37002" x="-16.7" height="12.4278"/>
+        <rect width="1.6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.37002" x="-39.7" height="12.4278"/>
+        <rect width="18.4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.3411" x="-38.1" height="19.8845"/>
+        <rect width="20.7" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.3411" x="20.95" height="19.8845"/>
+        <arc width="11.5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-17.555" x="-17.85" height="11.185"/>
+        <text size="4" y="16" x="-5" text="Te 20"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6.05777" antialias="false" length2="1.5" end1="none" length1="1.5" y1="6.05777" x1="-10.95" x2="14.35"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-13" x="-20" height="25"/>
+        <rect width="28" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-19" x="-13" height="2"/>
+        <terminal y="-40.0946" x="-0.0574" orientation="n"/>
+        <terminal y="-0.39891" x="44.25" orientation="e"/>
+        <terminal y="0" x="-40" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tealpex25-20-25.elmt b/elements/60_energy/11_water/fittings/tealpex25-20-25.elmt
index 63d8a117b..e2d3a7df1 100644
--- a/elements/60_energy/11_water/fittings/tealpex25-20-25.elmt
+++ b/elements/60_energy/11_water/fittings/tealpex25-20-25.elmt
@@ -1,31 +1,33 @@
-<definition width="110" version="0.4" hotspot_x="57" hotspot_y="48" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{70E414AC-CA1C-43D0-86A6-924CAB4BE747}"/><names>
-        <name lang="es">Te Alpex 25-20-25</name>
+<definition width="110" hotspot_x="58" type="element" link_type="simple" orientation="dyyy" version="0.5" height="70" hotspot_y="47">
+    <uuid uuid="{0f784357-f8c6-408f-b033-253e672e291c}"/>
+    <names>
+        <name lang="cs">T Alpex 25-20-25</name>
         <name lang="it">T Alpex 25-20-25</name>
         <name lang="pl">Trójnik Alpex 25-20-25</name>
-        <name lang="cs">T Alpex 25-20-25</name>
+        <name lang="es">Te Alpex 25-20-25</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="3" x="16" y="-15" antialias="false" height="29" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="15.5671" x="-10.8226" y="-40.0799" antialias="false" height="18.5943" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.18" x="-8.815" y="-20.4857" antialias="false" height="4.56867" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="10.955" y="-8.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="14.65" x="2.365" y="-22.0085" antialias="true" height="13.706" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.163" x="42.9235" y="-7.8254" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.0728" x="-8.07545" y="-41.7989" antialias="false" height="1.71887" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="-22.2" y="-8.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.29352" x="-50.2781" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.7846" x="-46.9846" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.9085" x="19.015" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="14.65" x="-23.465" y="-22.0085" antialias="true" height="13.706" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-18.405" y="16.0636" size="4" text="Te 25-20-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="6.92635" x1="-15.875" y2="6.92635" x2="11.955"/>
-        <rect width="3" x="-25" y="-15" antialias="false" height="29" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="21" x="-14" y="-22" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-50.2781" y="0.3119" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-3.4969" y="-41.7989" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="45.0865" y="-0.21099" nameHidden="1" number="" name="" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="15.55" x="-12" text="_"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-15" x="16" height="29"/>
+        <rect width="15.5671" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-40.0799" x="-10.8226" height="18.5943"/>
+        <rect width="11.18" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-20.4857" x="-8.815" height="4.56867"/>
+        <rect width="5.06" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.3025" x="10.955" height="15.2289"/>
+        <arc width="14.65" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="-22.0085" x="2.365" height="13.706"/>
+        <rect width="2.163" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-7.8254" x="42.9235" height="15.2289"/>
+        <rect width="10.0728" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-41.7989" x="-8.07545" height="1.71887"/>
+        <rect width="5.06" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.3025" x="-22.2" height="15.2289"/>
+        <rect width="3.29352" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-7.3025" x="-50.2781" height="15.2289"/>
+        <rect width="21.7846" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-12.394" x="-46.9846" height="24.3663"/>
+        <rect width="23.9085" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-12.394" x="19.015" height="24.3663"/>
+        <arc width="14.65" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-22.0085" x="-23.465" height="13.706"/>
+        <text size="4" y="16.0636" x="-18.405" text="Te 25-20-25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6.92635" antialias="false" length2="1.5" end1="none" length1="1.5" y1="6.92635" x1="-15.875" x2="11.955"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-15" x="-25" height="29"/>
+        <rect width="21" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-22" x="-14" height="2"/>
+        <terminal y="0.3119" x="-50.2781" orientation="w"/>
+        <terminal y="-41.7989" x="-3.4969" orientation="n"/>
+        <terminal y="-0.21099" x="45.0865" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tealpex25.elmt b/elements/60_energy/11_water/fittings/tealpex25.elmt
index 7e14a7959..2449be51e 100644
--- a/elements/60_energy/11_water/fittings/tealpex25.elmt
+++ b/elements/60_energy/11_water/fittings/tealpex25.elmt
@@ -1,31 +1,33 @@
-<definition width="110" version="0.4" hotspot_x="57" hotspot_y="54" height="80" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1E32F772-71FE-4C4B-B73C-A49C9C402312}"/><names>
-        <name lang="es">Te Alpex 25</name>
+<definition width="110" hotspot_x="58" type="element" link_type="simple" orientation="dyyy" version="0.5" height="80" hotspot_y="54">
+    <uuid uuid="{d9ac0a6c-3e42-42df-955f-070f8de35b23}"/>
+    <names>
+        <name lang="cs">T Alpex 16</name>
         <name lang="it">T Alpex 25</name>
         <name lang="pl">Trójnik Alpex 25</name>
-        <name lang="cs">T Alpex 16</name>
+        <name lang="es">Te Alpex 25</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="3" x="16" y="-16" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="21.505" x="-15.61" y="-44.3289" antialias="false" height="22.8433" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.18" x="-11.815" y="-19.4857" antialias="false" height="4.56867" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="10.955" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="12.65" x="3.365" y="-21.0085" antialias="true" height="13.706" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.06" x="41.785" y="-7.8254" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.915" x="-11.815" y="-46.8977" antialias="false" height="2.56867" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="-23.2" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.289" x="-49.2" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20.24" x="-46.44" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="22.77" x="19.015" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="12.65" x="-24.465" y="-21.0085" antialias="true" height="13.706" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-9" y="18" size="4" text="Te 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="7.92635" x1="-16.875" y2="7.92635" x2="10.955"/>
-        <rect width="3" x="-27" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="27" x="-18" y="-22" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-49.2" y="0.3119" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-5.49" y="-46.8977" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="43.845" y="-0.21099" nameHidden="1" number="" name="" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="20.55" x="-7" text="_"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-16" x="16" height="30"/>
+        <rect width="21.505" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-44.3289" x="-15.61" height="22.8433"/>
+        <rect width="15.18" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-19.4857" x="-11.815" height="4.56867"/>
+        <rect width="5.06" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-7.3025" x="10.955" height="15.2289"/>
+        <arc width="12.65" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="-21.0085" x="3.365" height="13.706"/>
+        <rect width="2.06" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-7.8254" x="41.785" height="15.2289"/>
+        <rect width="13.915" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-46.8977" x="-11.815" height="2.56867"/>
+        <rect width="5.06" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-7.3025" x="-23.2" height="15.2289"/>
+        <rect width="3.289" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-7.3025" x="-49.2" height="15.2289"/>
+        <rect width="20.24" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-12.394" x="-46.44" height="24.3663"/>
+        <rect width="22.77" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-12.394" x="19.015" height="24.3663"/>
+        <arc width="12.65" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-21.0085" x="-24.465" height="13.706"/>
+        <text size="4" y="18" x="-9" text="Te 25"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="7.92635" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7.92635" x1="-16.875" x2="10.955"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-15" x="-27" height="30"/>
+        <rect width="27" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-22" x="-18" height="2"/>
+        <terminal y="-46.8977" x="-5.49" orientation="n"/>
+        <terminal y="-0.21099" x="43.845" orientation="e"/>
+        <terminal y="0.3119" x="-49.2" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tealpex32-25-32.elmt b/elements/60_energy/11_water/fittings/tealpex32-25-32.elmt
index 9341c8f9d..5a2bbc840 100644
--- a/elements/60_energy/11_water/fittings/tealpex32-25-32.elmt
+++ b/elements/60_energy/11_water/fittings/tealpex32-25-32.elmt
@@ -1,31 +1,33 @@
-<definition width="120" version="0.4" hotspot_x="55" hotspot_y="54" height="80" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{BD278B22-BFA7-484D-A240-ABA669C30BD0}"/><names>
-        <name lang="es">Te Alpex 32-25-32</name>
+<definition width="120" hotspot_x="54" type="element" link_type="simple" orientation="dyyy" version="0.5" height="80" hotspot_y="53">
+    <uuid uuid="{deb449d8-cea4-4ad0-b020-8e86374a176c}"/>
+    <names>
+        <name lang="cs">T Alpex 32-25-32</name>
         <name lang="it">T Alpex 32-25-32</name>
         <name lang="pl">Trójnik Alpex 32-25-32</name>
-        <name lang="cs">T Alpex 32-25-32</name>
+        <name lang="es">Te Alpex 32-25-32</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="3" x="27" y="-18" antialias="false" height="34" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="23.2254" x="-7.632" y="-45.8467" antialias="false" height="21.0697" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.216" x="-5.078" y="-22.7772" antialias="false" height="5.3143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.072" x="21.246" y="-8.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.18" x="13.138" y="-24.5485" antialias="true" height="15.9429" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="3.072" x="56.642" y="-9.3771" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.0282" x="-3.5334" y="-47.7791" antialias="false" height="1.9322" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.072" x="-18.74" y="-8.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.3396" x="-50" y="-8.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24.288" x="-46.028" y="-14.6913" antialias="false" height="28.343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="27.324" x="29.318" y="-14.6913" antialias="false" height="28.343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.18" x="-20.258" y="-24.5485" antialias="true" height="15.9429" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-7" y="20" size="4" text="Te 32-25-32"/>
-        <line 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.10868" x1="-11.15" y2="9.10868" x2="22.246"/>
-        <rect width="3" x="-22" y="-17" antialias="false" height="34" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="30" x="-11" y="-25" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-50" y="0.251509" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="3.2976" y="-47.7791" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="59.714" y="-0.51993" nameHidden="1" number="" name="" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="20.55" x="3" text="_"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-18" x="27" height="34"/>
+        <rect width="23.2254" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-45.8467" x="-7.632" height="21.0697"/>
+        <rect width="18.216" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-22.7772" x="-5.078" height="5.3143"/>
+        <rect width="6.072" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.60561" x="21.246" height="17.7143"/>
+        <arc width="15.18" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="-24.5485" x="13.138" height="15.9429"/>
+        <rect width="3.072" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9.3771" x="56.642" height="17.7143"/>
+        <rect width="15.0282" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-47.7791" x="-3.5334" height="1.9322"/>
+        <rect width="6.072" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.60561" x="-18.74" height="17.7143"/>
+        <rect width="3.3396" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.60561" x="-50" height="17.7143"/>
+        <rect width="24.288" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-14.6913" x="-46.028" height="28.343"/>
+        <rect width="27.324" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-14.6913" x="29.318" height="28.343"/>
+        <arc width="15.18" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-24.5485" x="-20.258" height="15.9429"/>
+        <text size="4" y="20" x="-7" text="Te 32-25-32"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="9.10868" antialias="false" length2="1.5" end1="none" length1="1.5" y1="9.10868" x1="-11.15" x2="22.246"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-17" x="-22" height="34"/>
+        <rect width="30" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-25" x="-11" height="2"/>
+        <terminal y="-47.7791" x="3.2976" orientation="n"/>
+        <terminal y="-0.51993" x="59.714" orientation="e"/>
+        <terminal y="0.251509" x="-50" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tealpex32.elmt b/elements/60_energy/11_water/fittings/tealpex32.elmt
index 2988fe4b3..56af48494 100644
--- a/elements/60_energy/11_water/fittings/tealpex32.elmt
+++ b/elements/60_energy/11_water/fittings/tealpex32.elmt
@@ -1,31 +1,33 @@
-<definition width="120" version="0.4" hotspot_x="54" hotspot_y="63" height="90" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A520E169-0B00-4C94-A364-BB3199A90E22}"/><names>
-        <name lang="es">Te Alpex 32</name>
+<definition width="120" hotspot_x="54" type="element" link_type="simple" orientation="dyyy" version="0.5" height="90" hotspot_y="63">
+    <uuid uuid="{8ebda7a6-cd6b-4413-abc6-de4b12787202}"/>
+    <names>
+        <name lang="cs">T Alpex 32</name>
         <name lang="it">T Alpex 32</name>
         <name lang="pl">Trójnik Alpex 32</name>
-        <name lang="cs">T Alpex 32</name>
+        <name lang="es">Te Alpex 32</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="3" x="28" y="-19" antialias="false" height="35" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="25.806" x="-9.632" y="-53.3485" antialias="false" height="26.5715" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.216" x="-5.078" y="-23.7772" antialias="false" height="5.3143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.072" x="22.246" y="-9.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.18" x="13.138" y="-25.5485" antialias="true" height="15.9429" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="3.072" x="57.642" y="-9.3771" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="16.698" x="-5.078" y="-55.663" antialias="false" height="2.3143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.072" x="-18.74" y="-9.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.6432" x="-49.9" y="-8.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24.288" x="-46.028" y="-14.6913" antialias="false" height="28.343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="27.324" x="30.318" y="-14.6913" antialias="false" height="28.343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.18" x="-20.258" y="-25.5485" antialias="true" height="15.9429" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-2" y="19" size="4" text="Te 32"/>
-        <line 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.10868" x1="-11.15" y2="8.10868" x2="22.246"/>
-        <rect width="32" x="-12" y="-27" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="3" x="-22" y="-18" antialias="false" height="35" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-49.9" y="0.251509" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="2.512" y="-55.663" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="60.714" y="-0.51993" nameHidden="1" number="" name="" orientation="e"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-19" x="28" height="35"/>
+        <input tagg="label" rotate="true" size="9" y="20.55" x="-2" text="_"/>
+        <rect width="25.806" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-53.3485" x="-9.632" height="26.5715"/>
+        <rect width="18.216" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-23.7772" x="-5.078" height="5.3143"/>
+        <rect width="6.072" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9.60561" x="22.246" height="17.7143"/>
+        <arc width="15.18" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" antialias="true" angle="-90" y="-25.5485" x="13.138" height="15.9429"/>
+        <rect width="3.072" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9.3771" x="57.642" height="17.7143"/>
+        <rect width="16.698" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-55.663" x="-5.078" height="2.3143"/>
+        <rect width="6.072" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9.60561" x="-18.74" height="17.7143"/>
+        <rect width="3.6432" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.60561" x="-49.9" height="17.7143"/>
+        <rect width="24.288" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-14.6913" x="-46.028" height="28.343"/>
+        <rect width="27.324" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-14.6913" x="30.318" height="28.343"/>
+        <arc width="15.18" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-90" y="-25.5485" x="-20.258" height="15.9429"/>
+        <text size="4" y="19" x="-2" text="Te 32"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="8.10868" antialias="false" length2="1.5" end1="none" length1="1.5" y1="8.10868" x1="-11.15" x2="22.246"/>
+        <rect width="32" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-27" x="-12" height="3"/>
+        <rect width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" y="-18" x="-22" height="35"/>
+        <terminal y="0.251509" x="-49.9" orientation="w"/>
+        <terminal y="-55.663" x="2.512" orientation="n"/>
+        <terminal y="-0.51993" x="60.714" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tuboalpex16.elmt b/elements/60_energy/11_water/fittings/tuboalpex16.elmt
index 256126abb..5b33d6d25 100644
--- a/elements/60_energy/11_water/fittings/tuboalpex16.elmt
+++ b/elements/60_energy/11_water/fittings/tuboalpex16.elmt
@@ -1,16 +1,18 @@
-<definition width="90" version="0.4" hotspot_x="45" hotspot_y="15" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{77EE9472-CCA9-40B2-96D7-B76C720B95A1}"/><names>
-        <name lang="es">Tubo Alpex 16</name>
+<definition width="90" hotspot_x="44" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="15">
+    <uuid uuid="{74f3aeef-25dd-4cb9-bbdd-7ca86144d6f5}"/>
+    <names>
+        <name lang="cs">Trubka Alpex 16</name>
         <name lang="it">Tubo Alpex 16</name>
         <name lang="pl">Rura Alpex 16</name>
-        <name lang="cs">Trubka Alpex 16</name>
+        <name lang="es">Tubo Alpex 16</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="79" x="-39" y="-10" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-8" y="-4" size="4" text="Alpex 16"/>
-        <terminal x="-39" y="-5" nameHidden="184" number="" name="" orientation="w"/>
-        <terminal x="39" y="-5" nameHidden="248" number="" name="" orientation="e"/>
+        <rect width="79" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10" x="-39" height="10"/>
+        <input tagg="label" rotate="true" size="9" y="-19.45" x="-37" text="_"/>
+        <text size="4" y="-4" x="-8" text="Alpex 16"/>
+        <terminal y="-5" x="-39" orientation="w"/>
+        <terminal y="-5" x="39" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tuboalpex20.elmt b/elements/60_energy/11_water/fittings/tuboalpex20.elmt
index 504b7e914..31215cec9 100644
--- a/elements/60_energy/11_water/fittings/tuboalpex20.elmt
+++ b/elements/60_energy/11_water/fittings/tuboalpex20.elmt
@@ -1,16 +1,18 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="9" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{7114C871-86B5-436B-89C3-CEA288C16D53}"/><names>
-        <name lang="es">Tubo Alpex 20</name>
+<definition width="90" hotspot_x="45" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="9">
+    <uuid uuid="{6868115c-b8e2-4c40-bea8-c628a663ab0a}"/>
+    <names>
+        <name lang="cs">Trubka Alpex 20</name>
         <name lang="it">Tubo Alpex 20</name>
         <name lang="pl">Rura Alpex 20</name>
-        <name lang="cs">Trubka Alpex 20</name>
+        <name lang="es">Tubo Alpex 20</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="79" x="-40" y="-7" antialias="false" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-9" y="1" size="4" text="Alpex 20"/>
-        <terminal x="-40" y="0" nameHidden="184" number="" name="" orientation="w"/>
-        <terminal x="38" y="0" nameHidden="248" number="" name="" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="-18.5" x="-38" text="_"/>
+        <rect width="79" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-7" x="-40" height="15"/>
+        <text size="4" y="1" x="-9" text="Alpex 20"/>
+        <terminal y="0" x="-40" orientation="w"/>
+        <terminal y="0" x="38" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tuboalpex25.elmt b/elements/60_energy/11_water/fittings/tuboalpex25.elmt
index 9166e7d40..af4be05df 100644
--- a/elements/60_energy/11_water/fittings/tuboalpex25.elmt
+++ b/elements/60_energy/11_water/fittings/tuboalpex25.elmt
@@ -1,16 +1,18 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E6A4B57A-11BC-415F-AF49-AC20C7CE5AD0}"/><names>
-        <name lang="es">Tubo Alpex 25</name>
+<definition width="90" hotspot_x="45" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="15">
+    <uuid uuid="{2d48fbf3-06c8-42eb-b987-7485e8a565ed}"/>
+    <names>
+        <name lang="cs">Trubka Alpex 25</name>
         <name lang="it">Tubo Alpex 25</name>
         <name lang="pl">Rura Alpex 25</name>
-        <name lang="cs">Trubka Alpex 25</name>
+        <name lang="es">Tubo Alpex 25</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="79" x="-40" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-9" y="1" size="4" text="Alpex 25"/>
-        <terminal x="-40" y="0" nameHidden="184" number="" name="" orientation="w"/>
-        <terminal x="38" y="0" nameHidden="248" number="" name="" orientation="e"/>
+        <rect width="79" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10" x="-40" height="20"/>
+        <input tagg="label" rotate="true" size="9" y="-20.5" x="-30" text="_"/>
+        <text size="4" y="1" x="-9" text="Alpex 25"/>
+        <terminal y="0" x="-40" orientation="w"/>
+        <terminal y="0" x="38" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/tuboalpex32.elmt b/elements/60_energy/11_water/fittings/tuboalpex32.elmt
index ee327fd93..6dcaf34ba 100644
--- a/elements/60_energy/11_water/fittings/tuboalpex32.elmt
+++ b/elements/60_energy/11_water/fittings/tuboalpex32.elmt
@@ -1,16 +1,18 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{971EEDF1-27BA-4789-B2F3-E31DE4551A05}"/><names>
-        <name lang="es">Tubo Alpex 32</name>
+<definition width="90" hotspot_x="45" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="20">
+    <uuid uuid="{a4fd57d7-408e-4971-b8ff-e87a0a754e01}"/>
+    <names>
+        <name lang="cs">Trubka Alpex 32</name>
         <name lang="it">Tubo Alpex 32</name>
         <name lang="pl">Rura Alpex 32</name>
-        <name lang="cs">Trubka Alpex 32</name>
+        <name lang="es">Tubo Alpex 32</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="79" x="-40" y="-14" antialias="false" height="28" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-9" y="1" size="4" text="Alpex 32"/>
-        <terminal x="-40" y="0" nameHidden="184" number="" name="" orientation="w"/>
-        <terminal x="38" y="0" nameHidden="248" number="" name="" orientation="e"/>
+        <rect width="79" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-14" x="-40" height="28"/>
+        <input tagg="label" rotate="true" size="9" y="-24.45" x="-22" text="_"/>
+        <text size="4" y="1" x="-9" text="Alpex 32"/>
+        <terminal y="0" x="-40" orientation="w"/>
+        <terminal y="0" x="38" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/manguito-rosca1.elmt b/elements/60_energy/11_water/valves/manguito-rosca1.elmt
index 428d33b70..ad22b08be 100644
--- a/elements/60_energy/11_water/valves/manguito-rosca1.elmt
+++ b/elements/60_energy/11_water/valves/manguito-rosca1.elmt
@@ -1,26 +1,27 @@
-<definition width="60" version="0.4" hotspot_x="25" hotspot_y="40" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{92D57815-D4F4-4B25-99E0-B1C918A3BA01}"/><names>
-        <name lang="es">Manguito rosca 1"</name>
+<definition width="60" hotspot_x="25" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="29">
+    <uuid uuid="{cf25c54f-742f-482e-85d1-61722a37b4b6}"/>
+    <names>
+        <name lang="cs">Objímka se závitem 1"</name>
         <name lang="it">Manicotto filettato 1</name>
         <name lang="pl">Mufa 1"</name>
-        <name lang="cs">Objímka se závitem 1"</name>
+        <name lang="es">Manguito rosca 1"</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="17.8125" x="-3.00469" y="5.365" antialias="true" height="9.635" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.25386" x1="24.1074" y2="-14.4607" x2="21.4578"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.25386" x1="-11.5176" y2="-14.4607" x2="-14.1672"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.25386" x1="27.6402" y2="-14.4607" x2="24.9906"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.25386" x1="-7.98477" y2="-14.4607" x2="-10.6344"/>
-        <rect width="11.1625" x="17.925" y="-15.0808" antialias="false" height="21.3203" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.25386" x1="20.5746" y2="-14.4607" x2="17.925"/>
-        <rect width="14.1312" x="-19.1844" y="-15.0808" antialias="false" height="21.3203" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="14.4133" x="14.9562" y="-19.0237" antialias="false" height="29.2063" 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:dotted;line-weight:normal;filling:none;color:red" y1="5.25386" x1="-15.0504" y2="-14.4607" x2="-17.7"/>
-        <rect width="15.8977" x="-19.1844" y="-19.0237" antialias="false" height="29.2063" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="17.8125" x="-3.00469" y="-23.54" antialias="true" height="9.635" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <input x="-6" y="-28" size="4" rotate="true" text="1&quot;HH"/>
-        <terminal x="-19.6" y="-4.79795" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="29.7852" y="-4.60342" nameHidden="0" number="" name="" orientation="e"/>
+        <arc width="17.8125" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="5.365" x="-3.00469" height="9.635"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-14.4607" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.25386" x1="24.1074" x2="21.4578"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-14.4607" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.25386" x1="-11.5176" x2="-14.1672"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-14.4607" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.25386" x1="27.6402" x2="24.9906"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-14.4607" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.25386" x1="-7.98477" x2="-10.6344"/>
+        <rect width="11.1625" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" y="-15.0808" x="17.925" height="21.3203"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-14.4607" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.25386" x1="20.5746" x2="17.925"/>
+        <rect width="14.1312" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" y="-15.0808" x="-19.1844" height="21.3203"/>
+        <rect width="14.4133" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-19.0237" x="14.9562" height="29.2063"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-14.4607" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.25386" x1="-15.0504" x2="-17.7"/>
+        <rect width="15.8977" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-19.0237" x="-19.1844" height="29.2063"/>
+        <arc width="17.8125" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="-23.54" x="-3.00469" height="9.635"/>
+        <input tagg="label" rotate="true" size="4" y="-28" x="-6" text="1&quot;HH"/>
+        <terminal y="-4.79795" x="-19.6" orientation="w"/>
+        <terminal y="-4.60342" x="29.7852" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/manguito-rosca1_2.elmt b/elements/60_energy/11_water/valves/manguito-rosca1_2.elmt
index 8b6019ead..1a7cf93a9 100644
--- a/elements/60_energy/11_water/valves/manguito-rosca1_2.elmt
+++ b/elements/60_energy/11_water/valves/manguito-rosca1_2.elmt
@@ -1,26 +1,27 @@
-<definition width="40" version="0.4" hotspot_x="23" hotspot_y="31" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EA4080BC-47A5-47BE-8EE2-0708EC2E9212}"/><names>
-        <name lang="es">Manguito rosca 1/2</name>
+<definition width="50" hotspot_x="27" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="15">
+    <uuid uuid="{a4744c0a-0aa8-4dfb-9e4a-e0f3d51df72c}"/>
+    <names>
+        <name lang="cs">Objímka se závitem 1/2"</name>
         <name lang="it">Manicotto filettato 1/2</name>
         <name lang="pl">Mufa 1/2"</name>
-        <name lang="cs">Objímka se závitem 1/2"</name>
+        <name lang="es">Manguito rosca 1/2</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="12" x="-9" y="6" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.93079" x1="9.265" y2="-6.34605" x2="7.48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.93079" x1="-14.735" y2="-6.34605" x2="-16.52"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.93079" x1="11.645" y2="-6.34605" x2="9.86"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.93079" x1="-12.355" y2="-6.34605" x2="-14.14"/>
-        <rect width="7.52" x="5.1" y="-6.7322" antialias="false" height="13.2768" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.93079" x1="6.885" y2="-6.34605" x2="5.1"/>
-        <rect width="9.52" x="-19.9" y="-6.7322" antialias="false" height="13.2768" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="9.71" x="3.1" y="-9.18757" antialias="false" height="18.1876" 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:dotted;line-weight:normal;filling:none;color:red" y1="5.93079" x1="-17.115" y2="-6.34605" x2="-18.9"/>
-        <rect width="10.71" x="-19.9" y="-9.18757" antialias="false" height="18.1876" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="12" x="-9" y="-12" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <input x="-17" y="-17" size="4" rotate="true" text="1/2&quot;HH"/>
-        <terminal x="-18.9" y="-0.207628" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="13.09" y="-0.207628" nameHidden="0" number="" name="" orientation="e"/>
+        <arc width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="6" x="-9" height="6"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-6.34605" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.93079" x1="9.265" x2="7.48"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-6.34605" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.93079" x1="-14.735" x2="-16.52"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-6.34605" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.93079" x1="11.645" x2="9.86"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-6.34605" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.93079" x1="-12.355" x2="-14.14"/>
+        <rect width="7.52" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" y="-6.7322" x="5.1" height="13.2768"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-6.34605" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.93079" x1="6.885" x2="5.1"/>
+        <rect width="9.52" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" y="-6.7322" x="-19.9" height="13.2768"/>
+        <rect width="9.71" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9.18757" x="3.1" height="18.1876"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-6.34605" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.93079" x1="-17.115" x2="-18.9"/>
+        <rect width="10.71" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-9.18757" x="-19.9" height="18.1876"/>
+        <arc width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="-12" x="-9" height="6"/>
+        <input tagg="label" rotate="true" size="4" y="-17" x="-17" text="1/2&quot;HH"/>
+        <terminal y="-0.207628" x="-18.9" orientation="w"/>
+        <terminal y="-0.207628" x="13.09" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/manguito-rosca3_4.elmt b/elements/60_energy/11_water/valves/manguito-rosca3_4.elmt
index a4c7f2e0b..80118220a 100644
--- a/elements/60_energy/11_water/valves/manguito-rosca3_4.elmt
+++ b/elements/60_energy/11_water/valves/manguito-rosca3_4.elmt
@@ -1,26 +1,27 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="30" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C5EECB58-7F1D-4AF8-AE07-DC203100D488}"/><names>
-        <name lang="es">Manguito rosca 3/4</name>
+<definition width="50" hotspot_x="25" type="element" link_type="simple" orientation="dyyy" version="0.5" height="40" hotspot_y="19">
+    <uuid uuid="{f9aaee71-3b4e-4acf-b945-6c2441751916}"/>
+    <names>
+        <name lang="cs">Objímka se závitem 3/4"</name>
         <name lang="it">Manicotto filettato 3/4</name>
         <name lang="pl">Mufa 3/4"</name>
-        <name lang="cs">Objímka se závitem 3/4"</name>
+        <name lang="es">Manguito rosca 3/4</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="14.25" x="-6.82375" y="7.7" antialias="true" height="7.3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="7.61579" x1="14.8659" y2="-7.32103" x2="12.7462"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="7.61579" x1="-13.6341" y2="-7.32103" x2="-15.7538"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="7.61579" x1="17.6922" y2="-7.32103" x2="15.5725"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="7.61579" x1="-10.8078" y2="-7.32103" x2="-12.9275"/>
-        <rect width="8.93" x="9.92" y="-7.79084" antialias="false" height="16.1534" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="7.61579" x1="12.0397" y2="-7.32103" x2="9.92"/>
-        <rect width="11.305" x="-19.7675" y="-7.79084" antialias="false" height="16.1534" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="11.5306" x="7.545" y="-10.7782" antialias="false" height="22.1282" 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:dotted;line-weight:normal;filling:none;color:red" y1="7.61579" x1="-16.4603" y2="-7.32103" x2="-18.58"/>
-        <rect width="12.7181" x="-19.7675" y="-10.7782" antialias="false" height="22.1282" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="14.25" x="-6.82375" y="-14.2" antialias="true" height="7.3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <input x="-14" y="-18" size="4" rotate="true" text="3/4&quot;HH"/>
-        <terminal x="-20.1" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="19.4081" y="0.147386" nameHidden="0" number="" name="" orientation="e"/>
+        <arc width="14.25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" antialias="true" angle="-180" y="7.7" x="-6.82375" height="7.3"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-7.32103" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7.61579" x1="14.8659" x2="12.7462"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-7.32103" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7.61579" x1="-13.6341" x2="-15.7538"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-7.32103" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7.61579" x1="17.6922" x2="15.5725"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-7.32103" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7.61579" x1="-10.8078" x2="-12.9275"/>
+        <rect width="8.93" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" y="-7.79084" x="9.92" height="16.1534"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-7.32103" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7.61579" x1="12.0397" x2="9.92"/>
+        <rect width="11.305" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" y="-7.79084" x="-19.7675" height="16.1534"/>
+        <rect width="11.5306" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.7782" x="7.545" height="22.1282"/>
+        <line end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y2="-7.32103" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7.61579" x1="-16.4603" x2="-18.58"/>
+        <rect width="12.7181" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.7782" x="-19.7675" height="22.1282"/>
+        <arc width="14.25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" antialias="true" angle="-180" y="-14.2" x="-6.82375" height="7.3"/>
+        <input tagg="label" rotate="true" size="4" y="-18" x="-14" text="3/4&quot;HH"/>
+        <terminal y="0" x="-20.1" orientation="w"/>
+        <terminal y="0.147386" x="19.4081" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/termometro.elmt b/elements/60_energy/11_water/valves/termometro.elmt
index 5a5950792..82c92c080 100644
--- a/elements/60_energy/11_water/valves/termometro.elmt
+++ b/elements/60_energy/11_water/valves/termometro.elmt
@@ -1,31 +1,33 @@
-<definition width="50" version="0.4" hotspot_x="18" hotspot_y="39" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{60F540CC-152F-4016-A5CC-3B9297F26EF3}"/><names>
-        <name lang="es">Termómetro 1/2H</name>
+<definition width="50" hotspot_x="18" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="39">
+    <uuid uuid="{f82bb4dd-ec72-4819-99d1-aea7dbb1bd0f}"/>
+    <names>
+        <name lang="cs">Termometr 1/2"</name>
         <name lang="it">Termometro 1/2 F</name>
         <name lang="pl">Termometr 1/2"</name>
-        <name lang="cs">Termometr 1/2"</name>
+        <name lang="es">Termómetro 1/2H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.75773" x1="-7.4" y2="-7.61688" x2="-7.4"/>
-        <ellipse width="28.8" x="-13.4" y="-35.7256" antialias="true" height="28.8838" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="12.8" x="-6.2" y="-3.32888" antialias="false" height="9.75805" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.2" x="-4.2" y="-0.986947" antialias="false" height="7.41612" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <line 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.32888" x1="-7.4" y2="-3.32888" x2="7.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="-3.66717" x1="7.8" y2="-6.91984" x2="7.8"/>
-        <ellipse width="32" x="-15" y="-36.8966" antialias="true" height="31.2258" 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="-21.674" x1="0.6" y2="-29.0901" x2="-8.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="-29.4805" x1="-8.6" y2="-22.0643" x2="0.6"/>
-        <ellipse width="2.4" x="0.2" y="-22.0643" antialias="true" height="2.34193" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-10" y="-12.5" size="3" rotate="true" text="10"/>
-        <text x="-12" y="-21" size="3" text="20"/>
-        <text x="-6" y="-29" size="3" text="30"/>
-        <text x="4" y="-30" size="3" text="40"/>
-        <text x="10" y="-21" size="3" text="50"/>
-        <text x="7" y="-12" size="3" text="60"/>
-        <text x="-3" y="-15" size="4" text="ºC"/>
-        <text x="14" y="-5" size="4" text="1/2&quot;H"/>
-        <terminal x="0.2" y="6.42917" nameHidden="1" number="" name="" orientation="s"/>
+        <input tagg="label" rotate="true" size="9" y="-24.45" x="18" text="_"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-7.61688" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3.75773" x1="-7.4" x2="-7.4"/>
+        <ellipse width="28.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-35.7256" x="-13.4" height="28.8838"/>
+        <rect width="12.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-3.32888" x="-6.2" height="9.75805"/>
+        <rect width="9.2" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" y="-0.986947" x="-4.2" height="7.41612"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-3.32888" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3.32888" x1="-7.4" x2="7.8"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-6.91984" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3.66717" x1="7.8" x2="7.8"/>
+        <ellipse width="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-36.8966" x="-15" height="31.2258"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-29.0901" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-21.674" x1="0.6" x2="-8.6"/>
+        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-22.0643" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-29.4805" x1="-8.6" x2="0.6"/>
+        <ellipse width="2.4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-22.0643" x="0.2" height="2.34193"/>
+        <input tagg="none" rotate="true" size="3" y="-12.5" x="-10" text="10"/>
+        <text size="3" y="-21" x="-12" text="20"/>
+        <text size="3" y="-29" x="-6" text="30"/>
+        <text size="3" y="-30" x="4" text="40"/>
+        <text size="3" y="-21" x="10" text="50"/>
+        <text size="3" y="-12" x="7" text="60"/>
+        <text size="4" y="-15" x="-3" text="ºC"/>
+        <text size="4" y="-5" x="14" text="1/2&quot;H"/>
+        <terminal y="6.42917" x="0.2" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/tubo-rosca1.elmt b/elements/60_energy/11_water/valves/tubo-rosca1.elmt
index 5eef55042..f6e1b6115 100644
--- a/elements/60_energy/11_water/valves/tubo-rosca1.elmt
+++ b/elements/60_energy/11_water/valves/tubo-rosca1.elmt
@@ -1,25 +1,27 @@
-<definition width="70" version="0.4" hotspot_x="35" hotspot_y="18" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{6B4315A8-43AF-44EC-9C0C-62035A987068}"/><names>
-        <name lang="es">Tubo rosca 1"</name>
+<definition width="70" hotspot_x="34" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="18">
+    <uuid uuid="{21c837c8-966b-4404-9ab4-13db90c0427a}"/>
+    <names>
+        <name lang="cs">Trubka se závitem 1"</name>
         <name lang="it">Tubo filettato 1</name>
         <name lang="pl">Rurka gwintowana 1"</name>
-        <name lang="cs">Trubka se závitem 1"</name>
+        <name lang="es">Tubo rosca 1"</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <rect width="60" x="-30" y="-13.899" antialias="false" height="20.899" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-10" y="-0.308367" size="5" text="1&quot;"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="20" y2="-13.707" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="23" y2="-13.707" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-20" y2="-13.707" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="25" y2="-13.707" x2="23"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-26" y2="-13.707" x2="-28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-24" y2="-13.707" x2="-26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="27" y2="-13.707" x2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="29" y2="-13.707" x2="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-22" y2="-13.707" x2="-24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.78194" x1="-20" y2="-13.707" x2="-22"/>
-        <terminal x="-30" y="-2.74449" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="30" y="-2.74449" nameHidden="0" number="" name="" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="-24.45" x="-17" text="_"/>
+        <rect width="60" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-13.899" x="-30" height="20.899"/>
+        <text size="5" y="-0.308367" x="-10" text="1&quot;"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="20" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="23" x2="21"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-20" x2="-20"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="25" x2="23"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-26" x2="-28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-24" x2="-26"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="27" x2="25"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="29" x2="27"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-22" x2="-24"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-13.707" antialias="false" length2="1.5" end1="none" length1="1.5" y1="5.78194" x1="-20" x2="-22"/>
+        <terminal y="-2.74449" x="30" orientation="e"/>
+        <terminal y="-2.74449" x="-30" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/tubo-rosca1_1_2.elmt b/elements/60_energy/11_water/valves/tubo-rosca1_1_2.elmt
index db79af870..44a059a57 100644
--- a/elements/60_energy/11_water/valves/tubo-rosca1_1_2.elmt
+++ b/elements/60_energy/11_water/valves/tubo-rosca1_1_2.elmt
@@ -1,25 +1,27 @@
-<definition width="80" version="0.4" hotspot_x="35" hotspot_y="36" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A56E7BEC-C530-4ADF-B464-DEE0A20AB298}"/><names>
-        <name lang="es">Tubo rosca 1 1/2"</name>
+<definition width="80" hotspot_x="35" type="element" link_type="simple" orientation="dyyy" version="0.5" height="50" hotspot_y="36">
+    <uuid uuid="{249c5e4e-0b44-44da-a348-4d06181b6693}"/>
+    <names>
+        <name lang="cs">Trubka se závitem 1 1/2"</name>
         <name lang="it">Tubo filettato 1"1/2</name>
         <name lang="pl">Rurka gwintowana 1 1/2"</name>
-        <name lang="cs">Trubka se závitem 1 1/2"</name>
+        <name lang="es">Tubo rosca 1 1/2"</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <rect width="69" x="-29.7" y="-29.9267" antialias="false" height="36.9266" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-6.7" y="-5.91321" size="9" text="1&quot; 1/2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="27.8" y2="-29.5874" x2="27.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="31.25" y2="-29.5874" x2="28.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-18.2" y2="-29.5874" x2="-18.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="33.55" y2="-29.5874" x2="31.25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-25.1" y2="-29.5874" x2="-27.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-22.8" y2="-29.5874" x2="-25.1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="35.85" y2="-29.5874" x2="33.55"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="38.15" y2="-29.5874" x2="35.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-20.5" y2="-29.5874" x2="-22.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.8478" x1="-18.2" y2="-29.5874" x2="-20.5"/>
-        <terminal x="-29.7" y="-10.2176" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="39.3" y="-10.2176" nameHidden="0" number="" name="" orientation="e"/>
+        <input tagg="label" rotate="true" size="9" y="-39.45" x="-15" text="_"/>
+        <rect width="69" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-29.9267" x="-29.7" height="36.9266"/>
+        <text size="9" y="-5.91321" x="-6.7" text="1&quot; 1/2"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="27.8" x2="27.8"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="31.25" x2="28.95"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-18.2" x2="-18.2"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="33.55" x2="31.25"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-25.1" x2="-27.4"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-22.8" x2="-25.1"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="35.85" x2="33.55"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="38.15" x2="35.85"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-20.5" x2="-22.8"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-29.5874" antialias="false" length2="1.5" end1="none" length1="1.5" y1="4.8478" x1="-18.2" x2="-20.5"/>
+        <terminal y="-10.2176" x="-29.7" orientation="w"/>
+        <terminal y="-10.2176" x="39.3" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/tubo-rosca3_4.elmt b/elements/60_energy/11_water/valves/tubo-rosca3_4.elmt
index 55ce667bc..b694f41ef 100644
--- a/elements/60_energy/11_water/valves/tubo-rosca3_4.elmt
+++ b/elements/60_energy/11_water/valves/tubo-rosca3_4.elmt
@@ -1,25 +1,27 @@
-<definition width="70" version="0.4" hotspot_x="35" hotspot_y="16" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{5F3092EE-0921-44A1-B9D6-774131BE0F5C}"/><names>
-        <name lang="es">Tubo rosca 3/4"</name>
+<definition width="70" hotspot_x="34" type="element" link_type="simple" orientation="dyyy" version="0.5" height="30" hotspot_y="16">
+    <uuid uuid="{5c17586a-2e65-4bb2-8c40-3c373b94b28e}"/>
+    <names>
+        <name lang="cs">Trubka se závitem 3/4"</name>
         <name lang="it">Tubo filettato 3/4</name>
         <name lang="pl">Rurka gwintowana 3/4"</name>
-        <name lang="cs">Trubka se závitem 3/4"</name>
+        <name lang="es">Tubo rosca 3/4"</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <rect width="60" x="-30" y="-10.1576" antialias="false" height="17.1576" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-10" y="1" size="4" text="3/4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="20" y2="-10" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="23" y2="-10" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-20" y2="-10" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="25" y2="-10" x2="23"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-26" y2="-10" x2="-28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-24" y2="-10" x2="-26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="27" y2="-10" x2="25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="29" y2="-10" x2="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-22" y2="-10" x2="-24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6" x1="-20" y2="-10" x2="-22"/>
-        <terminal x="-30" y="-1" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="30" y="-1" nameHidden="0" number="" name="" orientation="e"/>
+        <rect width="60" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-10.1576" x="-30" height="17.1576"/>
+        <input tagg="label" rotate="true" size="9" y="-19.45" x="-22" text="_"/>
+        <text size="4" y="1" x="-10" text="3/4"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="20" x2="20"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="23" x2="21"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-20" x2="-20"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="25" x2="23"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-26" x2="-28"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-24" x2="-26"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="27" x2="25"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="29" x2="27"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="7" x1="-22" x2="-24"/>
+        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-10" antialias="false" length2="1.5" end1="none" length1="1.5" y1="6" x1="-20" x2="-22"/>
+        <terminal y="-1" x="30" orientation="e"/>
+        <terminal y="-1" x="-30" orientation="w"/>
     </description>
 </definition>