diff --git a/elements/10_electric/10_allpole/114_connections/combine.elmt b/elements/10_electric/10_allpole/114_connections/combine.elmt
index dc96c3c08..2f01786da 100644
--- a/elements/10_electric/10_allpole/114_connections/combine.elmt
+++ b/elements/10_electric/10_allpole/114_connections/combine.elmt
@@ -1,20 +1,20 @@
-<definition width="30" hotspot_x="11" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="4">
-    <uuid uuid="{2464f139-f057-4bd0-8c46-8f7eb1056d86}"/>
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="11">
+    <uuid uuid="{8ef9d490-8db2-450a-ab89-22d2b35c01ed}"/>
     <names>
-        <name lang="cs">Spoj</name>
         <name lang="it">Collegamento</name>
-        <name lang="pl">Połączenie 1</name>
-        <name lang="ru">Соединение</name>
         <name lang="en">Combine</name>
+        <name lang="ru">Соединение</name>
+        <name lang="pl">Połączenie 1</name>
         <name lang="fr">Jonction</name>
+        <name lang="cs">Spoj</name>
     </names>
     <informations></informations>
     <description>
-        <line 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="7" x2="1"/>
-        <input tagg="label" rotate="true" size="9" y="3.55" x="0" text="_"/>
-        <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="6" x1="0" x2="6"/>
-        <terminal y="0" x="-4" orientation="w"/>
-        <terminal y="10" x="0" orientation="s"/>
-        <terminal y="0" x="10" orientation="e"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="7" y1="0" end2="none" x2="1" antialias="false" end1="none" length2="1.5"/>
+        <input x="2" y="13.5" size="1" tagg="label" rotate="true" text="_"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="w" x="-4" y="0"/>
+        <terminal orientation="s" x="0" y="10"/>
+        <terminal orientation="e" x="10" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/114_connections/corner.elmt b/elements/10_electric/10_allpole/114_connections/corner.elmt
index f74c8e49d..20a730354 100644
--- a/elements/10_electric/10_allpole/114_connections/corner.elmt
+++ b/elements/10_electric/10_allpole/114_connections/corner.elmt
@@ -1,15 +1,17 @@
-<definition width="20" version="0.3" hotspot_x="12" hotspot_y="8" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{36DFFED3-9D7F-41E1-9F8D-44B505E6AA89}"/><names>
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="7" width="20" hotspot_x="11">
+    <uuid uuid="{2c6c492e-8d8e-402e-a449-0cf5a7462ced}"/>
+    <names>
         <name lang="en">Corner</name>
         <name lang="it">Angolo</name>
+        <name lang="ru">Угол</name>
         <name lang="fr">Coin</name>
         <name lang="pl">Narożnik</name>
         <name lang="cs">Roh</name>
-	<name lang="ru">Угол</name>
     </names>
     <informations></informations>
     <description>
-        <terminal x="0" y="4" orientation="s"/>
-        <terminal x="-4" y="0" orientation="w"/>
+        <input x="-0.5" y="-0.45" size="1" tagg="label" rotate="true" text="_"/>
+        <terminal orientation="s" x="0" y="4"/>
+        <terminal orientation="w" x="-4" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/114_connections/cross.elmt b/elements/10_electric/10_allpole/114_connections/cross.elmt
index a5c8f0f2c..31ab44695 100644
--- a/elements/10_electric/10_allpole/114_connections/cross.elmt
+++ b/elements/10_electric/10_allpole/114_connections/cross.elmt
@@ -1,18 +1,20 @@
-<definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{18465D26-FC6C-4B1F-BCF4-CB1AB8495213}"/><names>
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="9" width="20" hotspot_x="9">
+    <uuid uuid="{eb8040c8-6998-4f43-818b-1d368825ffac}"/>
+    <names>
         <name lang="en">Cross</name>
         <name lang="it">Croce</name>
+        <name lang="ru">Пересечение</name>
         <name lang="fr">Croix</name>
         <name lang="pl">Połączenie 2</name>
         <name lang="cs">Kříž</name>
-	<name lang="ru">Пересечение</name>
     </names>
     <informations></informations>
     <description>
-        <circle x="-1" y="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="2"/>
-        <terminal x="0" y="4" orientation="s"/>
-        <terminal x="-4" y="0" orientation="w"/>
-        <terminal x="4" y="0" orientation="e"/>
-        <terminal x="0" y="-4" orientation="n"/>
+        <circle x="-1" y="-1" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="true" diameter="2"/>
+        <input x="-0.5" y="-4.45" size="1" tagg="label" rotate="true" text="_"/>
+        <terminal orientation="e" x="4" y="0"/>
+        <terminal orientation="s" x="0" y="4"/>
+        <terminal orientation="n" x="0" y="-4"/>
+        <terminal orientation="w" x="-4" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/114_connections/jump.elmt b/elements/10_electric/10_allpole/114_connections/jump.elmt
index 5f950996b..f1fc48aab 100644
--- a/elements/10_electric/10_allpole/114_connections/jump.elmt
+++ b/elements/10_electric/10_allpole/114_connections/jump.elmt
@@ -1,16 +1,18 @@
-<definition width="10" version="0.3" hotspot_x="5" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{269B2D3E-BFE3-4C79-9EF2-E1529C2A8348}"/><names>
+<definition type="element" height="30" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="14" width="10" hotspot_x="5">
+    <uuid uuid="{cd8b3f5f-5eae-416c-9966-c7b5529b6e63}"/>
+    <names>
         <name lang="en">Jump</name>
         <name lang="it">Salto</name>
+        <name lang="ru">Перемычка</name>
         <name lang="fr">Saut</name>
         <name lang="pl">Brak połączenia</name>
         <name lang="cs">Skok</name>
-	<name lang="ru">Перемычка</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="6" x="-3" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <terminal x="0" y="7" orientation="s"/>
-        <terminal x="0" y="-7" orientation="n"/>
+        <arc height="6" start="90" angle="-180" x="-3" y="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="6"/>
+        <input x="1.5" y="-6.45" size="1" tagg="label" rotate="true" text="_"/>
+        <terminal orientation="n" x="0" y="-7"/>
+        <terminal orientation="s" x="0" y="7"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/114_connections/splice.elmt b/elements/10_electric/10_allpole/114_connections/splice.elmt
index 69d9f95e5..0665cb984 100644
--- a/elements/10_electric/10_allpole/114_connections/splice.elmt
+++ b/elements/10_electric/10_allpole/114_connections/splice.elmt
@@ -1,18 +1,20 @@
-<definition width="30" version="0.3" hotspot_x="18" hotspot_y="5" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EADA01D8-0429-45A6-9255-BDA504A8EF77}"/><names>
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="17">
+    <uuid uuid="{0f807068-d5a4-4628-85f4-0644e6d3129f}"/>
+    <names>
         <name lang="en">Splice</name>
         <name lang="it">Spaziatura</name>
+        <name lang="ru">Сращивание</name>
         <name lang="fr">Epissure</name>
         <name lang="pl">Połączenie 3</name>
         <name lang="cs">Spojka</name>
-	<name lang="ru">Сращивание</name>
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="0" y2="0" x2="-6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="1" y2="0" x2="-5"/>
-        <terminal x="0" y="10" orientation="s"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="4" y="0" orientation="e"/>
+        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="1" y1="0" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="s" x="0" y="10"/>
+        <terminal orientation="w" x="-10" y="0"/>
+        <terminal orientation="e" x="4" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/114_connections/thruleft.elmt b/elements/10_electric/10_allpole/114_connections/thruleft.elmt
index 9deded9b3..dc2f300fa 100644
--- a/elements/10_electric/10_allpole/114_connections/thruleft.elmt
+++ b/elements/10_electric/10_allpole/114_connections/thruleft.elmt
@@ -1,18 +1,20 @@
-<definition width="30" version="0.3" hotspot_x="18" hotspot_y="5" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C5E69A27-D3D4-481F-BD55-46B693519108}"/><names>
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="17">
+    <uuid uuid="{a1ced185-e98f-4cf1-8a62-3f8ea691bcb6}"/>
+    <names>
         <name lang="en">Thru left</name>
         <name lang="it">Collegamento sinistro</name>
+        <name lang="ru">Справа налево</name>
         <name lang="fr">Liaison gauche</name>
         <name lang="pl">Połączenie 4</name>
         <name lang="cs">Levé spojení</name>
-	<name lang="ru">Справа налево</name>
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="0" y2="0" x2="-6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="5" x2="0"/>
-        <terminal x="0" y="10" orientation="s"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="4" y="0" orientation="e"/>
+        <input x="1.5" y="3.55" size="1" tagg="label" rotate="true" text="_"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="6" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="e" x="4" y="0"/>
+        <terminal orientation="w" x="-10" y="0"/>
+        <terminal orientation="s" x="0" y="10"/>
     </description>
 </definition>
diff --git a/elements/10_electric/10_allpole/114_connections/thruright.elmt b/elements/10_electric/10_allpole/114_connections/thruright.elmt
index 3eb30f047..0028fdb09 100644
--- a/elements/10_electric/10_allpole/114_connections/thruright.elmt
+++ b/elements/10_electric/10_allpole/114_connections/thruright.elmt
@@ -1,19 +1,21 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="5" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F21DAA84-0DBD-4C1E-A707-4D2F82D76D3C}"/><names>
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="4" width="30" hotspot_x="14">
+    <uuid uuid="{5d72394b-8aa0-4368-bc88-0f738478ca45}"/>
+    <names>
         <name lang="en">Thru right</name>
         <name lang="it">Collegamento destro</name>
+        <name lang="ru">Слева направо</name>
         <name lang="fr">Liaison droite</name>
         <name lang="pl">Połączenie 5</name>
         <name lang="cs">Pravé spojení</name>
-	<name lang="ru">Слева направо</name>
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="-6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="5" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="6" y2="6" x2="0"/>
-        <terminal x="0" y="10" orientation="s"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="10" y="0" orientation="e"/>
+        <input x="5.5" y="4.55" size="1" tagg="label" rotate="true" text="_"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="-6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
+        <line y2="6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="6" y1="0" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="s" x="0" y="10"/>
+        <terminal orientation="w" x="-10" y="0"/>
+        <terminal orientation="e" x="10" y="0"/>
     </description>
 </definition>
diff --git a/elements/10_electric/98_graphics/01_auxiliary_symbols/verrouillage-meca.elmt b/elements/10_electric/98_graphics/01_auxiliary_symbols/verrouillage-meca.elmt
index af1e4c2b5..afad2b3b2 100644
--- a/elements/10_electric/98_graphics/01_auxiliary_symbols/verrouillage-meca.elmt
+++ b/elements/10_electric/98_graphics/01_auxiliary_symbols/verrouillage-meca.elmt
@@ -1,18 +1,20 @@
-<definition width="30" version="0.3" hotspot_x="0" hotspot_y="10" height="20" type="element" orientation="dnny">
-<uuid uuid="{EF99036D-F72E-4B15-882C-90551B771A3F}"/><names>
-        <name lang="ar">قفل ميكانيكي</name>
-        <name lang="el">Μηχανική μανδάλωση</name>
+<definition type="element" height="20" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="1" width="20" hotspot_x="7">
+    <uuid uuid="{7d23d234-1736-40be-8423-98280338f775}"/>
+    <names>
         <name lang="en">Mechanical lock</name>
-        <name lang="de">Mechanische Verriegelung</name>
         <name lang="it">blocco meccanico</name>
+        <name lang="de">Mechanische Verriegelung</name>
         <name lang="fr">Verrouillage Mécannique</name>
         <name lang="pl">Blokada mechaniczna</name>
-        <name lang="cs">Mechanický zámek</name>
+        <name lang="ar">قفل ميكانيكي</name>
         <name lang="nl">mechanisch grendel</name>
+        <name lang="el">Μηχανική μανδάλωση</name>
+        <name lang="cs">Mechanický zámek</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="8" y2="-7" x2="18" y3="4" x3="13" y4="-7"/>
+        <polygon y4="3" y2="3" x4="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-2" y1="3" x2="8" antialias="true" y3="14" x3="3"/>
+        <input x="-1" y="13" size="1" tagg="label" rotate="true" text="_"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/cuivre/manguito-15-22.elmt b/elements/60_energy/11_water/cuivre/manguito-15-22.elmt
index 8c5055665..aa3972980 100644
--- a/elements/60_energy/11_water/cuivre/manguito-15-22.elmt
+++ b/elements/60_energy/11_water/cuivre/manguito-15-22.elmt
@@ -1,24 +1,26 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="18" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{0B39A799-C794-46B5-85EF-BDD68E110B7F}"/><names>
-        <name lang="en">Copper Hose 15-22</name>
-        <name lang="it">Riduzione 15-22</name>
-        <name lang="fr">Cuivre Tuyau 15-22</name>
-        <name lang="pl">Redukcja 15 - 22</name>
+<definition orientation="dyyy" link_type="simple" width="40" hotspot_x="15" type="element" height="30" hotspot_y="18" version="0.5">
+    <uuid uuid="{4848dfef-f442-4a70-bb46-8888af0e0d0c}"/>
+    <names>
         <name lang="es">Manguito cobre 15-22</name>
+        <name lang="fr">Cuivre Tuyau 15-22</name>
+        <name lang="en">Copper Hose 15-22</name>
         <name lang="cs">Redukční převod 15 - 22</name>
+        <name lang="pl">Redukcja 15 - 22</name>
+        <name lang="it">Riduzione 15-22</name>
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="9" y2="8" 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="5" x1="0" y2="5" 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="-8" x1="9" y2="-8" x2="10"/>
-        <rect width="8.8" x="-9.6" y="-5.63888" antialias="false" height="11.6389" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7.8" x="10.4" y="-8.63888" antialias="false" height="17.6389" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-5" y="-9" size="3" text="Cu15-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="-5" x1="0" y2="-5" 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="-5" x1="1" y2="-8" 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="5" x1="1" y2="8" x2="8"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="19" y="0" orientation="e"/>
+        <input tagg="label" y="8.55" text="_" x="-3" rotate="true" size="9"/>
+        <line end1="none" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" length2="1.5" x1="9" antialias="false" length1="1.5" end2="none" y2="8"/>
+        <line end1="none" x2="1" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" length2="1.5" x1="0" antialias="false" length1="1.5" end2="none" y2="5"/>
+        <line end1="none" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" length2="1.5" x1="9" antialias="false" length1="1.5" end2="none" y2="-8"/>
+        <rect y="-5.63888" width="8.8" x="-9.6" style="line-style:normal;line-weight:normal;filling:none;color:black" height="11.6389" antialias="false"/>
+        <rect y="-8.63888" width="7.8" x="10.4" style="line-style:normal;line-weight:normal;filling:none;color:black" height="17.6389" antialias="false"/>
+        <text y="-9" text="Cu15-22" x="-5" size="3"/>
+        <line end1="none" x2="1" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" length2="1.5" x1="0" antialias="false" length1="1.5" end2="none" y2="-5"/>
+        <line end1="none" x2="8" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" length2="1.5" x1="1" antialias="false" length1="1.5" end2="none" y2="-8"/>
+        <line end1="none" x2="8" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" length2="1.5" x1="1" antialias="false" length1="1.5" end2="none" y2="8"/>
+        <terminal orientation="w" y="0" x="-10"/>
+        <terminal orientation="e" y="0" x="19"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/cuivre/tubocobre15.elmt b/elements/60_energy/11_water/cuivre/tubocobre15.elmt
index d955871ff..636aa436c 100644
--- a/elements/60_energy/11_water/cuivre/tubocobre15.elmt
+++ b/elements/60_energy/11_water/cuivre/tubocobre15.elmt
@@ -1,17 +1,19 @@
-<definition width="60" version="0.4" hotspot_x="28" hotspot_y="10" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1A8829A1-CF1F-4FB3-AE42-6C8B251A86C7}"/><names>
-        <name lang="en">15 Copper Tube</name>
-        <name lang="it">Tubo rame 15</name>
-        <name lang="fr">Tube 15 cuivre</name>
-        <name lang="pl">Mufa 15</name>
+<definition orientation="dyyy" link_type="simple" width="60" hotspot_x="28" type="element" height="20" hotspot_y="10" version="0.5">
+    <uuid uuid="{463b0599-b892-49b4-af4a-d1a31574d165}"/>
+    <names>
         <name lang="es">Tubo cobre 15</name>
+        <name lang="fr">Tube 15 cuivre</name>
+        <name lang="en">15 Copper Tube</name>
         <name lang="cs">Trubka 15 měď</name>
+        <name lang="pl">Mufa 15</name>
+        <name lang="it">Tubo rame 15</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="48.8" x="-22.6" y="-5.63888" antialias="false" height="11.6389" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-5.8" y="1.56614" size="3" text="Cu15"/>
-        <terminal x="-23.4" y="0.00983577" orientation="w"/>
-        <terminal x="27" y="0.00983577" orientation="e"/>
+        <rect y="-5.63888" width="48.8" x="-22.6" style="line-style:normal;line-weight:normal;filling:none;color:black" height="11.6389" antialias="false"/>
+        <text y="1.56614" text="Cu15" x="-5.8" size="3"/>
+        <input tagg="label" y="-16" text="_" x="-20" rotate="true" size="9"/>
+        <terminal orientation="w" y="0.00983577" x="-23.4"/>
+        <terminal orientation="e" y="0.00983577" x="27"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/aspersor.elmt b/elements/60_energy/11_water/faucets/aspersor.elmt
index 29649828d..5bdf91f0b 100644
--- a/elements/60_energy/11_water/faucets/aspersor.elmt
+++ b/elements/60_energy/11_water/faucets/aspersor.elmt
@@ -1,29 +1,31 @@
-<definition width="60" version="0.4" hotspot_x="18" hotspot_y="34" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{0A663780-9AD2-4DC8-96EC-8D784D7828FC}"/><names>
+<definition type="element" height="80" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="34" width="60" hotspot_x="18">
+    <uuid uuid="{436f4029-abaa-44f1-a226-12144fd45caa}"/>
+    <names>
         <name lang="en">Sprinkler irrigation</name>
-        <name lang="fr">irrigation</name>
-        <name lang="es">Aspersor riego</name>
-        <name lang="pl">Zraszacz</name>
         <name lang="it">Irrigatore</name>
+        <name lang="es">Aspersor riego</name>
+        <name lang="fr">irrigation</name>
+        <name lang="pl">Zraszacz</name>
         <name lang="cs">Závlahový postřikovač</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="-15" x1="6" y2="-12" x2="6"/>
-        <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="-13" x1="10.6952" y2="-13" x2="32.3302"/>
-        <line 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="0"/>
-        <rect width="8" x="-4" y="-11" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="16" x="-8" y="-16" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="-5" y2="-12" x2="-5"/>
-        <polygon x4="-6.13375" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="14.0459" x1="-6.13375" y2="14.0459" x2="5.6" y3="39.0631" x3="-0.266875" y4="14.0459"/>
-        <rect width="3" x="4" y="6" antialias="false" height="6.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.6" x1="4.73333" y2="7.6" x2="6.28889"/>
-        <line 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.524" x1="5" y2="10.524" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-15" x1="10" y2="-28" x2="37"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:black" y1="-11" x1="11" y2="-4" x2="36"/>
-        <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="3" x1="-11" y2="3" x2="12"/>
+        <line y2="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="6" y1="-15" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-13" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" x1="10.6952" y1="-13" end2="none" x2="32.3302" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0" y1="-15" end2="none" x2="0" antialias="false" end1="none" length2="1.5"/>
+        <rect height="25" x="-4" y="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="8"/>
+        <rect height="5" x="-8" y="-16" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="16"/>
+        <line y2="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-5" y1="-15" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <polygon y4="14.0459" y2="14.0459" x4="-6.13375" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-6.13375" y1="14.0459" x2="5.6" closed="false" antialias="false" y3="39.0631" x3="-0.266875"/>
+        <rect height="6.5" x="4" y="6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="3"/>
+        <line y2="7.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4.73333" y1="7.6" end2="none" x2="6.28889" antialias="false" end1="none" length2="1.5"/>
+        <line y2="10.524" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="5" y1="10.524" end2="none" x2="7" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-28" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" x1="10" y1="-15" end2="none" x2="37" antialias="true" end1="none" length2="1.5"/>
+        <line y2="-4" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" x1="11" y1="-11" end2="none" x2="36" antialias="true" end1="none" length2="1.5"/>
+        <line y2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-11" y1="3" end2="none" x2="12" antialias="false" end1="none" length2="1.5"/>
         <text x="-12" y="-20" size="4" text="Aspersor"/>
-        <terminal x="6" y="9" orientation="e"/>
+        <input x="15" y="15" size="9" tagg="label" rotate="true" text="_"/>
+        <terminal orientation="e" x="6" y="9"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/banera.elmt b/elements/60_energy/11_water/faucets/banera.elmt
index c0491528d..727c7b770 100644
--- a/elements/60_energy/11_water/faucets/banera.elmt
+++ b/elements/60_energy/11_water/faucets/banera.elmt
@@ -1,44 +1,45 @@
-<definition width="150" version="0.4" hotspot_x="73" hotspot_y="37" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{43A9C627-492C-4B95-B4D2-E455D29C5B91}"/><names>
-        <name lang="el">Μπανιέρα</name>
+<definition type="element" height="70" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="38" width="150" hotspot_x="73">
+    <uuid uuid="{700342df-2992-4285-a3ad-b4b2ee055a39}"/>
+    <names>
         <name lang="en">Bathtub</name>
         <name lang="it">Vasca da bagno</name>
+        <name lang="es">Bañera</name>
         <name lang="fr">Baignoire</name>
         <name lang="pl">Wanna</name>
-        <name lang="es">Bañera</name>
+        <name lang="el">Μπανιέρα</name>
         <name lang="cs">Vana</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="-25.3079" x1="-57.1517" y2="-25.3079" x2="60.7788"/>
-        <rect width="10.2234" x="6.0028" y="-31.1604" antialias="false" height="6.05644" 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:thin;filling:none;color:black" y1="-16.886" x1="-9" y2="-11.788" x2="-9"/>
-        <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="-16.886" x1="13" y2="-11.788" x2="13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.9056" x1="-9" y2="-19.9448" x2="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.2515" x1="-50.6848" y2="-19.2515" x2="56.5248"/>
-        <line 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.1248" x1="-50.6848" y2="21.1248" x2="56.5247"/>
-        <arc width="16.6022" x="-59.8037" y="-19.2515" antialias="true" height="40.3762" style="line-style:normal;line-weight:normal;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="-31.1604" x1="9" y2="-26.0624" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.9056" x1="13" y2="-19.9448" x2="13"/>
-        <arc width="16.6022" x="49.0327" y="-19.32" antialias="true" height="40.6" style="line-style:normal;line-weight:normal;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="29.2" x1="-57.1517" y2="29.2" x2="60.7788"/>
-        <rect width="9.22342" x="6.1581" y="-17.0287" antialias="false" height="6.05644" 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="-31.1604" x1="13" y2="-26.0624" x2="13"/>
-        <arc width="18.2624" x="-67.1824" y="-25.26" antialias="true" height="54.46" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <ellipse width="7.37874" x="-45.0462" y="-3.10099" antialias="true" height="8.07525" 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="-17.9056" x1="9" y2="-19.9448" x2="9"/>
-        <arc width="18.2624" x="52.5376" y="-25.26" antialias="true" height="54.46" style="line-style:normal;line-weight:normal;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="-16.886" x1="8" y2="-11.788" x2="8"/>
-        <rect width="36.8937" x="-19.5312" y="-25.104" antialias="false" height="5.01644" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.2234" x="-18.9972" y="-31.1604" antialias="false" height="6.05644" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.22342" x="-15.8419" y="-17.0287" antialias="false" height="6.05644" 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="-17.9056" x1="-13" y2="-19.9448" x2="-13"/>
-        <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="-16.886" x1="-14" y2="-11.788" x2="-14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31.1604" x1="-16" y2="-26.0624" x2="-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="-31.1604" x1="-12" y2="-26.0624" x2="-12"/>
-        <text x="-9" y="8.60404" size="4" text="Bañera"/>
-        <terminal x="-14" y="-32.18" orientation="n"/>
-        <terminal x="11" y="-32.18" orientation="n"/>
+        <input x="83" y="0.55" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="-25.3079" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-57.1517" y1="-25.3079" end2="none" x2="60.7788" antialias="false" end1="none" length2="1.5"/>
+        <rect height="6.05644" x="6.0028" y="-31.1604" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.2234"/>
+        <line y2="-11.788" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-9" y1="-16.886" end2="none" x2="-9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-11.788" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="13" y1="-16.886" end2="none" x2="13" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-19.9448" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-9" y1="-17.9056" end2="none" x2="-9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-19.2515" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-50.6848" y1="-19.2515" end2="none" x2="56.5248" antialias="false" end1="none" length2="1.5"/>
+        <line y2="21.1248" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-50.6848" y1="21.1248" end2="none" x2="56.5247" antialias="false" end1="none" length2="1.5"/>
+        <arc height="40.3762" start="-90" angle="-180" x="-59.8037" y="-19.2515" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="16.6022"/>
+        <line y2="-26.0624" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="9" y1="-31.1604" end2="none" x2="9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-19.9448" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="13" y1="-17.9056" end2="none" x2="13" antialias="false" end1="none" length2="1.5"/>
+        <arc height="40.6" start="90" angle="-180" x="49.0327" y="-19.32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="16.6022"/>
+        <line y2="29.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-57.1517" y1="29.2" end2="none" x2="60.7788" antialias="false" end1="none" length2="1.5"/>
+        <rect height="6.05644" x="6.1581" y="-17.0287" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="9.22342"/>
+        <line y2="-26.0624" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="13" y1="-31.1604" end2="none" x2="13" antialias="false" end1="none" length2="1.5"/>
+        <arc height="54.46" start="-90" angle="-180" x="-67.1824" y="-25.26" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="18.2624"/>
+        <ellipse height="8.07525" x="-45.0462" y="-3.10099" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="7.37874"/>
+        <line y2="-19.9448" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="9" y1="-17.9056" end2="none" x2="9" antialias="false" end1="none" length2="1.5"/>
+        <arc height="54.46" start="90" angle="-180" x="52.5376" y="-25.26" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="18.2624"/>
+        <line y2="-11.788" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="8" y1="-16.886" end2="none" x2="8" antialias="false" end1="none" length2="1.5"/>
+        <rect height="5.01644" x="-19.5312" y="-25.104" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="36.8937"/>
+        <rect height="6.05644" x="-18.9972" y="-31.1604" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.2234"/>
+        <rect height="6.05644" x="-15.8419" y="-17.0287" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="9.22342"/>
+        <line y2="-19.9448" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-13" y1="-17.9056" end2="none" x2="-13" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-11.788" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-14" y1="-16.886" end2="none" x2="-14" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-26.0624" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-16" y1="-31.1604" end2="none" x2="-16" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-26.0624" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-12" y1="-31.1604" end2="none" x2="-12" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="n" x="11" y="-32.18"/>
+        <terminal orientation="n" x="-14" y="-32.18"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/bide.elmt b/elements/60_energy/11_water/faucets/bide.elmt
index 87c5a4b5a..1f9186bca 100644
--- a/elements/60_energy/11_water/faucets/bide.elmt
+++ b/elements/60_energy/11_water/faucets/bide.elmt
@@ -1,39 +1,40 @@
-<definition width="60" version="0.4" hotspot_x="29" hotspot_y="45" height="100" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{CA905E8C-8399-40B7-ABCA-CA38AEDE3AB3}"/><names>
-        <name lang="el">Μπιντέ</name>
+<definition type="element" height="100" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="45" width="60" hotspot_x="29">
+    <uuid uuid="{e569c174-fc3f-424e-8763-674c0d60d939}"/>
+    <names>
         <name lang="en">Bidet</name>
         <name lang="it">Bidè</name>
+        <name lang="es">Bidé</name>
         <name lang="fr">Bidé</name>
         <name lang="pl">Bidet</name>
-        <name lang="es">Bidé</name>
+        <name lang="el">Μπιντέ</name>
         <name lang="cs">Bidet</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:thin;filling:none;color:black" y1="-29" x1="4" y2="-29" x2="7"/>
-        <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="-31" x1="-7" y2="-31" x2="-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="-31" x1="4" y2="-31" 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="-36.3283" x1="18" y2="-25.7277" x2="18"/>
-        <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="-29" x1="-7" y2="-29" x2="-4"/>
-        <circle x="-12" y="-33" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <arc width="4" x="-6" y="-33" antialias="true" height="5" style="line-style:normal;line-weight:normal;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="-33" x1="-9" y2="-33" 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="-28" x1="-9" y2="-28" x2="-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="-32" x1="-7" y2="-32" x2="-4"/>
-        <ellipse width="38" x="-19" y="-19" antialias="true" height="64" 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="-36.3684" x1="-17" y2="-25.6842" x2="-17"/>
-        <arc width="51" x="-25" y="-38" antialias="true" height="88" style="line-style:normal;line-weight:normal;filling:none;color:black" start="45" angle="-270"/>
-        <circle x="-4" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="-37" x1="-16.3213" y2="-37" x2="17.3481"/>
-        <rect width="3" x="-1" y="-33" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="7" y="-33" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <arc width="4" x="3" y="-33" antialias="true" height="5" style="line-style:normal;line-weight:normal;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="-33" x1="5" y2="-33" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-28" x1="5" y2="-28" 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="-32" x1="4" y2="-32" x2="7"/>
-        <text x="-4" y="27" size="4" text="Bidé"/>
-        <terminal x="-7" y="-38" orientation="n"/>
-        <terminal x="9" y="-37" orientation="n"/>
+        <input x="33" y="0.55" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="-29" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="4" y1="-29" end2="none" x2="7" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-31" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-7" y1="-31" end2="none" x2="-4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-31" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="4" y1="-31" end2="none" x2="7" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-25.7277" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="18" y1="-36.3283" end2="none" x2="18" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-29" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-7" y1="-29" end2="none" x2="-4" antialias="false" end1="none" length2="1.5"/>
+        <circle x="-12" y="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5"/>
+        <arc height="5" start="90" angle="-180" x="-6" y="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="4"/>
+        <line y2="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-9" y1="-33" end2="none" x2="-4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-28" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-9" y1="-28" end2="none" x2="-4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-32" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-7" y1="-32" end2="none" x2="-4" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="64" x="-19" y="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="38"/>
+        <line y2="-25.6842" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-17" y1="-36.3684" end2="none" x2="-17" antialias="false" end1="none" length2="1.5"/>
+        <arc height="88" start="45" angle="-270" x="-25" y="-38" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="51"/>
+        <circle x="-4" y="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8"/>
+        <line y2="-37" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-16.3213" y1="-37" end2="none" x2="17.3481" antialias="false" end1="none" length2="1.5"/>
+        <rect height="18" x="-1" y="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="3"/>
+        <circle x="7" y="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5"/>
+        <arc height="5" start="-90" angle="-180" x="3" y="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="4"/>
+        <line y2="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="5" y1="-33" end2="none" x2="10" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-28" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="5" y1="-28" end2="none" x2="10" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-32" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="4" y1="-32" end2="none" x2="7" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="n" x="-7" y="-38"/>
+        <terminal orientation="n" x="9" y="-37"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/bomba-agua-vert.elmt b/elements/60_energy/11_water/faucets/bomba-agua-vert.elmt
index 04dee3bc7..aeed8af46 100644
--- a/elements/60_energy/11_water/faucets/bomba-agua-vert.elmt
+++ b/elements/60_energy/11_water/faucets/bomba-agua-vert.elmt
@@ -1,49 +1,51 @@
-<definition width="60" version="0.4" hotspot_x="28" hotspot_y="74" height="110" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3EF1378B-DE8E-42EB-9C5E-6C641F61E160}"/><names>
-        <name lang="el">Κάθετη αντλία νερού</name>
+<definition type="element" height="110" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="74" width="60" hotspot_x="28">
+    <uuid uuid="{ee2f8662-d425-4d4b-85db-e65378e19378}"/>
+    <names>
         <name lang="en">Vertical Water Pump</name>
         <name lang="it">Pompa verticale</name>
+        <name lang="es">Bomba agua vertical</name>
         <name lang="fr">Pompe verticale</name>
         <name lang="pl">Pompa pionowa</name>
-        <name lang="es">Bomba agua vertical</name>
+        <name lang="el">Κάθετη αντλία νερού</name>
         <name lang="cs">Svislé čerpadlo na vodu</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:thin;filling:none;color:black" y1="-11" x1="-14" y2="-11" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21.022" x1="11" y2="26.0238" x2="11"/>
-        <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="0" x1="-14" y2="0" x2="15"/>
-        <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="20" x1="-14" y2="20" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-41" x1="-14" y2="-41" x2="15"/>
-        <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="-61" x1="14" y2="-41" x2="14"/>
-        <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="-61" x1="11.5" y2="-41" x2="11.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="-61" x1="-3.5" y2="-41" x2="-3.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="-61" x1="4" y2="-41" x2="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="11" x1="-14" y2="11" x2="15"/>
-        <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="-61" x1="-8" y2="-41" x2="-8"/>
-        <rect width="3.6529" x="19.9807" y="-24.1933" antialias="false" height="7.65709" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="5.74027" x="17.8936" y="-25.2397" antialias="false" height="9.74971" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.08737" x="15.8064" y="-28.5213" antialias="false" height="16.741" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.6529" x="19.9807" y="18.8067" antialias="false" height="7.65709" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="5.74027" x="17.8936" y="17.7603" antialias="false" height="9.74971" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.08737" x="15.8064" y="14.4787" antialias="false" height="16.741" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-14" y="-29" antialias="false" height="61" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="48" x="-23" y="32" antialias="false" height="2" 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:thin;filling:none;color:black" y1="-22" x1="-14" y2="-22" x2="15"/>
-        <rect width="16" x="-6" y="-35" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30" x="-14" y="-67" antialias="false" height="32" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="30" x="-14" y="-72" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-61" x1="-14" y2="-61" x2="15"/>
-        <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="-61" x1="-11" y2="-41" x2="-11"/>
-        <rect width="7" x="-21" y="-58" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="-19" y="-46" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11" x="-3" y="-32" antialias="false" height="2" 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.022" x1="-8" y2="26.0238" x2="-8"/>
-        <rect width="30" x="-14" y="-29" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="30" x="-14" y="26" 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="-58" x1="-19" y2="-47" x2="-19"/>
-        <terminal x="23.7299" y="22.3213" orientation="e"/>
-        <terminal x="23.7299" y="-20.6787" orientation="e"/>
+        <line y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-14" y1="-11" end2="none" x2="15" antialias="false" end1="none" length2="1.5"/>
+        <input x="-7" y="40.55" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="26.0238" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="11" y1="-21.022" end2="none" x2="11" antialias="false" end1="none" length2="1.5"/>
+        <line y2="0" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-14" y1="0" end2="none" x2="15" antialias="false" end1="none" length2="1.5"/>
+        <line y2="20" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-14" y1="20" end2="none" x2="15" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-41" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-14" y1="-41" end2="none" x2="15" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-41" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="14" y1="-61" end2="none" x2="14" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-41" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="11.5" y1="-61" end2="none" x2="11.5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-41" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-3.5" y1="-61" end2="none" x2="-3.5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-41" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="4" y1="-61" end2="none" x2="4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-14" y1="11" end2="none" x2="15" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-41" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-8" y1="-61" end2="none" x2="-8" antialias="false" end1="none" length2="1.5"/>
+        <rect height="7.65709" x="19.9807" y="-24.1933" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" width="3.6529"/>
+        <rect height="9.74971" x="17.8936" y="-25.2397" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="5.74027"/>
+        <rect height="16.741" x="15.8064" y="-28.5213" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2.08737"/>
+        <rect height="7.65709" x="19.9807" y="18.8067" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" width="3.6529"/>
+        <rect height="9.74971" x="17.8936" y="17.7603" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="5.74027"/>
+        <rect height="16.741" x="15.8064" y="14.4787" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2.08737"/>
+        <rect height="61" x="-14" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="30"/>
+        <rect height="2" x="-23" y="32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="48"/>
+        <line y2="-22" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-14" y1="-22" end2="none" x2="15" antialias="false" end1="none" length2="1.5"/>
+        <rect height="2" x="-6" y="-35" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="16"/>
+        <rect height="32" x="-14" y="-67" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="30"/>
+        <arc height="10" start="-180" angle="-180" x="-14" y="-72" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="30"/>
+        <line y2="-61" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-14" y1="-61" end2="none" x2="15" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-41" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-11" y1="-61" end2="none" x2="-11" antialias="false" end1="none" length2="1.5"/>
+        <rect height="12" x="-21" y="-58" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="7"/>
+        <rect height="2" x="-19" y="-46" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="3"/>
+        <rect height="2" x="-3" y="-32" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="11"/>
+        <line y2="26.0238" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-8" y1="-21.022" end2="none" x2="-8" antialias="false" end1="none" length2="1.5"/>
+        <rect height="7" x="-14" y="-29" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" width="30"/>
+        <rect height="6" x="-14" y="26" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" width="30"/>
+        <line y2="-47" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-19" y1="-58" end2="none" x2="-19" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="e" x="23.7299" y="22.3213"/>
+        <terminal orientation="e" x="23.7299" y="-20.6787"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/deposito-reserva.elmt b/elements/60_energy/11_water/faucets/deposito-reserva.elmt
index d707737fb..0bc813c13 100644
--- a/elements/60_energy/11_water/faucets/deposito-reserva.elmt
+++ b/elements/60_energy/11_water/faucets/deposito-reserva.elmt
@@ -1,26 +1,27 @@
-<definition width="50" version="0.4" hotspot_x="23" hotspot_y="33" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{741EDBD7-6533-4B50-A2B9-30D2BC0202CE}"/><names>
-        <name lang="ar">إناء تسخين مفتوح 02</name>
+<definition type="element" height="60" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="33" width="50" hotspot_x="23">
+    <uuid uuid="{e74d93be-d458-4360-8ff8-a9afeee01a1a}"/>
+    <names>
         <name lang="en">Heating Open vase 02</name>
         <name lang="it">Vaso aperto</name>
+        <name lang="es">Depósito reserva 100L</name>
         <name lang="fr">Vase Chauffage Ouvert 02</name>
         <name lang="pl">Naczynie wzbiorcze otwarte</name>
-        <name lang="es">Depósito reserva 100L</name>
+        <name lang="ar">إناء تسخين مفتوح 02</name>
         <name lang="cs">Otevřená nádoba, ohřívání 02</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <input x="-12" y="-7.5" size="5" rotate="true" text="100L"/>
-        <rect width="2" x="16" y="14" antialias="false" height="2" 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="-18" x1="16" y2="18" x2="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="-18" x1="-16" y2="17" x2="-16"/>
-        <polygon x4="1" y5="-22.9" x5="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-22.9" x1="-1" y2="-24.9" x2="-1" y3="-24.9" x3="1" y4="-22.9"/>
-        <arc width="34" x="-17" y="-22" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="32" x="-16" y="16" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18" x1="-16.6466" y2="-18" x2="16.6172"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="17" y2="-18" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-17" y2="-18" x2="-17"/>
-        <terminal x="0" y="-25" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="18" y="15" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-12" y="-7.5" size="5" tagg="label" rotate="true" text="100L"/>
+        <rect height="2" x="16" y="14" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2"/>
+        <line y2="18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="16" y1="-18" end2="none" x2="16" antialias="false" end1="none" length2="1.5"/>
+        <line y2="17" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-16" y1="-18" end2="none" x2="-16" antialias="false" end1="none" length2="1.5"/>
+        <polygon y4="-22.9" y2="-24.9" x4="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-1" y1="-22.9" x2="-1" closed="false" antialias="false" y3="-24.9" x5="1" y5="-22.9" x3="1"/>
+        <arc height="4" start="-180" angle="-180" x="-17" y="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="34"/>
+        <arc height="4" start="0" angle="-180" x="-16" y="16" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="32"/>
+        <line y2="-18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-16.6466" y1="-18" end2="none" x2="16.6172" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="17" y1="-20" end2="none" x2="17" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-17" y1="-20" end2="none" x2="-17" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="n" x="0" y="-25"/>
+        <terminal orientation="e" x="18" y="15"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/ducha.elmt b/elements/60_energy/11_water/faucets/ducha.elmt
index 6b47cc910..d2c2f49d4 100644
--- a/elements/60_energy/11_water/faucets/ducha.elmt
+++ b/elements/60_energy/11_water/faucets/ducha.elmt
@@ -1,51 +1,52 @@
-<definition width="100" version="0.4" hotspot_x="39" hotspot_y="68" height="110" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{655DB369-D0FE-46DA-99B4-59B7DA4E124A}"/><names>
-        <name lang="el">Ντούζ</name>
+<definition type="element" height="110" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="69" width="100" hotspot_x="39">
+    <uuid uuid="{716e11f1-61a5-4c56-b53a-fb7156cf42f4}"/>
+    <names>
         <name lang="en">Douche</name>
         <name lang="it">Doccia</name>
+        <name lang="es">Ducha</name>
         <name lang="fr">Douche</name>
         <name lang="pl">Natrysk</name>
-        <name lang="es">Ducha</name>
+        <name lang="el">Ντούζ</name>
         <name lang="cs">Sprcha</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:thin;filling:none;color:black" y1="-46.9061" x1="22.5" y2="-43.8231" x2="22.5"/>
-        <rect width="10.4" x="14.7" y="-59.855" antialias="false" height="5.045" 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:thin;filling:none;color:black" y1="-46.9061" x1="1.7" y2="-43.8231" x2="1.7"/>
-        <ellipse width="7.8" x="6.9" y="-11.9275" antialias="true" height="7.5675" 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="-59.855" x1="17.3" y2="-56.0712" x2="17.3"/>
-        <rect width="7.8" x="17.3" y="-47.2425" antialias="false" height="3.78375" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.45" x1="18.6" y2="-34.63" x2="36.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="-47.2425" x1="19.9" y2="-48.5037" x2="19.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-59.855" x1="22.5" y2="-56.0712" x2="22.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="-14.45" x1="3" y2="-34.63" x2="-15.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.8375" x1="18.6" y2="15.82" x2="36.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="-47.2425" x1="22.5" y2="-48.5037" x2="22.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="-1.8375" x1="3" y2="15.82" x2="-15.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="-46.9061" x1="19.9" y2="-43.8231" x2="19.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-49.765" x1="-25.6" y2="-49.765" x2="47.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-44.72" x1="52.4" y2="14.5588" x2="52.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.6885" x1="52.4" y2="26.0525" x2="52.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="-44.72" x1="-30.8" y2="25.91" x2="-30.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="30.955" x1="-26.9257" y2="30.955" x2="47.2279"/>
-        <line 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.9812" x1="-30.8" y2="-49.765" x2="-25.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="-49.765" x1="47.2" y2="-44.72" x2="52.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="25.91" x1="-30.8" y2="30.955" x2="-26.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30.955" x1="47.2" y2="25.91" x2="52.4"/>
-        <rect width="93.6" x="-36" y="-54.81" antialias="false" height="90.81" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="35.1" x="-7.4" y="-54.81" antialias="false" height="5.045" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7.8" x="-3.5" y="-47.2425" antialias="false" height="3.78375" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="5.2" x="8.2" y="-54.81" antialias="true" height="5.045" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.4" x="-4.8" y="-59.855" antialias="false" height="5.045" 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="-47.2425" x1="-0.9" y2="-48.5037" x2="-0.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-47.2425" x1="1.7" y2="-48.5037" x2="1.7"/>
-        <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="-46.9061" x1="-0.9" y2="-43.8231" x2="-0.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-59.855" x1="-2.2" y2="-56.0712" x2="-2.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-59.855" x1="3" y2="-56.0712" x2="3"/>
-        <input x="-3" y="11" size="4" rotate="true" text="Ducha" tagg="label"/>
-        <terminal x="0.4" y="-61.1162" orientation="n"/>
-        <terminal x="19.9" y="-61.1162" orientation="n"/>
+        <input x="63" y="-29.45" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="-43.8231" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="22.5" y1="-46.9061" end2="none" x2="22.5" antialias="false" end1="none" length2="1.5"/>
+        <rect height="5.045" x="14.7" y="-59.855" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.4"/>
+        <line y2="-43.8231" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="1.7" y1="-46.9061" end2="none" x2="1.7" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="7.5675" x="6.9" y="-11.9275" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="7.8"/>
+        <line y2="-56.0712" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="17.3" y1="-59.855" end2="none" x2="17.3" antialias="false" end1="none" length2="1.5"/>
+        <rect height="3.78375" x="17.3" y="-47.2425" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="7.8"/>
+        <line y2="-34.63" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="18.6" y1="-14.45" end2="none" x2="36.8" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-48.5037" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="19.9" y1="-47.2425" end2="none" x2="19.9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-56.0712" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="22.5" y1="-59.855" end2="none" x2="22.5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-34.63" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="3" y1="-14.45" end2="none" x2="-15.2" antialias="false" end1="none" length2="1.5"/>
+        <line y2="15.82" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="18.6" y1="-1.8375" end2="none" x2="36.8" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-48.5037" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="22.5" y1="-47.2425" end2="none" x2="22.5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="15.82" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="3" y1="-1.8375" end2="none" x2="-15.2" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-43.8231" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="19.9" y1="-46.9061" end2="none" x2="19.9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-49.765" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-25.6" y1="-49.765" end2="none" x2="47.2" antialias="false" end1="none" length2="1.5"/>
+        <line y2="14.5588" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="52.4" y1="-44.72" end2="none" x2="52.4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="26.0525" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="52.4" y1="15.6885" end2="none" x2="52.4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="25.91" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-30.8" y1="-44.72" end2="none" x2="-30.8" antialias="false" end1="none" length2="1.5"/>
+        <line y2="30.955" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-26.9257" y1="30.955" end2="none" x2="47.2279" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-49.765" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-30.8" y1="-45.9812" end2="none" x2="-25.6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-44.72" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="47.2" y1="-49.765" end2="none" x2="52.4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="30.955" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-30.8" y1="25.91" end2="none" x2="-26.9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="25.91" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="47.2" y1="30.955" end2="none" x2="52.4" antialias="false" end1="none" length2="1.5"/>
+        <rect height="90.81" x="-36" y="-54.81" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="93.6"/>
+        <rect height="5.045" x="-7.4" y="-54.81" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="35.1"/>
+        <rect height="3.78375" x="-3.5" y="-47.2425" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="7.8"/>
+        <ellipse height="5.045" x="8.2" y="-54.81" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="5.2"/>
+        <rect height="5.045" x="-4.8" y="-59.855" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.4"/>
+        <line y2="-48.5037" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-0.9" y1="-47.2425" end2="none" x2="-0.9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-48.5037" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="1.7" y1="-47.2425" end2="none" x2="1.7" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-43.8231" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-0.9" y1="-46.9061" end2="none" x2="-0.9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-56.0712" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-2.2" y1="-59.855" end2="none" x2="-2.2" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-56.0712" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="3" y1="-59.855" end2="none" x2="3" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="n" x="0.4" y="-61.1162"/>
+        <terminal orientation="n" x="19.9" y="-61.1162"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/fregadero.elmt b/elements/60_energy/11_water/faucets/fregadero.elmt
index 7834e8ee2..6951c3b72 100644
--- a/elements/60_energy/11_water/faucets/fregadero.elmt
+++ b/elements/60_energy/11_water/faucets/fregadero.elmt
@@ -1,51 +1,52 @@
-<definition width="130" version="0.4" hotspot_x="49" hotspot_y="39" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{CEBAACB7-7B9D-4B14-A350-0CF1123ED09D}"/><names>
+<definition type="element" height="70" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="40" width="130" hotspot_x="49">
+    <uuid uuid="{6df4c49f-72d6-4a00-a9ed-a4c6f235c15a}"/>
+    <names>
         <name lang="en">Sink 2</name>
-        <name lang="fr">Evier 2</name>
-        <name lang="es">Fregadero 2senos</name>
-        <name lang="pl">Zlewozmywak</name>
         <name lang="it">Lavello doppio</name>
+        <name lang="es">Fregadero 2senos</name>
+        <name lang="fr">Evier 2</name>
+        <name lang="pl">Zlewozmywak</name>
         <name lang="cs">Kuchyňský dřez</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="13.2" x="-16" y="-15.8" antialias="true" height="33.6" style="line-style:normal;line-weight:normal;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="17.8" x1="-34.2" y2="17.8" x2="-10.2"/>
-        <arc width="13.2" x="28.2" y="-15.8" antialias="true" height="33.6" style="line-style:normal;line-weight:normal;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="-3.6" x1="48.2473" y2="-3.6" x2="68.182"/>
-        <line 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.6" x1="48.2473" y2="7.6" x2="68.1821"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17.8" x1="10" y2="17.8" x2="34"/>
-        <line 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.2" x1="45" y2="13.2" x2="71.4"/>
-        <rect width="10.2234" x="6.0028" y="-30" antialias="false" height="5.94" 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:thin;filling:none;color:black" y1="-16" x1="-9" y2="-11" x2="-9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="45" y2="2" x2="71.4"/>
-        <ellipse width="7.65449" x="5.34456" y="-2.872" antialias="true" height="8.288" 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:thin;filling:none;color:black" y1="-16" x1="14" y2="-11" x2="14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15.8" x1="10" y2="-15.8" x2="34"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-12" y2="-19" x2="-12"/>
-        <arc width="13.2" x="2.8" y="-15.8" antialias="true" height="33.6" style="line-style:normal;line-weight:normal;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="-30" x1="9" y2="-25" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="16" y2="-19" x2="16"/>
-        <rect width="9.22342" x="9.1581" y="-16.14" antialias="false" height="5.94" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="13" y2="-25" x2="13"/>
-        <ellipse width="7.65449" x="-12.6554" y="-2.872" antialias="true" height="8.288" 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="-17" x1="12" y2="-19" x2="12"/>
-        <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="-16" x1="9" y2="-11" x2="9"/>
-        <rect width="36.8937" x="-19.5312" y="-24.06" antialias="false" height="4.92" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.2234" x="-18.9972" y="-30" antialias="false" height="5.94" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.22342" x="-18.8419" y="-16.14" antialias="false" height="5.94" 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="-17" x1="-16" y2="-19" x2="-16"/>
-        <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="-16" x1="-14" y2="-11" x2="-14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-16" y2="-25" x2="-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="-30" x1="-12" y2="-25" x2="-12"/>
-        <rect width="2" x="-1" y="-22" antialias="false" height="26" 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.8" x1="-34.2" y2="-15.8" x2="-10.2"/>
-        <arc width="13.2" x="-41.4" y="-15.8" antialias="true" height="33.6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="122.4" x="-45" y="-19" antialias="false" height="42" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.2" x1="45" y2="-9.2" x2="71.4"/>
-        <input x="-11" y="31" size="4" rotate="true" text="Fregadero 2senos" tagg="label"/>
-        <terminal x="-14" y="-31" orientation="n"/>
-        <terminal x="11" y="-31" orientation="n"/>
+        <input x="-2" y="25.55" size="9" tagg="label" rotate="true" text="_"/>
+        <arc height="33.6" start="90" angle="-180" x="-16" y="-15.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="13.2"/>
+        <line y2="17.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-34.2" y1="17.8" end2="none" x2="-10.2" antialias="false" end1="none" length2="1.5"/>
+        <arc height="33.6" start="90" angle="-180" x="28.2" y="-15.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="13.2"/>
+        <line y2="-3.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="48.2473" y1="-3.6" end2="none" x2="68.182" antialias="false" end1="none" length2="1.5"/>
+        <line y2="7.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="48.2473" y1="7.6" end2="none" x2="68.1821" antialias="false" end1="none" length2="1.5"/>
+        <line y2="17.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="10" y1="17.8" end2="none" x2="34" antialias="false" end1="none" length2="1.5"/>
+        <line y2="13.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="45" y1="13.2" end2="none" x2="71.4" antialias="false" end1="none" length2="1.5"/>
+        <rect height="5.94" x="6.0028" y="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.2234"/>
+        <line y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-9" y1="-16" end2="none" x2="-9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="45" y1="2" end2="none" x2="71.4" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="8.288" x="5.34456" y="-2.872" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="7.65449"/>
+        <line y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="14" y1="-16" end2="none" x2="14" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-15.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="10" y1="-15.8" end2="none" x2="34" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-12" y1="-17" end2="none" x2="-12" antialias="false" end1="none" length2="1.5"/>
+        <arc height="33.6" start="-90" angle="-180" x="2.8" y="-15.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="13.2"/>
+        <line y2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="9" y1="-30" end2="none" x2="9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="16" y1="-17" end2="none" x2="16" antialias="false" end1="none" length2="1.5"/>
+        <rect height="5.94" x="9.1581" y="-16.14" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="9.22342"/>
+        <line y2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="13" y1="-30" end2="none" x2="13" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="8.288" x="-12.6554" y="-2.872" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="7.65449"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="12" y1="-17" end2="none" x2="12" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="9" y1="-16" end2="none" x2="9" antialias="false" end1="none" length2="1.5"/>
+        <rect height="4.92" x="-19.5312" y="-24.06" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="36.8937"/>
+        <rect height="5.94" x="-18.9972" y="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.2234"/>
+        <rect height="5.94" x="-18.8419" y="-16.14" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="9.22342"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-16" y1="-17" end2="none" x2="-16" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-14" y1="-16" end2="none" x2="-14" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-16" y1="-30" end2="none" x2="-16" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-12" y1="-30" end2="none" x2="-12" antialias="false" end1="none" length2="1.5"/>
+        <rect height="26" x="-1" y="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2"/>
+        <line y2="-15.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-34.2" y1="-15.8" end2="none" x2="-10.2" antialias="false" end1="none" length2="1.5"/>
+        <arc height="33.6" start="-90" angle="-180" x="-41.4" y="-15.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="13.2"/>
+        <rect height="42" x="-45" y="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="122.4"/>
+        <line y2="-9.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="45" y1="-9.2" end2="none" x2="71.4" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="n" x="-14" y="-31"/>
+        <terminal orientation="n" x="11" y="-31"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/fregadero1.elmt b/elements/60_energy/11_water/faucets/fregadero1.elmt
index 5ad236730..470460418 100644
--- a/elements/60_energy/11_water/faucets/fregadero1.elmt
+++ b/elements/60_energy/11_water/faucets/fregadero1.elmt
@@ -1,50 +1,51 @@
-<definition width="100" version="0.4" hotspot_x="38" hotspot_y="39" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{36659B7D-0127-41B7-A469-03027EF59BD9}"/><names>
+<definition type="element" height="70" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="40" width="100" hotspot_x="38">
+    <uuid uuid="{71b4cc01-091c-4c42-94d3-9629bf25360b}"/>
+    <names>
         <name lang="en">Sink </name>
-        <name lang="fr">Evier</name>
-        <name lang="es">Fregadero 1seno</name>
-        <name lang="pl">Zlewozmywak</name>
         <name lang="it">Lavello</name>
+        <name lang="es">Fregadero 1seno</name>
+        <name lang="fr">Evier</name>
+        <name lang="pl">Zlewozmywak</name>
         <name lang="cs">Kuchyňský dřez</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:thin;filling:none;color:black" y1="-15" x1="18" y2="-10" x2="18"/>
-        <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="-11" y2="-10" x2="-11"/>
-        <arc width="13.2" x="12" y="-15.8" antialias="true" height="33.6" style="line-style:normal;line-weight:normal;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="-15" x1="-16" y2="-10" x2="-16"/>
-        <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="13" y2="-10" x2="13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17.8" x1="-21.4462" y2="17.8" x2="17.9834"/>
-        <line 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.6" x1="30.2473" y2="-5.6" x2="50.182"/>
-        <line 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.6" x1="30.2473" y2="5.6" x2="50.1821"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11.2" x1="27" y2="11.2" x2="53.4"/>
-        <rect width="10.2234" x="6.0028" y="-30" antialias="false" height="5.94" 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:thin;filling:none;color:black" y1="-16" x1="-13" y2="-11" x2="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="27" y2="0" x2="53.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="-16" x1="16" y2="-11" x2="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="-17" x1="-12" y2="-19" x2="-12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="9" y2="-25" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="16" y2="-19" x2="16"/>
-        <rect width="9.22342" x="10.1581" y="-16.14" antialias="false" height="5.94" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="13" y2="-25" x2="13"/>
-        <ellipse width="7.65449" x="9.3446" y="-3.872" antialias="true" height="8.288" 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="-17" x1="12" y2="-19" x2="12"/>
-        <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="-16" x1="11" y2="-11" x2="11"/>
-        <rect width="36.8937" x="-19.5312" y="-24.06" antialias="false" height="4.92" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.2234" x="-18.9972" y="-30" antialias="false" height="5.94" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.22342" x="-18.8419" y="-16.14" antialias="false" height="5.94" 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="-17" x1="-16" y2="-19" x2="-16"/>
-        <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="-16" x1="-18" y2="-11" x2="-18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-16" y2="-25" x2="-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="-30" x1="-12" y2="-25" x2="-12"/>
-        <rect width="2" x="-1" y="-22" antialias="false" height="26" 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.8" x1="-21.4616" y2="-15.8" x2="18"/>
-        <arc width="13.2" x="-28.4" y="-15.8" antialias="true" height="33.6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="90.4" x="-33" y="-19" antialias="false" height="42" 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="-11.2" x1="27" y2="-11.2" x2="53.4"/>
-        <input x="-7" y="27" size="4" rotate="true" text="Fregadero 1 seno" tagg="label"/>
-        <terminal x="-14" y="-31" orientation="n"/>
-        <terminal x="11" y="-31" orientation="n"/>
+        <input x="-2" y="25.55" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="18" y1="-15" end2="none" x2="18" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-11" y1="-15" end2="none" x2="-11" antialias="false" end1="none" length2="1.5"/>
+        <arc height="33.6" start="90" angle="-180" x="12" y="-15.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="13.2"/>
+        <line y2="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-16" y1="-15" end2="none" x2="-16" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="13" y1="-15" end2="none" x2="13" antialias="false" end1="none" length2="1.5"/>
+        <line y2="17.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-21.4462" y1="17.8" end2="none" x2="17.9834" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-5.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="30.2473" y1="-5.6" end2="none" x2="50.182" antialias="false" end1="none" length2="1.5"/>
+        <line y2="5.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="30.2473" y1="5.6" end2="none" x2="50.1821" antialias="false" end1="none" length2="1.5"/>
+        <line y2="11.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="27" y1="11.2" end2="none" x2="53.4" antialias="false" end1="none" length2="1.5"/>
+        <rect height="5.94" x="6.0028" y="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.2234"/>
+        <line y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-13" y1="-16" end2="none" x2="-13" antialias="false" end1="none" length2="1.5"/>
+        <line y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="27" y1="0" end2="none" x2="53.4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="16" y1="-16" end2="none" x2="16" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-12" y1="-17" end2="none" x2="-12" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="9" y1="-30" end2="none" x2="9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="16" y1="-17" end2="none" x2="16" antialias="false" end1="none" length2="1.5"/>
+        <rect height="5.94" x="10.1581" y="-16.14" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="9.22342"/>
+        <line y2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="13" y1="-30" end2="none" x2="13" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="8.288" x="9.3446" y="-3.872" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="7.65449"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="12" y1="-17" end2="none" x2="12" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="11" y1="-16" end2="none" x2="11" antialias="false" end1="none" length2="1.5"/>
+        <rect height="4.92" x="-19.5312" y="-24.06" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="36.8937"/>
+        <rect height="5.94" x="-18.9972" y="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.2234"/>
+        <rect height="5.94" x="-18.8419" y="-16.14" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="9.22342"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-16" y1="-17" end2="none" x2="-16" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-18" y1="-16" end2="none" x2="-18" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-16" y1="-30" end2="none" x2="-16" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-12" y1="-30" end2="none" x2="-12" antialias="false" end1="none" length2="1.5"/>
+        <rect height="26" x="-1" y="-22" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2"/>
+        <line y2="-15.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-21.4616" y1="-15.8" end2="none" x2="18" antialias="false" end1="none" length2="1.5"/>
+        <arc height="33.6" start="-90" angle="-180" x="-28.4" y="-15.8" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="13.2"/>
+        <rect height="42" x="-33" y="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="90.4"/>
+        <line y2="-11.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="27" y1="-11.2" end2="none" x2="53.4" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="n" x="11" y="-31"/>
+        <terminal orientation="n" x="-14" y="-31"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/grifo-lavabo.elmt b/elements/60_energy/11_water/faucets/grifo-lavabo.elmt
index 05e6557e8..15a477a0e 100644
--- a/elements/60_energy/11_water/faucets/grifo-lavabo.elmt
+++ b/elements/60_energy/11_water/faucets/grifo-lavabo.elmt
@@ -1,41 +1,43 @@
-<definition width="40" version="0.4" hotspot_x="20" hotspot_y="21" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{ED4EF8CC-3433-4FB8-929E-27120235ABA5}"/><names>
+<definition type="element" height="60" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="21" width="40" hotspot_x="20">
+    <uuid uuid="{c2197850-a2e0-4330-a5c5-0fb8253e0cd3}"/>
+    <names>
         <name lang="en">Bathroom Sink Faucets</name>
-        <name lang="fr">Robinets de salle de bains évier</name>
-        <name lang="es">Grifo Lavabo</name>
-        <name lang="pl">Bateria</name>
         <name lang="it">Rubinetto per lavabo</name>
+        <name lang="es">Grifo Lavabo</name>
+        <name lang="fr">Robinets de salle de bains évier</name>
+        <name lang="pl">Bateria</name>
         <name lang="cs">Baterie</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="29.2836" x1="-8.93933" y2="29.2836" x2="-7.65739"/>
-        <arc width="14.3325" x="-12.708" y="-15.4965" antialias="true" height="17.7193" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="11.2" x="-13" y="13.5891" antialias="true" height="17.2036" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.11994" x1="1.6245" y2="-7.3708" x2="1.6245"/>
-        <arc width="11.2" x="1.25" y="13.5891" antialias="true" height="17.2036" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <ellipse width="7.056" x="8.46" y="12.2726" antialias="true" height="7.93405" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="35.5005" x="-18" y="11.2147" antialias="false" height="9.78533" 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="29.2836" x1="7.06067" y2="29.2836" x2="8.34261"/>
-        <arc width="8.4" x="2.3" y="14.4946" antialias="true" height="15.3927" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="9.261" x="-4.1085" y="10.6858" antialias="false" height="0.528936" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.75" x="6.85" y="28.3782" antialias="false" height="3.62181" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="3.3075" x="10.224" y="14.6528" antialias="true" height="3.43808" 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="31.0945" x1="7.06067" y2="31.0945" x2="8.34261"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="9.86017" x2="14.0166" x3="16.0232" x4="13.8733" antialias="false" x5="9.86017" x6="7.7985" x7="9.71685" x8="9.71685" closed="false" y1="19.9421" y2="19.9421" y3="16.2349" y4="12.3325" y5="12.3325" y6="16.2349" y7="19.9421" y8="19.9421"/>
-        <arc width="8.4" x="-11.6" y="14.4946" antialias="true" height="15.3927" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <ellipse width="7.056" x="-15.1335" y="12.0081" antialias="true" height="7.93405" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.75" x="-9.15" y="28.3782" antialias="false" height="3.62181" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.1895" x="-1.683" y="8.83451" antialias="false" height="1.85127" 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="31.0945" x1="-8.93933" y2="31.0945" x2="-7.65739"/>
-        <rect width="5.5125" x="-2.565" y="8.04111" antialias="false" height="0.793405" 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.12431" x1="-1.0215" y2="-7.1104" x2="-1.0215"/>
-        <arc width="8.82" x="-9.8415" y="-12.5874" antialias="true" height="11.9011" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="3.7485" x="-13.149" y="-6.50463" antialias="false" height="2.90914" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="3.3075" x="-13.3695" y="14.3883" antialias="true" height="3.43808" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-13.7333" x2="-9.5769" x3="-7.5704" x4="-9.7202" antialias="false" x5="-13.7333" x6="-15.795" x7="-13.8767" x8="-13.8767" closed="false" y1="19.6777" y2="19.6777" y3="15.9704" y4="12.068" y5="12.068" y6="15.9704" y7="19.6777" y8="19.6777"/>
-        <terminal x="-9.15" y="30.1891" orientation="w"/>
-        <terminal x="8.6" y="30.1891" orientation="e"/>
+        <line y2="29.2836" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-8.93933" y1="29.2836" end2="none" x2="-7.65739" antialias="false" end1="none" length2="1.5"/>
+        <input x="19" y="16.55" size="9" tagg="label" rotate="true" text="_"/>
+        <arc height="17.7193" start="-180" angle="-180" x="-12.708" y="-15.4965" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="14.3325"/>
+        <arc height="17.2036" start="0" angle="-90" x="-13" y="13.5891" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="11.2"/>
+        <line y2="-7.3708" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="1.6245" y1="8.11994" end2="none" x2="1.6245" antialias="false" end1="none" length2="1.5"/>
+        <arc height="17.2036" start="-90" angle="-90" x="1.25" y="13.5891" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="11.2"/>
+        <ellipse height="7.93405" x="8.46" y="12.2726" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="7.056"/>
+        <rect height="9.78533" x="-18" y="11.2147" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="35.5005"/>
+        <line y2="29.2836" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="7.06067" y1="29.2836" end2="none" x2="8.34261" antialias="false" end1="none" length2="1.5"/>
+        <arc height="15.3927" start="-90" angle="-90" x="2.3" y="14.4946" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="8.4"/>
+        <rect height="0.528936" x="-4.1085" y="10.6858" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="9.261"/>
+        <rect height="3.62181" x="6.85" y="28.3782" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="1.75"/>
+        <ellipse height="3.43808" x="10.224" y="14.6528" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="3.3075"/>
+        <line y2="31.0945" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="7.06067" y1="31.0945" end2="none" x2="8.34261" antialias="false" end1="none" length2="1.5"/>
+        <polygon x1="9.86017" x7="9.71685" x4="13.8733" x6="7.7985" y8="19.9421" x2="14.0166" y6="16.2349" y4="12.3325" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.9421" closed="false" x5="9.86017" x8="9.71685" y3="16.2349" y7="19.9421" y2="19.9421" x3="16.0232" y5="12.3325" antialias="false"/>
+        <arc height="15.3927" start="0" angle="-90" x="-11.6" y="14.4946" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="8.4"/>
+        <ellipse height="7.93405" x="-15.1335" y="12.0081" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="7.056"/>
+        <rect height="3.62181" x="-9.15" y="28.3782" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="1.75"/>
+        <rect height="1.85127" x="-1.683" y="8.83451" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4.1895"/>
+        <line y2="31.0945" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-8.93933" y1="31.0945" end2="none" x2="-7.65739" antialias="false" end1="none" length2="1.5"/>
+        <rect height="0.793405" x="-2.565" y="8.04111" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="5.5125"/>
+        <line y2="-7.1104" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-1.0215" y1="8.12431" end2="none" x2="-1.0215" antialias="false" end1="none" length2="1.5"/>
+        <arc height="11.9011" start="-180" angle="-180" x="-9.8415" y="-12.5874" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="8.82"/>
+        <rect height="2.90914" x="-13.149" y="-6.50463" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="3.7485"/>
+        <ellipse height="3.43808" x="-13.3695" y="14.3883" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="3.3075"/>
+        <polygon x1="-13.7333" x7="-13.8767" x4="-9.7202" x6="-15.795" y8="19.6777" x2="-9.5769" y6="15.9704" y4="12.068" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.6777" closed="false" x5="-13.7333" x8="-13.8767" y3="15.9704" y7="19.6777" y2="19.6777" x3="-7.5704" y5="12.068" antialias="false"/>
+        <terminal orientation="e" x="8.6" y="30.1891"/>
+        <terminal orientation="w" x="-9.15" y="30.1891"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/grifo-lavabo1.elmt b/elements/60_energy/11_water/faucets/grifo-lavabo1.elmt
index 85c783f0d..4c83b47a9 100644
--- a/elements/60_energy/11_water/faucets/grifo-lavabo1.elmt
+++ b/elements/60_energy/11_water/faucets/grifo-lavabo1.elmt
@@ -1,46 +1,48 @@
-<definition width="50" version="0.4" hotspot_x="14" hotspot_y="24" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EB6293FD-5DC3-4238-AF06-DD5CFE41EFDC}"/><names>
+<definition type="element" height="50" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="24" width="50" hotspot_x="14">
+    <uuid uuid="{d056814d-7c70-4d41-b3eb-c5084d35ae91}"/>
+    <names>
         <name lang="en">Sink faucet</name>
-        <name lang="fr">Robinet lavabo</name>
-        <name lang="es">Grifo lavabo latig</name>
-        <name lang="pl">Bateria</name>
         <name lang="it">Rubinetto lavabo</name>
+        <name lang="es">Grifo lavabo latig</name>
+        <name lang="fr">Robinet lavabo</name>
+        <name lang="pl">Bateria</name>
         <name lang="cs">Baterie</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="19.2836" x1="-7.93933" y2="19.2836" x2="-6.65739"/>
-        <arc width="11.2" x="-12" y="3.58913" antialias="true" height="17.2036" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="11.2" x="0.25" y="3.58913" antialias="true" height="17.2036" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12.04" x1="-2.2" y2="8.1164" x2="-2.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12.04" x1="-0.8" y2="8.1164" x2="-0.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12.04" x1="0.25" y2="8.1164" x2="0.25"/>
-        <rect width="10.85" x="-6.4" y="-13.0108" antialias="false" height="19.0145" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.6" x="-11.3" y="7.2109" antialias="false" height="0.603635" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.2836" x1="6.06067" y2="19.2836" x2="7.34261"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.25812" x1="4.45" y2="-16.6326" x2="25.45"/>
-        <arc width="8.4" x="1.3" y="4.49458" antialias="true" height="15.3927" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16.6326" x1="34.2" y2="-16.6326" x2="25.45"/>
-        <rect width="1.75" x="5.85" y="18.3782" antialias="false" height="3.62181" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.1851" x1="34.2" y2="-16.338" x2="34.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21.0945" x1="6.06067" y2="21.0945" x2="7.34261"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.58913" x1="4.45" y2="-13.9163" x2="26.15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13.9163" x1="34.2" y2="-13.9163" x2="26.15"/>
-        <rect width="5.95" x="27.2" y="-13.9163" antialias="false" height="1.81091" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7.35" x="-4.3" y="-14.2181" antialias="false" height="1.20727" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.5199" x1="-3.25" y2="-17.5381" x2="-1.5"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.5381" x1="-1.5" y2="-20.5563" x2="13.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.5199" x1="2.35" y2="-16.6326" x2="2.35"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16.6326" x1="2.35" y2="-19.6508" x2="13.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20.2545" x1="13.2" y2="-19.6508" x2="13.2"/>
-        <arc width="8.4" x="-10.6" y="4.49458" antialias="true" height="15.3927" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="1.75" x="-8.15" y="18.3782" antialias="false" height="3.62181" 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.0945" x1="-7.93933" y2="21.0945" x2="-6.65739"/>
-        <line 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.2109" x1="-8.5" y2="6.00367" x2="-6.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.00367" x1="4.45" y2="7.2109" x2="6.55"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12.04" x1="1.3" y2="8.1164" x2="1.3"/>
-        <terminal x="-8.15" y="20.1891" orientation="w"/>
-        <terminal x="7.6" y="20.1891" orientation="e"/>
+        <input x="14" y="5.55" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="19.2836" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-7.93933" y1="19.2836" end2="none" x2="-6.65739" antialias="false" end1="none" length2="1.5"/>
+        <arc height="17.2036" start="0" angle="-90" x="-12" y="3.58913" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="11.2"/>
+        <arc height="17.2036" start="-90" angle="-90" x="0.25" y="3.58913" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="11.2"/>
+        <line y2="8.1164" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-2.2" y1="12.04" end2="none" x2="-2.2" antialias="false" end1="none" length2="1.5"/>
+        <line y2="8.1164" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-0.8" y1="12.04" end2="none" x2="-0.8" antialias="false" end1="none" length2="1.5"/>
+        <line y2="8.1164" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="0.25" y1="12.04" end2="none" x2="0.25" antialias="false" end1="none" length2="1.5"/>
+        <rect height="19.0145" x="-6.4" y="-13.0108" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.85"/>
+        <rect height="0.603635" x="-11.3" y="7.2109" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="19.6"/>
+        <line y2="19.2836" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="6.06067" y1="19.2836" end2="none" x2="7.34261" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-16.6326" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4.45" y1="-4.25812" end2="none" x2="25.45" antialias="true" end1="none" length2="1.5"/>
+        <arc height="15.3927" start="-90" angle="-90" x="1.3" y="4.49458" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="8.4"/>
+        <line y2="-16.6326" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="34.2" y1="-16.6326" end2="none" x2="25.45" antialias="false" end1="none" length2="1.5"/>
+        <rect height="3.62181" x="5.85" y="18.3782" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="1.75"/>
+        <line y2="-16.338" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="34.2" y1="-14.1851" end2="none" x2="34.2" antialias="false" end1="none" length2="1.5"/>
+        <line y2="21.0945" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="6.06067" y1="21.0945" end2="none" x2="7.34261" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-13.9163" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4.45" y1="3.58913" end2="none" x2="26.15" antialias="true" end1="none" length2="1.5"/>
+        <line y2="-13.9163" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="34.2" y1="-13.9163" end2="none" x2="26.15" antialias="false" end1="none" length2="1.5"/>
+        <rect height="1.81091" x="27.2" y="-13.9163" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="5.95"/>
+        <rect height="1.20727" x="-4.3" y="-14.2181" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="7.35"/>
+        <line y2="-17.5381" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-3.25" y1="-14.5199" end2="none" x2="-1.5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-20.5563" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-1.5" y1="-17.5381" end2="none" x2="13.2" antialias="true" end1="none" length2="1.5"/>
+        <line y2="-16.6326" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="2.35" y1="-14.5199" end2="none" x2="2.35" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-19.6508" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="2.35" y1="-16.6326" end2="none" x2="13.2" antialias="true" end1="none" length2="1.5"/>
+        <line y2="-19.6508" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="13.2" y1="-20.2545" end2="none" x2="13.2" antialias="false" end1="none" length2="1.5"/>
+        <arc height="15.3927" start="0" angle="-90" x="-10.6" y="4.49458" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="8.4"/>
+        <rect height="3.62181" x="-8.15" y="18.3782" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="1.75"/>
+        <line y2="21.0945" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-7.93933" y1="21.0945" end2="none" x2="-6.65739" antialias="false" end1="none" length2="1.5"/>
+        <line y2="6.00367" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-8.5" y1="7.2109" end2="none" x2="-6.4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="7.2109" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4.45" y1="6.00367" end2="none" x2="6.55" antialias="false" end1="none" length2="1.5"/>
+        <line y2="8.1164" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="1.3" y1="12.04" end2="none" x2="1.3" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="e" x="7.6" y="20.1891"/>
+        <terminal orientation="w" x="-8.15" y="20.1891"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/grifo-manguera.elmt b/elements/60_energy/11_water/faucets/grifo-manguera.elmt
index 6f7610043..c83e0de1f 100644
--- a/elements/60_energy/11_water/faucets/grifo-manguera.elmt
+++ b/elements/60_energy/11_water/faucets/grifo-manguera.elmt
@@ -1,42 +1,44 @@
-<definition width="70" version="0.4" hotspot_x="29" hotspot_y="21" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D5C8CAE7-55D7-4FC2-BC0D-ADDCEBBFF60B}"/><names>
+<definition type="element" height="50" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="21" width="70" hotspot_x="29">
+    <uuid uuid="{e1013fe5-f77c-42be-ad9f-862bd496eaba}"/>
+    <names>
         <name lang="en">Sink hose</name>
-        <name lang="fr">Robinet </name>
-        <name lang="es">Grifo-manguera</name>
-        <name lang="pl">Zawór</name>
         <name lang="it">Rubinetto</name>
+        <name lang="es">Grifo-manguera</name>
+        <name lang="fr">Robinet </name>
+        <name lang="pl">Zawór</name>
         <name lang="cs">Kohoutek</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="24" x="11" y="-4" antialias="true" height="27" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.90151" x1="8.9243" y2="-2.90151" x2="12.4862"/>
-        <arc width="12.6" x="-6.3" y="-9.1799" antialias="true" height="9.34405" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="2.2" x="6.3" y="-4.26197" antialias="false" height="9.34405" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.4" x="8.5" y="-7.21273" antialias="false" height="15.7374" 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="4.7139" x1="-15.1" y2="-3.37976" x2="-16.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.09849" x1="8.9243" y2="4.09849" x2="12.4862"/>
-        <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="4.7139" x1="-17.3" y2="-3.37976" x2="-18.95"/>
-        <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="4.7139" x1="-22.25" y2="-3.37976" x2="-23.9"/>
-        <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="4.7139" x1="-20.05" y2="-3.37976" x2="-21.7"/>
-        <rect width="8.8" x="-23.9" y="-2.97508" antialias="false" height="7.68898" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="10.45" x="12.9" y="-4.26197" antialias="false" height="9.3112" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.45" x="-23.9" y="-3.78445" antialias="false" height="9.30769" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.4" x="-13.45" y="-7.21273" antialias="false" height="15.7374" 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="-2.5704" x1="-13.45" y2="-2.5704" x2="-9.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="4.09849" x1="-13.0257" y2="4.09849" x2="-9.4638"/>
-        <arc width="12.6" x="-6.3" y="0.655948" antialias="true" height="9.34405" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <rect width="7.7" x="-3.35" y="-11.6389" antialias="false" height="2.45896" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="26.95" x="-2.8" y="-15.0814" antialias="false" height="1.47538" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.2" x="-0.6" y="-13.606" antialias="false" height="1.96717" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.75" x="-9.05" y="-4.26197" antialias="false" height="9.34405" 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="-11.6389" x1="-1.15" y2="-9.67169" x2="-1.15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11.6389" x1="2.7" y2="-9.67169" x2="2.7"/>
-        <arc width="8" x="19" y="5" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="14" x="24" y="9" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="35" y5="11" x5="35" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="11" x1="27" y2="21" x2="28" y3="21" x3="34" y4="11"/>
-        <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="14" x1="28" y2="14" x2="34"/>
-        <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="18" x1="28" y2="18" x2="34"/>
-        <terminal x="-23.9" y="0.667065" orientation="w"/>
+        <arc height="27" start="90" angle="-90" x="11" y="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="24"/>
+        <input x="38" y="-9.45" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="-2.90151" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="8.9243" y1="-2.90151" end2="none" x2="12.4862" antialias="false" end1="none" length2="1.5"/>
+        <arc height="9.34405" start="-180" angle="-180" x="-6.3" y="-9.1799" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="12.6"/>
+        <rect height="9.34405" x="6.3" y="-4.26197" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2.2"/>
+        <rect height="15.7374" x="8.5" y="-7.21273" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4.4"/>
+        <line y2="-3.37976" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" x1="-15.1" y1="4.7139" end2="none" x2="-16.75" antialias="false" end1="none" length2="1.5"/>
+        <line y2="4.09849" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="8.9243" y1="4.09849" end2="none" x2="12.4862" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-3.37976" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" x1="-17.3" y1="4.7139" end2="none" x2="-18.95" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-3.37976" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" x1="-22.25" y1="4.7139" end2="none" x2="-23.9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-3.37976" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" x1="-20.05" y1="4.7139" end2="none" x2="-21.7" antialias="false" end1="none" length2="1.5"/>
+        <rect height="7.68898" x="-23.9" y="-2.97508" style="line-style:dotted;line-weight:normal;filling:none;color:red" antialias="false" width="8.8"/>
+        <rect height="9.3112" x="12.9" y="-4.26197" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.45"/>
+        <rect height="9.30769" x="-23.9" y="-3.78445" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.45"/>
+        <rect height="15.7374" x="-13.45" y="-7.21273" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4.4"/>
+        <line y2="-2.5704" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-13.45" y1="-2.5704" end2="none" x2="-9.6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="4.09849" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-13.0257" y1="4.09849" end2="none" x2="-9.4638" antialias="false" end1="none" length2="1.5"/>
+        <arc height="9.34405" start="0" angle="-180" x="-6.3" y="0.655948" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="12.6"/>
+        <rect height="2.45896" x="-3.35" y="-11.6389" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="7.7"/>
+        <rect height="1.47538" x="-2.8" y="-15.0814" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="26.95"/>
+        <rect height="1.96717" x="-0.6" y="-13.606" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2.2"/>
+        <rect height="9.34405" x="-9.05" y="-4.26197" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2.75"/>
+        <line y2="-9.67169" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-1.15" y1="-11.6389" end2="none" x2="-1.15" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-9.67169" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="2.7" y1="-11.6389" end2="none" x2="2.7" antialias="false" end1="none" length2="1.5"/>
+        <arc height="7" start="90" angle="-90" x="19" y="5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="8"/>
+        <rect height="2" x="24" y="9" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="14"/>
+        <polygon y4="11" y2="21" x4="35" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="27" y1="11" x2="28" closed="false" antialias="true" y3="21" x5="35" y5="11" x3="34"/>
+        <line y2="14" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="28" y1="14" end2="none" x2="34" antialias="false" end1="none" length2="1.5"/>
+        <line y2="18" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="28" y1="18" end2="none" x2="34" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="w" x="-23.9" y="0.667065"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/inodoro.elmt b/elements/60_energy/11_water/faucets/inodoro.elmt
index e2e7da1f2..8ff5ae183 100644
--- a/elements/60_energy/11_water/faucets/inodoro.elmt
+++ b/elements/60_energy/11_water/faucets/inodoro.elmt
@@ -1,31 +1,32 @@
-<definition width="70" version="0.4" hotspot_x="36" hotspot_y="13" height="100" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3997DE08-D319-4AC5-9384-17E4BC5891FC}"/><names>
+<definition type="element" height="100" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="13" width="70" hotspot_x="36">
+    <uuid uuid="{a9b8b3f3-8fdc-4408-99f0-e7f6b82eb674}"/>
+    <names>
         <name lang="en">toilet tank</name>
-        <name lang="fr">WC</name>
-        <name lang="es">Inodoro tanque</name>
-        <name lang="pl">WC</name>
         <name lang="it">WC</name>
+        <name lang="es">Inodoro tanque</name>
+        <name lang="fr">WC</name>
+        <name lang="pl">WC</name>
         <name lang="cs">WC</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="9.55" x1="21.9951" y2="15.5" x2="21.9951"/>
-        <ellipse width="0.889438" x="8.65348" y="15.5" antialias="true" height="0.85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="53.3663" x="-25.1452" y="-10" antialias="false" height="19.55" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="8.00495" x="-2.01978" y="-3.2" antialias="true" height="6.8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.44719" x="-29.5924" y="-3.2" antialias="false" height="6.8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.2" x1="-29.5924" y2="3.6" x2="-27.8135"/>
-        <line 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.2" x1="-26.9241" y2="2.75" x2="-25.1452"/>
-        <ellipse width="42.693" x="-19.8085" y="21.45" antialias="true" height="56.1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.55" x1="-18.0297" y2="15.5" x2="-18.0297"/>
-        <arc width="56.0346" x="-26.0346" y="4.45" antialias="true" height="78.2" style="line-style:normal;line-weight:normal;filling:none;color:black" start="45" angle="-270"/>
-        <ellipse width="16.8993" x="-7.35641" y="32.5" antialias="true" height="13.6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.85" x1="-25.1452" y2="9.55" x2="-23.3663"/>
-        <line 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.55" x1="25.5528" y2="7.85" x2="28.2211"/>
-        <line 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.2" x1="-2.01978" y2="0.2" x2="5.09573"/>
-        <ellipse width="0.889438" x="-7.35641" y="15.5" antialias="true" height="0.85" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-11" y="60" size="4" rotate="true" text="Inodoro" tagg="label"/>
-        <terminal x="-30.4818" y="0.2" orientation="w"/>
+        <line y2="15.5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="21.9951" y1="9.55" end2="none" x2="21.9951" antialias="false" end1="none" length2="1.5"/>
+        <input x="33" y="40.55" size="9" tagg="label" rotate="true" text="_"/>
+        <ellipse height="0.85" x="8.65348" y="15.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="0.889438"/>
+        <rect height="19.55" x="-25.1452" y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="53.3663"/>
+        <ellipse height="6.8" x="-2.01978" y="-3.2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="8.00495"/>
+        <rect height="6.8" x="-29.5924" y="-3.2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4.44719"/>
+        <line y2="3.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-29.5924" y1="-3.2" end2="none" x2="-27.8135" antialias="false" end1="none" length2="1.5"/>
+        <line y2="2.75" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-26.9241" y1="-3.2" end2="none" x2="-25.1452" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="56.1" x="-19.8085" y="21.45" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="42.693"/>
+        <line y2="15.5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0297" y1="9.55" end2="none" x2="-18.0297" antialias="false" end1="none" length2="1.5"/>
+        <arc height="78.2" start="45" angle="-270" x="-26.0346" y="4.45" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="56.0346"/>
+        <ellipse height="13.6" x="-7.35641" y="32.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="16.8993"/>
+        <line y2="9.55" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-25.1452" y1="7.85" end2="none" x2="-23.3663" antialias="false" end1="none" length2="1.5"/>
+        <line y2="7.85" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="25.5528" y1="9.55" end2="none" x2="28.2211" antialias="false" end1="none" length2="1.5"/>
+        <line y2="0.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-2.01978" y1="0.2" end2="none" x2="5.09573" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="0.85" x="-7.35641" y="15.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="0.889438"/>
+        <terminal orientation="w" x="-30.4818" y="0.2"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/interacum-acs.elmt b/elements/60_energy/11_water/faucets/interacum-acs.elmt
index 6316b82c4..296349189 100644
--- a/elements/60_energy/11_water/faucets/interacum-acs.elmt
+++ b/elements/60_energy/11_water/faucets/interacum-acs.elmt
@@ -1,89 +1,91 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="38" height="80" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{40DB767E-C9B8-4E77-A672-015431DCAD7C}"/><names>
-        <name lang="ar">بالون جامع 1000 ل</name>
+<definition type="element" height="80" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="38" width="50" hotspot_x="25">
+    <uuid uuid="{dc95129a-50c8-4b7e-a224-6f0cd52d264b}"/>
+    <names>
         <name lang="en">Combined ball 1000L</name>
         <name lang="it">Scambiatore combinato 1000L</name>
+        <name lang="es">Interacumulador  Vertical</name>
         <name lang="fr">Ballon Combiné 1000L</name>
         <name lang="pl">Zasobnik kombinowany 1000L</name>
-        <name lang="es">Interacumulador  Vertical</name>
+        <name lang="ar">بالون جامع 1000 ل</name>
         <name lang="cs">Kombinovaný zásobnik 1000L</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <arc width="42.9" x="-22" y="23.5688" antialias="true" height="10.2805" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="42.9" x="-22" y="-33.8307" antialias="true" height="10.2805" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="0.715" x="-4.4825" y="-31.6889" antialias="false" height="8.56709" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="0.715" x="2.6675" y="-31.6889" antialias="false" height="28.557" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.98665" x1="-9.13" y2="-7.98665" x2="-6.6275"/>
-        <ellipse width="2.68125" x="-19.7656" y="-1.34714" antialias="true" height="2.14177" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1.43" x="2.31" y="-32.2601" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2.68125" x="15.9844" y="-1.34714" antialias="true" height="2.14177" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2.68125" x="15.9844" y="24.3541" antialias="true" height="2.14177" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="42.9" x="-22" y="-28.5477" antialias="false" height="57.3995" 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="2.00828" x1="-18.0675" y2="2.00828" x2="13.3925"/>
-        <line 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.15055" x1="-18.0675" y2="3.15055" x2="0.165"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.86398" x1="-5.1975" y2="4.86398" x2="13.3925"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.71968" x1="-5.1975" y2="7.71968" x2="13.3925"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.5754" x1="-4.84" y2="10.5754" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13.4311" x1="-4.84" y2="13.4311" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="16.2868" x1="-5.1975" y2="16.2868" x2="13.3925"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.1425" x1="-4.84" y2="19.1425" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21.9982" x1="-18.425" y2="19.1425" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23.1404" x1="-18.0675" y2="20.2847" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21.9982" x1="13.75" y2="21.9982" x2="-5.555"/>
-        <line 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.00625" x1="-18.0675" y2="6.00625" x2="0.5225"/>
-        <line 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.86195" x1="-18.0675" y2="8.86195" x2="0.5225"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11.7176" x1="-18.0675" y2="11.7176" x2="0.5225"/>
-        <line 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.5733" x1="-18.0675" y2="14.5733" x2="0.5225"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17.429" x1="-18.425" y2="17.429" x2="0.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="20.2847" x1="-18.0675" y2="20.2847" x2="0.5225"/>
-        <line 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.1404" x1="-18.0675" y2="23.1404" x2="0.5225"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.5754" x1="-18.425" y2="7.71968" x2="13.75"/>
-        <arc width="1.43" x="-18.9612" y="21.9982" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="1.43" x="-18.9612" y="19.1425" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.86195" x1="-18.0675" y2="6.00625" x2="13.75"/>
-        <arc width="1.43" x="-18.9612" y="16.2868" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="1.43" x="-18.9612" y="13.4311" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.71968" x1="-18.425" y2="4.86398" x2="13.75"/>
-        <arc width="1.43" x="-18.9612" y="10.5754" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.00625" x1="-18.0675" y2="3.15055" x2="13.75"/>
-        <arc width="1.43" x="-18.9612" y="7.71968" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="1.43" x="-18.9612" y="4.86398" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.86398" x1="-18.425" y2="2.00828" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13.4311" x1="-18.425" y2="10.5754" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="16.2868" x1="-18.425" y2="13.4311" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="19.1425" x1="-18.425" y2="16.2868" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11.7176" x1="-18.0675" y2="8.86195" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14.5733" x1="-18.0675" y2="11.7176" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17.429" x1="-18.0675" y2="14.5733" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="20.2847" x1="-18.0675" y2="17.429" x2="13.75"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.8539" x1="-18.425" y2="21.9982" x2="13.75"/>
-        <arc width="1.43" x="13.2138" y="2.00828" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="1.43" x="13.2138" y="4.86398" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="1.43" x="13.2138" y="7.71968" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="1.43" x="13.2138" y="10.5754" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="1.43" x="13.2138" y="13.4311" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="1.43" x="13.2138" y="16.2868" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="1.43" x="13.2138" y="19.1425" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="25.9961" x1="-18.0675" y2="23.1404" x2="13.75"/>
-        <arc width="1.43" x="13.2138" y="21.9982" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <polygon x4="0.165" y5="33.9921" x5="0.165" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="33.9921" x1="-1.265" y2="34.8488" x2="-1.265" y3="34.8488" x3="0.165" y4="33.9921"/>
-        <ellipse width="2.68125" x="-19.7656" y="-27.0484" antialias="true" height="2.14177" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1.43" x="-4.84" y="-32.2601" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="13.75" y5="32.2787" x5="13.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30.8508" x1="19.1125" y2="35.1344" x2="19.1125" y3="35.1344" x3="13.75" y4="32.2787"/>
-        <polygon x4="-14.85" y5="32.2787" x5="-14.85" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30.8508" x1="-20.2125" y2="35.1344" x2="-20.2125" y3="35.1344" x3="-14.85" y4="32.2787"/>
-        <ellipse width="2.68125" x="15.9844" y="-27.0484" antialias="true" height="2.14177" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1.43" x="-19.14" y="24.8539" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1.43" x="-19.14" y="2.00828" antialias="true" height="1.14228" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-18.425" y="-25.9775" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="-18.425" y="25.425" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="3.025" y="-31.6889" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="-0.55" y="34.8488" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="17.325" y="-0.276249" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="17.325" y="-25.9775" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="17.325" y="25.425" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="-18.425" y="2.57945" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="-18.425" y="-0.276249" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="-4.125" y="-31.6889" nameHidden="0" number="" name="" orientation="n"/>
+        <input x="3" y="-54.45" size="9" tagg="label" rotate="true" text="_"/>
+        <arc height="10.2805" start="0" angle="-180" x="-22" y="23.5688" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="42.9"/>
+        <arc height="10.2805" start="-180" angle="-180" x="-22" y="-33.8307" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="42.9"/>
+        <rect height="8.56709" x="-4.4825" y="-31.6889" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="0.715"/>
+        <rect height="28.557" x="2.6675" y="-31.6889" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="0.715"/>
+        <line y2="-7.98665" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-9.13" y1="-7.98665" end2="none" x2="-6.6275" antialias="true" end1="none" length2="1.5"/>
+        <ellipse height="2.14177" x="-19.7656" y="-1.34714" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="2.68125"/>
+        <ellipse height="1.14228" x="2.31" y="-32.2601" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <ellipse height="2.14177" x="15.9844" y="-1.34714" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="2.68125"/>
+        <ellipse height="2.14177" x="15.9844" y="24.3541" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="2.68125"/>
+        <rect height="57.3995" x="-22" y="-28.5477" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="42.9"/>
+        <line y2="2.00828" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="2.00828" end2="none" x2="13.3925" antialias="false" end1="none" length2="1.5"/>
+        <line y2="3.15055" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="3.15055" end2="none" x2="0.165" antialias="false" end1="none" length2="1.5"/>
+        <line y2="4.86398" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-5.1975" y1="4.86398" end2="none" x2="13.3925" antialias="true" end1="none" length2="1.5"/>
+        <line y2="7.71968" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-5.1975" y1="7.71968" end2="none" x2="13.3925" antialias="true" end1="none" length2="1.5"/>
+        <line y2="10.5754" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-4.84" y1="10.5754" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="13.4311" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-4.84" y1="13.4311" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="16.2868" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-5.1975" y1="16.2868" end2="none" x2="13.3925" antialias="true" end1="none" length2="1.5"/>
+        <line y2="19.1425" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-4.84" y1="19.1425" end2="none" x2="13.75" antialias="false" end1="none" length2="1.5"/>
+        <line y2="19.1425" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.425" y1="21.9982" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="20.2847" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="23.1404" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="21.9982" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="13.75" y1="21.9982" end2="none" x2="-5.555" antialias="false" end1="none" length2="1.5"/>
+        <line y2="6.00625" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="6.00625" end2="none" x2="0.5225" antialias="false" end1="none" length2="1.5"/>
+        <line y2="8.86195" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="8.86195" end2="none" x2="0.5225" antialias="false" end1="none" length2="1.5"/>
+        <line y2="11.7176" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="11.7176" end2="none" x2="0.5225" antialias="false" end1="none" length2="1.5"/>
+        <line y2="14.5733" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="14.5733" end2="none" x2="0.5225" antialias="false" end1="none" length2="1.5"/>
+        <line y2="17.429" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.425" y1="17.429" end2="none" x2="0.165" antialias="false" end1="none" length2="1.5"/>
+        <line y2="20.2847" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="20.2847" end2="none" x2="0.5225" antialias="false" end1="none" length2="1.5"/>
+        <line y2="23.1404" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="23.1404" end2="none" x2="0.5225" antialias="false" end1="none" length2="1.5"/>
+        <line y2="7.71968" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.425" y1="10.5754" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <arc height="1.14228" start="-90" angle="-180" x="-18.9612" y="21.9982" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <arc height="1.14228" start="-90" angle="-180" x="-18.9612" y="19.1425" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <line y2="6.00625" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="8.86195" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <arc height="1.14228" start="-90" angle="-180" x="-18.9612" y="16.2868" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <arc height="1.14228" start="-90" angle="-180" x="-18.9612" y="13.4311" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <line y2="4.86398" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.425" y1="7.71968" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <arc height="1.14228" start="-90" angle="-180" x="-18.9612" y="10.5754" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <line y2="3.15055" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="6.00625" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <arc height="1.14228" start="-90" angle="-180" x="-18.9612" y="7.71968" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <arc height="1.14228" start="-90" angle="-180" x="-18.9612" y="4.86398" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <line y2="2.00828" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.425" y1="4.86398" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="10.5754" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.425" y1="13.4311" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="13.4311" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.425" y1="16.2868" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="16.2868" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.425" y1="19.1425" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="8.86195" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="11.7176" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="11.7176" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="14.5733" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="14.5733" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="17.429" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="17.429" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="20.2847" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <line y2="21.9982" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.425" y1="24.8539" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <arc height="1.14228" start="90" angle="-180" x="13.2138" y="2.00828" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <arc height="1.14228" start="90" angle="-180" x="13.2138" y="4.86398" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <arc height="1.14228" start="90" angle="-180" x="13.2138" y="7.71968" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <arc height="1.14228" start="90" angle="-180" x="13.2138" y="10.5754" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <arc height="1.14228" start="90" angle="-180" x="13.2138" y="13.4311" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <arc height="1.14228" start="90" angle="-180" x="13.2138" y="16.2868" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <arc height="1.14228" start="90" angle="-180" x="13.2138" y="19.1425" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <line y2="23.1404" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-18.0675" y1="25.9961" end2="none" x2="13.75" antialias="true" end1="none" length2="1.5"/>
+        <arc height="1.14228" start="90" angle="-180" x="13.2138" y="21.9982" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <polygon y4="33.9921" y2="34.8488" x4="0.165" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-1.265" y1="33.9921" x2="-1.265" closed="false" antialias="false" y3="34.8488" x5="0.165" y5="33.9921" x3="0.165"/>
+        <ellipse height="2.14177" x="-19.7656" y="-27.0484" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="2.68125"/>
+        <ellipse height="1.14228" x="-4.84" y="-32.2601" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <polygon y4="32.2787" y2="35.1344" x4="13.75" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="19.1125" y1="30.8508" x2="19.1125" antialias="true" y3="35.1344" x5="13.75" y5="32.2787" x3="13.75"/>
+        <polygon y4="32.2787" y2="35.1344" x4="-14.85" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20.2125" y1="30.8508" x2="-20.2125" antialias="true" y3="35.1344" x5="-14.85" y5="32.2787" x3="-14.85"/>
+        <ellipse height="2.14177" x="15.9844" y="-27.0484" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="2.68125"/>
+        <ellipse height="1.14228" x="-19.14" y="24.8539" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <ellipse height="1.14228" x="-19.14" y="2.00828" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.43"/>
+        <terminal orientation="w" x="-18.425" y="-25.9775"/>
+        <terminal orientation="w" x="-18.425" y="25.425"/>
+        <terminal orientation="n" x="3.025" y="-31.6889"/>
+        <terminal orientation="s" x="-0.55" y="34.8488"/>
+        <terminal orientation="e" x="17.325" y="-0.276249"/>
+        <terminal orientation="e" x="17.325" y="-25.9775"/>
+        <terminal orientation="e" x="17.325" y="25.425"/>
+        <terminal orientation="w" x="-18.425" y="2.57945"/>
+        <terminal orientation="w" x="-18.425" y="-0.276249"/>
+        <terminal orientation="n" x="-4.125" y="-31.6889"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/interacumulador.elmt b/elements/60_energy/11_water/faucets/interacumulador.elmt
index 953247ff8..a3d78b961 100644
--- a/elements/60_energy/11_water/faucets/interacumulador.elmt
+++ b/elements/60_energy/11_water/faucets/interacumulador.elmt
@@ -1,26 +1,27 @@
-<definition width="100" version="0.4" hotspot_x="48" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{6F86C314-790C-40CC-A651-D93DB87AD08D}"/><names>
-        <name lang="ar">خزان ماء أفقي</name>
+<definition type="element" height="60" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="30" width="100" hotspot_x="48">
+    <uuid uuid="{61661b26-86d5-4070-a0f7-e612aafec53a}"/>
+    <names>
         <name lang="en">DHW horizontal</name>
         <name lang="it">Scambiatore orizzontale ACS</name>
+        <name lang="es">Interacumulador ACS</name>
         <name lang="fr">Ballon ECS horizontal</name>
         <name lang="pl">Zasobnik poziomy CWU</name>
-        <name lang="es">Interacumulador ACS</name>
+        <name lang="ar">خزان ماء أفقي</name>
         <name lang="cs">Vodorovný zásobnik ECS</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <polygon x4="43.76" y5="-10.2245" x5="43.76" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-12.6442" x1="43.2925" y2="-12.6442" x2="46.565" y3="-10.2245" x3="46.565" y4="-10.2245"/>
-        <polygon x4="43.76" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12.8309" x1="43.2925" y2="12.8309" x2="46.565" y3="10.4505" x3="46.565" y4="10.4505"/>
-        <rect width="1.87" x="31.605" y="17.9073" antialias="true" height="3.60663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.2075" x="-38.52" y="-21.7657" antialias="true" height="3.60663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="77.1375" x="-39.455" y="-18.1591" antialias="true" height="36.0663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-23.56" y="0.23476" size="2" rotate="true" text="interacumulador ACS"/>
-        <arc width="13.09" x="31.605" y="-18.1591" antialias="true" height="36.0663" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="13.09" x="-46" y="-18.1591" antialias="true" height="36.0663" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <terminal x="-36.65" y="-21.7657" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="32.54" y="21.5139" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="46.565" y="-11.4344" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="46.565" y="11.4153" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-22" y="-34.45" size="9" tagg="label" rotate="true" text="_"/>
+        <polygon y4="-10.2245" y2="-12.6442" x4="43.76" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="43.2925" y1="-12.6442" x2="46.565" closed="false" antialias="true" y3="-10.2245" x5="43.76" y5="-10.2245" x3="46.565"/>
+        <polygon y4="10.4505" y2="12.8309" x4="43.76" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="43.2925" y1="12.8309" x2="46.565" closed="false" antialias="true" y3="10.4505" x3="46.565"/>
+        <rect height="3.60663" x="31.605" y="17.9073" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.87"/>
+        <rect height="3.60663" x="-38.52" y="-21.7657" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="4.2075"/>
+        <rect height="36.0663" x="-39.455" y="-18.1591" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="77.1375"/>
+        <arc height="36.0663" start="90" angle="-180" x="31.605" y="-18.1591" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="13.09"/>
+        <arc height="36.0663" start="-90" angle="-180" x="-46" y="-18.1591" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="13.09"/>
+        <terminal orientation="e" x="46.565" y="11.4153"/>
+        <terminal orientation="n" x="-36.65" y="-21.7657"/>
+        <terminal orientation="e" x="46.565" y="-11.4344"/>
+        <terminal orientation="s" x="32.54" y="21.5139"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/lavabo.elmt b/elements/60_energy/11_water/faucets/lavabo.elmt
index c9e8b3f62..7947500d4 100644
--- a/elements/60_energy/11_water/faucets/lavabo.elmt
+++ b/elements/60_energy/11_water/faucets/lavabo.elmt
@@ -1,38 +1,39 @@
-<definition width="90" version="0.4" hotspot_x="44" hotspot_y="41" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B95300C1-546C-4DCF-B44A-7406FC392B75}"/><names>
+<definition type="element" height="70" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="41" width="90" hotspot_x="44">
+    <uuid uuid="{85f3ead2-125c-49fa-b012-0ad046d91b28}"/>
+    <names>
         <name lang="en">sink</name>
-        <name lang="fr">Lavabo1</name>
-        <name lang="es">Lavabo1</name>
-        <name lang="pl">Umywalka</name>
         <name lang="it">Lavabo1</name>
+        <name lang="es">Lavabo1</name>
+        <name lang="fr">Lavabo1</name>
+        <name lang="pl">Umywalka</name>
         <name lang="cs">Umyvadlo</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:thin;filling:none;color:black" y1="-25" x1="3" y2="-25" x2="6"/>
-        <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="-27" x1="-8" y2="-27" x2="-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="-27" x1="3" y2="-27" x2="6"/>
-        <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="-8" y2="-25" x2="-5"/>
-        <circle x="-13" y="-29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <arc width="4" x="-7" y="-29" antialias="true" height="5" style="line-style:normal;line-weight:normal;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="-29" x1="-10" y2="-29" 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="-24" x1="-10" y2="-24" x2="-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="-28" x1="-8" y2="-28" x2="-5"/>
-        <circle x="-4" y="-4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="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="-33" x1="-29.4373" y2="-33" x2="29.3905"/>
-        <rect width="3" x="-2" y="-29" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="6" y="-29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <arc width="4" x="2" y="-29" antialias="true" height="5" style="line-style:normal;line-weight:normal;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="-29" x1="4" y2="-29" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="4" y2="-24" x2="9"/>
-        <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="-28" x1="3" y2="-28" x2="6"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="-30" y2="-2" x2="-39"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-33" x1="30" y2="-2" x2="40"/>
-        <arc width="79" x="-39" y="-26" antialias="true" height="49" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <ellipse width="67" x="-33" y="-17" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-13" y="10" size="4" rotate="true" text="Lavabo" tagg="label"/>
-        <terminal x="-8" y="-34" orientation="n"/>
-        <terminal x="8" y="-34" orientation="n"/>
+        <input x="38" y="-20.5" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="-25" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="3" y1="-25" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-27" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-8" y1="-27" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-27" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="3" y1="-27" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-25" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-8" y1="-25" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <circle x="-13" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5"/>
+        <arc height="5" start="90" angle="-180" x="-7" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="4"/>
+        <line y2="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-10" y1="-29" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-10" y1="-24" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-28" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-8" y1="-28" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <circle x="-4" y="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8"/>
+        <line y2="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-29.4373" y1="-33" end2="none" x2="29.3905" antialias="false" end1="none" length2="1.5"/>
+        <rect height="18" x="-2" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="3"/>
+        <circle x="6" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5"/>
+        <arc height="5" start="-90" angle="-180" x="2" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="4"/>
+        <line y2="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4" y1="-29" end2="none" x2="9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4" y1="-24" end2="none" x2="9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-28" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="3" y1="-28" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-30" y1="-33" end2="none" x2="-39" antialias="true" end1="none" length2="1.5"/>
+        <line y2="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="30" y1="-33" end2="none" x2="40" antialias="true" end1="none" length2="1.5"/>
+        <arc height="49" start="0" angle="-180" x="-39" y="-26" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="79"/>
+        <ellipse height="36" x="-33" y="-17" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="67"/>
+        <terminal orientation="n" x="-8" y="-34"/>
+        <terminal orientation="n" x="8" y="-34"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/lavadero.elmt b/elements/60_energy/11_water/faucets/lavadero.elmt
index 9c1f082b7..a035d9725 100644
--- a/elements/60_energy/11_water/faucets/lavadero.elmt
+++ b/elements/60_energy/11_water/faucets/lavadero.elmt
@@ -1,45 +1,46 @@
-<definition width="80" version="0.4" hotspot_x="40" hotspot_y="42" height="110" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F9DCC5AE-4BB3-4E7F-AC7E-5AAE3329E9D2}"/><names>
+<definition type="element" height="110" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="42" width="80" hotspot_x="40">
+    <uuid uuid="{66c8d1ed-f5b7-4513-8749-df4b11d8d963}"/>
+    <names>
         <name lang="en">Laundry</name>
-        <name lang="fr">Evier</name>
-        <name lang="es">Lavadero</name>
-        <name lang="pl">Pralnia</name>
         <name lang="it">Lavatoio</name>
+        <name lang="es">Lavadero</name>
+        <name lang="fr">Evier</name>
+        <name lang="pl">Pralnia</name>
         <name lang="cs">Prádelna</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="47" x1="-24.1853" y2="47" x2="25.2008"/>
-        <line 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="-24.164" y2="35" x2="26.1777"/>
-        <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="3" y2="-25" 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="41" x1="-25" y2="41" x2="26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="57" x1="-25" y2="57" 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="-27" x1="-8" y2="-27" x2="-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="-27" x1="3" y2="-27" x2="6"/>
-        <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="-8" y2="-25" x2="-5"/>
-        <circle x="-13" y="-29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <arc width="4" x="-7" y="-29" antialias="true" height="5" style="line-style:normal;line-weight:normal;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="-29" x1="-10" y2="-29" 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="-24" x1="-10" y2="-24" x2="-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="-28" x1="-8" y2="-28" x2="-5"/>
-        <circle x="-4" y="-4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="8"/>
-        <rect width="3" x="-2" y="-29" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="6" y="-29" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <arc width="4" x="2" y="-29" antialias="true" height="5" style="line-style:normal;line-weight:normal;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="-29" x1="4" y2="-29" x2="9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="4" y2="-24" x2="9"/>
-        <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="-28" x1="3" y2="-28" x2="6"/>
-        <rect width="70" x="-35" y="-33" antialias="false" height="95" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="-1.96011" y2="-19" x2="-29.0368"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="1.9619" y2="-19" x2="30.0413"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18.2424" x1="-30" y2="56.1792" x2="-30"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="57" x1="29.9994" y2="57" x2="-29.9994"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18.1976" x1="31" y2="57.1308" x2="31"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="-28.9606" y2="21" x2="30.9574"/>
-        <line 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" x1="-25" y2="29" x2="26"/>
-        <input x="-16" y="13" size="4" rotate="true" text="Lavadero" tagg="label"/>
-        <terminal x="-8" y="-34" orientation="n"/>
-        <terminal x="8" y="-34" orientation="n"/>
+        <input x="43" y="-19.45" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="47" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-24.1853" y1="47" end2="none" x2="25.2008" antialias="false" end1="none" length2="1.5"/>
+        <line y2="35" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-24.164" y1="35" end2="none" x2="26.1777" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-25" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="3" y1="-25" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="41" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-25" y1="41" end2="none" x2="26" antialias="false" end1="none" length2="1.5"/>
+        <line y2="57" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-25" y1="57" end2="none" x2="26" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-27" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-8" y1="-27" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-27" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="3" y1="-27" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-25" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-8" y1="-25" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <circle x="-13" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5"/>
+        <arc height="5" start="90" angle="-180" x="-7" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="4"/>
+        <line y2="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-10" y1="-29" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-10" y1="-24" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-28" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-8" y1="-28" end2="none" x2="-5" antialias="false" end1="none" length2="1.5"/>
+        <circle x="-4" y="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="8"/>
+        <rect height="18" x="-2" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="3"/>
+        <circle x="6" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="5"/>
+        <arc height="5" start="-90" angle="-180" x="2" y="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="4"/>
+        <line y2="-29" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4" y1="-29" end2="none" x2="9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4" y1="-24" end2="none" x2="9" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-28" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="3" y1="-28" end2="none" x2="6" antialias="false" end1="none" length2="1.5"/>
+        <rect height="95" x="-35" y="-33" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="70"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-1.96011" y1="-19" end2="none" x2="-29.0368" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="1.9619" y1="-19" end2="none" x2="30.0413" antialias="false" end1="none" length2="1.5"/>
+        <line y2="56.1792" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-30" y1="-18.2424" end2="none" x2="-30" antialias="false" end1="none" length2="1.5"/>
+        <line y2="57" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="29.9994" y1="57" end2="none" x2="-29.9994" antialias="false" end1="none" length2="1.5"/>
+        <line y2="57.1308" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="31" y1="-18.1976" end2="none" x2="31" antialias="false" end1="none" length2="1.5"/>
+        <line y2="21" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-28.9606" y1="21" end2="none" x2="30.9574" antialias="false" end1="none" length2="1.5"/>
+        <line y2="29" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-25" y1="29" end2="none" x2="26" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="n" x="8" y="-34"/>
+        <terminal orientation="n" x="-8" y="-34"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/lavadora.elmt b/elements/60_energy/11_water/faucets/lavadora.elmt
index 40502f185..e951bc620 100644
--- a/elements/60_energy/11_water/faucets/lavadora.elmt
+++ b/elements/60_energy/11_water/faucets/lavadora.elmt
@@ -1,34 +1,35 @@
-<definition width="100" version="0.4" hotspot_x="44" hotspot_y="56" height="100" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{94ED1053-7081-4B20-AF28-3C7809DDE5EA}"/><names>
+<definition type="element" height="100" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="56" width="100" hotspot_x="44">
+    <uuid uuid="{f1bbd6e6-c3c8-4e63-b97e-7b209b7730fd}"/>
+    <names>
         <name lang="en">Washing machine</name>
-        <name lang="fr">Lave linge</name>
-        <name lang="es">Lavadora</name>
-        <name lang="pl">Pralka</name>
         <name lang="it">Lavatrice</name>
+        <name lang="es">Lavadora</name>
+        <name lang="fr">Lave linge</name>
+        <name lang="pl">Pralka</name>
         <name lang="cs">Pračka</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="20" x="30" y="-11" antialias="true" height="45" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-39.8808" x1="16.7229" y2="-39.8808" x2="18.198"/>
-        <arc width="15" x="33" y="-9" antialias="true" height="41" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <ellipse width="10.6207" x="20.0861" y="-46.478" antialias="true" height="11.8749" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="47" y="9" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.6207" x="1.49981" y="-45.1586" antialias="false" height="9.23602" 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="-46.478" x1="18.7585" y2="-45.1586" x2="20.0861"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-49.8206" x1="25.3965" y2="-48.3545" x2="25.3965"/>
-        <line 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.9226" x1="20.0861" y2="-34.6031" x2="18.7585"/>
-        <line 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.9226" x1="30.7069" y2="-34.6031" x2="32.0344"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-39.8808" x1="25.3965" y2="-42.5197" x2="28.0517"/>
-        <rect width="13.2759" x="-33.0176" y="-42.5197" antialias="false" height="3.95829" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="79.6556" x="-39.6556" y="-51.7557" antialias="false" height="19.7915" 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="-43.8391" x1="32.0344" y2="-45.1586" x2="34.6896"/>
-        <rect width="79.6556" x="-39.6556" y="-31.9643" antialias="false" height="71.2493" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="37.1726" x="-18.4141" y="-16.1311" antialias="true" height="34.3052" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="48.1209" x="-24.052" y="-20.7568" antialias="true" height="44.2086" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.98278" x="24.0689" y="-2.93678" antialias="false" height="5.27772" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-29" y="30" size="4" rotate="true" text="Lavadora" tagg="label"/>
-        <terminal x="49" y="11" orientation="n"/>
+        <input x="48" y="-29.45" size="9" tagg="label" rotate="true" text="_"/>
+        <arc height="45" start="0" angle="-90" x="30" y="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="20"/>
+        <line y2="-39.8808" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="16.7229" y1="-39.8808" end2="none" x2="18.198" antialias="false" end1="none" length2="1.5"/>
+        <arc height="41" start="0" angle="-90" x="33" y="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="15"/>
+        <ellipse height="11.8749" x="20.0861" y="-46.478" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="10.6207"/>
+        <rect height="2" x="47" y="9" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4"/>
+        <rect height="9.23602" x="1.49981" y="-45.1586" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" width="10.6207"/>
+        <line y2="-45.1586" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="18.7585" y1="-46.478" end2="none" x2="20.0861" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-48.3545" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="25.3965" y1="-49.8206" end2="none" x2="25.3965" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-34.6031" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="20.0861" y1="-35.9226" end2="none" x2="18.7585" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-34.6031" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="30.7069" y1="-35.9226" end2="none" x2="32.0344" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-42.5197" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="25.3965" y1="-39.8808" end2="none" x2="28.0517" antialias="false" end1="none" length2="1.5"/>
+        <rect height="3.95829" x="-33.0176" y="-42.5197" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="13.2759"/>
+        <rect height="19.7915" x="-39.6556" y="-51.7557" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="79.6556"/>
+        <line y2="-45.1586" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="32.0344" y1="-43.8391" end2="none" x2="34.6896" antialias="false" end1="none" length2="1.5"/>
+        <rect height="71.2493" x="-39.6556" y="-31.9643" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="79.6556"/>
+        <ellipse height="34.3052" x="-18.4141" y="-16.1311" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="37.1726"/>
+        <ellipse height="44.2086" x="-24.052" y="-20.7568" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="48.1209"/>
+        <rect height="5.27772" x="24.0689" y="-2.93678" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="3.98278"/>
+        <terminal orientation="n" x="49" y="11"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/lavavajillas.elmt b/elements/60_energy/11_water/faucets/lavavajillas.elmt
index 8f97097b2..6801966c3 100644
--- a/elements/60_energy/11_water/faucets/lavavajillas.elmt
+++ b/elements/60_energy/11_water/faucets/lavavajillas.elmt
@@ -1,28 +1,29 @@
-<definition width="100" version="0.4" hotspot_x="44" hotspot_y="61" height="100" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E35477C6-E13E-4525-887F-D32A235CA86E}"/><names>
+<definition type="element" height="100" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="61" width="100" hotspot_x="44">
+    <uuid uuid="{40a5aa2c-0ddd-445e-b9c7-3e2fd984736f}"/>
+    <names>
         <name lang="en">Dishwasher</name>
-        <name lang="fr">Lave-vaisselle</name>
-        <name lang="es">Lavavajillas</name>
-        <name lang="pl">Zmywarka</name>
         <name lang="it">Lavastoviglie</name>
+        <name lang="es">Lavavajillas</name>
+        <name lang="fr">Lave-vaisselle</name>
+        <name lang="pl">Zmywarka</name>
         <name lang="cs">Myčka</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="20" x="30" y="-15" antialias="true" height="45" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <circle x="31" y="-44" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="24" y="-44" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="17" y="-44" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <rect width="10.6207" x="-35.5002" y="-49.1586" antialias="false" height="10.236" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="28.2759" x="-14.0176" y="-31.5197" antialias="false" height="3.95829" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="79.6556" x="-39.6556" y="-56.7557" antialias="false" height="21.7915" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="79.6556" x="-39.6556" y="-34.9643" antialias="false" height="69.2493" 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="-54" x1="-39" y2="-54" x2="40"/>
-        <circle x="9" y="-44" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <arc width="15" x="33" y="-13" antialias="true" height="41" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="4" x="47" y="5" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-17" y="-9" size="4" rotate="true" text="Lavavajillas" tagg="label"/>
-        <terminal x="49" y="7" orientation="n"/>
+        <input x="48" y="-39.45" size="9" tagg="label" rotate="true" text="_"/>
+        <arc height="45" start="0" angle="-90" x="30" y="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="20"/>
+        <circle x="31" y="-44" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4"/>
+        <circle x="24" y="-44" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4"/>
+        <circle x="17" y="-44" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4"/>
+        <rect height="10.236" x="-35.5002" y="-49.1586" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.6207"/>
+        <rect height="3.95829" x="-14.0176" y="-31.5197" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="28.2759"/>
+        <rect height="21.7915" x="-39.6556" y="-56.7557" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="79.6556"/>
+        <rect height="69.2493" x="-39.6556" y="-34.9643" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="79.6556"/>
+        <line y2="-54" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-39" y1="-54" end2="none" x2="40" antialias="false" end1="none" length2="1.5"/>
+        <circle x="9" y="-44" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="4"/>
+        <arc height="41" start="0" angle="-90" x="33" y="-13" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="15"/>
+        <rect height="2" x="47" y="5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4"/>
+        <terminal orientation="n" x="49" y="7"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/manguera.elmt b/elements/60_energy/11_water/faucets/manguera.elmt
index 9f44e7b8a..2dacf3212 100644
--- a/elements/60_energy/11_water/faucets/manguera.elmt
+++ b/elements/60_energy/11_water/faucets/manguera.elmt
@@ -1,30 +1,32 @@
-<definition width="60" version="0.4" hotspot_x="36" hotspot_y="15" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E765500F-14DC-4D1E-9AE7-E5422FAB4090}"/><names>
+<definition type="element" height="40" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="15" width="60" hotspot_x="36">
+    <uuid uuid="{4d3c25ee-ca59-4d4b-bea2-51dfc52c5e95}"/>
+    <names>
         <name lang="en">Hose irrigation</name>
-        <name lang="fr">Tuyau d'arrosage</name>
-        <name lang="es">Manguera riego</name>
-        <name lang="pl">Wąż</name>
         <name lang="it">Tubo per irrigazione</name>
+        <name lang="es">Manguera riego</name>
+        <name lang="fr">Tuyau d'arrosage</name>
+        <name lang="pl">Wąż</name>
         <name lang="cs">Hadice</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="10.8" x="-20.4" y="-7.25" antialias="false" height="7.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="49.5" x="-31.2" y="-2" antialias="true" height="20.25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2.7" x="-9.6" y="-5.75" antialias="false" height="4.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="30.6" x="-22.2" y="4" antialias="true" height="14.25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-270"/>
-        <rect width="2.7" x="-15.9" y="-9.5" antialias="false" height="2.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.0725" x="-24.4725" y="-8.25753" antialias="false" height="9.69441" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="54" x="-33" y="-4.25" antialias="true" height="24.75" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="35.1" x="-24.9" y="2.5" antialias="true" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-270"/>
-        <polygon x4="11.1" y5="11.5" x5="11.1" y6="11.5" x6="11.1" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="11.5" x1="11.1" y2="11.5" x2="7.5" y3="20.5" x3="9.3" y4="12.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="-9.5" x1="-17.7" y2="-9.5" x2="-12.3"/>
-        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.5" x1="-12.3" y2="-11" x2="-9.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="-11" x1="-9.744" y2="-11" x2="-5.844"/>
-        <line 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.25" x1="-15" y2="-10.25" x2="-14.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="-5.02606" x1="-24.2767" y2="-5.02606" x2="-21.0696"/>
-        <line 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.79459" x1="-24.2767" y2="-1.79459" x2="-21.0696"/>
-        <terminal x="-24.9" y="-3.5" orientation="w"/>
+        <input x="3" y="-14.45" size="9" tagg="label" rotate="true" text="_"/>
+        <rect height="7.5" x="-20.4" y="-7.25" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="10.8"/>
+        <arc height="20.25" start="90" angle="-180" x="-31.2" y="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="49.5"/>
+        <rect height="4.5" x="-9.6" y="-5.75" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2.7"/>
+        <arc height="14.25" start="-90" angle="-270" x="-22.2" y="4" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="30.6"/>
+        <rect height="2.25" x="-15.9" y="-9.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2.7"/>
+        <rect height="9.69441" x="-24.4725" y="-8.25753" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4.0725"/>
+        <arc height="24.75" start="90" angle="-180" x="-33" y="-4.25" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="54"/>
+        <arc height="18" start="-90" angle="-270" x="-24.9" y="2.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="35.1"/>
+        <polygon y4="12.25" y2="11.5" y6="11.5" x4="11.1" style="line-style:normal;line-weight:normal;filling:black;color:black" x1="11.1" y1="11.5" x6="11.1" x2="7.5" antialias="true" y3="20.5" x5="11.1" y5="11.5" x3="9.3"/>
+        <line y2="-9.5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-17.7" y1="-9.5" end2="none" x2="-12.3" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-12.3" y1="-9.5" end2="none" x2="-9.6" antialias="true" end1="none" length2="1.5"/>
+        <line y2="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-9.744" y1="-11" end2="none" x2="-5.844" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-10.25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-15" y1="-10.25" end2="none" x2="-14.1" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-5.02606" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-24.2767" y1="-5.02606" end2="none" x2="-21.0696" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-1.79459" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-24.2767" y1="-1.79459" end2="none" x2="-21.0696" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="w" x="-24.9" y="-3.5"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/termo-electrico.elmt b/elements/60_energy/11_water/faucets/termo-electrico.elmt
index d5c80234f..f84a2acad 100644
--- a/elements/60_energy/11_water/faucets/termo-electrico.elmt
+++ b/elements/60_energy/11_water/faucets/termo-electrico.elmt
@@ -1,42 +1,44 @@
-<definition width="50" version="0.4" hotspot_x="29" hotspot_y="34" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B26D1A5E-6D4B-4764-B6AF-7904FAF3C484}"/><names>
+<definition type="element" height="80" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="34" width="50" hotspot_x="29">
+    <uuid uuid="{61dfd962-b7a8-4406-b2da-e5bce72a182f}"/>
+    <names>
         <name lang="en">thermo Electric</name>
-        <name lang="fr">Ballon eau chaude</name>
-        <name lang="es">Termo Electrico</name>
-        <name lang="pl">Bojler elektryczny</name>
         <name lang="it">Boiler elettrico</name>
+        <name lang="es">Termo Electrico</name>
+        <name lang="fr">Ballon eau chaude</name>
+        <name lang="pl">Bojler elektryczny</name>
         <name lang="cs">Elektrický ohřívač</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:thin;filling:none;color:black" y1="38.8288" x1="7.4" y2="38.4249" x2="11.18"/>
-        <arc width="9.786" x="-10.62" y="39.3811" antialias="true" height="2.57749" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="38.8288" x1="-22.18" y2="38.4249" x2="-18.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="37.2133" x1="-15.88" y2="40.4441" x2="-15.88"/>
-        <rect width="4.158" x="14.118" y="-4.38275" antialias="false" height="6.46153" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="37.0986" x="-22.842" y="-26.4691" antialias="false" height="59.4061" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="37.0986" x="-22.3338" y="-29.5048" antialias="true" height="6.5043" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="39.2326" x1="-15.04" y2="40.848" x2="-15.88"/>
-        <ellipse width="1.848" x="15.504" y="-1.55583" antialias="true" height="1.21154" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.2" x="-22.18" y="35.598" antialias="false" height="5.25" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <arc width="37.0986" x="-22.842" y="29.9013" antialias="true" height="6.5043" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="39.2326" x1="-16.72" y2="40.848" x2="-15.88"/>
-        <rect width="4.2" x="7.4" y="35.598" antialias="false" height="5.25" style="line-style:normal;line-weight:normal;filling:blue;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="40.4441" x1="-22.18" y2="40.0403" x2="-18.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="40.4441" x1="7.4" y2="40.0403" x2="11.18"/>
-        <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="39.6364" x1="-22.18" y2="39.2326" x2="-18.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="39.6364" x1="7.4" y2="39.2326" x2="11.18"/>
-        <ellipse width="1.68" x="-8.52" y="37.9201" antialias="true" height="1.51442" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <rect width="0.16" x="-2.8" y="37.9201" antialias="false" height="2.01922" 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="40.949" x1="-10.62" y2="36.4056" x2="-10.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="40.949" x1="-0.96" y2="36.4056" x2="-0.96"/>
-        <line 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.2133" x1="4.88" y2="40.4441" x2="4.88"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36.8095" x1="4.88" y2="38.4249" x2="4.04"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36.8095" x1="4.88" y2="38.4249" x2="5.72"/>
-        <rect width="4.158" x="-27" y="-5.19046" antialias="false" height="6.46153" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1.848" x="-25.614" y="-2.36352" antialias="true" height="1.21154" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="9.5" y="40.4441" orientation="s"/>
-        <terminal x="-20.08" y="40.0403" orientation="s"/>
+        <line y2="38.4249" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="7.4" y1="38.8288" end2="none" x2="11.18" antialias="false" end1="none" length2="1.5"/>
+        <input x="23" y="-39.45" size="9" tagg="label" rotate="true" text="_"/>
+        <arc height="2.57749" start="0" angle="-180" x="-10.62" y="39.3811" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="9.786"/>
+        <line y2="38.4249" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-22.18" y1="38.8288" end2="none" x2="-18.4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="40.4441" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-15.88" y1="37.2133" end2="none" x2="-15.88" antialias="false" end1="none" length2="1.5"/>
+        <rect height="6.46153" x="14.118" y="-4.38275" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4.158"/>
+        <rect height="59.4061" x="-22.842" y="-26.4691" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="37.0986"/>
+        <arc height="6.5043" start="-180" angle="-180" x="-22.3338" y="-29.5048" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="37.0986"/>
+        <line y2="40.848" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-15.04" y1="39.2326" end2="none" x2="-15.88" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="1.21154" x="15.504" y="-1.55583" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.848"/>
+        <rect height="5.25" x="-22.18" y="35.598" style="line-style:normal;line-weight:normal;filling:red;color:black" antialias="false" width="4.2"/>
+        <arc height="6.5043" start="0" angle="-180" x="-22.842" y="29.9013" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="37.0986"/>
+        <line y2="40.848" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-16.72" y1="39.2326" end2="none" x2="-15.88" antialias="false" end1="none" length2="1.5"/>
+        <rect height="5.25" x="7.4" y="35.598" style="line-style:normal;line-weight:normal;filling:blue;color:black" antialias="false" width="4.2"/>
+        <line y2="40.0403" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-22.18" y1="40.4441" end2="none" x2="-18.4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="40.0403" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="7.4" y1="40.4441" end2="none" x2="11.18" antialias="false" end1="none" length2="1.5"/>
+        <line y2="39.2326" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-22.18" y1="39.6364" end2="none" x2="-18.4" antialias="false" end1="none" length2="1.5"/>
+        <line y2="39.2326" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="7.4" y1="39.6364" end2="none" x2="11.18" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="1.51442" x="-8.52" y="37.9201" style="line-style:normal;line-weight:normal;filling:red;color:black" antialias="true" width="1.68"/>
+        <rect height="2.01922" x="-2.8" y="37.9201" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="0.16"/>
+        <line y2="36.4056" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-10.62" y1="40.949" end2="none" x2="-10.62" antialias="false" end1="none" length2="1.5"/>
+        <line y2="36.4056" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-0.96" y1="40.949" end2="none" x2="-0.96" antialias="false" end1="none" length2="1.5"/>
+        <line y2="40.4441" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4.88" y1="37.2133" end2="none" x2="4.88" antialias="false" end1="none" length2="1.5"/>
+        <line y2="38.4249" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4.88" y1="36.8095" end2="none" x2="4.04" antialias="false" end1="none" length2="1.5"/>
+        <line y2="38.4249" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="4.88" y1="36.8095" end2="none" x2="5.72" antialias="false" end1="none" length2="1.5"/>
+        <rect height="6.46153" x="-27" y="-5.19046" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4.158"/>
+        <ellipse height="1.21154" x="-25.614" y="-2.36352" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="1.848"/>
+        <terminal orientation="s" x="9.5" y="40.4441"/>
+        <terminal orientation="s" x="-20.08" y="40.0403"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/faucets/vertedero.elmt b/elements/60_energy/11_water/faucets/vertedero.elmt
index 57b1190f4..48d8e1f90 100644
--- a/elements/60_energy/11_water/faucets/vertedero.elmt
+++ b/elements/60_energy/11_water/faucets/vertedero.elmt
@@ -1,39 +1,40 @@
-<definition width="70" version="0.4" hotspot_x="35" hotspot_y="37" height="90" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{2D6A9301-0FEF-4B55-BCF5-9FFCD98EA2D4}"/><names>
+<definition type="element" height="90" orientation="dyyy" version="0.5" link_type="simple" hotspot_y="37" width="70" hotspot_x="35">
+    <uuid uuid="{53bb5b7e-32bf-461a-8b41-d20f2bd7cb5b}"/>
+    <names>
         <name lang="en">Sink</name>
-        <name lang="fr">Evier</name>
-        <name lang="es">Vertedero</name>
-        <name lang="pl">Zlewozmywak</name>
         <name lang="it">Lavandino</name>
+        <name lang="es">Vertedero</name>
+        <name lang="fr">Evier</name>
+        <name lang="pl">Zlewozmywak</name>
         <name lang="cs">Výlevka</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:thin;filling:none;color:black" y1="-21.1" x1="2.23516" y2="-21.1" x2="4.93187"/>
-        <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="-22.9" x1="-7.65275" y2="-22.9" x2="-4.95604"/>
-        <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="-22.9" x1="2.23516" y2="-22.9" x2="4.93187"/>
-        <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="-21.1" x1="-7.65275" y2="-21.1" x2="-4.95604"/>
-        <ellipse width="4.49451" x="-12.1473" y="-24.7" antialias="true" height="4.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3.5956" x="-6.75385" y="-24.7" antialias="true" height="4.5" style="line-style:normal;line-weight:normal;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="-24.7" x1="-9.45055" y2="-24.7" x2="-4.95604"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20.2" x1="-9.45055" y2="-20.2" x2="-4.95604"/>
-        <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="-23.8" x1="-7.65275" y2="-23.8" x2="-4.95604"/>
-        <ellipse width="7.19121" x="-4.05714" y="-2.2" antialias="true" height="7.2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.6967" x="-2.25934" y="-24.7" antialias="false" height="16.2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="4.49451" x="4.93187" y="-24.7" antialias="true" height="4.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3.5956" x="1.33626" y="-24.7" antialias="true" height="4.5" style="line-style:normal;line-weight:normal;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="-24.7" x1="3.13407" y2="-24.7" x2="7.62857"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20.2" x1="3.13407" y2="-20.2" x2="7.62857"/>
-        <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="-23.8" x1="2.23516" y2="-23.8" x2="4.93187"/>
-        <rect width="62.9231" x="-31.9231" y="-28.3" antialias="false" height="75.6" 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.7" x1="-2.25934" y2="-15.7" x2="-27.4286"/>
-        <line 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.7" x1="1.33626" y2="-15.7" x2="27.4044"/>
-        <line 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.6136" x1="-27.4286" y2="42.7064" x2="-27.4286"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="43.7" x1="27.3857" y2="43.7" x2="-27.4113"/>
-        <line 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.6136" x1="27.4044" y2="42.7064" x2="27.4044"/>
-        <input x="-15" y="22" size="4" rotate="true" text="Vertedero" tagg="label"/>
-        <terminal x="-7.65275" y="-29.2" orientation="n"/>
-        <terminal x="6.72967" y="-29.2" orientation="n"/>
+        <line y2="-21.1" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="2.23516" y1="-21.1" end2="none" x2="4.93187" antialias="false" end1="none" length2="1.5"/>
+        <input x="38" y="-19.45" size="9" tagg="label" rotate="true" text="_"/>
+        <line y2="-22.9" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-7.65275" y1="-22.9" end2="none" x2="-4.95604" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-22.9" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="2.23516" y1="-22.9" end2="none" x2="4.93187" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-21.1" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-7.65275" y1="-21.1" end2="none" x2="-4.95604" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="4.5" x="-12.1473" y="-24.7" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="4.49451"/>
+        <arc height="4.5" start="90" angle="-180" x="-6.75385" y="-24.7" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="3.5956"/>
+        <line y2="-24.7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-9.45055" y1="-24.7" end2="none" x2="-4.95604" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-20.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-9.45055" y1="-20.2" end2="none" x2="-4.95604" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-23.8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="-7.65275" y1="-23.8" end2="none" x2="-4.95604" antialias="false" end1="none" length2="1.5"/>
+        <ellipse height="7.2" x="-4.05714" y="-2.2" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="7.19121"/>
+        <rect height="16.2" x="-2.25934" y="-24.7" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="2.6967"/>
+        <ellipse height="4.5" x="4.93187" y="-24.7" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="4.49451"/>
+        <arc height="4.5" start="-90" angle="-180" x="1.33626" y="-24.7" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="3.5956"/>
+        <line y2="-24.7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="3.13407" y1="-24.7" end2="none" x2="7.62857" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-20.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="3.13407" y1="-20.2" end2="none" x2="7.62857" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-23.8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x1="2.23516" y1="-23.8" end2="none" x2="4.93187" antialias="false" end1="none" length2="1.5"/>
+        <rect height="75.6" x="-31.9231" y="-28.3" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="62.9231"/>
+        <line y2="-15.7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-2.25934" y1="-15.7" end2="none" x2="-27.4286" antialias="false" end1="none" length2="1.5"/>
+        <line y2="-15.7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="1.33626" y1="-15.7" end2="none" x2="27.4044" antialias="false" end1="none" length2="1.5"/>
+        <line y2="42.7064" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="-27.4286" y1="-15.6136" end2="none" x2="-27.4286" antialias="false" end1="none" length2="1.5"/>
+        <line y2="43.7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="27.3857" y1="43.7" end2="none" x2="-27.4113" antialias="false" end1="none" length2="1.5"/>
+        <line y2="42.7064" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x1="27.4044" y1="-15.6136" end2="none" x2="27.4044" antialias="false" end1="none" length2="1.5"/>
+        <terminal orientation="n" x="-7.65275" y="-29.2"/>
+        <terminal orientation="n" x="6.72967" y="-29.2"/>
     </description>
 </definition>