diff --git a/elements/60_energy/11_water/cuivre/manguito-18-22.elmt b/elements/60_energy/11_water/cuivre/manguito-18-22.elmt
index 2ca41a550..e7384834c 100644
--- a/elements/60_energy/11_water/cuivre/manguito-18-22.elmt
+++ b/elements/60_energy/11_water/cuivre/manguito-18-22.elmt
@@ -1,24 +1,26 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="17" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D6D88663-C5E9-401E-9145-CC0DAE0F843F}"/><names>
-        <name lang="en">Copper Hose 18-22</name>
-        <name lang="it">Riduzione 18-22</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="15" height="30" hotspot_y="17" link_type="simple">
+    <uuid uuid="{2af53f09-95f8-4758-9447-00db209e9c4b}"/>
+    <names>
         <name lang="fr">Cuivre Tuyau 18-22</name>
+        <name lang="it">Riduzione 18-22</name>
+        <name lang="en">Copper Hose 18-22</name>
         <name lang="pl">Redukcja 18 - 22</name>
-        <name lang="es">Manguito cobre 18-22</name>
         <name lang="cs">Redukční převod 18 - 22</name>
+        <name lang="es">Manguito cobre 18-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="-7" x1="9" y2="-7" x2="10"/>
-        <rect width="8.8" x="-9.6" y="-6.63888" antialias="false" height="13.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="-6" y="-8" size="3" text="Cu18-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="-7" 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="5" x1="1" y2="8" x2="9"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="19" y="0" orientation="e"/>
+        <input text="_" size="9" y="7.55" tagg="label" rotate="true" x="-4"/>
+        <line x2="10" x1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="8" length2="1.5" y1="8" end2="none" antialias="false"/>
+        <line x2="1" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <line x2="10" x1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-7" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.63888" width="8.8" height="13.6389" x="-9.6" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.63888" width="7.8" height="17.6389" x="10.4" antialias="false"/>
+        <text text="Cu18-22" size="3" y="-8" x="-6"/>
+        <line x2="1" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <line x2="9" x1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <line x2="9" x1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="8" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <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/manguito15-18.elmt b/elements/60_energy/11_water/cuivre/manguito15-18.elmt
index c87f65b6f..a3d02932b 100644
--- a/elements/60_energy/11_water/cuivre/manguito15-18.elmt
+++ b/elements/60_energy/11_water/cuivre/manguito15-18.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="{CCDF5547-310D-4814-A697-4D8C70552B02}"/><names>
-        <name lang="en">Copper Hose 15-18</name>
-        <name lang="it">Riduzione 15-18</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="15" height="30" hotspot_y="18" link_type="simple">
+    <uuid uuid="{49c5bb39-b2b4-4c36-9162-ab2dc4bc78b9}"/>
+    <names>
         <name lang="fr">Cuivre Tuyau 15-18</name>
+        <name lang="it">Riduzione 15-18</name>
+        <name lang="en">Copper Hose 15-18</name>
         <name lang="pl">Redukcja 15 - 18</name>
-        <name lang="es">Manguito cobre 15-18</name>
         <name lang="cs">Redukční převod 15 - 18</name>
+        <name lang="es">Manguito cobre 15-18</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="9" y2="6" 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="-6" x1="9" y2="-6" 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="-6.63888" antialias="false" height="13.6389" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-5" y="-8" size="3" text="Cu15-18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="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="-6" 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="6" x2="8"/>
-        <terminal x="-10" y="0" orientation="w"/>
-        <terminal x="19" y="0" orientation="e"/>
+        <input text="_" size="9" y="7.55" tagg="label" rotate="true" x="-2"/>
+        <line x2="10" x1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6" length2="1.5" y1="6" end2="none" antialias="false"/>
+        <line x2="1" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <line x2="10" x1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6" length2="1.5" y1="-6" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.63888" width="8.8" height="11.6389" x="-9.6" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.63888" width="7.8" height="13.6389" x="10.4" antialias="false"/>
+        <text text="Cu15-18" size="3" y="-8" x="-5"/>
+        <line x2="1" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <line x2="8" x1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <line x2="8" x1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <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/tubo18.elmt b/elements/60_energy/11_water/cuivre/tubo18.elmt
index a3d50983c..1e061d69f 100644
--- a/elements/60_energy/11_water/cuivre/tubo18.elmt
+++ b/elements/60_energy/11_water/cuivre/tubo18.elmt
@@ -1,17 +1,19 @@
-<definition width="70" version="0.4" hotspot_x="33" hotspot_y="10" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{045965AB-EA12-4D8C-AEE1-7126640CAE0E}"/><names>
-        <name lang="en">18 Copper Tube</name>
-        <name lang="it">Tubo rame 18</name>
+<definition orientation="dyyy" type="element" width="80" version="0.5" hotspot_x="37" height="20" hotspot_y="10" link_type="simple">
+    <uuid uuid="{9dccac3f-ca40-45c8-b92a-066551c33d34}"/>
+    <names>
         <name lang="fr">Tube cuivre 18</name>
+        <name lang="it">Tubo rame 18</name>
+        <name lang="en">18 Copper Tube</name>
         <name lang="pl">Mufa 18</name>
-        <name lang="es">Tubo Cobre 18</name>
         <name lang="cs">Trubka 18 měď</name>
+        <name lang="es">Tubo Cobre 18</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="61" x="-29" y="-7.15763" antialias="false" height="14.1576" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-10" y="1" size="4" text="Cu15"/>
-        <terminal x="-29" y="0" orientation="w"/>
-        <terminal x="33" y="0" orientation="e"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.15763" width="61" height="14.1576" x="-29" antialias="false"/>
+        <input text="_" size="9" y="-19.45" tagg="label" rotate="true" x="-22"/>
+        <text text="Cu15" size="4" y="1" x="-10"/>
+        <terminal orientation="w" y="0" x="-29"/>
+        <terminal orientation="e" y="0" x="33"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/cuivre/tubo22.elmt b/elements/60_energy/11_water/cuivre/tubo22.elmt
index e2e8c1ab8..b7fa684d4 100644
--- a/elements/60_energy/11_water/cuivre/tubo22.elmt
+++ b/elements/60_energy/11_water/cuivre/tubo22.elmt
@@ -1,17 +1,19 @@
-<definition width="60" version="0.4" hotspot_x="28" hotspot_y="16" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{341A059A-1314-413F-8F3B-98F0B5FEAEBA}"/><names>
-        <name lang="en">22 Copper Tube</name>
-        <name lang="it">Tubo rame 22</name>
+<definition orientation="dyyy" type="element" width="60" version="0.5" hotspot_x="27" height="30" hotspot_y="16" link_type="simple">
+    <uuid uuid="{633380e0-6b0b-4549-93db-53a9ad0dd595}"/>
+    <names>
         <name lang="fr">Tube 22 cuivre</name>
+        <name lang="it">Tubo rame 22</name>
+        <name lang="en">22 Copper Tube</name>
         <name lang="pl">Mufa 22</name>
-        <name lang="es">Tubo Cobre 22</name>
         <name lang="cs">Trubka 22 měď</name>
+        <name lang="es">Tubo Cobre 22</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="48.8" x="-22.4" y="-9.99447" antialias="false" height="17.9945" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-8" y="0.930742" size="4" text="Cu22"/>
-        <terminal x="-23" y="0" orientation="w"/>
-        <terminal x="27" y="0" orientation="e"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.99447" width="48.8" height="17.9945" x="-22.4" antialias="false"/>
+        <text text="Cu22" size="4" y="0.930742" x="-8"/>
+        <input text="_" size="9" y="-20" tagg="label" rotate="true" x="-14"/>
+        <terminal orientation="w" y="0" x="-23"/>
+        <terminal orientation="e" y="0" x="27"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/codoalpex-16.elmt b/elements/60_energy/11_water/fittings/codoalpex-16.elmt
index d44ffd4a4..6975c3697 100644
--- a/elements/60_energy/11_water/fittings/codoalpex-16.elmt
+++ b/elements/60_energy/11_water/fittings/codoalpex-16.elmt
@@ -1,27 +1,29 @@
-<definition width="60" version="0.4" hotspot_x="34" hotspot_y="41" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{0653AD24-3556-494B-9702-D1A72498F6B8}"/><names>
-        <name lang="en">Elbow Alpex 16</name>
+<definition orientation="dyyy" type="element" width="60" version="0.5" hotspot_x="34" height="60" hotspot_y="40" link_type="simple">
+    <uuid uuid="{eb967071-ca57-4284-be05-9fc1281c41a8}"/>
+    <names>
         <name lang="fr">Coude Alpex 16</name>
-        <name lang="es">Codo Alpex 16</name>
-        <name lang="pl">Kolanko Alpex 16</name>
         <name lang="it">Gomito Alpex 16</name>
+        <name lang="en">Elbow Alpex 16</name>
+        <name lang="pl">Kolanko Alpex 16</name>
         <name lang="cs">Koleno Alpex 16</name>
+        <name lang="es">Codo Alpex 16</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="4" x="-4" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17" x="2" y="-30.4762" antialias="false" height="15.4762" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="33" x="-16" y="-25" antialias="true" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="11" x="5" y="-32.6871" antialias="false" height="2.21089" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="12" x="5" y="-13" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.22328" x="-27.1212" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.8979" x="-24.8979" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="-5" y="-14" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-1" y="11" size="4" text="codo16"/>
-        <rect width="22" x="-1" y="-15" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="-6" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-27.1212" y="0" orientation="w"/>
-        <terminal x="10" y="-32.6871" orientation="n"/>
+        <input text="_" size="9" y="10.55" tagg="label" rotate="true" x="3"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5" width="4" height="10" x="-4" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-30.4762" width="17" height="15.4762" x="2" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-25" width="33" height="30" start="0" angle="-90" x="-16" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-32.6871" width="11" height="2.21089" x="5" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13" width="12" height="3" x="5" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5" width="2.22328" height="10" x="-27.1212" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8" width="18.8979" height="16" x="-24.8979" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14" width="10" height="9" start="0" angle="-90" x="-5" antialias="true"/>
+        <text text="codo16" size="4" y="11" x="-1"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-15" width="22" height="2" x="-1" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-10" width="2" height="20" x="-6" antialias="false"/>
+        <terminal orientation="w" y="0" x="-27.1212"/>
+        <terminal orientation="n" y="-32.6871" x="10"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/codoalpex20.elmt b/elements/60_energy/11_water/fittings/codoalpex20.elmt
index 1701ab5fc..2106ec9f1 100644
--- a/elements/60_energy/11_water/fittings/codoalpex20.elmt
+++ b/elements/60_energy/11_water/fittings/codoalpex20.elmt
@@ -1,27 +1,29 @@
-<definition width="70" version="0.4" hotspot_x="33" hotspot_y="42" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{BC052801-52D9-4142-A20B-32A5F866306B}"/><names>
-        <name lang="en">Elbow Alpex 20</name>
+<definition orientation="dyyy" type="element" width="70" version="0.5" hotspot_x="33" height="70" hotspot_y="42" link_type="simple">
+    <uuid uuid="{96caaac5-10b2-46e6-b987-5a79aade538b}"/>
+    <names>
         <name lang="fr">Coude Alpex 20</name>
-        <name lang="es">Codo Alpex 20</name>
-        <name lang="pl">Kolanko Alpex 20</name>
         <name lang="it">Gomito Alpex 20</name>
+        <name lang="en">Elbow Alpex 20</name>
+        <name lang="pl">Kolanko Alpex 20</name>
         <name lang="cs">Koleno Alpex 20</name>
+        <name lang="es">Codo Alpex 20</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="5.21976" x="-0.513623" y="-0.115766" antialias="false" height="12.7448" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="22.184" x="7.31602" y="-32.2387" antialias="false" height="18.9271" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="43.063" x="-16.1729" y="-25.6053" antialias="true" height="38.2343" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="14.3543" x="11.2308" y="-34.6065" antialias="false" height="2.3678" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.6593" x="11.2308" y="-10.3116" antialias="false" height="3.82343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.21976" x="-27.9174" y="-0.115766" antialias="false" height="12.7448" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="22.184" x="-24.6976" y="-3.9392" antialias="false" height="20.3916" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="13.0494" x="-1.81856" y="-11.5861" antialias="true" height="11.4703" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="3" y="20" size="4" text="codo20"/>
-        <rect width="29" x="4" y="-13" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="4" x="-4" y="-8" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-27.9174" y="6.25662" orientation="w"/>
-        <terminal x="17.7555" y="-34.6065" orientation="n"/>
+        <input text="_" size="9" y="20.55" tagg="label" rotate="true" x="3"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-0.115766" width="5.21976" height="12.7448" x="-0.513623" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-32.2387" width="22.184" height="18.9271" x="7.31602" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-25.6053" width="43.063" height="38.2343" start="0" angle="-90" x="-16.1729" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-34.6065" width="14.3543" height="2.3678" x="11.2308" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.3116" width="15.6593" height="3.82343" x="11.2308" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-0.115766" width="3.21976" height="12.7448" x="-27.9174" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.9392" width="22.184" height="20.3916" x="-24.6976" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.5861" width="13.0494" height="11.4703" start="0" angle="-90" x="-1.81856" antialias="true"/>
+        <text text="codo20" size="4" y="20" x="3"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-13" width="29" height="2" x="4" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-8" width="4" height="27" x="-4" antialias="false"/>
+        <terminal orientation="w" y="6.25662" x="-27.9174"/>
+        <terminal orientation="n" y="-34.6065" x="17.7555"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/codoalpex25.elmt b/elements/60_energy/11_water/fittings/codoalpex25.elmt
index 9890d589e..5a5e29389 100644
--- a/elements/60_energy/11_water/fittings/codoalpex25.elmt
+++ b/elements/60_energy/11_water/fittings/codoalpex25.elmt
@@ -1,27 +1,29 @@
-<definition width="80" version="0.4" hotspot_x="35" hotspot_y="55" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{04992835-5321-4CCB-9D4A-A136687CA2FA}"/><names>
-        <name lang="en">Elbow Alpex 25</name>
+<definition orientation="dyyy" type="element" width="80" version="0.5" hotspot_x="35" height="80" hotspot_y="54" link_type="simple">
+    <uuid uuid="{5cf1e14c-0b37-4ddf-9dbe-bbd94add4a5c}"/>
+    <names>
         <name lang="fr">Coude Alpex 25</name>
-        <name lang="es">Codo Alpex 25</name>
-        <name lang="pl">Kolanko Alpex 25</name>
         <name lang="it">Gomito Alpex 25</name>
+        <name lang="en">Elbow Alpex 25</name>
+        <name lang="pl">Kolanko Alpex 25</name>
         <name lang="cs">Koleno Alpex 25</name>
+        <name lang="es">Codo Alpex 25</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="6.26371" x="2.36713" y="-7.3698" antialias="false" height="16.3488" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="26.6208" x="11.7627" y="-45.1238" antialias="false" height="22.675" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="51.6756" x="-16.424" y="-40.0674" antialias="true" height="49.0465" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="17.2252" x="16.4605" y="-48.2228" antialias="false" height="3.09892" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.7911" x="16.4605" y="-20.4489" antialias="false" height="4.90465" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.26371" x="-30.5174" y="-7.3698" antialias="false" height="16.3488" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="26.6208" x="-27.2537" y="-12.2744" antialias="false" height="26.1581" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.6593" x="0.8012" y="-22.0837" antialias="true" height="14.7139" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="6.58347" y="18.4344" size="4" text="codo25"/>
-        <rect width="34" x="8" y="-23" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="3" x="-1" y="-16" antialias="false" height="33" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-30.5174" y="0.80461" orientation="w"/>
-        <terminal x="25" y="-48.642" orientation="n"/>
+        <input text="_" size="9" y="20.55" tagg="label" rotate="true" x="3"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.3698" width="6.26371" height="16.3488" x="2.36713" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-45.1238" width="26.6208" height="22.675" x="11.7627" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-40.0674" width="51.6756" height="49.0465" start="0" angle="-90" x="-16.424" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-48.2228" width="17.2252" height="3.09892" x="16.4605" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20.4489" width="18.7911" height="4.90465" x="16.4605" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.3698" width="3.26371" height="16.3488" x="-30.5174" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.2744" width="26.6208" height="26.1581" x="-27.2537" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-22.0837" width="15.6593" height="14.7139" start="0" angle="-90" x="0.8012" antialias="true"/>
+        <text text="codo25" size="4" y="18.4344" x="6.58347"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-23" width="34" height="3" x="8" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-16" width="3" height="33" x="-1" antialias="false"/>
+        <terminal orientation="n" y="-48.642" x="25"/>
+        <terminal orientation="w" y="0.80461" x="-30.5174"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/codoalpex32.elmt b/elements/60_energy/11_water/fittings/codoalpex32.elmt
index 024bec576..baf5e8e9f 100644
--- a/elements/60_energy/11_water/fittings/codoalpex32.elmt
+++ b/elements/60_energy/11_water/fittings/codoalpex32.elmt
@@ -1,27 +1,29 @@
-<definition width="100" version="0.4" hotspot_x="38" hotspot_y="65" height="90" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1108FCA1-F46C-4497-9873-A51E9ED6BF03}"/><names>
-        <name lang="en">Elbow Alpex 32</name>
+<definition orientation="dyyy" type="element" width="100" version="0.5" hotspot_x="38" height="90" hotspot_y="65" link_type="simple">
+    <uuid uuid="{eda37f30-2abc-4030-a6df-dce76f3e73b7}"/>
+    <names>
         <name lang="fr">Coude Alpex 32</name>
-        <name lang="es">Codo Alpex 32</name>
-        <name lang="pl">Kolanko Alpex 32</name>
         <name lang="it">Gomito Alpex 32</name>
+        <name lang="en">Elbow Alpex 32</name>
+        <name lang="pl">Kolanko Alpex 32</name>
         <name lang="cs">Koleno Alpex 32</name>
+        <name lang="es">Codo Alpex 32</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="7.20327" x="10.5998" y="-10.6809" antialias="false" height="18.7958" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30.6139" x="21.4047" y="-56.3644" antialias="false" height="27.6469" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="59.427" x="-11.01" y="-48.2724" antialias="true" height="56.3873" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="19.809" x="27.8072" y="-59.35" antialias="false" height="2.98565" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.6098" x="26.8072" y="-25.7175" antialias="false" height="5.63873" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.45686" x="-29.8946" y="-10.6809" antialias="false" height="18.7958" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="33.0375" x="-26.4377" y="-16.3197" antialias="false" height="30.0732" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="18.0082" x="8.79898" y="-27.5971" antialias="true" height="16.9162" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="15.4486" y="18.9854" size="4" text="codo32"/>
-        <rect width="40" x="16" y="-29" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="3" x="7" y="-19" antialias="false" height="35" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-29.8946" y="-1.28306" orientation="w"/>
-        <terminal x="35.8112" y="-59.35" orientation="n"/>
+        <input text="_" size="9" y="20.55" tagg="label" rotate="true" x="18"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.6809" width="7.20327" height="18.7958" x="10.5998" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-56.3644" width="30.6139" height="27.6469" x="21.4047" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-48.2724" width="59.427" height="56.3873" start="0" angle="-90" x="-11.01" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-59.35" width="19.809" height="2.98565" x="27.8072" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-25.7175" width="21.6098" height="5.63873" x="26.8072" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.6809" width="3.45686" height="18.7958" x="-29.8946" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-16.3197" width="33.0375" height="30.0732" x="-26.4377" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-27.5971" width="18.0082" height="16.9162" start="0" angle="-90" x="8.79898" antialias="true"/>
+        <text text="codo32" size="4" y="18.9854" x="15.4486"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-29" width="40" height="3" x="16" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-19" width="3" height="35" x="7" antialias="false"/>
+        <terminal orientation="w" y="-1.28306" x="-29.8946"/>
+        <terminal orientation="n" y="-59.35" x="35.8112"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/curvaalpex16.elmt b/elements/60_energy/11_water/fittings/curvaalpex16.elmt
index 6033a584b..69aeb39cf 100644
--- a/elements/60_energy/11_water/fittings/curvaalpex16.elmt
+++ b/elements/60_energy/11_water/fittings/curvaalpex16.elmt
@@ -1,25 +1,27 @@
-<definition width="80" version="0.4" hotspot_x="46" hotspot_y="34" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{8283DDDC-2707-4F33-A8AE-784482680933}"/><names>
-        <name lang="en">Elbow Alpex16</name>
+<definition orientation="dyyy" type="element" width="60" version="0.5" hotspot_x="46" height="60" hotspot_y="34" link_type="simple">
+    <uuid uuid="{a04aef21-4463-4b6c-8322-d405f24a21cf}"/>
+    <names>
         <name lang="fr">Coude Alpex16</name>
-        <name lang="es">CurvaAlpex16</name>
-        <name lang="pl">Kolanko Alpex 16</name>
         <name lang="it">Curva Alpex 16</name>
+        <name lang="en">Elbow Alpex16</name>
+        <name lang="pl">Kolanko Alpex 16</name>
         <name lang="cs">Koleno Alpex 16</name>
+        <name lang="es">CurvaAlpex16</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="52" x="-42" y="-29" antialias="true" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-22" y="16" size="4" text="Alpex 16"/>
-        <arc width="31" x="-32" y="-19" antialias="true" height="30" 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="-4.34551" x1="-1" y2="-19.6811" 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="-20" x1="-0.904" y2="-20" x2="9.896"/>
-        <line 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.35862" x1="10" y2="-19.669" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11" x1="-17" y2="11" x2="-29"/>
-        <line 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="-16.8476" y2="21" x2="-29.1406"/>
-        <line 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="-30" y2="11" x2="-30"/>
-        <terminal x="-31" y="16" orientation="w"/>
-        <terminal x="4" y="-21" orientation="n"/>
+        <input text="_" size="9" y="10.55" tagg="label" rotate="true" x="3"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-29" width="52" height="50" start="0" angle="-90" x="-42" antialias="true"/>
+        <text text="Alpex 16" size="4" y="16" x="-22"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-19" width="31" height="30" start="0" angle="-90" x="-32" antialias="true"/>
+        <line x2="-1" x1="-1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-19.6811" length2="1.5" y1="-4.34551" end2="none" antialias="false"/>
+        <line x2="9.896" x1="-0.904" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-20" length2="1.5" y1="-20" end2="none" antialias="false"/>
+        <line x2="10" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-19.669" length2="1.5" y1="-4.35862" end2="none" antialias="false"/>
+        <line x2="-29" x1="-17" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="11" length2="1.5" y1="11" end2="none" antialias="false"/>
+        <line x2="-29.1406" x1="-16.8476" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="21" length2="1.5" y1="21" end2="none" antialias="false"/>
+        <line x2="-30" x1="-30" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="11" length2="1.5" y1="21" end2="none" antialias="false"/>
+        <terminal orientation="w" y="16" x="-31"/>
+        <terminal orientation="n" y="-21" x="4"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/curvaalpex20.elmt b/elements/60_energy/11_water/fittings/curvaalpex20.elmt
index 8f99b14e7..d2d8315ab 100644
--- a/elements/60_energy/11_water/fittings/curvaalpex20.elmt
+++ b/elements/60_energy/11_water/fittings/curvaalpex20.elmt
@@ -1,25 +1,27 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="43" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{2580E58B-2095-4C59-A4F2-B2FD1154ED1B}"/><names>
-        <name lang="en">Elbow Alpex 20</name>
+<definition orientation="dyyy" type="element" width="70" version="0.5" hotspot_x="47" height="70" hotspot_y="43" link_type="simple">
+    <uuid uuid="{b83249dc-ab0d-4376-908a-3ee11bc4885c}"/>
+    <names>
         <name lang="fr">Coude Alpex 20</name>
-        <name lang="es">CurvaAlpex20</name>
-        <name lang="pl">Kolanko Alpex 20</name>
         <name lang="it">Curva Alpex 20</name>
+        <name lang="en">Elbow Alpex 20</name>
+        <name lang="pl">Kolanko Alpex 20</name>
         <name lang="cs">Koleno Alpex 20</name>
+        <name lang="es">CurvaAlpex20</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="59.8" x="-42" y="-37.5" antialias="true" height="58.5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-19" y="15.15" size="4" text="Alpex 20"/>
-        <arc width="35.65" x="-30.5" y="-25.8" antialias="true" height="35.1" 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.65425" x1="5.15" y2="-26.5969" x2="5.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="-26.97" x1="5.2604" y2="-26.97" x2="17.6804"/>
-        <line 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.66959" x1="17.8" y2="-26.5827" x2="17.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.3" x1="-13.25" y2="9.3" x2="-27.05"/>
-        <line 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="-13.0747" y2="21" x2="-27.2117"/>
-        <line 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.2" y2="9.3" x2="-28.2"/>
-        <terminal x="-29.35" y="15.15" orientation="w"/>
-        <terminal x="10.9" y="-28.14" orientation="n"/>
+        <input text="_" size="9" y="10.55" tagg="label" rotate="true" x="13"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-37.5" width="59.8" height="58.5" start="0" angle="-90" x="-42" antialias="true"/>
+        <text text="Alpex 20" size="4" y="15.15" x="-19"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-25.8" width="35.65" height="35.1" start="0" angle="-90" x="-30.5" antialias="true"/>
+        <line x2="5.15" x1="5.15" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-26.5969" length2="1.5" y1="-8.65425" end2="none" antialias="false"/>
+        <line x2="17.6804" x1="5.2604" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-26.97" length2="1.5" y1="-26.97" end2="none" antialias="false"/>
+        <line x2="17.8" x1="17.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-26.5827" length2="1.5" y1="-8.66959" end2="none" antialias="false"/>
+        <line x2="-27.05" x1="-13.25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.3" length2="1.5" y1="9.3" end2="none" antialias="false"/>
+        <line x2="-27.2117" x1="-13.0747" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="21" length2="1.5" y1="21" end2="none" antialias="false"/>
+        <line x2="-28.2" x1="-28.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.3" length2="1.5" y1="21" end2="none" antialias="false"/>
+        <terminal orientation="w" y="15.15" x="-29.35"/>
+        <terminal orientation="n" y="-28.14" x="10.9"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/curvaalpex25.elmt b/elements/60_energy/11_water/fittings/curvaalpex25.elmt
index 14960ce86..4c28a67f2 100644
--- a/elements/60_energy/11_water/fittings/curvaalpex25.elmt
+++ b/elements/60_energy/11_water/fittings/curvaalpex25.elmt
@@ -1,25 +1,27 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="53" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EECE5CDE-E17B-42F4-809C-94949C0682C0}"/><names>
-        <name lang="en">Elbow Alpex 25</name>
+<definition orientation="dyyy" type="element" width="80" version="0.5" hotspot_x="46" height="80" hotspot_y="53" link_type="simple">
+    <uuid uuid="{95c38edc-5abf-488d-b953-969ccc39b5e8}"/>
+    <names>
         <name lang="fr">Coude Alpex 25</name>
-        <name lang="es">CurvaAlpex25</name>
-        <name lang="pl">Kolanko Alpex 25</name>
         <name lang="it">Curva Alpex 25</name>
+        <name lang="en">Elbow Alpex 25</name>
+        <name lang="pl">Kolanko Alpex 25</name>
         <name lang="cs">Koleno Alpex 25</name>
+        <name lang="es">CurvaAlpex25</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="71.76" x="-42" y="-48.225" antialias="true" height="69.225" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-14.4" y="14.0775" size="4" text="Alpex 25"/>
-        <arc width="42.78" x="-28.2" y="-34.38" antialias="true" height="41.535" 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="-14.0909" x1="14.58" y2="-35.323" x2="14.58"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35.7645" x1="14.7125" y2="-35.7645" x2="29.6165"/>
-        <line 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.109" x1="29.76" y2="-35.3062" x2="29.76"/>
-        <line 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.155" x1="-7.5" y2="7.155" x2="-24.06"/>
-        <line 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="-7.28964" y2="21" x2="-24.254"/>
-        <line 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="-25.44" y2="7.155" x2="-25.44"/>
-        <terminal x="-26.82" y="14.0775" orientation="w"/>
-        <terminal x="21.48" y="-37.149" orientation="n"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-48.225" width="71.76" height="69.225" start="0" angle="-90" x="-42" antialias="true"/>
+        <input text="_" size="9" y="10.55" tagg="label" rotate="true" x="13"/>
+        <text text="Alpex 25" size="4" y="14.0775" x="-14.4"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-34.38" width="42.78" height="41.535" start="0" angle="-90" x="-28.2" antialias="true"/>
+        <line x2="14.58" x1="14.58" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-35.323" length2="1.5" y1="-14.0909" end2="none" antialias="false"/>
+        <line x2="29.6165" x1="14.7125" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-35.7645" length2="1.5" y1="-35.7645" end2="none" antialias="false"/>
+        <line x2="29.76" x1="29.76" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-35.3062" length2="1.5" y1="-14.109" end2="none" antialias="false"/>
+        <line x2="-24.06" x1="-7.5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.155" length2="1.5" y1="7.155" end2="none" antialias="false"/>
+        <line x2="-24.254" x1="-7.28964" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="21" length2="1.5" y1="21" end2="none" antialias="false"/>
+        <line x2="-25.44" x1="-25.44" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.155" length2="1.5" y1="21" end2="none" antialias="false"/>
+        <terminal orientation="n" y="-37.149" x="21.48"/>
+        <terminal orientation="w" y="14.0775" x="-26.82"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/curvaalpex32.elmt b/elements/60_energy/11_water/fittings/curvaalpex32.elmt
index 847adfec8..8d7007f96 100644
--- a/elements/60_energy/11_water/fittings/curvaalpex32.elmt
+++ b/elements/60_energy/11_water/fittings/curvaalpex32.elmt
@@ -1,25 +1,27 @@
-<definition width="110" version="0.4" hotspot_x="51" hotspot_y="47" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B2BF5FBE-F204-46F1-8FEA-9C63AE471D2A}"/><names>
-        <name lang="en">Elbow Alpex 32</name>
+<definition orientation="dyyy" type="element" width="80" version="0.5" hotspot_x="53" height="80" hotspot_y="47" link_type="simple">
+    <uuid uuid="{741a553b-6602-4a9d-8473-24a0800355b8}"/>
+    <names>
         <name lang="fr">Coude Alpex 32</name>
-        <name lang="es">CurvaAlpex32</name>
-        <name lang="pl">Kolanko Alpex 32</name>
         <name lang="it">Curva Alpex 32</name>
+        <name lang="en">Elbow Alpex 32</name>
+        <name lang="pl">Kolanko Alpex 32</name>
         <name lang="cs">Koleno Alpex 32</name>
+        <name lang="es">CurvaAlpex32</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="71.76" x="-49" y="-43.8" antialias="true" height="73.8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-21.4" y="22.62" size="4" text="Alpex 32"/>
-        <arc width="42.78" x="-35.2" y="-29.04" antialias="true" height="44.28" 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="-7.40997" x1="7.58" y2="-30.0453" x2="7.58"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30.516" x1="7.71248" y2="-30.516" x2="22.6165"/>
-        <line 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.42932" x1="22.76" y2="-30.0274" x2="22.76"/>
-        <line 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.24" x1="-14.5" y2="15.24" x2="-31.06"/>
-        <line 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="-14.2897" y2="30" x2="-31.254"/>
-        <line 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="-32.44" y2="15.24" x2="-32.44"/>
-        <terminal x="-33.82" y="22.62" orientation="w"/>
-        <terminal x="14.48" y="-31.992" orientation="n"/>
+        <input text="_" size="9" y="20.55" tagg="label" rotate="true" x="13"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-43.8" width="71.76" height="73.8" start="0" angle="-90" x="-49" antialias="true"/>
+        <text text="Alpex 32" size="4" y="22.62" x="-21.4"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-29.04" width="42.78" height="44.28" start="0" angle="-90" x="-35.2" antialias="true"/>
+        <line x2="7.58" x1="7.58" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-30.0453" length2="1.5" y1="-7.40997" end2="none" antialias="false"/>
+        <line x2="22.6165" x1="7.71248" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-30.516" length2="1.5" y1="-30.516" end2="none" antialias="false"/>
+        <line x2="22.76" x1="22.76" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-30.0274" length2="1.5" y1="-7.42932" end2="none" antialias="false"/>
+        <line x2="-31.06" x1="-14.5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="15.24" length2="1.5" y1="15.24" end2="none" antialias="false"/>
+        <line x2="-31.254" x1="-14.2897" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="30" length2="1.5" y1="30" end2="none" antialias="false"/>
+        <line x2="-32.44" x1="-32.44" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="15.24" length2="1.5" y1="30" end2="none" antialias="false"/>
+        <terminal orientation="n" y="-31.992" x="14.48"/>
+        <terminal orientation="w" y="22.62" x="-33.82"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/racoralpex16-1_2.elmt b/elements/60_energy/11_water/fittings/racoralpex16-1_2.elmt
index 781e7f475..54b635b82 100644
--- a/elements/60_energy/11_water/fittings/racoralpex16-1_2.elmt
+++ b/elements/60_energy/11_water/fittings/racoralpex16-1_2.elmt
@@ -1,25 +1,26 @@
-<definition width="60" version="0.4" hotspot_x="34" hotspot_y="26" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F6A51F68-9337-43D5-9DFA-F658E05B5736}"/><names>
-        <name lang="es">Rácor Alpex16-1/2</name>
+<definition orientation="dyyy" type="element" width="60" version="0.5" hotspot_x="34" height="60" hotspot_y="29" link_type="simple">
+    <uuid uuid="{d068f512-6ecb-40a4-9ae4-00a135d362c9}"/>
+    <names>
         <name lang="it">Raccordo Alpex 16-1/2</name>
         <name lang="pl">Złączka Alpex 16-1/2"</name>
         <name lang="cs">Spojka Alpex 16-1/2"</name>
+        <name lang="es">Rácor Alpex16-1/2</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="9" x="-21" y="9" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="5" x="-12" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17" x="-29" y="-16" antialias="false" height="33" 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" x1="-16.8382" y2="-9" x2="-28.1494"/>
-        <arc width="8" x="-20" y="-23" antialias="true" height="14" 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="9" x1="-28.0738" y2="9" x2="-16.92"/>
-        <arc width="7" x="-19" y="-9" antialias="true" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-20" y="24.5" size="4" rotate="true" text="rácor 16-1/2"/>
-        <rect width="22" x="-5" y="-9" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="17" y="-6" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-7" y="-12" antialias="false" height="24" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-29" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="20.5" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="9" width="9" height="16" start="90" angle="-90" x="-21" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7" width="5" height="14" x="-12" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-16" width="17" height="33" x="-29" antialias="false"/>
+        <line x2="-28.1494" x1="-16.8382" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9" length2="1.5" y1="-9" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-23" width="8" height="14" start="0" angle="-90" x="-20" antialias="true"/>
+        <line x2="-16.92" x1="-28.0738" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9" length2="1.5" y1="9" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="7" height="18" start="90" angle="-180" x="-19" antialias="true"/>
+        <input text="rácor 16-1/2" size="4" y="24.5" tagg="label" rotate="true" x="-20"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="22" height="18" x="-5" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6" width="3" height="12" x="17" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-12" width="2" height="24" x="-7" antialias="false"/>
+        <terminal orientation="w" y="0" x="-29"/>
+        <terminal orientation="e" y="0" x="20.5"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/racoralpex20-3_4.elmt b/elements/60_energy/11_water/fittings/racoralpex20-3_4.elmt
index 70e38affe..a4cb0c99b 100644
--- a/elements/60_energy/11_water/fittings/racoralpex20-3_4.elmt
+++ b/elements/60_energy/11_water/fittings/racoralpex20-3_4.elmt
@@ -1,25 +1,26 @@
-<definition width="70" version="0.4" hotspot_x="36" hotspot_y="33" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3B675AD3-93C6-41FA-953E-942F4A102B5A}"/><names>
-        <name lang="es">Rácor Alpex20-3/4</name>
+<definition orientation="dyyy" type="element" width="70" version="0.5" hotspot_x="35" height="60" hotspot_y="29" link_type="simple">
+    <uuid uuid="{9796495d-a7de-48df-9874-93532d8159f2}"/>
+    <names>
         <name lang="it">Raccordo Alpex 20-3/4</name>
         <name lang="pl">Złączka Alpex 20-3/4"</name>
         <name lang="cs">Spojka Alpex 20-3/4"</name>
+        <name lang="es">Rácor Alpex20-3/4</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="10.8" x="-21" y="9.8866" antialias="true" height="18.214" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="6.4" x="-10.2" y="-8.32745" antialias="false" height="15.9373" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20.4" x="-30.6" y="-18.5728" antialias="false" height="37.5664" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.6042" x1="-16.0058" y2="-10.6042" x2="-29.5793"/>
-        <arc width="9.6" x="-19.8" y="-26.5415" antialias="true" height="15.9373" 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="9.8866" x1="-29.4886" y2="9.8866" x2="-16.104"/>
-        <arc width="8.4" x="-18.6" y="-10.6042" antialias="true" height="20.4908" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-18" y="23" size="4" rotate="true" text="rácor 20-3/4"/>
-        <rect width="27.8" x="-1.8" y="-10.6042" antialias="false" height="20.4908" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.2" x="26" y="-7.18907" antialias="false" height="13.6605" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-4" y="-14" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-30.6" y="-0.358821" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="29.2" y="-0.358821" nameHidden="1" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="9.8866" width="10.8" height="18.214" start="90" angle="-90" x="-21" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.32745" width="6.4" height="15.9373" x="-10.2" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-18.5728" width="20.4" height="37.5664" x="-30.6" antialias="false"/>
+        <line x2="-29.5793" x1="-16.0058" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10.6042" length2="1.5" y1="-10.6042" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-26.5415" width="9.6" height="15.9373" start="0" angle="-90" x="-19.8" antialias="true"/>
+        <line x2="-16.104" x1="-29.4886" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.8866" length2="1.5" y1="9.8866" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.6042" width="8.4" height="20.4908" start="90" angle="-180" x="-18.6" antialias="true"/>
+        <input text="rácor 20-3/4" size="4" y="23" tagg="label" rotate="true" x="-18"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.6042" width="27.8" height="20.4908" x="-1.8" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.18907" width="3.2" height="13.6605" x="26" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-14" width="2" height="27" x="-4" antialias="false"/>
+        <terminal orientation="w" y="-0.358821" x="-30.6"/>
+        <terminal orientation="e" y="-0.358821" x="29.2"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/racoralpex25-3_4.elmt b/elements/60_energy/11_water/fittings/racoralpex25-3_4.elmt
index 936962f28..91b845253 100644
--- a/elements/60_energy/11_water/fittings/racoralpex25-3_4.elmt
+++ b/elements/60_energy/11_water/fittings/racoralpex25-3_4.elmt
@@ -1,25 +1,26 @@
-<definition width="80" version="0.4" hotspot_x="38" hotspot_y="33" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{CC0CF4E2-39EE-4CBC-9664-513D919159FE}"/><names>
-        <name lang="es">Rácor Alpex25-3/4</name>
+<definition orientation="dyyy" type="element" width="80" version="0.5" hotspot_x="39" height="70" hotspot_y="34" link_type="simple">
+    <uuid uuid="{0f861fd4-1bb8-4538-8e24-ed2d3296493a}"/>
+    <names>
         <name lang="it">Raccordo Alpex 25-3/4</name>
         <name lang="pl">Złączka Alpex 25-3/4"</name>
         <name lang="cs">Spojka Alpex 25-3/4"</name>
+        <name lang="es">Rácor Alpex25-3/4</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="12.42" x="-19.26" y="11.1483" antialias="true" height="20.6937" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="6.66" x="-6.84" y="-9.54538" antialias="false" height="18.107" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.46" x="-30.3" y="-21.1855" antialias="false" height="42.6807" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12.1321" x1="-13.5167" y2="-12.1321" x2="-29.1262"/>
-        <arc width="11.04" x="-17.88" y="-30.2391" antialias="true" height="18.107" 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="11.1483" x1="-29.0219" y2="11.1483" x2="-13.6296"/>
-        <arc width="9.66" x="-16.5" y="-12.1321" antialias="true" height="23.2804" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-16" y="26.5" size="4" rotate="true" text="rácor 25-3/4"/>
-        <rect width="28.22" x="2.82" y="-12.1321" antialias="false" height="23.2804" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.28" x="31.04" y="-8.25202" antialias="false" height="15.5203" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="0" y="-17" antialias="false" height="32" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-30.3" y="-0.491897" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="33" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="11.1483" width="12.42" height="20.6937" start="90" angle="-90" x="-19.26" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.54538" width="6.66" height="18.107" x="-6.84" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.1855" width="23.46" height="42.6807" x="-30.3" antialias="false"/>
+        <line x2="-29.1262" x1="-13.5167" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-12.1321" length2="1.5" y1="-12.1321" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-30.2391" width="11.04" height="18.107" start="0" angle="-90" x="-17.88" antialias="true"/>
+        <line x2="-13.6296" x1="-29.0219" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="11.1483" length2="1.5" y1="11.1483" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.1321" width="9.66" height="23.2804" start="90" angle="-180" x="-16.5" antialias="true"/>
+        <input text="rácor 25-3/4" size="4" y="26.5" tagg="label" rotate="true" x="-16"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.1321" width="28.22" height="23.2804" x="2.82" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.25202" width="2.28" height="15.5203" x="31.04" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-17" width="3" height="32" x="0" antialias="false"/>
+        <terminal orientation="w" y="-0.491897" x="-30.3"/>
+        <terminal orientation="e" y="0" x="33"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/racoralpex32-1.elmt b/elements/60_energy/11_water/fittings/racoralpex32-1.elmt
index d6bffec3c..cec2611eb 100644
--- a/elements/60_energy/11_water/fittings/racoralpex32-1.elmt
+++ b/elements/60_energy/11_water/fittings/racoralpex32-1.elmt
@@ -1,25 +1,26 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="38" height="80" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3BB0ABB9-C4C2-4918-A49B-6CFD7672B617}"/><names>
-        <name lang="es">Rácor Alpex32-1"</name>
+<definition orientation="dyyy" type="element" width="90" version="0.5" hotspot_x="46" height="80" hotspot_y="38" link_type="simple">
+    <uuid uuid="{14d72e4a-1457-45e3-a085-d108e51a5fe2}"/>
+    <names>
         <name lang="it">Raccordo Alpex 32-1"</name>
         <name lang="pl">Złączka Alpex 32-1"</name>
         <name lang="cs">Spojka Alpex 32-1"</name>
+        <name lang="es">Rácor Alpex32-1"</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="14.3831" x="-27.5115" y="13.4698" antialias="true" height="24.2062" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="8.1869" x="-13.1284" y="-10.7364" antialias="false" height="21.1804" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="27.1681" x="-40.2965" y="-24.3524" antialias="false" height="49.9253" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13.7622" x1="-20.8604" y2="-13.7622" x2="-38.9371"/>
-        <arc width="12.785" x="-25.9134" y="-34.9426" antialias="true" height="21.1804" 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="13.4698" x1="-38.8163" y2="13.4698" x2="-20.9912"/>
-        <arc width="11.1869" x="-24.3152" y="-13.7622" antialias="true" height="27.232" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-23.5162" y="30.8974" size="4" rotate="true" text="rácor 32-1&quot;"/>
-        <rect width="35.3644" x="-1.94151" y="-13.7622" antialias="false" height="27.232" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.58874" x="33.4228" y="-9.2235" antialias="false" height="18.1547" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="-5" y="-18" antialias="false" height="35" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-40.2965" y="-0.14619" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="38.0116" y="-0.14619" nameHidden="1" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="13.4698" width="14.3831" height="24.2062" start="90" angle="-90" x="-27.5115" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.7364" width="8.1869" height="21.1804" x="-13.1284" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-24.3524" width="27.1681" height="49.9253" x="-40.2965" antialias="false"/>
+        <line x2="-38.9371" x1="-20.8604" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-13.7622" length2="1.5" y1="-13.7622" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-34.9426" width="12.785" height="21.1804" start="0" angle="-90" x="-25.9134" antialias="true"/>
+        <line x2="-20.9912" x1="-38.8163" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="13.4698" length2="1.5" y1="13.4698" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.7622" width="11.1869" height="27.232" start="90" angle="-180" x="-24.3152" antialias="true"/>
+        <input text="rácor 32-1&quot;" size="4" y="30.8974" tagg="label" rotate="true" x="-23.5162"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.7622" width="35.3644" height="27.232" x="-1.94151" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.2235" width="4.58874" height="18.1547" x="33.4228" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-18" width="3" height="35" x="-5" antialias="false"/>
+        <terminal orientation="w" y="-0.14619" x="-40.2965"/>
+        <terminal orientation="e" y="-0.14619" x="38.0116"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/reduccion20-16.elmt b/elements/60_energy/11_water/fittings/reduccion20-16.elmt
index f0e674123..c45d288c2 100644
--- a/elements/60_energy/11_water/fittings/reduccion20-16.elmt
+++ b/elements/60_energy/11_water/fittings/reduccion20-16.elmt
@@ -1,24 +1,26 @@
-<definition width="60" version="0.4" hotspot_x="33" hotspot_y="16" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{4650D22D-4CA8-45B1-9C4E-ABFCEFA71EAE}"/><names>
-        <name lang="es">Reduccion Alpex 20-16</name>
+<definition orientation="dyyy" type="element" width="70" version="0.5" hotspot_x="37" height="40" hotspot_y="15" link_type="simple">
+    <uuid uuid="{de02351d-70cd-418f-8560-5082b672b969}"/>
+    <names>
         <name lang="it">Riduzione Alpex 20-16</name>
         <name lang="pl">Redukcja Alpex 20-16</name>
         <name lang="cs">Redukční převod Alpex 20-16</name>
+        <name lang="es">Reduccion Alpex 20-16</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="3.91" x="-1.94" y="-5.84453" antialias="false" height="10.4257" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.91" x="21.565" y="-5.8871" antialias="false" height="10.4257" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.6" x="-29.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.4" x="-27.1" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17.595" x="3.97" y="-8.1759" antialias="false" height="16.6812" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-22" y="19" size="4" text="reduccion 20-16"/>
-        <rect width="2" x="-9" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="2" y="-11" antialias="false" height="22" 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="-6" x1="-2" y2="-8" 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="5" x1="-2" y2="7" x2="-7"/>
-        <terminal x="-29" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="23" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="18.55" tagg="label" rotate="true" x="-7"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.84453" width="3.91" height="10.4257" x="-1.94" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.8871" width="1.91" height="10.4257" x="21.565" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.37002" width="2.6" height="12.4278" x="-29.7" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.3411" width="18.4" height="19.8845" x="-27.1" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.1759" width="17.595" height="16.6812" x="3.97" antialias="false"/>
+        <text text="reduccion 20-16" size="4" y="19" x="-22"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-13" width="2" height="25" x="-9" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-11" width="2" height="22" x="2" antialias="false"/>
+        <line x2="-7" x1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8" length2="1.5" y1="-6" end2="none" antialias="false"/>
+        <line x2="-7" x1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <terminal orientation="w" y="0" x="-29"/>
+        <terminal orientation="e" y="0" x="23"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/reduccionalpex25-20.elmt b/elements/60_energy/11_water/fittings/reduccionalpex25-20.elmt
index 2e75bd5e9..01fccff4b 100644
--- a/elements/60_energy/11_water/fittings/reduccionalpex25-20.elmt
+++ b/elements/60_energy/11_water/fittings/reduccionalpex25-20.elmt
@@ -1,23 +1,25 @@
-<definition width="70" version="0.4" hotspot_x="44" hotspot_y="20" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{46D0618B-E85B-4C52-8838-D680201E960C}"/><names>
-        <name lang="es">ReducciónAlpex25-20</name>
+<definition orientation="dyyy" type="element" width="70" version="0.5" hotspot_x="44" height="50" hotspot_y="20" link_type="simple">
+    <uuid uuid="{222deb13-a772-4734-b214-7cbf3bfa0d80}"/>
+    <names>
         <name lang="it">Riduzione Alpex 25-20</name>
         <name lang="pl">Redukcja Alpex 25-20</name>
         <name lang="cs">Redukční převod Alpex 25-20</name>
+        <name lang="es">ReducciónAlpex25-20</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="4.048" x="-6.045" y="-4.52362" antialias="false" height="11.2465" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.048" x="19.219" y="-4.6483" antialias="false" height="11.2465" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="-11.2" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.06" x="-39.5" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.24" x="-36.44" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.216" x="0.003" y="-8.0222" antialias="false" height="17.9945" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-26" y="22" size="4" text="reducción 25-20"/>
-        <rect width="2" x="-13" y="-15" antialias="false" height="29" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="-2" y="-11" antialias="false" height="23" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-39.5" y="0.3119" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="21" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="25.55" tagg="label" rotate="true" x="-17"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.52362" width="4.048" height="11.2465" x="-6.045" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.6483" width="2.048" height="11.2465" x="19.219" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.3025" width="5.06" height="15.2289" x="-11.2" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.3025" width="3.06" height="15.2289" x="-39.5" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.394" width="23.24" height="24.3663" x="-36.44" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.0222" width="19.216" height="17.9945" x="0.003" antialias="false"/>
+        <text text="reducción 25-20" size="4" y="22" x="-26"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-15" width="2" height="29" x="-13" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-11" width="2" height="23" x="-2" antialias="false"/>
+        <terminal orientation="w" y="0.3119" x="-39.5"/>
+        <terminal orientation="e" y="0" x="21"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/fittings/reduccionalpex32-25.elmt b/elements/60_energy/11_water/fittings/reduccionalpex32-25.elmt
index f05451481..d59eec1fd 100644
--- a/elements/60_energy/11_water/fittings/reduccionalpex32-25.elmt
+++ b/elements/60_energy/11_water/fittings/reduccionalpex32-25.elmt
@@ -1,24 +1,26 @@
-<definition width="80" version="0.4" hotspot_x="35" hotspot_y="21" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F4899BD6-26F1-488E-86A7-0C6037F4D7E5}"/><names>
-        <name lang="es">Reduccion Alpex32-25</name>
+<definition orientation="dyyy" type="element" width="80" version="0.5" hotspot_x="34" height="50" hotspot_y="20" link_type="simple">
+    <uuid uuid="{4d1cf6bd-daac-490d-afe4-5e3418ad1253}"/>
+    <names>
         <name lang="it">Riduzione Alpex 32-25</name>
         <name lang="pl">Redukcja Alpex 32-25</name>
         <name lang="cs">Redukční převod Alpex 32-25</name>
+        <name lang="es">Reduccion Alpex32-25</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="5.19346" x="6.6919" y="-6.2118" antialias="false" height="13.3347" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.19346" x="37.2559" y="-6.5453" antialias="false" height="13.3347" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.10995" x="-30.1" y="-8.1421" antialias="false" height="17.4433" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24.4398" x="-26.9901" y="-13.1194" antialias="false" height="27.9094" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.3706" x="13.8854" y="-10.5456" antialias="false" height="21.3356" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-12" y="22" size="4" text="reducción32-25"/>
-        <rect width="3" x="-3" y="-16" antialias="false" height="34" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="12" y="-13" antialias="false" height="26" 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="-6" x1="7" y2="-9" 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="7" x1="7" y2="10" x2="0"/>
-        <terminal x="-30" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="40" y="-1" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="20.55" tagg="label" rotate="true" x="3"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.2118" width="5.19346" height="13.3347" x="6.6919" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.5453" width="3.19346" height="13.3347" x="37.2559" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.1421" width="3.10995" height="17.4433" x="-30.1" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.1194" width="24.4398" height="27.9094" x="-26.9901" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.5456" width="23.3706" height="21.3356" x="13.8854" antialias="false"/>
+        <text text="reducción32-25" size="4" y="22" x="-12"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-16" width="3" height="34" x="-3" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:black;color:black" y="-13" width="2" height="26" x="12" antialias="false"/>
+        <line x2="0" x1="7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9" length2="1.5" y1="-6" end2="none" antialias="false"/>
+        <line x2="0" x1="7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="7" end2="none" antialias="false"/>
+        <terminal orientation="w" y="0" x="-30"/>
+        <terminal orientation="e" y="-1" x="40"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/acometida-agua.elmt b/elements/60_energy/11_water/schemas/acometida-agua.elmt
index 4bb933b10..ae5fca679 100644
--- a/elements/60_energy/11_water/schemas/acometida-agua.elmt
+++ b/elements/60_energy/11_water/schemas/acometida-agua.elmt
@@ -1,24 +1,25 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="24" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C4BC853C-BF01-4DCB-BAE2-9FBB5980BE00}"/><names>
-        <name lang="es">Acometida</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="14" height="20" hotspot_y="7" link_type="simple">
+    <uuid uuid="{7e51d8ba-6956-4c37-b522-916b5e163ade}"/>
+    <names>
         <name lang="it">Presa</name>
         <name lang="pl">Przyłącze</name>
         <name lang="cs">Rozvod</name>
+        <name lang="es">Acometida</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="11" x1="-10" y2="11" x2="10.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="6.86251" x1="-10" y2="6.86251" x2="10.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="6.41157" x1="-2.3" y2="0.412131" x2="-2.3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.0332937" x1="-2.0287" y2="-0.0332937" x2="1.89776"/>
-        <line 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.0332937" x1="9.928" y2="-0.0332937" x2="17.5363"/>
-        <input x="-12" y="-11.1025" size="4" rotate="true" text="Ø_"/>
-        <polygon x4="9" y5="-4" x5="2" y6="-4" x6="2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="2" y2="4" x2="2" y3="-4" x3="9" y4="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="0" x1="5.48" y2="-5" x2="5.48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2.97578" x1="14" y2="2.97578" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4" x1="18" y2="2.97578" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="1.95157" x1="18" y2="2.97578" x2="20"/>
-        <terminal x="20" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <line x2="10.9" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="11" length2="1.5" y1="11" end2="none" antialias="false"/>
+        <line x2="10.9" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.86251" length2="1.5" y1="6.86251" end2="none" antialias="false"/>
+        <line x2="-2.3" x1="-2.3" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0.412131" length2="1.5" y1="6.41157" end2="none" antialias="false"/>
+        <line x2="1.89776" x1="-2.0287" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.0332937" length2="1.5" y1="-0.0332937" end2="none" antialias="false"/>
+        <line x2="17.5363" x1="9.928" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.0332937" length2="1.5" y1="-0.0332937" end2="none" antialias="false"/>
+        <input text="Ø_" size="4" y="-11.1025" tagg="label" rotate="true" x="-12"/>
+        <polygon x2="2" x3="9" x1="2" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="2" x4="9" y6="-4" y2="4" y4="4" closed="false" y5="-4" y1="-4" y3="-4" antialias="false" x5="2"/>
+        <line x2="5.48" x1="5.48" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="20" x1="14" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="2.97578" length2="1.5" y1="2.97578" end2="none" antialias="false"/>
+        <line x2="20" x1="18" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="2.97578" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <line x2="20" x1="18" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="2.97578" length2="1.5" y1="1.95157" end2="none" antialias="false"/>
+        <terminal orientation="e" y="0" x="20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/aljibe.elmt b/elements/60_energy/11_water/schemas/aljibe.elmt
index 817c397ee..9b4e08b58 100644
--- a/elements/60_energy/11_water/schemas/aljibe.elmt
+++ b/elements/60_energy/11_water/schemas/aljibe.elmt
@@ -1,31 +1,33 @@
-<definition width="70" version="0.4" hotspot_x="34" hotspot_y="20" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{4F7A4CCE-603B-473D-ADF5-61C438324785}"/><names>
-        <name lang="es">Aljibe</name>
+<definition orientation="dyyy" type="element" width="70" version="0.5" hotspot_x="34" height="50" hotspot_y="20" link_type="simple">
+    <uuid uuid="{1856e31d-6b40-4894-aced-0511cc6eaef8}"/>
+    <names>
         <name lang="it">Vasca</name>
         <name lang="pl">Zbiornik</name>
         <name lang="cs">Nádrž</name>
+        <name lang="es">Aljibe</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="28.6" x="-15.51" y="-0.87869" antialias="false" height="13.2105" style="line-style:normal;line-weight:normal;filling:blue;color:blue"/>
-        <line 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.8019" x1="14.8481" y2="9.8019" x2="28.8487"/>
-        <line 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.77939" x1="-26.9692" y2="-9.77939" x2="-9.69008"/>
-        <line 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.74136" x1="-8.8" y2="-6.35089" x2="-8.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6.35089" x1="-14.3" y2="-4.09058" x2="0"/>
-        <arc width="7.7" x="-6.6" y="-9.74136" antialias="true" height="7.91109" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-30" angle="-140"/>
-        <line 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="-9" y2="-8" 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="-6" x1="-9" y2="-8" x2="-11"/>
-        <rect width="29" x="-16" y="-12" antialias="false" height="24" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="33" x="-18" y="-14" antialias="false" height="28" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="13" y2="-4" 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="-3.69818" x1="18" y2="-1.24364" 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="0" x1="16" y2="2" 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="0" x1="20" y2="2" 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="2" x1="18" y2="5" x2="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="10" y2="-15" x2="10"/>
-        <text x="-13" y="22" size="4" text="__L"/>
-        <terminal x="30" y="10" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="-29" y="-9.5" nameHidden="1" number="" name="" orientation="w"/>
+        <input text="_" size="9" y="18.55" tagg="label" rotate="true" x="3"/>
+        <rect style="line-style:normal;line-weight:normal;filling:blue;color:blue" y="-0.87869" width="28.6" height="13.2105" x="-15.51" antialias="false"/>
+        <line x2="28.8487" x1="14.8481" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.8019" length2="1.5" y1="9.8019" end2="none" antialias="false"/>
+        <line x2="-9.69008" x1="-26.9692" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.77939" length2="1.5" y1="-9.77939" end2="none" antialias="false"/>
+        <line x2="-8.8" x1="-8.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.35089" length2="1.5" y1="-9.74136" end2="none" antialias="false"/>
+        <line x2="0" x1="-14.3" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.09058" length2="1.5" y1="-6.35089" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:thin;filling:none;color:black" y="-9.74136" width="7.7" height="7.91109" start="-30" angle="-140" x="-6.6" antialias="true"/>
+        <line x2="-7" x1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8" length2="1.5" y1="-6" end2="none" antialias="false"/>
+        <line x2="-11" x1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8" length2="1.5" y1="-6" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-12" width="29" height="24" x="-16" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-14" width="33" height="28" x="-18" antialias="false"/>
+        <line x2="17" x1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4" length2="1.5" y1="-4" end2="none" antialias="false"/>
+        <line x2="18" x1="18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1.24364" length2="1.5" y1="-3.69818" end2="none" antialias="false"/>
+        <line x2="18" x1="16" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="2" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="18" x1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="2" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="18" x1="18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="2" end2="none" antialias="false"/>
+        <line x2="10" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-15" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <text text="__L" size="4" y="22" x="-13"/>
+        <terminal orientation="e" y="10" x="30"/>
+        <terminal orientation="w" y="-9.5" x="-29"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/aspersor-riego.elmt b/elements/60_energy/11_water/schemas/aspersor-riego.elmt
index b78338beb..3ce7797a2 100644
--- a/elements/60_energy/11_water/schemas/aspersor-riego.elmt
+++ b/elements/60_energy/11_water/schemas/aspersor-riego.elmt
@@ -1,23 +1,25 @@
-<definition width="40" version="0.4" hotspot_x="12" hotspot_y="22" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3C5D516E-F7FB-4852-BB91-72C734D9AC8F}"/><names>
-        <name lang="es">Aspersor riego</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="12" height="40" hotspot_y="22" link_type="simple">
+    <uuid uuid="{d08e980a-1086-47fc-9be6-2c984715d75c}"/>
+    <names>
         <name lang="it">Innaffiatore</name>
         <name lang="pl">Zraszacz</name>
         <name lang="cs">Rozprašovač</name>
+        <name lang="es">Aspersor riego</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="4" x="-2" y="-9" antialias="false" height="12" 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="-8" x1="7" y2="-17" x2="22"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6" x1="7" y2="-6" x2="22"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-8" x1="10" y2="-11" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3.36923" x1="0" y2="8.6" 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="-4" x1="-2" y2="-4" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="4" y2="-11" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11" x1="3" y2="-11" 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="-12" x1="-4" y2="-4" 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="-7" x1="2.98045" y2="-7" x2="4.93784"/>
-        <terminal x="0" y="10" nameHidden="32" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-2.45" tagg="label" rotate="true" x="4"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="4" height="12" x="-2" antialias="false"/>
+        <line x2="22" x1="7" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-17" length2="1.5" y1="-8" end2="none" antialias="false"/>
+        <line x2="22" x1="7" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-6" length2="1.5" y1="-6" end2="none" antialias="false"/>
+        <line x2="21" x1="10" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-11" length2="1.5" y1="-8" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="8.6" length2="1.5" y1="3.36923" end2="none" antialias="false"/>
+        <line x2="2" x1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4" length2="1.5" y1="-4" end2="none" antialias="false"/>
+        <line x2="3" x1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-11" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <line x2="-6" x1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-11" length2="1.5" y1="-11" end2="none" antialias="false"/>
+        <line x2="-4" x1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4" length2="1.5" y1="-12" end2="none" antialias="false"/>
+        <line x2="4.93784" x1="2.98045" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-7" end2="none" antialias="false"/>
+        <terminal orientation="s" y="10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/calentador-acs.elmt b/elements/60_energy/11_water/schemas/calentador-acs.elmt
index ae878eaee..ae5f119c6 100644
--- a/elements/60_energy/11_water/schemas/calentador-acs.elmt
+++ b/elements/60_energy/11_water/schemas/calentador-acs.elmt
@@ -1,18 +1,20 @@
-<definition width="40" version="0.4" hotspot_x="20" hotspot_y="45" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B00CCEA5-7CF2-4E21-B766-06CD68C35850}"/><names>
-        <name lang="es">Calentador ACS</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="20" height="60" hotspot_y="44" link_type="simple">
+    <uuid uuid="{8df9afa9-0c83-4e45-b0a1-9b064494084d}"/>
+    <names>
         <name lang="it">Boiler ACS</name>
         <name lang="pl">Zasobnik CWU</name>
         <name lang="cs">Ohřívač vody ACS</name>
+        <name lang="es">Calentador ACS</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:dashed;line-weight:normal;filling:none;color:black" y1="6.16281" x1="9.5" y2="-12.3811" x2="9.5"/>
-        <ellipse width="32.5" x="-16" y="-41.306" antialias="true" height="31.306" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-12.1" y="-22.5224" size="9" text="ACS"/>
-        <line 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.38037" x1="-10" y2="-12.505" x2="-10"/>
-        <terminal x="-10" y="8" nameHidden="1" number="" name="" orientation="s"/>
-        <terminal x="9.5" y="9" nameHidden="1" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-39.45" tagg="label" rotate="true" x="18"/>
+        <line x2="9.5" x1="9.5" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-12.3811" length2="1.5" y1="6.16281" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-41.306" width="32.5" height="31.306" x="-16" antialias="true"/>
+        <text text="ACS" size="9" y="-22.5224" x="-12.1"/>
+        <line x2="-10" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-12.505" length2="1.5" y1="6.38037" end2="none" antialias="false"/>
+        <terminal orientation="s" y="9" x="9.5"/>
+        <terminal orientation="s" y="8" x="-10"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/calentador-solar.elmt b/elements/60_energy/11_water/schemas/calentador-solar.elmt
index 5cd69be00..c81f04c3c 100644
--- a/elements/60_energy/11_water/schemas/calentador-solar.elmt
+++ b/elements/60_energy/11_water/schemas/calentador-solar.elmt
@@ -1,33 +1,35 @@
-<definition width="100" version="0.4" hotspot_x="65" hotspot_y="35" height="80" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{846897C7-19F4-489A-8376-8034CB2B48FA}"/><names>
-        <name lang="es">Calentador solar1</name>
+<definition orientation="dyyy" type="element" width="100" version="0.5" hotspot_x="65" height="80" hotspot_y="35" link_type="simple">
+    <uuid uuid="{b24ee521-649e-4b30-b085-d4c856aa599b}"/>
+    <names>
         <name lang="it">Scalda acqua solare</name>
         <name lang="pl">Kolektor słoneczny</name>
         <name lang="cs">Sluneční kolektor</name>
+        <name lang="es">Calentador solar1</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <circle x="17" y="-11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <polygon x4="-1.4325" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="4" x1="-1.4325" y2="37.15" x2="-41" y3="37.15" x3="-1.4325" y4="4.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-19.2662" x1="-40.1324" y2="-12.3876" x2="-40.1324"/>
-        <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.2636" x1="-53.3111" y2="-9.8864" x2="-48.6986"/>
-        <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.63311" x1="-59.2416" y2="-3.63311" x2="-51.9933"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.99741" x1="-52.6522" y2="2.62014" x2="-47.3807"/>
-        <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="7.42138" x1="19.5" y2="-5.61978" x2="19.5"/>
-        <ellipse width="32.5" x="-4" y="-30.306" antialias="true" height="31.306" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-2" y="-17" size="7" text="ACS"/>
-        <line 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.41797" x1="9" y2="-6.5397" x2="9"/>
-        <polygon x4="0.55" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="0" x1="0.55" y2="39" x2="-46" y3="39" x3="0.55" y4="1"/>
-        <circle x="7" y="-11" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <polygon x4="-47" y5="-2" x5="-1" antialias="false" style="line-style:normal;line-weight:normal;filling:red;color:black" y1="-2" x1="-1" y2="-5" x2="-4" y3="34" x3="-50" y4="37"/>
-        <ellipse width="9.22513" x="-44.7449" y="-7.3851" antialias="true" height="8.75454" style="line-style:normal;line-weight:thin;filling:red;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="-4.2584" x1="-30.2483" y2="-4.2584" x2="-23"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.12143" x1="-40.7913" y2="12" x2="-40.7913"/>
-        <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.24546" x1="-34.8609" y2="7.62273" x2="-30.2483"/>
-        <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="-9.261" x1="-34.8609" y2="-13.6383" x2="-29.5894"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-3" y2="-5" x2="-1"/>
-        <terminal x="9" y="9" nameHidden="1" number="" name="" orientation="s"/>
-        <terminal x="19.5" y="9" nameHidden="1" number="" name="" orientation="s"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11" diameter="4" x="17" antialias="true"/>
+        <input text="_" size="9" y="-39.45" tagg="label" rotate="true" x="-57"/>
+        <polygon x2="-41" x3="-1.4325" x1="-1.4325" style="line-style:normal;line-weight:thin;filling:none;color:black" x4="-1.4325" y2="37.15" y4="4.85" closed="false" y1="4" y3="37.15" antialias="false"/>
+        <line x2="-40.1324" x1="-40.1324" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-12.3876" length2="1.5" y1="-19.2662" end2="none" antialias="false"/>
+        <line x2="-48.6986" x1="-53.3111" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-9.8864" length2="1.5" y1="-14.2636" end2="none" antialias="false"/>
+        <line x2="-51.9933" x1="-59.2416" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-3.63311" length2="1.5" y1="-3.63311" end2="none" antialias="false"/>
+        <line x2="-47.3807" x1="-52.6522" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="2.62014" length2="1.5" y1="6.99741" end2="none" antialias="false"/>
+        <line x2="19.5" x1="19.5" style="line-style:dashed;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.61978" length2="1.5" y1="7.42138" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-30.306" width="32.5" height="31.306" x="-4" antialias="true"/>
+        <text text="ACS" size="7" y="-17" x="-2"/>
+        <line x2="9" x1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.5397" length2="1.5" y1="8.41797" end2="none" antialias="false"/>
+        <polygon x2="-46" x3="0.55" x1="0.55" style="line-style:normal;line-weight:thin;filling:none;color:black" x4="0.55" y2="39" y4="1" closed="false" y1="0" y3="39" antialias="false"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11" diameter="4" x="7" antialias="true"/>
+        <polygon x2="-4" x3="-50" x1="-1" style="line-style:normal;line-weight:normal;filling:red;color:black" x4="-47" y2="-5" y4="37" y5="-2" y1="-2" y3="34" antialias="false" x5="-1"/>
+        <ellipse style="line-style:normal;line-weight:thin;filling:red;color:black" y="-7.3851" width="9.22513" height="8.75454" x="-44.7449" antialias="true"/>
+        <line x2="-23" x1="-30.2483" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.2584" length2="1.5" y1="-4.2584" end2="none" antialias="false"/>
+        <line x2="-40.7913" x1="-40.7913" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="12" length2="1.5" y1="5.12143" end2="none" antialias="false"/>
+        <line x2="-30.2483" x1="-34.8609" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="7.62273" length2="1.5" y1="3.24546" end2="none" antialias="false"/>
+        <line x2="-29.5894" x1="-34.8609" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-13.6383" length2="1.5" y1="-9.261" end2="none" antialias="false"/>
+        <line x2="-1" x1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5" length2="1.5" y1="-3" end2="none" antialias="false"/>
+        <terminal orientation="s" y="9" x="9"/>
+        <terminal orientation="s" y="9" x="19.5"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/codo-baja.elmt b/elements/60_energy/11_water/schemas/codo-baja.elmt
index 90b7d7e2d..1f4a8ab26 100644
--- a/elements/60_energy/11_water/schemas/codo-baja.elmt
+++ b/elements/60_energy/11_water/schemas/codo-baja.elmt
@@ -1,15 +1,17 @@
-<definition width="30" version="0.4" hotspot_x="17" hotspot_y="5" height="10" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{691F7FE8-0DD0-4019-A474-1138E40AC224}"/><names>
-        <name lang="es">Codo baja</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="17" height="10" hotspot_y="5" link_type="simple">
+    <uuid uuid="{7eef7ba2-7b49-4464-a7a0-649714e2363a}"/>
+    <names>
         <name lang="it">Gomito basso</name>
         <name lang="pl">Kolanko niskie</name>
         <name lang="cs">Nízké koleno</name>
+        <name lang="es">Codo baja</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="0" x1="-5.48" y2="0" x2="0.52"/>
-        <circle x="1" y="-3" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="6"/>
-        <terminal x="-10" y="0" nameHidden="1" number="" name="" orientation="w"/>
+        <input text="_" size="9" y="-12.45" tagg="label" rotate="true" x="-6"/>
+        <line x2="0.52" x1="-5.48" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3" diameter="6" x="1" antialias="true"/>
+        <terminal orientation="w" y="0" x="-10"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/codo-sube.elmt b/elements/60_energy/11_water/schemas/codo-sube.elmt
index 1a41e4e33..7c113b10f 100644
--- a/elements/60_energy/11_water/schemas/codo-sube.elmt
+++ b/elements/60_energy/11_water/schemas/codo-sube.elmt
@@ -1,15 +1,17 @@
-<definition width="30" version="0.4" hotspot_x="18" hotspot_y="5" height="10" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E3B3664F-1042-470F-98E7-72AE2C40AFE9}"/><names>
-        <name lang="es">Codo sube</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="18" height="10" hotspot_y="5" link_type="simple">
+    <uuid uuid="{2c4a05b3-b03e-46ed-8398-bb4e7de673c8}"/>
+    <names>
         <name lang="it">Gomito alto</name>
         <name lang="pl">Kolanko wysokie</name>
         <name lang="cs">Vysoké koleno</name>
+        <name lang="es">Codo sube</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="0" x1="-4.90353" y2="0" x2="-1.02118"/>
-        <circle x="0" y="-3" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="6"/>
-        <terminal x="-10" y="0" nameHidden="1" number="" name="" orientation="w"/>
+        <input text="_" size="9" y="-11.5" tagg="label" rotate="true" x="-8"/>
+        <line x2="-1.02118" x1="-4.90353" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <circle style="line-style:normal;line-weight:normal;filling:black;color:black" y="-3" diameter="6" x="0" antialias="true"/>
+        <terminal orientation="w" y="0" x="-10"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/colector.elmt b/elements/60_energy/11_water/schemas/colector.elmt
index 268b22e72..ffdf12c9a 100644
--- a/elements/60_energy/11_water/schemas/colector.elmt
+++ b/elements/60_energy/11_water/schemas/colector.elmt
@@ -1,24 +1,26 @@
-<definition width="40" version="0.4" hotspot_x="20" hotspot_y="14" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{71EA1617-960C-49C9-8F54-8A9D3545C7A5}"/><names>
-        <name lang="es">Colector</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="20" height="30" hotspot_y="13" link_type="simple">
+    <uuid uuid="{dcfb7349-04a5-4e05-adcb-25392f3f7c42}"/>
+    <names>
         <name lang="it">Collettore</name>
         <name lang="pl">Kolektor</name>
         <name lang="cs">Kolektor</name>
+        <name lang="es">Colector</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="-2" x1="5" y2="-7" 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="-2" x1="-5" y2="-7" 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="-2" x1="14" y2="-7" x2="14"/>
-        <rect width="33" x="-17" y="-2" 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="-2" x1="-14" y2="-7" 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="3" x1="0" y2="6" 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="3" x1="0" y2="10" x2="0"/>
-        <terminal x="0" y="10" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="-14" y="-8" nameHidden="160" number="" name="" orientation="n"/>
-        <terminal x="14" y="-8" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="-5" y="-8" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="5" y="-8" nameHidden="1" number="" name="" orientation="n"/>
+        <input text="_" size="9" y="6.55" tagg="label" rotate="true" x="7"/>
+        <line x2="5" x1="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-2" end2="none" antialias="false"/>
+        <line x2="-5" x1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-2" end2="none" antialias="false"/>
+        <line x2="14" x1="14" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-2" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2" width="33" height="5" x="-17" antialias="false"/>
+        <line x2="-14" x1="-14" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-2" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6" length2="1.5" y1="3" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="3" end2="none" antialias="false"/>
+        <terminal orientation="n" y="-8" x="-5"/>
+        <terminal orientation="n" y="-8" x="5"/>
+        <terminal orientation="s" y="10" x="0"/>
+        <terminal orientation="n" y="-8" x="-14"/>
+        <terminal orientation="n" y="-8" x="14"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/contador-agua.elmt b/elements/60_energy/11_water/schemas/contador-agua.elmt
index 6a6f4d770..afc40c9ad 100644
--- a/elements/60_energy/11_water/schemas/contador-agua.elmt
+++ b/elements/60_energy/11_water/schemas/contador-agua.elmt
@@ -1,24 +1,25 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="28" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{61DD15E7-168F-41FE-9356-BDBC53804EDB}"/><names>
-        <name lang="ar">مضخة</name>
-        <name lang="el">Αντλία</name>
-        <name lang="en">Pump</name>
-        <name lang="it">Flussometro</name>
-        <name lang="fr">Pompe</name>
-        <name lang="pl">Pompa</name>
-        <name lang="es">Contador Agua</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="14" height="20" hotspot_y="10" link_type="simple">
+    <uuid uuid="{74d4c858-04d3-494b-9239-14465a10ce2a}"/>
+    <names>
         <name lang="nl">Pomp</name>
+        <name lang="fr">Pompe</name>
+        <name lang="el">Αντλία</name>
+        <name lang="it">Flussometro</name>
+        <name lang="en">Pump</name>
+        <name lang="pl">Pompa</name>
         <name lang="cs">Pumpa</name>
+        <name lang="ar">مضخة</name>
+        <name lang="es">Contador Agua</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <polygon x4="11.94" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="8" x1="11.94" y2="-7.1636" x2="-2.55" y3="7.77827" x3="-2.55" y4="8"/>
-        <rect width="16" x="-3" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-9" y2="0" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="13.6545" y2="0" x2="18.2909"/>
-        <input x="-8" y="-17" size="4" rotate="true" text="Ø_"/>
-        <terminal x="-9.75" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="20" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <polygon x2="-2.55" x3="-2.55" x1="11.94" style="line-style:normal;line-weight:normal;filling:black;color:black" x4="11.94" y2="-7.1636" y4="8" y1="8" y3="7.77827" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8" width="16" height="16" x="-3" antialias="false"/>
+        <line x2="-3" x1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="18.2909" x1="13.6545" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <input text="Ø_" size="4" y="-17" tagg="label" rotate="true" x="-8"/>
+        <terminal orientation="w" y="0" x="-9.75"/>
+        <terminal orientation="e" y="0" x="20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/contador-divisionario.elmt b/elements/60_energy/11_water/schemas/contador-divisionario.elmt
index c01060efd..3c60c0e01 100644
--- a/elements/60_energy/11_water/schemas/contador-divisionario.elmt
+++ b/elements/60_energy/11_water/schemas/contador-divisionario.elmt
@@ -1,25 +1,26 @@
-<definition width="30" version="0.4" hotspot_x="23" hotspot_y="35" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1C42EF28-4956-410C-A7E0-1126DFFBE636}"/><names>
-        <name lang="es">Contador divisionario</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="10" height="60" hotspot_y="34" link_type="simple">
+    <uuid uuid="{03adabf9-58c8-4bc6-a71a-f60a6e18a1fa}"/>
+    <names>
         <name lang="it">Flussometro divisionale</name>
         <name lang="pl">Wodomierz</name>
         <name lang="cs">Vodoměr</name>
+        <name lang="es">Contador divisionario</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="-14" x1="0" y2="-16" x2="0"/>
-        <polygon x4="4" y5="-16" x5="-3" y6="-16" x6="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-16" x1="-2" y2="-16" x2="4" y3="-22" x3="-3" y4="-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="-22.48" x1="0" y2="-28.48" 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="18.52" x1="0" y2="12.52" x2="0"/>
-        <rect width="8" x="-4" y="-4" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="-7" x2="0"/>
-        <polygon x4="3" y5="13" x5="-4" y6="13" x6="-4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="13" x1="-3" y2="13" x2="3" y3="7" x3="-4" y4="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="7" x1="0" y2="5" x2="0"/>
-        <polygon x4="3" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-13" x1="-4" y2="-13" x2="4" y3="-7" x3="-4" y4="-7"/>
-        <polygon x4="4" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-4" x1="4" y2="4" x2="-4" y3="4" x3="4" y4="-4"/>
-        <input x="-13" y="6" size="4" rotation="270" rotate="true" text="Ø_"/>
-        <terminal x="0" y="19" nameHidden="1" number="" name="" orientation="s"/>
-        <terminal x="0" y="-29" nameHidden="1" number="" name="" orientation="n"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-16" length2="1.5" y1="-14" end2="none" antialias="false"/>
+        <polygon x2="4" x3="-3" x1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-3" x4="4" y6="-16" y2="-16" y4="-22" closed="false" y5="-16" y1="-16" y3="-22" antialias="false" x5="-3"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-28.48" length2="1.5" y1="-22.48" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="12.52" length2="1.5" y1="18.52" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" width="8" height="8" x="-4" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <polygon x2="3" x3="-4" x1="-3" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-4" x4="3" y6="13" y2="13" y4="7" closed="false" y5="13" y1="13" y3="7" antialias="false" x5="-4"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="7" end2="none" antialias="false"/>
+        <polygon x2="4" x3="-4" x1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="3" y2="-13" y4="-7" closed="false" y1="-13" y3="-7" antialias="false"/>
+        <polygon x2="-4" x3="4" x1="4" style="line-style:normal;line-weight:normal;filling:black;color:black" x4="4" y2="4" y4="-4" y1="-4" y3="4" antialias="false"/>
+        <input text="Ø_" size="4" y="6" tagg="label" rotate="true" rotation="270" x="-13"/>
+        <terminal orientation="s" y="19" x="0"/>
+        <terminal orientation="n" y="-29" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/dep-expansion.elmt b/elements/60_energy/11_water/schemas/dep-expansion.elmt
index bc086799d..52d8f82fa 100644
--- a/elements/60_energy/11_water/schemas/dep-expansion.elmt
+++ b/elements/60_energy/11_water/schemas/dep-expansion.elmt
@@ -1,18 +1,19 @@
-<definition width="30" version="0.4" hotspot_x="14" hotspot_y="35" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{630CD380-3630-4436-99EA-5D42C76FCFB6}"/><names>
-        <name lang="es">Depósito esxpansión</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="14" height="40" hotspot_y="22" link_type="simple">
+    <uuid uuid="{2367d020-50ac-45f6-b789-2adf4598801c}"/>
+    <names>
         <name lang="it">Vaso d'espansione</name>
         <name lang="pl">Zbiornik wyrównawczy</name>
         <name lang="cs">Vyrovnávací nádrž</name>
+        <name lang="es">Depósito esxpansión</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="12" x="0" y="-8" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <ellipse width="23" x="-11" y="-16" antialias="true" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="0" y2="10" x2="0"/>
-        <arc width="11" x="-11" y="-8" antialias="true" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <input x="-4" y="-24.1826" size="4" rotate="true" text="_L"/>
-        <terminal x="0" y="10" nameHidden="0" number="" name="" orientation="s"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8" width="12" height="6" start="-180" angle="-180" x="0" antialias="true"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-16" width="23" height="22" x="-11" antialias="true"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="6" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8" width="11" height="7" start="0" angle="-180" x="-11" antialias="true"/>
+        <input text="_L" size="4" y="-24.1826" tagg="label" rotate="true" x="-4"/>
+        <terminal orientation="s" y="10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/deposito-agua.elmt b/elements/60_energy/11_water/schemas/deposito-agua.elmt
index a45054e58..d5f04c933 100644
--- a/elements/60_energy/11_water/schemas/deposito-agua.elmt
+++ b/elements/60_energy/11_water/schemas/deposito-agua.elmt
@@ -1,22 +1,24 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="28" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{FCA612C4-0126-44B5-9705-82FF4248806C}"/><names>
-        <name lang="es">Depósito de agua</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="15" height="40" hotspot_y="28" link_type="simple">
+    <uuid uuid="{2a21e2c4-1b7b-478b-b6eb-548d0e2f2c5f}"/>
+    <names>
         <name lang="it">Serbatoio acqua</name>
         <name lang="pl">Zbiornik wody</name>
         <name lang="cs">Nádrž na vodu</name>
+        <name lang="es">Depósito de agua</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="0" x1="14" y2="0" x2="19"/>
-        <arc width="25" x="-12" y="-19" antialias="true" height="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180"/>
-        <ellipse width="25" x="-12" y="-20" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="25" x="-12" y="-3" antialias="true" height="8" 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="1" x1="-12" y2="-17" 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="1" x1="13" y2="-17" 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="-20" x1="10.7275" y2="-20" x2="19.2118"/>
-        <line 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="10" y2="-20" x2="10"/>
-        <terminal x="20" y="-20" nameHidden="88" number="" name="" orientation="e"/>
-        <terminal x="19" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="2.55" tagg="label" rotate="true" x="-5"/>
+        <line x2="19" x1="14" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:thin;filling:none;color:black" y="-19" width="25" height="7" start="0" angle="-180" x="-12" antialias="true"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20" width="25" height="6" x="-12" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3" width="25" height="8" start="0" angle="-180" x="-12" antialias="true"/>
+        <line x2="-12" x1="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-17" length2="1.5" y1="1" end2="none" antialias="false"/>
+        <line x2="13" x1="13" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-17" length2="1.5" y1="1" end2="none" antialias="false"/>
+        <line x2="19.2118" x1="10.7275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-20" length2="1.5" y1="-20" end2="none" antialias="false"/>
+        <line x2="10" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-20" length2="1.5" y1="-18" end2="none" antialias="false"/>
+        <terminal orientation="e" y="-20" x="20"/>
+        <terminal orientation="e" y="0" x="19"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/dilatador.elmt b/elements/60_energy/11_water/schemas/dilatador.elmt
index 15eb8a91f..848224cb5 100644
--- a/elements/60_energy/11_water/schemas/dilatador.elmt
+++ b/elements/60_energy/11_water/schemas/dilatador.elmt
@@ -1,19 +1,21 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C0DC883C-0DC7-41A3-8ACF-A22810F0DDD6}"/><names>
-        <name lang="es">Dilatador</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="15" height="20" hotspot_y="10" link_type="simple">
+    <uuid uuid="{3989a3e5-3462-4d44-95b2-a8f0aa04eb45}"/>
+    <names>
         <name lang="it">Compensatore dilatazione</name>
         <name lang="pl">Kompensator rozszerzeń</name>
         <name lang="cs">Vyrovnávač roztažení</name>
+        <name lang="es">Dilatador</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="0" x1="7" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="7" y2="4" x2="7"/>
-        <ellipse width="14" x="-7" y="-3" antialias="true" height="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="-5" x1="-7" y2="4" 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="0" x1="-10" y2="0" x2="-7"/>
-        <terminal x="-10.25" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10.25" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="2.55" tagg="label" rotate="true" x="-7"/>
+        <line x2="10" x1="7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="7" x1="7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3" width="14" height="6" x="-7" antialias="true"/>
+        <line x2="-7" x1="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <line x2="-7" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <terminal orientation="w" y="0" x="-10.25"/>
+        <terminal orientation="e" y="0" x="10.25"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/electrovalvula.elmt b/elements/60_energy/11_water/schemas/electrovalvula.elmt
index 93d17f65a..10a9731e9 100644
--- a/elements/60_energy/11_water/schemas/electrovalvula.elmt
+++ b/elements/60_energy/11_water/schemas/electrovalvula.elmt
@@ -1,24 +1,26 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="13" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{73BF278F-F88D-4956-A168-20E3E3DC745B}"/><names>
-        <name lang="ar">صمّام كهربائي 2V "صحي"</name>
-        <name lang="en">Solenoid 2V "health"</name>
-        <name lang="it">Elettrovalvola 2vie acqua sanitaria</name>
-        <name lang="fr">Electro-vanne 2V "sanitaire"</name>
-        <name lang="pl">Elektrozawór dwudrożny</name>
-        <name lang="es">Electroválvula</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="19" height="20" hotspot_y="13" link_type="simple">
+    <uuid uuid="{8f0a0d92-7de6-4bf2-bc53-30934dbb5d77}"/>
+    <names>
         <name lang="nl">Elketrische klep sanitair 2</name>
+        <name lang="fr">Electro-vanne 2V "sanitaire"</name>
+        <name lang="it">Elettrovalvola 2vie acqua sanitaria</name>
+        <name lang="en">Solenoid 2V "health"</name>
+        <name lang="pl">Elektrozawór dwudrożny</name>
         <name lang="cs">Elektrický uzávěr 2V</name>
+        <name lang="ar">صمّام كهربائي 2V "صحي"</name>
+        <name lang="es">Electroválvula</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="0" y2="0" x2="0"/>
-        <rect width="8" x="-4" y="-11" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="0" y5="-4" x5="8" y6="4" x6="8" y7="0" x7="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-4" x2="-8" y3="4" x3="-8" y4="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="-11" x1="4" y2="-5" 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="0" x1="8" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-11" y2="0" x2="-8"/>
-        <terminal x="-11" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="11" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="1.55" tagg="label" rotate="true" x="-5"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11" width="8" height="6" x="-4" antialias="false"/>
+        <polygon x2="-8" x3="-8" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="8" y7="0" x4="0" y6="4" y2="-4" y4="0" y5="-4" y1="0" y3="4" x7="0" antialias="true" x5="8"/>
+        <line x2="-4" x1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5" length2="1.5" y1="-11" end2="none" antialias="false"/>
+        <line x2="10" x1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="-8" x1="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <terminal orientation="e" y="0" x="11"/>
+        <terminal orientation="w" y="0" x="-11"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/enlace-desmontable.elmt b/elements/60_energy/11_water/schemas/enlace-desmontable.elmt
index b0892a4a5..fcf2aafa8 100644
--- a/elements/60_energy/11_water/schemas/enlace-desmontable.elmt
+++ b/elements/60_energy/11_water/schemas/enlace-desmontable.elmt
@@ -1,18 +1,20 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="10" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3589F8CC-A946-446D-A5B5-B1C733FB1761}"/><names>
-        <name lang="es">Enlace desmontable</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="15" height="20" hotspot_y="10" link_type="simple">
+    <uuid uuid="{2bfdadaa-2c82-45ea-94d9-2a5fb2c4dadc}"/>
+    <names>
         <name lang="it">Raccordo smontabile</name>
         <name lang="pl">Złączka</name>
         <name lang="cs">Rozkládací spojení</name>
+        <name lang="es">Enlace desmontable</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="-0.0919428" x1="2.69827" y2="-0.0919428" x2="9.32688"/>
-        <line 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.04597" x1="2" y2="-6.22986" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.0919428" x1="-10.2079" y2="-0.0919428" x2="-2.7748"/>
-        <line 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.04597" x1="-2" y2="-6.22986" x2="-2"/>
-        <terminal x="-11" y="-0.0919428" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10" y="-0.0919428" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="5.55" tagg="label" rotate="true" x="-6"/>
+        <line x2="9.32688" x1="2.69827" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.0919428" length2="1.5" y1="-0.0919428" end2="none" antialias="false"/>
+        <line x2="2" x1="2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.22986" length2="1.5" y1="6.04597" end2="none" antialias="false"/>
+        <line x2="-2.7748" x1="-10.2079" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.0919428" length2="1.5" y1="-0.0919428" end2="none" antialias="false"/>
+        <line x2="-2" x1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.22986" length2="1.5" y1="6.04597" end2="none" antialias="false"/>
+        <terminal orientation="w" y="-0.0919428" x="-11"/>
+        <terminal orientation="e" y="-0.0919428" x="10"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/filtro.elmt b/elements/60_energy/11_water/schemas/filtro.elmt
index 7d73b7b22..41fbdfb70 100644
--- a/elements/60_energy/11_water/schemas/filtro.elmt
+++ b/elements/60_energy/11_water/schemas/filtro.elmt
@@ -1,19 +1,21 @@
-<definition width="30" version="0.4" hotspot_x="13" hotspot_y="7" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1394C425-288A-4376-95DD-85FBE882FCDB}"/><names>
-        <name lang="es">Filtro</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="13" height="20" hotspot_y="7" link_type="simple">
+    <uuid uuid="{9fd13373-8fdb-4f2b-adf7-43171347d7e5}"/>
+    <names>
         <name lang="it">Filtro</name>
         <name lang="pl">Filtr</name>
         <name lang="cs">Filtr</name>
+        <name lang="es">Filtro</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.23751" x1="10" y2="3.25731" 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="-3.23751" x1="-7" y2="3.25731" 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="0" x1="-5.98947" y2="0" x2="6.90526"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7" y2="7" 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="9" x1="-2" y2="5" x2="2"/>
-        <terminal x="-8" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="11" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="-10.5" tagg="label" rotate="true" x="-6"/>
+        <line x2="10" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.25731" length2="1.5" y1="-3.23751" end2="none" antialias="false"/>
+        <line x2="-7" x1="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.25731" length2="1.5" y1="-3.23751" end2="none" antialias="false"/>
+        <line x2="6.90526" x1="-5.98947" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="0" x1="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="2" x1="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="9" end2="none" antialias="false"/>
+        <terminal orientation="w" y="0" x="-8"/>
+        <terminal orientation="e" y="0" x="11"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/fitro-pisicna.elmt b/elements/60_energy/11_water/schemas/fitro-pisicna.elmt
index 3d22f35d2..d2bfb8758 100644
--- a/elements/60_energy/11_water/schemas/fitro-pisicna.elmt
+++ b/elements/60_energy/11_water/schemas/fitro-pisicna.elmt
@@ -1,36 +1,38 @@
-<definition width="50" version="0.4" hotspot_x="14" hotspot_y="10" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{BE99FC1E-3663-4815-A534-8433B8949170}"/><names>
-        <name lang="es">Filtro piscina</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="14" height="30" hotspot_y="10" link_type="simple">
+    <uuid uuid="{956df9a6-b8eb-4957-863f-0f6a15c83c25}"/>
+    <names>
         <name lang="it">Filtro piscina</name>
         <name lang="pl">Filtr basenowy</name>
         <name lang="cs">Bazénový filtr</name>
+        <name lang="es">Filtro piscina</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="20" x="-10" y="8" antialias="true" height="6" 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="12" x1="28.0648" y2="12" x2="25.0171"/>
-        <rect width="20" x="-10" y="-4" antialias="false" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="20" x="-10" y="-8" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-10" y2="-2" 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="13" x1="-5" y2="17" 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="17" x1="-8" y2="17" 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="17" x1="8" y2="13" x2="5"/>
-        <rect width="7" x="16" y="-2" antialias="false" height="13" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="18" y="-4" 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="-4" x1="19" y2="-7" x2="23"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="10" y2="1" 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="4" x1="10" y2="4" 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="0" x1="23.1846" y2="0" x2="27.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="23" y2="9" x2="28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" x1="28.7628" y2="-3" x2="24.2959"/>
-        <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="24" y2="-4" x2="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3" x1="24" y2="-2" x2="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="12" x1="28" y2="11" x2="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="12" x1="28" y2="13" x2="27"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="12" x1="18" y2="16" x2="18"/>
-        <terminal x="29" y="0" nameHidden="40" number="" name="" orientation="e"/>
-        <terminal x="29" y="9" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="18" y="15" nameHidden="110" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-19.45" tagg="label" rotate="true" x="-7"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="8" width="20" height="6" start="0" angle="-180" x="-10" antialias="true"/>
+        <line x2="25.0171" x1="28.0648" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="12" length2="1.5" y1="12" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" width="20" height="15" x="-10" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8" width="20" height="6" start="-180" angle="-180" x="-10" antialias="true"/>
+        <line x2="9" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-2" length2="1.5" y1="-2" end2="none" antialias="false"/>
+        <line x2="-8" x1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="17" length2="1.5" y1="13" end2="none" antialias="false"/>
+        <line x2="8" x1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="17" length2="1.5" y1="17" end2="none" antialias="false"/>
+        <line x2="5" x1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="13" length2="1.5" y1="17" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2" width="7" height="13" x="16" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" width="3" height="2" x="18" antialias="false"/>
+        <line x2="23" x1="19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-4" end2="none" antialias="false"/>
+        <line x2="16" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="1" length2="1.5" y1="1" end2="none" antialias="false"/>
+        <line x2="15" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <line x2="27.8" x1="23.1846" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="28" x1="23" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9" length2="1.5" y1="9" end2="none" antialias="false"/>
+        <line x2="24.2959" x1="28.7628" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-3" length2="1.5" y1="-3" end2="none" antialias="false"/>
+        <line x2="27" x1="24" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4" length2="1.5" y1="-3" end2="none" antialias="false"/>
+        <line x2="27" x1="24" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-2" length2="1.5" y1="-3" end2="none" antialias="false"/>
+        <line x2="27" x1="28" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="11" length2="1.5" y1="12" end2="none" antialias="false"/>
+        <line x2="27" x1="28" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="13" length2="1.5" y1="12" end2="none" antialias="false"/>
+        <line x2="18" x1="18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="16" length2="1.5" y1="12" end2="none" antialias="false"/>
+        <terminal orientation="e" y="9" x="29"/>
+        <terminal orientation="s" y="15" x="18"/>
+        <terminal orientation="e" y="0" x="29"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/flexible.elmt b/elements/60_energy/11_water/schemas/flexible.elmt
index b860d6b9b..a8c71f2b8 100644
--- a/elements/60_energy/11_water/schemas/flexible.elmt
+++ b/elements/60_energy/11_water/schemas/flexible.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="11" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{76A37C72-D686-4C87-BD33-C484554A6D5E}"/><names>
-        <name lang="es">Flexible</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="20" hotspot_y="11" link_type="simple">
+    <uuid uuid="{616f068f-bd3e-4d45-8dfe-cb1a6b87ae7c}"/>
+    <names>
         <name lang="it">Flessibile</name>
         <name lang="pl">Wąż giętki</name>
         <name lang="cs">Ohebná hadice</name>
+        <name lang="es">Flexible</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="-5" x1="6" y2="2" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.48" x1="8.96" y2="-0.48" x2="17.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="-0.48" x1="-18.2" y2="-0.48" x2="-9.86667"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-9" y2="-5" 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="-5" x1="-6" y2="2" 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="-5" x1="0" y2="2" 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="-5" x1="0" y2="2" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="6" y2="-1" x2="8"/>
-        <terminal x="-20" y="-0.5" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="20" y="-0.5" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="-19.45" tagg="label" rotate="true" x="-7"/>
+        <line x2="3" x1="6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="2" length2="1.5" y1="-5" end2="none" antialias="true"/>
+        <line x2="17.96" x1="8.96" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.48" length2="1.5" y1="-0.48" end2="none" antialias="false"/>
+        <line x2="-9.86667" x1="-18.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.48" length2="1.5" y1="-0.48" end2="none" antialias="false"/>
+        <line x2="-6" x1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5" length2="1.5" y1="-1" end2="none" antialias="true"/>
+        <line x2="-4" x1="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="2" length2="1.5" y1="-5" end2="none" antialias="true"/>
+        <line x2="-4" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="2" length2="1.5" y1="-5" end2="none" antialias="true"/>
+        <line x2="3" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="2" length2="1.5" y1="-5" end2="none" antialias="true"/>
+        <line x2="8" x1="6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1" length2="1.5" y1="-5" end2="none" antialias="true"/>
+        <terminal orientation="e" y="-0.5" x="20"/>
+        <terminal orientation="w" y="-0.5" x="-20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/fluxor.elmt b/elements/60_energy/11_water/schemas/fluxor.elmt
index 09f3aa5a7..7644b488f 100644
--- a/elements/60_energy/11_water/schemas/fluxor.elmt
+++ b/elements/60_energy/11_water/schemas/fluxor.elmt
@@ -1,17 +1,19 @@
-<definition width="20" version="0.4" hotspot_x="10" hotspot_y="16" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EC833A66-8927-41FE-9158-32FE6BE71542}"/><names>
-        <name lang="es">Fluxor</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="10" height="30" hotspot_y="16" link_type="simple">
+    <uuid uuid="{52960fe8-0f65-4f15-935f-4a3c6ab192e0}"/>
+    <names>
         <name lang="it">Scarico</name>
         <name lang="pl">Zawór spłukujący</name>
         <name lang="cs">Splachovací klapka</name>
+        <name lang="es">Fluxor</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <ellipse width="14.08" x="-7" y="-2.68797" antialias="true" height="12.2912" 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.26441" x1="0.04" y2="-9.06252" x2="0.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="-0.639445" x1="-5.24" y2="7.55467" x2="5.32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.639445" x1="5.32" y2="7.55467" x2="-5.24"/>
-        <terminal x="0" y="-10" nameHidden="1" number="" name="" orientation="n"/>
+        <input text="_" size="9" y="13.55" tagg="label" rotate="true" x="-7"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2.68797" width="14.08" height="12.2912" x="-7" antialias="true"/>
+        <line x2="0.04" x1="0.04" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.06252" length2="1.5" y1="-3.26441" end2="none" antialias="false"/>
+        <line x2="5.32" x1="-5.24" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.55467" length2="1.5" y1="-0.639445" end2="none" antialias="true"/>
+        <line x2="-5.24" x1="5.32" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.55467" length2="1.5" y1="-0.639445" end2="none" antialias="true"/>
+        <terminal orientation="n" y="-10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/grif-manguera.elmt b/elements/60_energy/11_water/schemas/grif-manguera.elmt
index 5d8182ea8..8d062259b 100644
--- a/elements/60_energy/11_water/schemas/grif-manguera.elmt
+++ b/elements/60_energy/11_water/schemas/grif-manguera.elmt
@@ -1,20 +1,22 @@
-<definition width="30" version="0.4" hotspot_x="18" hotspot_y="13" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{14D3FCF7-807B-4F88-A3B0-7A48147017ED}"/><names>
-        <name lang="es">Grifo riego</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="18" height="40" hotspot_y="13" link_type="simple">
+    <uuid uuid="{d62c53ab-02b3-408c-bfcf-994c9ca28277}"/>
+    <names>
         <name lang="it">Rubinetto irrigazione</name>
         <name lang="pl">Zawór do nawadniania</name>
         <name lang="cs">Kohoutek zavlažování</name>
+        <name lang="es">Grifo riego</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="-7.97109" x1="-0.02" y2="1.34236" x2="-0.02"/>
-        <polygon x4="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="1.46011" x1="7" y2="1.46011" x2="-8" y3="10" x3="-0.5" y4="1.46011"/>
-        <arc width="12.35" x="-13" y="11.4505" antialias="true" height="12.5495" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-270"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.4852" x1="-0.65" y2="18.2079" x2="-0.65"/>
-        <line 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.4505" x1="-6.35" y2="13.3812" x2="5.05"/>
-        <line 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.4159" x1="4.1" y2="14.3466" x2="6.95"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14.3466" x1="4.1" y2="14.3466" x2="6.95"/>
-        <terminal x="0" y="-9" nameHidden="1" number="" name="" orientation="n"/>
+        <input text="_" size="9" y="6.55" tagg="label" rotate="true" x="7"/>
+        <line x2="-0.02" x1="-0.02" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="1.34236" length2="1.5" y1="-7.97109" end2="none" antialias="false"/>
+        <polygon x2="-8" x3="-0.5" x1="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="7" y2="1.46011" y4="1.46011" y1="1.46011" y3="10" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="11.4505" width="12.35" height="12.5495" start="0" angle="-270" x="-13" antialias="true"/>
+        <line x2="-0.65" x1="-0.65" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="18.2079" length2="1.5" y1="10.4852" end2="none" antialias="false"/>
+        <line x2="5.05" x1="-6.35" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="13.3812" length2="1.5" y1="11.4505" end2="none" antialias="true"/>
+        <line x2="6.95" x1="4.1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14.3466" length2="1.5" y1="12.4159" end2="none" antialias="true"/>
+        <line x2="6.95" x1="4.1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14.3466" length2="1.5" y1="14.3466" end2="none" antialias="true"/>
+        <terminal orientation="n" y="-9" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/grifo-caliente.elmt b/elements/60_energy/11_water/schemas/grifo-caliente.elmt
index 3c4ca2b83..84eadbb3c 100644
--- a/elements/60_energy/11_water/schemas/grifo-caliente.elmt
+++ b/elements/60_energy/11_water/schemas/grifo-caliente.elmt
@@ -1,15 +1,17 @@
-<definition width="20" version="0.4" hotspot_x="10" hotspot_y="16" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E1921647-6297-44F5-BA01-8A5997342175}"/><names>
-        <name lang="es">Grifo caliente</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="10" height="30" hotspot_y="16" link_type="simple">
+    <uuid uuid="{e02583e7-3a45-4ea0-952a-bb084cfca206}"/>
+    <names>
         <name lang="it">Rubinetto caldo</name>
         <name lang="pl">Zawór do wody ciepłej</name>
         <name lang="cs">Kohoutek teplé vody</name>
+        <name lang="es">Grifo caliente</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="-8.57189" x1="-0.26" y2="1.36531" x2="-0.26"/>
-        <polygon x4="7.48" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="1.60393" x1="7.48" y2="1.60393" x2="-8" y3="10" x3="-0.26" y4="1.60393"/>
-        <terminal x="-0.5" y="-10" nameHidden="1" number="" name="" orientation="n"/>
+        <input text="_" size="9" y="-10.45" tagg="label" rotate="true" x="7"/>
+        <line x2="-0.26" x1="-0.26" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="1.36531" length2="1.5" y1="-8.57189" end2="none" antialias="false"/>
+        <polygon x2="-8" x3="-0.26" x1="7.48" style="line-style:normal;line-weight:normal;filling:black;color:black" x4="7.48" y2="1.60393" y4="1.60393" y1="1.60393" y3="10" antialias="true"/>
+        <terminal orientation="n" y="-10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/grifo-fria-caliente.elmt b/elements/60_energy/11_water/schemas/grifo-fria-caliente.elmt
index 147e6214c..69c90f21c 100644
--- a/elements/60_energy/11_water/schemas/grifo-fria-caliente.elmt
+++ b/elements/60_energy/11_water/schemas/grifo-fria-caliente.elmt
@@ -1,18 +1,20 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="14" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{608F492F-BC86-45F9-A23D-7C77D95C14F8}"/><names>
-        <name lang="es">Grifo fria y caliente</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="14" height="30" hotspot_y="14" link_type="simple">
+    <uuid uuid="{0cb7e3ca-1b24-4b9e-bbb8-4ca0e7ee5f35}"/>
+    <names>
         <name lang="it">Rubinetto caldo e freddo</name>
         <name lang="pl">Zawór do wody ciepłej i zimnej</name>
         <name lang="cs">Kohoutek teplé i studené vody</name>
+        <name lang="es">Grifo fria y caliente</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="-7.90245" x1="9.97745" y2="0.45589" x2="9.97745"/>
-        <line 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.90245" x1="-9.51402" y2="0.45589" x2="-9.51402"/>
-        <polygon x4="-10.678" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="1.3149" x1="-10.678" y2="1.3149" x2="1.25959" y3="12.9273" x3="1.25959" y4="1.3149"/>
-        <polygon x4="1.25959" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="1.3149" x1="1.25959" y2="1.3149" x2="12.0034" y3="12.9273" x3="1.25959" y4="1.3149"/>
-        <terminal x="-9.51402" y="-9.57412" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="10" y="-9" nameHidden="0" number="" name="" orientation="n"/>
+        <input text="_" size="9" y="-0.45" tagg="label" rotate="true" x="14"/>
+        <line x2="9.97745" x1="9.97745" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0.45589" length2="1.5" y1="-7.90245" end2="none" antialias="false"/>
+        <line x2="-9.51402" x1="-9.51402" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0.45589" length2="1.5" y1="-7.90245" end2="none" antialias="false"/>
+        <polygon x2="1.25959" x3="1.25959" x1="-10.678" style="line-style:normal;line-weight:normal;filling:black;color:black" x4="-10.678" y2="1.3149" y4="1.3149" y1="1.3149" y3="12.9273" antialias="false"/>
+        <polygon x2="12.0034" x3="1.25959" x1="1.25959" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="1.25959" y2="1.3149" y4="1.3149" closed="false" y1="1.3149" y3="12.9273" antialias="true"/>
+        <terminal orientation="n" y="-9.57412" x="-9.51402"/>
+        <terminal orientation="n" y="-9" x="10"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/grifo-fria.elmt b/elements/60_energy/11_water/schemas/grifo-fria.elmt
index e3d64bec3..d5ed73b89 100644
--- a/elements/60_energy/11_water/schemas/grifo-fria.elmt
+++ b/elements/60_energy/11_water/schemas/grifo-fria.elmt
@@ -1,15 +1,17 @@
-<definition width="20" version="0.4" hotspot_x="10" hotspot_y="16" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{81EF68A1-14C8-4073-B0AB-5236C70FE174}"/><names>
-        <name lang="es">Grifo fría</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="10" height="30" hotspot_y="16" link_type="simple">
+    <uuid uuid="{854991e3-68c3-4786-b1aa-c3d46394f4b3}"/>
+    <names>
         <name lang="it">Rubinetto freddo</name>
         <name lang="pl">Zawór do wody zimnej</name>
         <name lang="cs">Kohoutek studené vody</name>
+        <name lang="es">Grifo fría</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="-7.97109" x1="-0.02" y2="1.34236" x2="-0.02"/>
-        <polygon x4="7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="1.46011" x1="7" y2="1.46011" x2="-8" y3="10" x3="-0.5" y4="1.46011"/>
-        <terminal x="0" y="-10" nameHidden="1" number="" name="" orientation="n"/>
+        <input text="_" size="9" y="0.55" tagg="label" rotate="true" x="7"/>
+        <line x2="-0.02" x1="-0.02" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="1.34236" length2="1.5" y1="-7.97109" end2="none" antialias="false"/>
+        <polygon x2="-8" x3="-0.5" x1="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="7" y2="1.46011" y4="1.46011" y1="1.46011" y3="10" antialias="true"/>
+        <terminal orientation="n" y="-10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/grifo-prueba.elmt b/elements/60_energy/11_water/schemas/grifo-prueba.elmt
index 96abd0fe9..2b341d428 100644
--- a/elements/60_energy/11_water/schemas/grifo-prueba.elmt
+++ b/elements/60_energy/11_water/schemas/grifo-prueba.elmt
@@ -1,17 +1,19 @@
-<definition width="20" version="0.4" hotspot_x="8" hotspot_y="13" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{37600B4B-144F-4670-8A97-92BBA4017E78}"/><names>
-        <name lang="es">Grifo de comprobación</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="8" height="30" hotspot_y="13" link_type="simple">
+    <uuid uuid="{f4592a6a-d88f-4737-a614-1c3da715a8cf}"/>
+    <names>
         <name lang="it">Rubinetto di controllo</name>
         <name lang="pl">Zawór do regulacyjny</name>
         <name lang="cs">Ovládací kohoutek</name>
+        <name lang="es">Grifo de comprobación</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="10" x1="-6" y2="10" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="-4" x2="0"/>
-        <arc width="8" x="0" y="-9" antialias="true" height="8" 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="0" x1="-3.12632" y2="0" x2="3.13684"/>
-        <terminal x="0" y="10" nameHidden="1" number="" name="" orientation="s"/>
+        <line x2="10" x1="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="10" end2="none" antialias="false"/>
+        <input text="_" size="9" y="12.55" tagg="label" rotate="true" x="1"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4" length2="1.5" y1="10" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="8" height="8" start="-180" angle="-180" x="0" antialias="true"/>
+        <line x2="3.13684" x1="-3.12632" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <terminal orientation="s" y="10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/grupo-seg-termo.elmt b/elements/60_energy/11_water/schemas/grupo-seg-termo.elmt
index 5590a71b6..3a0a24863 100644
--- a/elements/60_energy/11_water/schemas/grupo-seg-termo.elmt
+++ b/elements/60_energy/11_water/schemas/grupo-seg-termo.elmt
@@ -1,45 +1,47 @@
-<definition width="40" version="0.4" hotspot_x="18" hotspot_y="24" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{79361D2A-01AC-4C29-A854-7840D8DB291E}"/><names>
-        <name lang="ar">صمّام كهربائي 3V  "صحي"</name>
-        <name lang="en">Solenoid 3V "health"</name>
-        <name lang="it">Elettrovalvola 3vie acqua sanitaria</name>
-        <name lang="fr">Electro-vanne 3V "sanitaire"</name>
-        <name lang="pl">Elektrozawór trójdrożny</name>
-        <name lang="es">Grupo seguridad termo</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="18" height="50" hotspot_y="24" link_type="simple">
+    <uuid uuid="{9a9dc41e-2a41-4c36-aa0e-c5c999375c5d}"/>
+    <names>
         <name lang="nl">Elektrisch klep sanitair 3</name>
+        <name lang="fr">Electro-vanne 3V "sanitaire"</name>
+        <name lang="it">Elettrovalvola 3vie acqua sanitaria</name>
+        <name lang="en">Solenoid 3V "health"</name>
+        <name lang="pl">Elektrozawór trójdrożny</name>
         <name lang="cs">Elektrický uzávěr 3V</name>
+        <name lang="ar">صمّام كهربائي 3V  "صحي"</name>
+        <name lang="es">Grupo seguridad termo</name>
     </names>
     <informations>24v et anti-bélier </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="-4" y2="-15" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-4" y2="15" 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="-8.39368" x1="0" y2="-0.656842" 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="-9" x1="-4" y2="-15" 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="-9" x1="-4" y2="-9" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15.3213" x1="0" y2="-18.7034" 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="0" y2="0" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="3" y2="3" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="3" y2="0" x2="11"/>
-        <line 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="11" y2="3" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="11" y2="6" 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="0" x1="11" y2="6" 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="6" x1="7.47772" y2="6" x2="13.5658"/>
-        <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="11" y2="-3" 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="-3" x1="13" y2="-5" 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="-5" x1="9" y2="-7" 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="6" x1="11" y2="9" x2="11"/>
-        <line 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="4" 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="5" x1="-4" y2="5" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="5" y2="15" 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="5" x1="-4" y2="15" 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="10" x1="0" y2="10" 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="7" x1="-9" y2="13" x2="-9"/>
-        <rect width="28" x="-12" y="-18" antialias="false" height="37" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="0" y2="20" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11" x1="8" y2="13" x2="11"/>
-        <line 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="14" y2="13" x2="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="16" x1="11" y2="13" x2="11"/>
-        <terminal x="0" y="-20" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="0" y="21" nameHidden="0" number="" name="" orientation="s"/>
+        <line x2="4" x1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-15" length2="1.5" y1="-15" end2="none" antialias="false"/>
+        <input text="_" size="9" y="0.55" tagg="label" rotate="true" x="18"/>
+        <line x2="4" x1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="15" length2="1.5" y1="15" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.656842" length2="1.5" y1="-8.39368" end2="none" antialias="false"/>
+        <line x2="4" x1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-15" length2="1.5" y1="-9" end2="none" antialias="true"/>
+        <line x2="4" x1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9" length2="1.5" y1="-9" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-18.7034" length2="1.5" y1="-15.3213" end2="none" antialias="false"/>
+        <line x2="3" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="3" x1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3" length2="1.5" y1="-3" end2="none" antialias="false"/>
+        <line x2="11" x1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="-3" end2="none" antialias="true"/>
+        <line x2="3" x1="11" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3" length2="1.5" y1="0" end2="none" antialias="true"/>
+        <line x2="7" x1="11" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6" length2="1.5" y1="0" end2="none" antialias="true"/>
+        <line x2="14" x1="11" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="13.5658" x1="7.47772" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6" length2="1.5" y1="6" end2="none" antialias="false"/>
+        <line x2="13" x1="11" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-3" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="9" x1="13" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-5" length2="1.5" y1="-3" end2="none" antialias="false"/>
+        <line x2="14" x1="9" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <line x2="11" x1="11" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9" length2="1.5" y1="6" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="5" x1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <line x2="-4" x1="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="15" length2="1.5" y1="5" end2="none" antialias="true"/>
+        <line x2="5" x1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="15" length2="1.5" y1="5" end2="none" antialias="true"/>
+        <line x2="-9" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="10" end2="none" antialias="false"/>
+        <line x2="-9" x1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="13" length2="1.5" y1="7" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-18" width="28" height="37" x="-12" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="20" length2="1.5" y1="15" end2="none" antialias="false"/>
+        <line x2="11" x1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="13" length2="1.5" y1="11" end2="none" antialias="true"/>
+        <line x2="11" x1="14" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="13" length2="1.5" y1="11" end2="none" antialias="true"/>
+        <line x2="11" x1="11" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="13" length2="1.5" y1="16" end2="none" antialias="false"/>
+        <terminal orientation="s" y="21" x="0"/>
+        <terminal orientation="n" y="-20" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/intercambiador.elmt b/elements/60_energy/11_water/schemas/intercambiador.elmt
index 075562c10..0bbdcf179 100644
--- a/elements/60_energy/11_water/schemas/intercambiador.elmt
+++ b/elements/60_energy/11_water/schemas/intercambiador.elmt
@@ -1,25 +1,27 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A4D3703E-3A74-4631-8DFD-61602A267AA2}"/><names>
-        <name lang="es">Interacambiador calor</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="40" hotspot_y="19" link_type="simple">
+    <uuid uuid="{d5243024-3bd0-42cb-908a-c0189354cbf1}"/>
+    <names>
         <name lang="it">Scambiatore di calore</name>
         <name lang="pl">Wymiennik ciepła</name>
         <name lang="cs">Výměník tepla</name>
+        <name lang="es">Interacambiador calor</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="10" x1="-20" y2="10" x2="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="10" y2="-10" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-20" y2="-10" x2="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="10" y2="10" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-10" y2="0" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="5" y2="10" 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="-10" x1="10" y2="0" 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="0" x1="-4" y2="10" x2="10"/>
-        <rect width="26" x="-12" y="-14" antialias="false" height="29" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <terminal x="-20" y="-10" nameHidden="224" number="" name="" orientation="w"/>
-        <terminal x="-20" y="10" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="20" y="-10" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="20" y="10" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="10.55" tagg="label" rotate="true" x="-7"/>
+        <line x2="-10" x1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="10" end2="none" antialias="false"/>
+        <line x2="20" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <line x2="-10" x1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <line x2="20" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="10" end2="none" antialias="false"/>
+        <line x2="5" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="-10" end2="none" antialias="true"/>
+        <line x2="-9" x1="5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="0" end2="none" antialias="true"/>
+        <line x2="-4" x1="10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="-10" end2="none" antialias="true"/>
+        <line x2="10" x1="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="0" end2="none" antialias="true"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-14" width="26" height="29" x="-12" antialias="false"/>
+        <terminal orientation="w" y="10" x="-20"/>
+        <terminal orientation="e" y="10" x="20"/>
+        <terminal orientation="w" y="-10" x="-20"/>
+        <terminal orientation="e" y="-10" x="20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/llave-acometida.elmt b/elements/60_energy/11_water/schemas/llave-acometida.elmt
index c125d5069..7b4135478 100644
--- a/elements/60_energy/11_water/schemas/llave-acometida.elmt
+++ b/elements/60_energy/11_water/schemas/llave-acometida.elmt
@@ -1,24 +1,25 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="28" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B5EB93C2-B305-4FD4-8E32-C7AA64AC937A}"/><names>
-        <name lang="es">Llave acometida</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="30" hotspot_y="16" link_type="simple">
+    <uuid uuid="{7ac74dfc-4faa-43c6-a5b8-d30952760bab}"/>
+    <names>
         <name lang="it">Valvola di attacco</name>
         <name lang="pl">Zawór szybkozamykający</name>
         <name lang="cs">Rychlozavírací ventil</name>
+        <name lang="es">Llave acometida</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="4.9727" x1="-8.8275" y2="-4.89732" x2="-8.8275"/>
-        <line 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.9727" x1="10.2993" y2="-4.89732" x2="10.2993"/>
-        <line 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.9225" x1="-8.8275" y2="5" x2="10.0725"/>
-        <line 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="-8.8275" y2="-4.9225" x2="10.0725"/>
-        <line 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.1975" x1="0.6225" y2="-9.175" x2="0.6225"/>
-        <line 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.175" x1="-4.1025" y2="-9.175" x2="5.3475"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-18.9357" y2="0" x2="-9.15304"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10.5647" y2="0" x2="19.3882"/>
-        <rect width="26" x="-12" y="-12" antialias="false" height="21" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-9" y="-18" size="4" rotate="true" text="Ø_"/>
-        <terminal x="-20" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="20" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <line x2="-8.8275" x1="-8.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.89732" length2="1.5" y1="4.9727" end2="none" antialias="false"/>
+        <line x2="10.2993" x1="10.2993" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.89732" length2="1.5" y1="4.9727" end2="none" antialias="false"/>
+        <line x2="10.0725" x1="-8.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="-4.9225" end2="none" antialias="false"/>
+        <line x2="10.0725" x1="-8.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.9225" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <line x2="0.6225" x1="0.6225" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.175" length2="1.5" y1="-0.1975" end2="none" antialias="false"/>
+        <line x2="5.3475" x1="-4.1025" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.175" length2="1.5" y1="-9.175" end2="none" antialias="false"/>
+        <line x2="-9.15304" x1="-18.9357" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="19.3882" x1="10.5647" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12" width="26" height="21" x="-12" antialias="false"/>
+        <input text="Ø_" size="4" y="-18" tagg="label" rotate="true" x="-9"/>
+        <terminal orientation="w" y="0" x="-20"/>
+        <terminal orientation="e" y="0" x="20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/llave-equilibrado.elmt b/elements/60_energy/11_water/schemas/llave-equilibrado.elmt
index cb1596d8a..7ed3107a0 100644
--- a/elements/60_energy/11_water/schemas/llave-equilibrado.elmt
+++ b/elements/60_energy/11_water/schemas/llave-equilibrado.elmt
@@ -1,27 +1,29 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="16" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{4A762824-272B-4B73-B69A-61D078707FB7}"/><names>
-        <name lang="es">Llave equilibrado</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="30" hotspot_y="16" link_type="simple">
+    <uuid uuid="{1d71dd35-90f2-4cd3-8998-2c11caf08e2b}"/>
+    <names>
         <name lang="it">Valvola di equilibratura</name>
         <name lang="pl">Zawór równoważący</name>
         <name lang="cs">Vyrovnávací ventil</name>
+        <name lang="es">Llave equilibrado</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="0" x1="9.8222" y2="0" x2="19.1926"/>
-        <line 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.05603" x1="-9.625" y2="-4.54821" x2="-9.625"/>
-        <line 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.32928" x1="-2.925" y2="7.99348" x2="-2.925"/>
-        <line 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.32216" x1="3.15" y2="8.00119" x2="3.15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.4681" x1="7.1" y2="8.34117" x2="7.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.05603" x1="9.603" y2="-4.54821" x2="9.603"/>
-        <line 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.5727" x1="-9.625" y2="5.0826" x2="9.375"/>
-        <line 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.0826" x1="-9.625" y2="-4.5727" x2="9.375"/>
-        <line 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.136259" x1="-0.125" y2="-6.97426" x2="-0.125"/>
-        <line 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.33137" x1="-4.875" y2="-7.33137" x2="4.625"/>
-        <arc width="9.975" x="-4.875" y="-10.09" antialias="true" height="5.51732" 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="4.4079" x1="-6.875" y2="8.40639" x2="-6.875"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-19.2789" y2="0" x2="-10.6979"/>
-        <terminal x="-20" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="20" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <line x2="19.1926" x1="9.8222" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <input text="_" size="9" y="10.55" tagg="label" rotate="true" x="-7"/>
+        <line x2="-9.625" x1="-9.625" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.54821" length2="1.5" y1="5.05603" end2="none" antialias="false"/>
+        <line x2="-2.925" x1="-2.925" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.99348" length2="1.5" y1="2.32928" end2="none" antialias="false"/>
+        <line x2="3.15" x1="3.15" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="8.00119" length2="1.5" y1="2.32216" end2="none" antialias="false"/>
+        <line x2="7.1" x1="7.1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="8.34117" length2="1.5" y1="4.4681" end2="none" antialias="false"/>
+        <line x2="9.603" x1="9.603" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.54821" length2="1.5" y1="5.05603" end2="none" antialias="false"/>
+        <line x2="9.375" x1="-9.625" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.0826" length2="1.5" y1="-4.5727" end2="none" antialias="false"/>
+        <line x2="9.375" x1="-9.625" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.5727" length2="1.5" y1="5.0826" end2="none" antialias="false"/>
+        <line x2="-0.125" x1="-0.125" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.97426" length2="1.5" y1="0.136259" end2="none" antialias="false"/>
+        <line x2="4.625" x1="-4.875" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7.33137" length2="1.5" y1="-7.33137" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.09" width="9.975" height="5.51732" start="-180" angle="-180" x="-4.875" antialias="true"/>
+        <line x2="-6.875" x1="-6.875" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="8.40639" length2="1.5" y1="4.4079" end2="none" antialias="false"/>
+        <line x2="-10.6979" x1="-19.2789" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <terminal orientation="w" y="0" x="-20"/>
+        <terminal orientation="e" y="0" x="20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/llave-paso-regul.elmt b/elements/60_energy/11_water/schemas/llave-paso-regul.elmt
index 142608e70..b6e61adf7 100644
--- a/elements/60_energy/11_water/schemas/llave-paso-regul.elmt
+++ b/elements/60_energy/11_water/schemas/llave-paso-regul.elmt
@@ -1,23 +1,25 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="18" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E24DC5E6-8599-4CAB-BFAD-D92D4D225634}"/><names>
-        <name lang="es">Llave regulación</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="30" hotspot_y="18" link_type="simple">
+    <uuid uuid="{6b79a2c6-de82-4a31-8abc-b62141a7f8da}"/>
+    <names>
         <name lang="it">Valvola di regolazione</name>
         <name lang="pl">Zawór regulacyjny</name>
         <name lang="cs">Regulační ventil</name>
+        <name lang="es">Llave regulación</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="4.97104" x1="-9.72225" y2="-5.49676" x2="-9.72225"/>
-        <line 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.97104" x1="9.61707" y2="-5.49676" x2="9.61707"/>
-        <line 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.52347" x1="-9.72225" y2="5" x2="9.38775"/>
-        <line 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="-9.72225" y2="-5.52347" x2="9.38775"/>
-        <line 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.421394" x1="-0.16725" y2="-8.61406" x2="-0.16725"/>
-        <line 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.03129" x1="-4.94475" y2="-9.03129" x2="4.61025"/>
-        <arc width="10.0328" x="-5.4225" y="-12.038" antialias="true" height="6.01341" 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="0" x1="-10" y2="0" x2="-20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="9" y2="0" x2="20"/>
-        <terminal x="-20" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="21" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="6.55" tagg="label" rotate="true" x="-7"/>
+        <line x2="-9.72225" x1="-9.72225" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.49676" length2="1.5" y1="4.97104" end2="none" antialias="false"/>
+        <line x2="9.61707" x1="9.61707" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.49676" length2="1.5" y1="4.97104" end2="none" antialias="false"/>
+        <line x2="9.38775" x1="-9.72225" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="-5.52347" end2="none" antialias="false"/>
+        <line x2="9.38775" x1="-9.72225" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.52347" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <line x2="-0.16725" x1="-0.16725" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8.61406" length2="1.5" y1="-0.421394" end2="none" antialias="false"/>
+        <line x2="4.61025" x1="-4.94475" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.03129" length2="1.5" y1="-9.03129" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.038" width="10.0328" height="6.01341" start="-180" angle="-180" x="-5.4225" antialias="true"/>
+        <line x2="-20" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="20" x1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <terminal orientation="e" y="0" x="21"/>
+        <terminal orientation="w" y="0" x="-20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/llave-vivienda.elmt b/elements/60_energy/11_water/schemas/llave-vivienda.elmt
index 3a468b7ab..65b4a8962 100644
--- a/elements/60_energy/11_water/schemas/llave-vivienda.elmt
+++ b/elements/60_energy/11_water/schemas/llave-vivienda.elmt
@@ -1,26 +1,28 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="14" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D961E1B5-BD08-4F48-BC31-787D937A9E3F}"/><names>
-        <name lang="es">LLave vivenda</name>
-        <name lang="pl">Zawór basenowy</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="30" hotspot_y="19" link_type="simple">
+    <uuid uuid="{73957881-0a64-4281-afee-f0c8935cfeb6}"/>
+    <names>
         <name lang="it">Valvola</name>
+        <name lang="pl">Zawór basenowy</name>
         <name lang="cs">Ventil</name>
+        <name lang="es">LLave vivenda</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="-10" x1="-13" y2="-1" x2="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-14" y2="-10" 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="3.9727" x1="-8.8275" y2="-5.89732" x2="-8.8275"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-10" y2="-1" 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="3.9727" x1="10.2993" y2="-5.89732" x2="10.2993"/>
-        <line 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.9225" x1="-8.8275" y2="4" x2="10.0725"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="-8.8275" y2="-5.9225" x2="10.0725"/>
-        <line 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.1975" x1="0.6225" y2="-10.175" x2="0.6225"/>
-        <line 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.175" x1="1.29499" y2="-10.175" x2="6.00022"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="19" y2="-10" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="14" y2="-1" 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="-1" x1="14" y2="-1" x2="11"/>
-        <terminal x="-18" y="-10" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="19" y="-10" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="2.55" tagg="label" rotate="true" x="-6"/>
+        <line x2="-13" x1="-13" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <line x2="-18" x1="-14" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <line x2="-8.8275" x1="-8.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.89732" length2="1.5" y1="3.9727" end2="none" antialias="false"/>
+        <line x2="-13" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1" length2="1.5" y1="-1" end2="none" antialias="false"/>
+        <line x2="10.2993" x1="10.2993" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.89732" length2="1.5" y1="3.9727" end2="none" antialias="false"/>
+        <line x2="10.0725" x1="-8.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4" length2="1.5" y1="-5.9225" end2="none" antialias="false"/>
+        <line x2="10.0725" x1="-8.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.9225" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <line x2="0.6225" x1="0.6225" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10.175" length2="1.5" y1="-1.1975" end2="none" antialias="false"/>
+        <line x2="6.00022" x1="1.29499" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10.175" length2="1.5" y1="-10.175" end2="none" antialias="false"/>
+        <line x2="15" x1="19" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <line x2="14" x1="14" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <line x2="11" x1="14" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1" length2="1.5" y1="-1" end2="none" antialias="false"/>
+        <terminal orientation="w" y="-10" x="-18"/>
+        <terminal orientation="e" y="-10" x="19"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/llavepaso.elmt b/elements/60_energy/11_water/schemas/llavepaso.elmt
index ddf0d2128..525ae8bda 100644
--- a/elements/60_energy/11_water/schemas/llavepaso.elmt
+++ b/elements/60_energy/11_water/schemas/llavepaso.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="12" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{6148F202-15FF-4942-B11C-D178704D36F9}"/><names>
-        <name lang="es">Llave corte rápido</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="25" height="20" hotspot_y="12" link_type="simple">
+    <uuid uuid="{627e7d72-2ebd-4bfb-98c6-f5535e0cdab3}"/>
+    <names>
         <name lang="it">Valvola taglio rapido</name>
         <name lang="pl">Zawór szybkozamykający</name>
         <name lang="cs">Rychlozavírací ventil</name>
+        <name lang="es">Llave corte rápido</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="0" x1="20.8012" y2="0" x2="11.0297"/>
-        <line 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.9727" x1="-8.8275" y2="-4.89732" x2="-8.8275"/>
-        <line 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.9727" x1="10.2993" y2="-4.89732" x2="10.2993"/>
-        <line 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.9225" x1="-8.8275" y2="5" x2="10.0725"/>
-        <line 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="-8.8275" y2="-4.9225" x2="10.0725"/>
-        <line 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.1975" x1="0.6225" y2="-9.175" x2="0.6225"/>
-        <line 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.175" x1="-4.1025" y2="-9.175" x2="5.3475"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-9.19881" y2="0" x2="-18.9703"/>
-        <terminal x="-19" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="10.545" y="0.275" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="2.55" tagg="label" rotate="true" x="-7"/>
+        <line x2="11.0297" x1="20.8012" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="-8.8275" x1="-8.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.89732" length2="1.5" y1="4.9727" end2="none" antialias="false"/>
+        <line x2="10.2993" x1="10.2993" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.89732" length2="1.5" y1="4.9727" end2="none" antialias="false"/>
+        <line x2="10.0725" x1="-8.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="-4.9225" end2="none" antialias="false"/>
+        <line x2="10.0725" x1="-8.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.9225" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <line x2="0.6225" x1="0.6225" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.175" length2="1.5" y1="-0.1975" end2="none" antialias="false"/>
+        <line x2="5.3475" x1="-4.1025" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.175" length2="1.5" y1="-9.175" end2="none" antialias="false"/>
+        <line x2="-18.9703" x1="-9.19881" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <terminal orientation="w" y="0" x="-19"/>
+        <terminal orientation="e" y="0.275" x="10.545"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/llaves-cuarto.elmt b/elements/60_energy/11_water/schemas/llaves-cuarto.elmt
index c75eb1531..3f93e8963 100644
--- a/elements/60_energy/11_water/schemas/llaves-cuarto.elmt
+++ b/elements/60_energy/11_water/schemas/llaves-cuarto.elmt
@@ -1,31 +1,33 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="22" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{6D77FBDA-FB6E-4B2A-A98A-7F782EA2159A}"/><names>
-        <name lang="es">Llaves cuarto húmedo</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="30" hotspot_y="22" link_type="simple">
+    <uuid uuid="{8d6539e9-e235-4dd7-acdf-1da8f059ed90}"/>
+    <names>
         <name lang="it">Valvola camera</name>
         <name lang="pl">Zespół zaworowy</name>
         <name lang="cs">Soustava ventilů</name>
+        <name lang="es">Llaves cuarto húmedo</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="-5.0273" x1="-9.8275" y2="-14.8973" x2="-9.8275"/>
-        <line 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="-16.9878" y2="0" x2="-11.0966"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="11.0122" y2="-10" x2="16.9034"/>
-        <line 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.9727" x1="-9.8275" y2="-4.89732" x2="-9.8275"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="10.9674" y2="0" x2="16.9519"/>
-        <line 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.0273" x1="9.2993" y2="-14.8973" x2="9.2993"/>
-        <line 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.9727" x1="9.2993" y2="-4.89732" x2="9.2993"/>
-        <line 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.9225" x1="-9.8275" y2="-5" x2="9.0725"/>
-        <line 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.9225" x1="-9.8275" y2="5" x2="9.0725"/>
-        <line 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="-9.8275" y2="-4.9225" x2="9.0725"/>
-        <line 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.1975" x1="-0.3775" y2="-9.175" x2="-0.3775"/>
-        <line 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.1975" x1="-0.3775" y2="-19.175" x2="-0.3775"/>
-        <line 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.175" x1="-5.1025" y2="-19.175" x2="4.3475"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-16.9878" y2="-10" x2="-11.0966"/>
-        <polygon x4="9" y5="-15" x5="-10" y6="-15" x6="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-15" x1="-10" y2="-5" x2="-10" y3="-15" x3="9" y4="-5"/>
-        <terminal x="-20" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="20" y="0" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="-20" y="-10" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="20" y="-10" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="2.55" tagg="label" rotate="true" x="-7"/>
+        <line x2="-9.8275" x1="-9.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-14.8973" length2="1.5" y1="-5.0273" end2="none" antialias="false"/>
+        <line x2="-11.0966" x1="-16.9878" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="16.9034" x1="11.0122" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <line x2="-9.8275" x1="-9.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.89732" length2="1.5" y1="4.9727" end2="none" antialias="false"/>
+        <line x2="16.9519" x1="10.9674" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="9.2993" x1="9.2993" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-14.8973" length2="1.5" y1="-5.0273" end2="none" antialias="false"/>
+        <line x2="9.2993" x1="9.2993" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.89732" length2="1.5" y1="4.9727" end2="none" antialias="false"/>
+        <line x2="9.0725" x1="-9.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5" length2="1.5" y1="-14.9225" end2="none" antialias="false"/>
+        <line x2="9.0725" x1="-9.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5" length2="1.5" y1="-4.9225" end2="none" antialias="false"/>
+        <line x2="9.0725" x1="-9.8275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.9225" length2="1.5" y1="5" end2="none" antialias="false"/>
+        <line x2="-0.3775" x1="-0.3775" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.175" length2="1.5" y1="-0.1975" end2="none" antialias="false"/>
+        <line x2="-0.3775" x1="-0.3775" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-19.175" length2="1.5" y1="-10.1975" end2="none" antialias="false"/>
+        <line x2="4.3475" x1="-5.1025" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-19.175" length2="1.5" y1="-19.175" end2="none" antialias="false"/>
+        <line x2="-11.0966" x1="-16.9878" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <polygon x2="-10" x3="9" x1="-10" style="line-style:normal;line-weight:normal;filling:black;color:black" x6="-10" x4="9" y6="-15" y2="-5" y4="-5" y5="-15" y1="-15" y3="-15" antialias="false" x5="-10"/>
+        <terminal orientation="w" y="0" x="-20"/>
+        <terminal orientation="w" y="-10" x="-20"/>
+        <terminal orientation="e" y="-10" x="20"/>
+        <terminal orientation="e" y="0" x="20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/manometro.elmt b/elements/60_energy/11_water/schemas/manometro.elmt
index b9d8af93f..e38ab9862 100644
--- a/elements/60_energy/11_water/schemas/manometro.elmt
+++ b/elements/60_energy/11_water/schemas/manometro.elmt
@@ -1,16 +1,18 @@
-<definition width="20" version="0.4" hotspot_x="10" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{736D4D03-23AF-45B7-830C-B852FB2DAAC9}"/><names>
-        <name lang="es">Termómetro</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="10" height="30" hotspot_y="15" link_type="simple">
+    <uuid uuid="{318d6806-53d8-4af7-a36a-05333959d909}"/>
+    <names>
         <name lang="it">Termometro</name>
         <name lang="pl">Termometr</name>
         <name lang="cs">Teploměr</name>
+        <name lang="es">Termómetro</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <ellipse width="16" x="-8" y="-11" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="0" y2="10" x2="0"/>
-        <text x="-4" y="1" size="9" text="T"/>
-        <terminal x="0" y="10" nameHidden="0" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-0.45" tagg="label" rotate="true" x="5"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11" width="16" height="15" x="-8" antialias="true"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <text text="T" size="9" y="1" x="-4"/>
+        <terminal orientation="s" y="10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/presostato.elmt b/elements/60_energy/11_water/schemas/presostato.elmt
index 150c5397a..92b2e4670 100644
--- a/elements/60_energy/11_water/schemas/presostato.elmt
+++ b/elements/60_energy/11_water/schemas/presostato.elmt
@@ -1,16 +1,18 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{37EF848C-1135-4A44-A171-806A7EAF5877}"/><names>
-        <name lang="es">Presostato</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="15" height="30" hotspot_y="15" link_type="simple">
+    <uuid uuid="{b73b5a0e-2a47-4b40-ab9c-62adda3eedab}"/>
+    <names>
         <name lang="it">Pressostato</name>
         <name lang="pl">Presostat</name>
         <name lang="cs">Zařízení udržující stálý tlak (presostat)</name>
+        <name lang="es">Presostato</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="4" x1="0" y2="10" x2="0"/>
-        <text x="-4" y="1" size="9" text="P"/>
-        <rect width="18" x="-9" y="-13" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="10" nameHidden="0" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-6.45" tagg="label" rotate="true" x="11"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <text text="P" size="9" y="1" x="-4"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13" width="18" height="16" x="-9" antialias="false"/>
+        <terminal orientation="s" y="10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/prosostato.elmt b/elements/60_energy/11_water/schemas/prosostato.elmt
index ad8a45f9e..57dd2f8e6 100644
--- a/elements/60_energy/11_water/schemas/prosostato.elmt
+++ b/elements/60_energy/11_water/schemas/prosostato.elmt
@@ -1,16 +1,18 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{91DC2812-0A08-43FD-86B2-105D31742D08}"/><names>
-        <name lang="es">Manómetro</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="15" height="30" hotspot_y="15" link_type="simple">
+    <uuid uuid="{3ecc827d-2be4-486d-b65f-efe516f0fda6}"/>
+    <names>
         <name lang="it">Manometro</name>
         <name lang="pl">Presostat</name>
         <name lang="cs">Zařízení udržující stálý tlak (presostat)</name>
+        <name lang="es">Manómetro</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="4" x1="0" y2="10" x2="0"/>
-        <text x="-4" y="1" size="9" text="P"/>
-        <ellipse width="18" x="-9" y="-13" antialias="true" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="10" nameHidden="0" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-8.45" tagg="label" rotate="true" x="9"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <text text="P" size="9" y="1" x="-4"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13" width="18" height="17" x="-9" antialias="true"/>
+        <terminal orientation="s" y="10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/purgador.elmt b/elements/60_energy/11_water/schemas/purgador.elmt
index 71bdff62f..3bcae51a6 100644
--- a/elements/60_energy/11_water/schemas/purgador.elmt
+++ b/elements/60_energy/11_water/schemas/purgador.elmt
@@ -1,16 +1,18 @@
-<definition width="20" version="0.4" hotspot_x="10" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{68E66888-D502-4E77-97E9-EAB2554B5004}"/><names>
-        <name lang="es">Purgador</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="10" height="30" hotspot_y="15" link_type="simple">
+    <uuid uuid="{b626e1c8-bcf3-40e0-bf13-2e9321633071}"/>
+    <names>
         <name lang="it">Spurgo</name>
         <name lang="pl">Odpowietrznik</name>
         <name lang="cs">Odvětrávač</name>
+        <name lang="es">Purgador</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <ellipse width="16" x="-8" y="-11" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="0" y2="10" x2="0"/>
-        <text x="-4" y="1" size="9" text="V"/>
-        <terminal x="0" y="10" nameHidden="0" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-4.45" tagg="label" rotate="true" x="5"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11" width="16" height="15" x="-8" antialias="true"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <text text="V" size="9" y="1" x="-4"/>
+        <terminal orientation="s" y="10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/reductora.elmt b/elements/60_energy/11_water/schemas/reductora.elmt
index 10d0417f7..17519307e 100644
--- a/elements/60_energy/11_water/schemas/reductora.elmt
+++ b/elements/60_energy/11_water/schemas/reductora.elmt
@@ -1,19 +1,21 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="9" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{13FD2134-E795-4BDD-8A0B-53F1B9CAF07E}"/><names>
-        <name lang="es">Reductora de presión</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="20" hotspot_y="9" link_type="simple">
+    <uuid uuid="{a9062799-a7f6-48b0-b435-a6b2f2a7c799}"/>
+    <names>
         <name lang="it">Riduttore di pressione</name>
         <name lang="pl">Reduktor ciśnienia</name>
         <name lang="cs">Snižovač tlaku</name>
+        <name lang="es">Reductora de presión</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="0" x1="10.9231" y2="0" x2="18"/>
-        <rect width="20" x="-10" y="-5" antialias="false" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-18.1276" y2="0" x2="-10.9451"/>
-        <line 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="-10" y2="0" 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="6" x1="-10" y2="0" x2="10"/>
-        <terminal x="-19" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="20" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="-14.45" tagg="label" rotate="true" x="-7"/>
+        <line x2="18" x1="10.9231" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5" width="20" height="11" x="-10" antialias="false"/>
+        <line x2="-10.9451" x1="-18.1276" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="9" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="-5" end2="none" antialias="false"/>
+        <line x2="10" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="6" end2="none" antialias="false"/>
+        <terminal orientation="w" y="0" x="-19"/>
+        <terminal orientation="e" y="0" x="20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/termostato.elmt b/elements/60_energy/11_water/schemas/termostato.elmt
index d8df4bfef..c255ab895 100644
--- a/elements/60_energy/11_water/schemas/termostato.elmt
+++ b/elements/60_energy/11_water/schemas/termostato.elmt
@@ -1,16 +1,18 @@
-<definition width="20" version="0.4" hotspot_x="10" hotspot_y="15" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C2C7FADD-83DF-49A0-B0B1-4B6094BC3EF1}"/><names>
-        <name lang="es">Termostato</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="10" height="30" hotspot_y="15" link_type="simple">
+    <uuid uuid="{7f80834a-02f0-4748-92c1-198a9def1532}"/>
+    <names>
         <name lang="it">Termostato</name>
         <name lang="pl">Termostat</name>
         <name lang="cs">Termostat</name>
+        <name lang="es">Termostato</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="4" x1="0" y2="10" x2="0"/>
-        <text x="-4" y="1" size="9" text="T"/>
-        <rect width="14" x="-7" y="-12" antialias="false" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="0" y="10" nameHidden="0" number="" name="" orientation="s"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <input text="_" size="9" y="-8.45" tagg="label" rotate="true" x="9"/>
+        <text text="T" size="9" y="1" x="-4"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12" width="14" height="15" x="-7" antialias="false"/>
+        <terminal orientation="s" y="10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/vaciado.elmt b/elements/60_energy/11_water/schemas/vaciado.elmt
index 11a584c4d..9c15b2ad8 100644
--- a/elements/60_energy/11_water/schemas/vaciado.elmt
+++ b/elements/60_energy/11_water/schemas/vaciado.elmt
@@ -1,16 +1,18 @@
-<definition width="20" version="0.4" hotspot_x="10" hotspot_y="6" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{69280B9E-C733-4B12-A68E-7248F60002E7}"/><names>
-        <name lang="es">Vaciado - Vertido</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="10" height="20" hotspot_y="6" link_type="simple">
+    <uuid uuid="{fd837760-9afd-482e-9f31-1a2f4ea9f62c}"/>
+    <names>
         <name lang="it">Scarico</name>
         <name lang="pl">Spust</name>
         <name lang="cs">Kohoutek</name>
+        <name lang="es">Vaciado - Vertido</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.208" x1="0" y2="0.808" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="0" y2="-4" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="0" y2="-4" x2="-5"/>
-        <terminal x="0" y="9" nameHidden="45" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="0.55" tagg="label" rotate="true" x="1"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0.808" length2="1.5" y1="9.208" end2="none" antialias="false"/>
+        <line x2="5" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4" length2="1.5" y1="1" end2="none" antialias="false"/>
+        <line x2="-5" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4" length2="1.5" y1="1" end2="none" antialias="false"/>
+        <terminal orientation="s" y="9" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/valv-retencion.elmt b/elements/60_energy/11_water/schemas/valv-retencion.elmt
index 7f1da4b60..5b55007fe 100644
--- a/elements/60_energy/11_water/schemas/valv-retencion.elmt
+++ b/elements/60_energy/11_water/schemas/valv-retencion.elmt
@@ -1,22 +1,24 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="9" height="20" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{171A2CD0-E01E-4761-86F4-5E920B37F3F0}"/><names>
-        <name lang="es">Válvula retención</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="20" hotspot_y="9" link_type="simple">
+    <uuid uuid="{cdc2a518-f5c4-4c05-9531-1ab0d34f27a2}"/>
+    <names>
         <name lang="it">Valvola di ritegno</name>
         <name lang="pl">Zawór zwrotny</name>
         <name lang="cs">Zpětná klapka</name>
+        <name lang="es">Válvula retención</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="5.59109" x1="-9.6275" y2="-6.80967" x2="-9.6275"/>
-        <line 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.59109" x1="9.4993" y2="-6.80967" x2="9.4993"/>
-        <line 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.84131" x1="-9.6275" y2="5.62539" x2="9.2725"/>
-        <line 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.21904" x1="-5.8475" y2="6.21904" x2="3.6025"/>
-        <line 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.43809" x1="1.7125" y2="6.21904" x2="4.075"/>
-        <line 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="1.7125" y2="6.21904" x2="4.075"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="20" y2="0" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-20" y2="0" x2="-10"/>
-        <terminal x="-20" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="20" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="6.55" tagg="label" rotate="true" x="-7"/>
+        <line x2="-9.6275" x1="-9.6275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.80967" length2="1.5" y1="5.59109" end2="none" antialias="false"/>
+        <line x2="9.4993" x1="9.4993" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.80967" length2="1.5" y1="5.59109" end2="none" antialias="false"/>
+        <line x2="9.2725" x1="-9.6275" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.62539" length2="1.5" y1="-6.84131" end2="none" antialias="false"/>
+        <line x2="3.6025" x1="-5.8475" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.21904" length2="1.5" y1="6.21904" end2="none" antialias="false"/>
+        <line x2="4.075" x1="1.7125" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.21904" length2="1.5" y1="4.43809" end2="none" antialias="false"/>
+        <line x2="4.075" x1="1.7125" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.21904" length2="1.5" y1="8" end2="none" antialias="false"/>
+        <line x2="10" x1="20" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="-10" x1="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <terminal orientation="e" y="0" x="20"/>
+        <terminal orientation="w" y="0" x="-20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/valvula-boya.elmt b/elements/60_energy/11_water/schemas/valvula-boya.elmt
index 8d26d5f7e..52f8e7ca4 100644
--- a/elements/60_energy/11_water/schemas/valvula-boya.elmt
+++ b/elements/60_energy/11_water/schemas/valvula-boya.elmt
@@ -1,23 +1,25 @@
-<definition width="30" version="0.4" hotspot_x="16" hotspot_y="18" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C86FDA1A-BB99-4100-A4D7-5464999A19EA}"/><names>
-        <name lang="es">Válvula de Boya</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="16" height="30" hotspot_y="18" link_type="simple">
+    <uuid uuid="{0e19f99f-f2d3-47d2-8406-e4d2c1cc42df}"/>
+    <names>
         <name lang="it">Valvola a galleggiante</name>
         <name lang="pl">Zawór pływakowy</name>
         <name lang="cs">Plováková klapka</name>
+        <name lang="es">Válvula de Boya</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="-1" x1="-6" y2="2" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-9" y2="-10" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.1043" x1="0" y2="-1.88696" x2="0"/>
-        <circle x="-9" y="-4" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="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="-2" x1="-5" y2="1" 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="-2" x1="0" y2="-6" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="0" y2="-6" x2="-2"/>
-        <arc width="6" x="4" y="-2" antialias="true" height="7" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-10" 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="1" x1="10" y2="2" x2="10"/>
-        <circle x="-8" y="-3" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <terminal x="-10" y="-10" nameHidden="1" number="" name="" orientation="w"/>
+        <line x2="10" x1="-6" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="2" length2="1.5" y1="-1" end2="none" antialias="false"/>
+        <input text="_" size="9" y="2.55" tagg="label" rotate="true" x="-8"/>
+        <line x2="0" x1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10" length2="1.5" y1="-10" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1.88696" length2="1.5" y1="-10.1043" end2="none" antialias="false"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" y="-4" diameter="4" x="-9" antialias="true"/>
+        <line x2="10" x1="-5" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="1" length2="1.5" y1="-2" end2="none" antialias="false"/>
+        <line x2="2" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6" length2="1.5" y1="-2" end2="none" antialias="false"/>
+        <line x2="-2" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6" length2="1.5" y1="-2" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:thin;filling:none;color:black" y="-2" width="6" height="7" start="-10" angle="-180" x="4" antialias="true"/>
+        <line x2="10" x1="10" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="2" length2="1.5" y1="1" end2="none" antialias="false"/>
+        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" y="-3" diameter="2" x="-8" antialias="true"/>
+        <terminal orientation="w" y="-10" x="-10"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/valvula-pie.elmt b/elements/60_energy/11_water/schemas/valvula-pie.elmt
index 9cf27c123..28dcc9f0d 100644
--- a/elements/60_energy/11_water/schemas/valvula-pie.elmt
+++ b/elements/60_energy/11_water/schemas/valvula-pie.elmt
@@ -1,18 +1,20 @@
-<definition width="20" version="0.4" hotspot_x="10" hotspot_y="16" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B1A15166-3C0D-4427-967F-619F466F0EB5}"/><names>
-        <name lang="es">Válvula de pie</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="10" height="30" hotspot_y="16" link_type="simple">
+    <uuid uuid="{514ef58d-f799-442d-b2dc-ff4087070adb}"/>
+    <names>
         <name lang="it">Valvola filtro</name>
         <name lang="pl">Zawór z filtrem</name>
         <name lang="cs">Ventil s filtrem</name>
+        <name lang="es">Válvula de pie</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <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="0" x1="-8" y2="6" 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="7" y2="6" 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="-4" x1="0" y2="-10" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.76364" x1="0" y2="6.21818" x2="0"/>
-        <terminal x="0" y="-10" nameHidden="1" number="" name="" orientation="n"/>
+        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" diameter="8" x="-4" antialias="true"/>
+        <input text="_" size="9" y="1.55" tagg="label" rotate="true" x="6"/>
+        <line x2="0" x1="-8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="0" x1="7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10" length2="1.5" y1="-4" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.21818" length2="1.5" y1="9.76364" end2="none" antialias="false"/>
+        <terminal orientation="n" y="-10" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/valvula-seguridad.elmt b/elements/60_energy/11_water/schemas/valvula-seguridad.elmt
index 15198eb9d..453a330ac 100644
--- a/elements/60_energy/11_water/schemas/valvula-seguridad.elmt
+++ b/elements/60_energy/11_water/schemas/valvula-seguridad.elmt
@@ -1,25 +1,27 @@
-<definition width="20" version="0.4" hotspot_x="9" hotspot_y="21" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9207AE33-D547-449C-ACBC-842A5AACA4B8}"/><names>
-        <name lang="es">Válvula de seguridad</name>
+<definition orientation="dyyy" type="element" width="20" version="0.5" hotspot_x="9" height="50" hotspot_y="21" link_type="simple">
+    <uuid uuid="{c37120f2-7e49-48b8-ac3b-1a8c5914e852}"/>
+    <names>
         <name lang="it">Valvola di sicurezza</name>
         <name lang="pl">Zawór bezpieczeństwa</name>
         <name lang="cs">Bezpečnostní ventil</name>
+        <name lang="es">Válvula de seguridad</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="8.9727" x1="9.2993" y2="-0.89732" x2="9.2993"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="0" y2="14" 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="14" x1="-6" y2="14" 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="4" x1="0" y2="14" 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="4" x1="0" y2="-1" 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="-1" x1="9" y2="9" 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="4" x1="0" y2="9" 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="4" x1="0" y2="0" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-5" y2="-2" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="1" y2="-4" x2="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="0" y2="19" x2="0"/>
-        <text x="-6" y="-8" size="4" text="_bar"/>
-        <terminal x="0" y="20" nameHidden="0" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-24.45" tagg="label" rotate="true" x="-7"/>
+        <line x2="9.2993" x1="9.2993" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.89732" length2="1.5" y1="8.9727" end2="none" antialias="false"/>
+        <line x2="-6" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <line x2="6" x1="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14" length2="1.5" y1="14" end2="none" antialias="false"/>
+        <line x2="6" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <line x2="9" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <line x2="9" x1="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9" length2="1.5" y1="-1" end2="none" antialias="false"/>
+        <line x2="9" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <line x2="-5" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="4" end2="none" antialias="false"/>
+        <line x2="1" x1="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-2" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="-4" x1="1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4" length2="1.5" y1="-2" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="19" length2="1.5" y1="15" end2="none" antialias="false"/>
+        <text text="_bar" size="4" y="-8" x="-6"/>
+        <terminal orientation="s" y="20" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/valvula3vias.elmt b/elements/60_energy/11_water/schemas/valvula3vias.elmt
index 92fa65077..b92e42e43 100644
--- a/elements/60_energy/11_water/schemas/valvula3vias.elmt
+++ b/elements/60_energy/11_water/schemas/valvula3vias.elmt
@@ -1,26 +1,28 @@
-<definition width="30" version="0.4" hotspot_x="14" hotspot_y="22" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{117977B0-DFA4-45F0-9DE1-A1032B648244}"/><names>
-        <name lang="ar">صمّام كهربائي 3V  "صحي"</name>
-        <name lang="en">Solenoid 3V "health"</name>
-        <name lang="it">Elettrovalvola 3vie acqua sanitaria</name>
-        <name lang="fr">Electro-vanne 3V "sanitaire"</name>
-        <name lang="pl">Elektrozawór trójdrożny</name>
-        <name lang="es">Válvula3 vias-zona</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="14" height="40" hotspot_y="21" link_type="simple">
+    <uuid uuid="{2551cab5-a9bb-4099-8338-2307aa70a6ad}"/>
+    <names>
         <name lang="nl">Elektrisch klep sanitair 3</name>
+        <name lang="fr">Electro-vanne 3V "sanitaire"</name>
+        <name lang="it">Elettrovalvola 3vie acqua sanitaria</name>
+        <name lang="en">Solenoid 3V "health"</name>
+        <name lang="pl">Elektrozawór trójdrożny</name>
         <name lang="cs">Elektrický uzávěr 3V</name>
+        <name lang="ar">صمّام كهربائي 3V  "صحي"</name>
+        <name lang="es">Válvula3 vias-zona</name>
     </names>
     <informations>24v et anti-bélier </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.68" x1="0" y2="-0.346667" x2="0"/>
-        <rect width="10.9695" x="-5.76946" y="-15" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="8" x2="-4" y3="8" x3="4" y4="0"/>
-        <polygon x4="0" y5="-4" x5="8" y6="4" x6="8" y7="0" x7="0" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="-4" x2="-8" y3="4" x3="-8" y4="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="8.64493" y2="0" x2="10.468"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-7.7729" y2="0" x2="-10.1327"/>
-        <line 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="0" y2="10" x2="0"/>
-        <text x="-2" y="-9" size="4" text="M"/>
-        <terminal x="-9" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="10" y="0" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="0" y="10" nameHidden="0" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-26.5" tagg="label" rotate="true" x="-7"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.346667" length2="1.5" y1="-6.68" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15" width="10.9695" height="8" x="-5.76946" antialias="false"/>
+        <polygon x2="-4" x3="4" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="0" y2="8" y4="0" y1="0" y3="8" antialias="true"/>
+        <polygon x2="-8" x3="-8" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="8" y7="0" x4="0" y6="4" y2="-4" y4="0" y5="-4" y1="0" y3="4" x7="0" antialias="true" x5="8"/>
+        <line x2="10.468" x1="8.64493" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="-10.1327" x1="-7.7729" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <line x2="0" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="8" end2="none" antialias="false"/>
+        <text text="M" size="4" y="-9" x="-2"/>
+        <terminal orientation="e" y="0" x="10"/>
+        <terminal orientation="s" y="10" x="0"/>
+        <terminal orientation="w" y="0" x="-9"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/schemas/vertido-visto.elmt b/elements/60_energy/11_water/schemas/vertido-visto.elmt
index a40eb167a..e9c15711c 100644
--- a/elements/60_energy/11_water/schemas/vertido-visto.elmt
+++ b/elements/60_energy/11_water/schemas/vertido-visto.elmt
@@ -1,27 +1,29 @@
-<definition width="30" version="0.4" hotspot_x="14" hotspot_y="22" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{983EBDA9-74F7-4779-B674-7AC7783D3D64}"/><names>
-        <name lang="ar">مجرى صرف</name>
-        <name lang="en">Sewer drain</name>
-        <name lang="it">Scarico</name>
-        <name lang="fr">Vidange égout</name>
-        <name lang="pl">Spust</name>
-        <name lang="es">Vertido desagüe</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="14" height="40" hotspot_y="22" link_type="simple">
+    <uuid uuid="{903cc802-4be0-4600-aca9-b000ded67b01}"/>
+    <names>
         <name lang="nl">Afvoer</name>
+        <name lang="fr">Vidange égout</name>
+        <name lang="it">Scarico</name>
+        <name lang="en">Sewer drain</name>
+        <name lang="pl">Spust</name>
         <name lang="cs">Kohoutek</name>
+        <name lang="ar">مجرى صرف</name>
+        <name lang="es">Vertido desagüe</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13.6278" x1="0.26" y2="-5.5019" x2="0.26"/>
-        <polygon x4="-4.87" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="8.87466" x1="-8.29" y2="12" x2="-6.58" y3="8.87466" x3="-4.87" y4="8.87466"/>
-        <line 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.87412" x1="-6.58" y2="12" x2="-6.58"/>
-        <arc width="2.85" x="-6.58" y="1.99891" antialias="true" height="3.12534" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="2.85" x="-6.01" y="1.99891" antialias="true" height="3.12534" 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="6.37439" x1="-3.16" y2="3.87412" x2="-3.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="1.37385" x1="0.26" y2="6.37439" x2="0.26"/>
-        <arc width="2.85" x="-3.16" y="5.12425" antialias="true" height="3.12534" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <arc width="2.85" x="-2.59" y="5.12425" antialias="true" height="3.12534" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <polygon x4="10.52" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9.87737" x1="-10" y2="1.37385" x2="0.26" y3="-9.87737" x3="10.52" y4="-9.87737"/>
-        <terminal x="0.26" y="-13.6278" nameHidden="0" number="" name="" orientation="n"/>
+        <input text="_" size="9" y="-3.45" tagg="label" rotate="true" x="9"/>
+        <line x2="0.26" x1="0.26" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.5019" length2="1.5" y1="-13.6278" end2="none" antialias="false"/>
+        <polygon x2="-6.58" x3="-4.87" x1="-8.29" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="-4.87" y2="12" y4="8.87466" closed="false" y1="8.87466" y3="8.87466" antialias="true"/>
+        <line x2="-6.58" x1="-6.58" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="12" length2="1.5" y1="3.87412" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="1.99891" width="2.85" height="3.12534" start="-180" angle="-90" x="-6.58" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="1.99891" width="2.85" height="3.12534" start="90" angle="-90" x="-6.01" antialias="true"/>
+        <line x2="-3.16" x1="-3.16" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.87412" length2="1.5" y1="6.37439" end2="none" antialias="false"/>
+        <line x2="0.26" x1="0.26" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.37439" length2="1.5" y1="1.37385" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="5.12425" width="2.85" height="3.12534" start="-90" angle="-90" x="-3.16" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="5.12425" width="2.85" height="3.12534" start="0" angle="-90" x="-2.59" antialias="true"/>
+        <polygon x2="0.26" x3="10.52" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="10.52" y2="1.37385" y4="-9.87737" closed="false" y1="-9.87737" y3="-9.87737" antialias="true"/>
+        <terminal orientation="n" y="-13.6278" x="0.26"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/brida-pn10-rosca1m.elmt b/elements/60_energy/11_water/valves/brida-pn10-rosca1m.elmt
index 1e015173a..0b080d3a8 100644
--- a/elements/60_energy/11_water/valves/brida-pn10-rosca1m.elmt
+++ b/elements/60_energy/11_water/valves/brida-pn10-rosca1m.elmt
@@ -1,24 +1,25 @@
-<definition width="30" version="0.4" hotspot_x="17" hotspot_y="17" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{955FFF4D-5A1D-4FBB-8C81-A9A8E12557F1}"/><names>
-        <name lang="es">BridaPN10-1"M</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="19" height="40" hotspot_y="19" link_type="simple">
+    <uuid uuid="{e6429d21-5e5a-486d-a256-905fd2f54a23}"/>
+    <names>
         <name lang="it">Flangia PN10-1" M</name>
         <name lang="pl">Kołnierz PN 10-1"</name>
         <name lang="cs">Krk PN 10-1"</name>
+        <name lang="es">BridaPN10-1"M</name>
     </names>
     <informations></informations>
     <description>
-        <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.24155" x1="-2.47005" y2="-3.78658" x2="-3.98138"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="10.0013" x1="-1.41669" y2="10.0013" x2="2.10975"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-12.0487" x1="-1.41669" y2="-12.0487" x2="2.10975"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="13.5012" x1="-1.41669" y2="13.5012" x2="2.10975"/>
-        <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.24155" x1="-4.48516" y2="-3.78658" x2="-5.99649"/>
-        <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.59154" x1="-8.56118" y2="-3.43658" x2="-10.0725"/>
-        <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.59154" x1="-6.54607" y2="-3.43658" x2="-8.0574"/>
-        <rect width="8.06044" x="-10.0725" y="-3.36766" antialias="false" height="7.95921" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.03022" x="-1.87467" y="-13.3" antialias="false" height="27.755" 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:red" y1="-8.54875" x1="-1.41669" y2="-8.54875" x2="2.10975"/>
-        <input x="-9" y="21.5" size="3" rotate="true" text="Brida"/>
-        <terminal x="-10.1641" y="0.455" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="2.20135" y="0.455" nameHidden="1" number="" name="" orientation="e"/>
+        <line x2="-3.98138" x1="-2.47005" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.78658" length2="1.5" y1="4.24155" end2="none" antialias="false"/>
+        <line x2="2.10975" x1="-1.41669" style="line-style:normal;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="10.0013" length2="1.5" y1="10.0013" end2="none" antialias="false"/>
+        <line x2="2.10975" x1="-1.41669" style="line-style:normal;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-12.0487" length2="1.5" y1="-12.0487" end2="none" antialias="false"/>
+        <line x2="2.10975" x1="-1.41669" style="line-style:normal;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="13.5012" length2="1.5" y1="13.5012" end2="none" antialias="false"/>
+        <line x2="-5.99649" x1="-4.48516" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.78658" length2="1.5" y1="4.24155" end2="none" antialias="false"/>
+        <line x2="-10.0725" x1="-8.56118" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.43658" length2="1.5" y1="4.59154" end2="none" antialias="false"/>
+        <line x2="-8.0574" x1="-6.54607" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.43658" length2="1.5" y1="4.59154" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.36766" width="8.06044" height="7.95921" x="-10.0725" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.3" width="4.03022" height="27.755" x="-1.87467" antialias="false"/>
+        <line x2="2.10975" x1="-1.41669" style="line-style:normal;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-8.54875" length2="1.5" y1="-8.54875" end2="none" antialias="false"/>
+        <input text="Brida" size="3" y="21.5" tagg="label" rotate="true" x="-9"/>
+        <terminal orientation="w" y="0.455" x="-10.1641"/>
+        <terminal orientation="e" y="0.455" x="2.20135"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/calderin3_4hembra.elmt b/elements/60_energy/11_water/valves/calderin3_4hembra.elmt
index ab377dba6..443b2d0d1 100644
--- a/elements/60_energy/11_water/valves/calderin3_4hembra.elmt
+++ b/elements/60_energy/11_water/valves/calderin3_4hembra.elmt
@@ -1,27 +1,28 @@
-<definition width="50" version="0.4" hotspot_x="27" hotspot_y="42" height="80" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EB87D947-661A-4B0A-A479-B9C79F408908}"/><names>
-        <name lang="ar">إناء تسخين 02</name>
-        <name lang="en">Heating Vase 02</name>
-        <name lang="it">Vaso di espansione 50L</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="20" height="70" hotspot_y="31" link_type="simple">
+    <uuid uuid="{ef221fd6-26b6-4447-8cba-dfd9e6563045}"/>
+    <names>
         <name lang="fr">Vase Chauffage 02</name>
+        <name lang="it">Vaso di espansione 50L</name>
+        <name lang="en">Heating Vase 02</name>
         <name lang="pl">Naczynie wzbiorcze</name>
-        <name lang="es">Calderin 3/4H</name>
         <name lang="cs">Nádoba, ohřívání 02</name>
+        <name lang="ar">إناء تسخين 02</name>
+        <name lang="es">Calderin 3/4H</name>
     </names>
     <informations></informations>
     <description>
-        <polygon x4="-0.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.2014" x1="-0.5" y2="2.84198" x2="-3.125" y3="2.84198" x3="2.125" y4="-0.2014"/>
-        <line 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.2014" x1="-18" y2="-0.2014" x2="17"/>
-        <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.4472" x1="17" y2="20.0878" x2="17"/>
-        <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.4472" x1="-18" y2="20.0878" x2="-18"/>
-        <polygon x4="0.375" y5="-24.4469" x5="0.375" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-24.4469" x1="-1.375" y2="-26.4759" x2="-1.375" y3="-26.4759" x3="0.375" y4="-24.4469"/>
-        <arc width="35" x="-18" y="-25.0556" antialias="true" height="15.2169" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="35" x="-18" y="12.4793" antialias="true" height="15.2169" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <rect width="10.5" x="-5.4" y="28.1332" antialias="false" height="7.86678" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7.7" x="-4" y="29.8814" antialias="false" height="6.11861" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="34.2518" x1="-4" y2="33.3777" x2="3.7"/>
-        <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="32.5037" x1="-4" y2="31.6296" x2="3.7"/>
-        <input x="-21" y="-32" size="4" rotate="true" text="Calderín__L"/>
-        <terminal x="-0.5" y="-26.5773" nameHidden="0" number="" name="" orientation="n"/>
+        <polygon x2="-3.125" x3="2.125" x1="-0.5" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="-0.5" y2="2.84198" y4="-0.2014" y1="-0.2014" y3="2.84198" antialias="true"/>
+        <line x2="17" x1="-18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.2014" length2="1.5" y1="-0.2014" end2="none" antialias="false"/>
+        <line x2="17" x1="17" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="20.0878" length2="1.5" y1="-17.4472" end2="none" antialias="true"/>
+        <line x2="-18" x1="-18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="20.0878" length2="1.5" y1="-17.4472" end2="none" antialias="true"/>
+        <polygon x2="-1.375" x3="0.375" x1="-1.375" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="0.375" y2="-26.4759" y4="-24.4469" closed="false" y5="-24.4469" y1="-24.4469" y3="-26.4759" antialias="false" x5="0.375"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-25.0556" width="35" height="15.2169" start="-180" angle="-180" x="-18" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="12.4793" width="35" height="15.2169" start="0" angle="-180" x="-18" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="28.1332" width="10.5" height="7.86678" x="-5.4" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="29.8814" width="7.7" height="6.11861" x="-4" antialias="false"/>
+        <line x2="3.7" x1="-4" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="33.3777" length2="1.5" y1="34.2518" end2="none" antialias="false"/>
+        <line x2="3.7" x1="-4" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="31.6296" length2="1.5" y1="32.5037" end2="none" antialias="false"/>
+        <input text="Calderín__L" size="4" y="-32" tagg="label" rotate="true" x="-21"/>
+        <terminal orientation="n" y="-26.5773" x="-0.5"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/enlace3_4.elmt b/elements/60_energy/11_water/valves/enlace3_4.elmt
index 9c94c9315..fb6de73b3 100644
--- a/elements/60_energy/11_water/valves/enlace3_4.elmt
+++ b/elements/60_energy/11_water/valves/enlace3_4.elmt
@@ -1,26 +1,27 @@
-<definition width="40" version="0.4" hotspot_x="16" hotspot_y="17" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{E3F4CDCB-CC9E-44CE-93B2-71EF409D8FD1}"/><names>
-        <name lang="es">Enlace 3tuercas 3/4H</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="14" height="40" hotspot_y="20" link_type="simple">
+    <uuid uuid="{20a974bb-4fe7-4e7c-a683-41783ee7eb6d}"/>
+    <names>
         <name lang="it">Giunto 3 pezzi 3/4" F</name>
         <name lang="pl">Śrubunek 3-częściowy 3/4"</name>
         <name lang="cs">Připojení 3 části 3/4"</name>
+        <name lang="es">Enlace 3tuercas 3/4H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="5.2" x="-8.2" y="-6.52901" antialias="false" height="12.8306" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3.2" x="-3" y="5.78839" antialias="true" height="8.21161" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="3.6" x="1.4" y="5.78839" antialias="true" height="8.21161" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="3.6" x="-3" y="-15.2538" antialias="true" height="10.2645" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="4.4" x="5" y="-6.52901" antialias="false" height="12.8306" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3.2" x="1.8" y="-4.98934" antialias="true" height="10.7777" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="8" x="-3" y="-10.6348" antialias="false" height="20.529" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.98934" x1="3.12175" y2="-4.98934" x2="-0.712384"/>
-        <arc width="3.6" x="1.4" y="-15.2538" antialias="true" height="10.2645" 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="5.78839" x1="-0.680384" y2="5.78839" x2="3.0871"/>
-        <arc width="2.8" x="-3" y="-4.98934" antialias="true" height="10.7777" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <input x="-13" y="14" size="4" rotate="true" text="enlace 3/4&quot;"/>
-        <terminal x="-8.2" y="-0.37031" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="9.4" y="-0.37031" nameHidden="1" number="" name="" orientation="e"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.52901" width="5.2" height="12.8306" x="-8.2" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="5.78839" width="3.2" height="8.21161" start="-180" angle="-90" x="-3" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="5.78839" width="3.6" height="8.21161" start="90" angle="-90" x="1.4" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.2538" width="3.6" height="10.2645" start="-90" angle="-90" x="-3" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.52901" width="4.4" height="12.8306" x="5" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.98934" width="3.2" height="10.7777" start="90" angle="-180" x="1.8" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.6348" width="8" height="20.529" x="-3" antialias="false"/>
+        <line x2="-0.712384" x1="3.12175" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.98934" length2="1.5" y1="-4.98934" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.2538" width="3.6" height="10.2645" start="0" angle="-90" x="1.4" antialias="true"/>
+        <line x2="3.0871" x1="-0.680384" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.78839" length2="1.5" y1="5.78839" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.98934" width="2.8" height="10.7777" start="-90" angle="-180" x="-3" antialias="true"/>
+        <input text="enlace 3/4&quot;" size="4" y="14" tagg="label" rotate="true" x="-13"/>
+        <terminal orientation="w" y="-0.37031" x="-8.2"/>
+        <terminal orientation="e" y="-0.37031" x="9.4"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/enlace3t-1_2.elmt b/elements/60_energy/11_water/valves/enlace3t-1_2.elmt
index 3611af192..3a4134393 100644
--- a/elements/60_energy/11_water/valves/enlace3t-1_2.elmt
+++ b/elements/60_energy/11_water/valves/enlace3t-1_2.elmt
@@ -1,26 +1,27 @@
-<definition width="40" version="0.4" hotspot_x="17" hotspot_y="18" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{0B59C21C-21E3-486F-9049-BFFB528CB73C}"/><names>
-        <name lang="es">Enlace 3tuercas 1/2H</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="16" height="30" hotspot_y="16" link_type="simple">
+    <uuid uuid="{9753f72e-9000-4929-81f5-9843650903ac}"/>
+    <names>
         <name lang="it">Giunto 3 pezzi 1/2" F</name>
         <name lang="pl">Śrubunek 3-częściowy 1/2"</name>
         <name lang="cs">Připojení 3 části 1/2"</name>
+        <name lang="es">Enlace 3tuercas 1/2H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="4.7775" x="-7.8325" y="-5.93822" antialias="false" height="8.61526" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="2.5725" x="-3.055" y="3.10779" antialias="true" height="6.89221" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="2.5725" x="0.2525" y="3.10779" antialias="true" height="6.89221" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="2.5725" x="-3.055" y="-11.5381" antialias="true" height="6.89221" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="4.0425" x="2.825" y="-5.93822" antialias="false" height="8.61526" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="1.8375" x="0.9875" y="-4.64594" antialias="true" height="7.75373" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="5.88" x="-3.055" y="-8.95356" antialias="false" height="15.5075" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.64594" x1="1.87661" y2="-4.64594" x2="-1.35976"/>
-        <arc width="2.5725" x="0.2525" y="-11.5381" antialias="true" height="6.89221" 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="3.10779" x1="-1.33093" y2="3.10779" x2="1.8454"/>
-        <arc width="1.8375" x="-3.055" y="-4.64594" antialias="true" height="7.75373" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <input x="-14" y="9" size="4" rotate="true" text="enlace1/2&quot;"/>
-        <terminal x="-8.2" y="-1.6306" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="7.235" y="-1.6306" nameHidden="1" number="" name="" orientation="e"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.93822" width="4.7775" height="8.61526" x="-7.8325" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="3.10779" width="2.5725" height="6.89221" start="-180" angle="-90" x="-3.055" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="3.10779" width="2.5725" height="6.89221" start="90" angle="-90" x="0.2525" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.5381" width="2.5725" height="6.89221" start="-90" angle="-90" x="-3.055" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.93822" width="4.0425" height="8.61526" x="2.825" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.64594" width="1.8375" height="7.75373" start="90" angle="-180" x="0.9875" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.95356" width="5.88" height="15.5075" x="-3.055" antialias="false"/>
+        <line x2="-1.35976" x1="1.87661" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.64594" length2="1.5" y1="-4.64594" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.5381" width="2.5725" height="6.89221" start="0" angle="-90" x="0.2525" antialias="true"/>
+        <line x2="1.8454" x1="-1.33093" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.10779" length2="1.5" y1="3.10779" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.64594" width="1.8375" height="7.75373" start="-90" angle="-180" x="-3.055" antialias="true"/>
+        <input text="enlace1/2&quot;" size="4" y="9" tagg="label" rotate="true" x="-14"/>
+        <terminal orientation="w" y="-1.6306" x="-8.2"/>
+        <terminal orientation="e" y="-1.6306" x="7.235"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/machon-red3_4-1.elmt b/elements/60_energy/11_water/valves/machon-red3_4-1.elmt
index 1af6e03fd..861701d47 100644
--- a/elements/60_energy/11_water/valves/machon-red3_4-1.elmt
+++ b/elements/60_energy/11_water/valves/machon-red3_4-1.elmt
@@ -1,27 +1,28 @@
-<definition width="40" version="0.4" hotspot_x="20" hotspot_y="17" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B8711B04-B493-4B30-803D-3D1805F8C9BA}"/><names>
-        <name lang="es">Machón red. 3/4-1</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="19" height="40" hotspot_y="20" link_type="simple">
+    <uuid uuid="{6869a9dd-60f8-4f8f-a9ba-8d7e6102d17a}"/>
+    <names>
         <name lang="it">Riduzione 3/4 - 1" M</name>
         <name lang="pl">Nypel 3/4-1"</name>
         <name lang="cs">Redukční převod 3/4 - 1" samec</name>
+        <name lang="es">Machón red. 3/4-1</name>
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8.27483" x1="-1.75884" y2="-7.57553" x2="-3.51829"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8.27483" x1="-4.10477" y2="-7.57553" x2="-5.86422"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.74948" x1="13.4761" y2="-4.92" x2="11.8055"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8.27483" x1="-9.38312" y2="-7.57553" x2="-11.1426"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.74948" x1="11.2486" y2="-4.92" x2="9.57801"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8.27483" x1="-7.03719" y2="-7.57553" x2="-8.79664"/>
-        <rect width="11.1432" x="-12.902" y="-8.368" antialias="false" height="16.7336" 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="6.74948" x1="6.23676" y2="-4.92" x2="4.56613"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.74948" x1="8.46426" y2="-4.92" x2="6.79363"/>
-        <rect width="10.5806" x="2.89551" y="-5.50345" antialias="false" height="11.9967" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.455" x="-1.55949" y="-13.7248" antialias="false" height="27.7248" 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.01629" x1="-0.805679" y2="-7.01629" x2="2.58996"/>
-        <line 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.9739" x1="-1.77089" y2="9.9739" x2="2.86792"/>
-        <input x="-13" y="19.5" size="4" rotate="true" text="machón&#xa;3/4-1&quot;"/>
-        <terminal x="-12.9395" y="0.376799" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="13.4761" y="0.914778" nameHidden="0" number="" name="" orientation="e"/>
+        <line x2="-3.51829" x1="-1.75884" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7.57553" length2="1.5" y1="8.27483" end2="none" antialias="false"/>
+        <line x2="-5.86422" x1="-4.10477" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7.57553" length2="1.5" y1="8.27483" end2="none" antialias="false"/>
+        <line x2="11.8055" x1="13.4761" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.92" length2="1.5" y1="6.74948" end2="none" antialias="false"/>
+        <line x2="-11.1426" x1="-9.38312" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7.57553" length2="1.5" y1="8.27483" end2="none" antialias="false"/>
+        <line x2="9.57801" x1="11.2486" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.92" length2="1.5" y1="6.74948" end2="none" antialias="false"/>
+        <line x2="-8.79664" x1="-7.03719" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7.57553" length2="1.5" y1="8.27483" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.368" width="11.1432" height="16.7336" x="-12.902" antialias="false"/>
+        <line x2="4.56613" x1="6.23676" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.92" length2="1.5" y1="6.74948" end2="none" antialias="false"/>
+        <line x2="6.79363" x1="8.46426" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.92" length2="1.5" y1="6.74948" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.50345" width="10.5806" height="11.9967" x="2.89551" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.7248" width="4.455" height="27.7248" x="-1.55949" antialias="false"/>
+        <line x2="2.58996" x1="-0.805679" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7.01629" length2="1.5" y1="-7.01629" end2="none" antialias="false"/>
+        <line x2="2.86792" x1="-1.77089" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.9739" length2="1.5" y1="9.9739" end2="none" antialias="false"/>
+        <input text="machón&#xa;3/4-1&quot;" size="4" y="19.5" tagg="label" rotate="true" x="-13"/>
+        <terminal orientation="w" y="0.376799" x="-12.9395"/>
+        <terminal orientation="e" y="0.914778" x="13.4761"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/machon-red3_4-1_2.elmt b/elements/60_energy/11_water/valves/machon-red3_4-1_2.elmt
index 608732b77..eefaef9c0 100644
--- a/elements/60_energy/11_water/valves/machon-red3_4-1_2.elmt
+++ b/elements/60_energy/11_water/valves/machon-red3_4-1_2.elmt
@@ -1,27 +1,28 @@
-<definition width="40" version="0.4" hotspot_x="18" hotspot_y="12" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A8CFCF7D-5D87-49C6-A6DE-CA374FDF39AB}"/><names>
-        <name lang="es">Machón red. 3/4-1/2</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="15" height="30" hotspot_y="15" link_type="simple">
+    <uuid uuid="{0db82274-89ce-41b0-90b9-499af49ec59c}"/>
+    <names>
         <name lang="it">Riduzione 3/4 - 1/2 M</name>
         <name lang="pl">Nypel 3/4-1/2"</name>
         <name lang="cs">Redukční převod 3/4 - 1/2" samec</name>
+        <name lang="es">Machón red. 3/4-1/2</name>
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.97692" x1="-1.49498" y2="-6.16115" x2="-2.90254"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.97692" x1="-3.37172" y2="-6.16115" x2="-4.77928"/>
-        <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.90505" x1="10.693" y2="-4.29511" x2="9.3565"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.97692" x1="-7.5944" y2="-6.16115" x2="-9.00196"/>
-        <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.90505" x1="8.911" y2="-4.29511" x2="7.5745"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.97692" x1="-5.71766" y2="-6.16115" x2="-7.12522"/>
-        <rect width="8.91455" x="-10.4095" y="-6.71802" antialias="false" height="11.7587" 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="3.90505" x1="4.9015" y2="-4.29511" x2="3.565"/>
-        <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.90505" x1="6.6835" y2="-4.29511" x2="5.347"/>
-        <rect width="8.4645" x="2.2285" y="-4.70509" antialias="false" height="8.43012" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.564" x="-1.3355" y="-10.4823" antialias="false" height="19.4823" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.76817" x1="-0.732451" y2="-5.76817" x2="1.98406"/>
-        <line 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.17085" x1="-1.50462" y2="6.17085" x2="2.20643"/>
-        <input x="-12" y="15" size="4" rotate="true" text="machón&#xa;3/4-1/2&quot;"/>
-        <terminal x="-10.4395" y="-0.57304" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="10.693" y="-0.195001" nameHidden="0" number="" name="" orientation="e"/>
+        <line x2="-2.90254" x1="-1.49498" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-6.16115" length2="1.5" y1="4.97692" end2="none" antialias="false"/>
+        <line x2="-4.77928" x1="-3.37172" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-6.16115" length2="1.5" y1="4.97692" end2="none" antialias="false"/>
+        <line x2="9.3565" x1="10.693" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.29511" length2="1.5" y1="3.90505" end2="none" antialias="false"/>
+        <line x2="-9.00196" x1="-7.5944" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-6.16115" length2="1.5" y1="4.97692" end2="none" antialias="false"/>
+        <line x2="7.5745" x1="8.911" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.29511" length2="1.5" y1="3.90505" end2="none" antialias="false"/>
+        <line x2="-7.12522" x1="-5.71766" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-6.16115" length2="1.5" y1="4.97692" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.71802" width="8.91455" height="11.7587" x="-10.4095" antialias="false"/>
+        <line x2="3.565" x1="4.9015" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.29511" length2="1.5" y1="3.90505" end2="none" antialias="false"/>
+        <line x2="5.347" x1="6.6835" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-4.29511" length2="1.5" y1="3.90505" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.70509" width="8.4645" height="8.43012" x="2.2285" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.4823" width="3.564" height="19.4823" x="-1.3355" antialias="false"/>
+        <line x2="1.98406" x1="-0.732451" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.76817" length2="1.5" y1="-5.76817" end2="none" antialias="false"/>
+        <line x2="2.20643" x1="-1.50462" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.17085" length2="1.5" y1="6.17085" end2="none" antialias="false"/>
+        <input text="machón&#xa;3/4-1/2&quot;" size="4" y="15" tagg="label" rotate="true" x="-12"/>
+        <terminal orientation="w" y="-0.57304" x="-10.4395"/>
+        <terminal orientation="e" y="-0.195001" x="10.693"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/machon1.elmt b/elements/60_energy/11_water/valves/machon1.elmt
index bd1a35a3e..420550ac0 100644
--- a/elements/60_energy/11_water/valves/machon1.elmt
+++ b/elements/60_energy/11_water/valves/machon1.elmt
@@ -1,29 +1,30 @@
-<definition width="40" version="0.4" hotspot_x="14" hotspot_y="23" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{830C9FF3-ABA6-48D1-A2A2-3C17B6C0331F}"/><names>
-        <name lang="es">Machón 1"</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="16" height="30" hotspot_y="19" link_type="simple">
+    <uuid uuid="{34a5ed5d-87e7-48e1-8c8d-84a48b8ffc17}"/>
+    <names>
         <name lang="it">Maschio 1"</name>
         <name lang="pl">Nypel 1"</name>
         <name lang="cs">Samec 1"</name>
+        <name lang="es">Machón 1"</name>
     </names>
     <informations></informations>
     <description>
-        <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.05629" x1="0.204" y2="-12.4226" x2="-1.578"/>
-        <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.05629" x1="18.024" y2="-12.4226" x2="16.242"/>
-        <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.05629" x1="15.648" y2="-12.4226" x2="13.866"/>
-        <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.05629" x1="-2.172" y2="-12.4226" x2="-3.954"/>
-        <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.05629" x1="-7.518" y2="-12.4226" x2="-9.3"/>
-        <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.05629" x1="10.302" y2="-12.4226" x2="8.52"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="4.05629" x1="-5.142" y2="-12.4226" x2="-6.924"/>
-        <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.05629" x1="12.678" y2="-12.4226" x2="10.896"/>
-        <rect width="9.504" x="8.52" y="-11.5986" antialias="false" height="15.655" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="9.504" x="-9.3" y="-11.5986" antialias="false" height="15.655" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="11.286" x="6.738" y="-13.2465" antialias="false" height="18.9506" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.286" x="-9.3" y="-13.2465" antialias="false" height="18.9506" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.752" x="1.986" y="-17.3662" antialias="false" height="26.3662" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.7747" x1="1.986" y2="-10.7747" x2="6.144"/>
-        <line 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.05629" x1="1.986" y2="4.05629" x2="6.738"/>
-        <input x="-9" y="14" size="4" rotate="true" text="machón1&quot;"/>
-        <terminal x="-9.3" y="-4.1831" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="18.024" y="-4.1831" nameHidden="0" number="" name="" orientation="e"/>
+        <line x2="-1.578" x1="0.204" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-12.4226" length2="1.5" y1="4.05629" end2="none" antialias="false"/>
+        <line x2="16.242" x1="18.024" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-12.4226" length2="1.5" y1="4.05629" end2="none" antialias="false"/>
+        <line x2="13.866" x1="15.648" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-12.4226" length2="1.5" y1="4.05629" end2="none" antialias="false"/>
+        <line x2="-3.954" x1="-2.172" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-12.4226" length2="1.5" y1="4.05629" end2="none" antialias="false"/>
+        <line x2="-9.3" x1="-7.518" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-12.4226" length2="1.5" y1="4.05629" end2="none" antialias="false"/>
+        <line x2="8.52" x1="10.302" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-12.4226" length2="1.5" y1="4.05629" end2="none" antialias="false"/>
+        <line x2="-6.924" x1="-5.142" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-12.4226" length2="1.5" y1="4.05629" end2="none" antialias="false"/>
+        <line x2="10.896" x1="12.678" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-12.4226" length2="1.5" y1="4.05629" end2="none" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-11.5986" width="9.504" height="15.655" x="8.52" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-11.5986" width="9.504" height="15.655" x="-9.3" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.2465" width="11.286" height="18.9506" x="6.738" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.2465" width="11.286" height="18.9506" x="-9.3" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-17.3662" width="4.752" height="26.3662" x="1.986" antialias="false"/>
+        <line x2="6.144" x1="1.986" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10.7747" length2="1.5" y1="-10.7747" end2="none" antialias="false"/>
+        <line x2="6.738" x1="1.986" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.05629" length2="1.5" y1="4.05629" end2="none" antialias="false"/>
+        <input text="machón1&quot;" size="4" y="14" tagg="label" rotate="true" x="-9"/>
+        <terminal orientation="w" y="-4.1831" x="-9.3"/>
+        <terminal orientation="e" y="-4.1831" x="18.024"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/machon1_2.elmt b/elements/60_energy/11_water/valves/machon1_2.elmt
index c723719ba..c3fb7aaad 100644
--- a/elements/60_energy/11_water/valves/machon1_2.elmt
+++ b/elements/60_energy/11_water/valves/machon1_2.elmt
@@ -1,29 +1,30 @@
-<definition width="40" version="0.4" hotspot_x="17" hotspot_y="8" height="30" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{573AD182-73C9-4A31-85E7-A09FBAF8E514}"/><names>
-        <name lang="es">Machón 1/2</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="14" height="20" hotspot_y="9" link_type="simple">
+    <uuid uuid="{3b771aee-34ae-48e3-b632-faa459268333}"/>
+    <names>
         <name lang="it">Maschio 1/2</name>
         <name lang="pl">Nypel 1/2"</name>
         <name lang="cs">Samec 1/2"</name>
+        <name lang="es">Machón 1/2</name>
     </names>
     <informations></informations>
     <description>
-        <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.55992" x1="-1.768" y2="-3.57368" x2="-2.5615"/>
-        <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.55992" x1="6.167" y2="-3.57368" x2="5.3735"/>
-        <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.55992" x1="5.109" y2="-3.57368" x2="4.3155"/>
-        <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.55992" x1="-2.826" y2="-3.57368" x2="-3.6195"/>
-        <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.55992" x1="-5.2065" y2="-3.57368" x2="-6"/>
-        <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.55992" x1="2.7285" y2="-3.57368" x2="1.935"/>
-        <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.55992" x1="-4.1485" y2="-3.57368" x2="-4.942"/>
-        <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.55992" x1="3.7865" y2="-3.57368" x2="2.993"/>
-        <rect width="4.232" x="1.935" y="-3.167" antialias="false" height="7.72692" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="4.232" x="-6" y="-3.167" antialias="false" height="7.72692" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="5.0255" x="1.1415" y="-3.98037" antialias="false" height="9.35364" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.0255" x="-6" y="-3.98037" antialias="false" height="9.35364" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.116" x="-0.9745" y="-6.01377" antialias="false" height="13.0138" 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.76032" x1="-0.9745" y2="-2.76032" x2="0.877"/>
-        <line 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.55992" x1="-0.9745" y2="4.55992" x2="1.1415"/>
-        <input x="-14" y="12" size="4" rotate="true" text="machón1/2"/>
-        <terminal x="-6" y="0.493117" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="6.167" y="0.493117" nameHidden="0" number="" name="" orientation="e"/>
+        <line x2="-2.5615" x1="-1.768" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.57368" length2="1.5" y1="4.55992" end2="none" antialias="false"/>
+        <line x2="5.3735" x1="6.167" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.57368" length2="1.5" y1="4.55992" end2="none" antialias="false"/>
+        <line x2="4.3155" x1="5.109" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.57368" length2="1.5" y1="4.55992" end2="none" antialias="false"/>
+        <line x2="-3.6195" x1="-2.826" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.57368" length2="1.5" y1="4.55992" end2="none" antialias="false"/>
+        <line x2="-6" x1="-5.2065" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.57368" length2="1.5" y1="4.55992" end2="none" antialias="false"/>
+        <line x2="1.935" x1="2.7285" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.57368" length2="1.5" y1="4.55992" end2="none" antialias="false"/>
+        <line x2="-4.942" x1="-4.1485" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.57368" length2="1.5" y1="4.55992" end2="none" antialias="false"/>
+        <line x2="2.993" x1="3.7865" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.57368" length2="1.5" y1="4.55992" end2="none" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-3.167" width="4.232" height="7.72692" x="1.935" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-3.167" width="4.232" height="7.72692" x="-6" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.98037" width="5.0255" height="9.35364" x="1.1415" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.98037" width="5.0255" height="9.35364" x="-6" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.01377" width="2.116" height="13.0138" x="-0.9745" antialias="false"/>
+        <line x2="0.877" x1="-0.9745" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-2.76032" length2="1.5" y1="-2.76032" end2="none" antialias="false"/>
+        <line x2="1.1415" x1="-0.9745" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.55992" length2="1.5" y1="4.55992" end2="none" antialias="false"/>
+        <input text="machón1/2" size="4" y="12" tagg="label" rotate="true" x="-14"/>
+        <terminal orientation="w" y="0.493117" x="-6"/>
+        <terminal orientation="e" y="0.493117" x="6.167"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/machon3_4.elmt b/elements/60_energy/11_water/valves/machon3_4.elmt
index c7af075c1..28a0c62a4 100644
--- a/elements/60_energy/11_water/valves/machon3_4.elmt
+++ b/elements/60_energy/11_water/valves/machon3_4.elmt
@@ -1,29 +1,30 @@
-<definition width="40" version="0.4" hotspot_x="16" hotspot_y="19" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9673FA13-FBF6-4D3C-8E0D-71C7D84722A4}"/><names>
-        <name lang="es">Machón 3/4</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="17" height="30" hotspot_y="15" link_type="simple">
+    <uuid uuid="{55884b1c-5dec-482f-a3fe-ce5557d0c375}"/>
+    <names>
         <name lang="it">Maschio 3/4</name>
         <name lang="pl">Nypel 3/4"</name>
         <name lang="cs">Samec 3/4"</name>
+        <name lang="es">Machón 3/4</name>
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.2235" x1="-1.5" y2="-5.8858" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.2235" x1="14" y2="-5.8858" x2="12.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.2235" x1="12" y2="-5.8858" x2="10.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.2235" x1="-3.5" y2="-5.8858" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.2235" x1="-8" y2="-5.8858" x2="-9.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.2235" x1="7.5" y2="-5.8858" x2="6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.2235" x1="-6" y2="-5.8858" x2="-7.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.2235" x1="9.5" y2="-5.8858" x2="8"/>
-        <rect width="8.5" x="5.5" y="-5.8858" antialias="false" height="11.1093" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="8.5" x="-10" y="-5.8858" antialias="false" height="11.1093" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="10" x="4" y="-8.10766" antialias="false" height="14.9975" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10" x="-10" y="-8.10766" antialias="false" height="14.9975" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="0" y="-13.1068" antialias="false" height="26.1068" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.44126" x1="0" y2="-6.44126" x2="3.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.2235" x1="0" y2="5.2235" x2="4"/>
-        <input x="-14" y="18" size="4" rotate="true" text="machón3/4&quot;"/>
-        <terminal x="-10" y="-0.331151" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="14" y="-0.331151" nameHidden="0" number="" name="" orientation="e"/>
+        <line x2="-3" x1="-1.5" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.8858" length2="1.5" y1="5.2235" end2="none" antialias="false"/>
+        <line x2="12.5" x1="14" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.8858" length2="1.5" y1="5.2235" end2="none" antialias="false"/>
+        <line x2="10.5" x1="12" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.8858" length2="1.5" y1="5.2235" end2="none" antialias="false"/>
+        <line x2="-5" x1="-3.5" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.8858" length2="1.5" y1="5.2235" end2="none" antialias="false"/>
+        <line x2="-9.5" x1="-8" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.8858" length2="1.5" y1="5.2235" end2="none" antialias="false"/>
+        <line x2="6" x1="7.5" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.8858" length2="1.5" y1="5.2235" end2="none" antialias="false"/>
+        <line x2="-7.5" x1="-6" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.8858" length2="1.5" y1="5.2235" end2="none" antialias="false"/>
+        <line x2="8" x1="9.5" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.8858" length2="1.5" y1="5.2235" end2="none" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-5.8858" width="8.5" height="11.1093" x="5.5" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-5.8858" width="8.5" height="11.1093" x="-10" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.10766" width="10" height="14.9975" x="4" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.10766" width="10" height="14.9975" x="-10" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.1068" width="4" height="26.1068" x="0" antialias="false"/>
+        <line x2="3.5" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.44126" length2="1.5" y1="-6.44126" end2="none" antialias="false"/>
+        <line x2="4" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.2235" length2="1.5" y1="5.2235" end2="none" antialias="false"/>
+        <input text="machón3/4&quot;" size="4" y="18" tagg="label" rotate="true" x="-14"/>
+        <terminal orientation="w" y="-0.331151" x="-10"/>
+        <terminal orientation="e" y="-0.331151" x="14"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/mando-ducha.elmt b/elements/60_energy/11_water/valves/mando-ducha.elmt
index 77bf4ca31..1b44f5a17 100644
--- a/elements/60_energy/11_water/valves/mando-ducha.elmt
+++ b/elements/60_energy/11_water/valves/mando-ducha.elmt
@@ -1,33 +1,34 @@
-<definition width="70" version="0.4" hotspot_x="25" hotspot_y="23" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{54E5C864-B308-449C-AA50-CD6B8336EA44}"/><names>
-        <name lang="ar">خلاّط 02 ECS</name>
-        <name lang="en">Mixer 02 ECS</name>
-        <name lang="it">Valvola miscelatrice ACS 2</name>
+<definition orientation="dyyy" type="element" width="60" version="0.5" hotspot_x="23" height="30" hotspot_y="12" link_type="simple">
+    <uuid uuid="{6fd4dc21-c7d0-4079-91f7-dc41692eea90}"/>
+    <names>
         <name lang="fr">Mitigeur02 ECS</name>
+        <name lang="it">Valvola miscelatrice ACS 2</name>
+        <name lang="en">Mixer 02 ECS</name>
         <name lang="pl">Mieszacz CWU</name>
-        <name lang="es">Mezclador ducha</name>
         <name lang="cs">Směšovací ventil 02 ECS</name>
+        <name lang="ar">خلاّط 02 ECS</name>
+        <name lang="es">Mezclador ducha</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="31" x="-14.8" y="-9.5045" antialias="false" height="18.9318" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-16" y="-5" size="4" rotate="true" text="Mezclador"/>
-        <line 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.03864" x1="5.35" y2="-0.03864" x2="8.45"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.93182" x1="-8.6" y2="1.85455" x2="-8.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.03864" x1="-10.15" y2="-0.03864" x2="-7.05"/>
-        <line 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.64091" x1="17.75" y2="5.64091" x2="22.4"/>
-        <rect width="6.2" x="3.8" y="9.42727" antialias="false" height="3.78636" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.1" x="-17.9" y="-3.825" antialias="false" height="7.57273" 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.42727" x1="31.7" y2="9.42727" x2="17.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="-9.5045" x1="31.7" y2="-9.5045" x2="17.75"/>
-        <arc width="4.65" x="29.375" y="-9.5045" antialias="true" height="18.9318" 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="-5.7182" x1="17.75" y2="-5.7182" x2="22.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="-1.93182" x1="17.75" y2="-1.93182" x2="22.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="1.85455" x1="17.75" y2="1.85455" x2="22.4"/>
-        <rect width="6.2" x="-11.7" y="9.42727" antialias="false" height="3.78636" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-13" y="-13" size="4" rotate="true" text="mezclador ducha_"/>
-        <terminal x="6.9" y="13.2136" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="-8.6" y="13.2136" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="-17.9" y="-0.03864" nameHidden="0" number="" name="" orientation="w"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.5045" width="31" height="18.9318" x="-14.8" antialias="false"/>
+        <input text="Mezclador" size="4" y="-5" tagg="none" rotate="true" x="-16"/>
+        <line x2="8.45" x1="5.35" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.03864" length2="1.5" y1="-0.03864" end2="none" antialias="false"/>
+        <line x2="-8.6" x1="-8.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="1.85455" length2="1.5" y1="-1.93182" end2="none" antialias="false"/>
+        <line x2="-7.05" x1="-10.15" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.03864" length2="1.5" y1="-0.03864" end2="none" antialias="false"/>
+        <line x2="22.4" x1="17.75" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.64091" length2="1.5" y1="5.64091" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="9.42727" width="6.2" height="3.78636" x="3.8" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.825" width="3.1" height="7.57273" x="-17.9" antialias="false"/>
+        <line x2="17.75" x1="31.7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.42727" length2="1.5" y1="9.42727" end2="none" antialias="false"/>
+        <line x2="17.75" x1="31.7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.5045" length2="1.5" y1="-9.5045" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.5045" width="4.65" height="18.9318" start="90" angle="-180" x="29.375" antialias="true"/>
+        <line x2="22.4" x1="17.75" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.7182" length2="1.5" y1="-5.7182" end2="none" antialias="false"/>
+        <line x2="22.4" x1="17.75" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1.93182" length2="1.5" y1="-1.93182" end2="none" antialias="false"/>
+        <line x2="22.4" x1="17.75" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="1.85455" length2="1.5" y1="1.85455" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="9.42727" width="6.2" height="3.78636" x="-11.7" antialias="false"/>
+        <input text="mezclador ducha_" size="4" y="-13" tagg="label" rotate="true" x="-13"/>
+        <terminal orientation="s" y="13.2136" x="6.9"/>
+        <terminal orientation="s" y="13.2136" x="-8.6"/>
+        <terminal orientation="w" y="-0.03864" x="-17.9"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/manometro1_2.elmt b/elements/60_energy/11_water/valves/manometro1_2.elmt
index 991d5cdb3..3c9899878 100644
--- a/elements/60_energy/11_water/valves/manometro1_2.elmt
+++ b/elements/60_energy/11_water/valves/manometro1_2.elmt
@@ -1,31 +1,32 @@
-<definition width="60" version="0.4" hotspot_x="21" hotspot_y="39" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3BAF6B01-E658-431D-907F-DD9507BC6B3A}"/><names>
-        <name lang="es">Manómetro 1/2H</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="19" height="50" hotspot_y="39" link_type="simple">
+    <uuid uuid="{8179cb10-1e77-415b-b678-50f52db36168}"/>
+    <names>
         <name lang="it">Manometro 1/2 F</name>
         <name lang="pl">Manometr 1/2"</name>
         <name lang="cs">Manometr 1/2"</name>
+        <name lang="es">Manómetro 1/2H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.75773" x1="-7.4" y2="-7.61688" x2="-7.4"/>
-        <ellipse width="28.8" x="-13.4" y="-35.7256" antialias="true" height="28.8838" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="12.8" x="-6.2" y="-3.32888" antialias="false" height="9.75805" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.2" x="-4.2" y="-0.986947" antialias="false" height="7.41612" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.32888" x1="-7.4" y2="-3.32888" x2="7.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3.66717" x1="7.8" y2="-6.91984" x2="7.8"/>
-        <ellipse width="32" x="-15" y="-36.8966" antialias="true" height="31.2258" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21.674" x1="0.6" y2="-29.0901" x2="-8.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29.4805" x1="-8.6" y2="-22.0643" x2="0.6"/>
-        <ellipse width="2.4" x="0.2" y="-22.0643" antialias="true" height="2.34193" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-10.2" y="-12.5014" size="3" rotate="true" text="1"/>
-        <text x="-12.2" y="-20.8934" size="3" text="2"/>
-        <text x="-6.2" y="-29.0901" size="3" text="3"/>
-        <text x="4.2" y="-29.8708" size="3" text="4"/>
-        <text x="11.8" y="-21.2837" size="3" text="5"/>
-        <text x="7" y="-10.3547" size="3" text="6"/>
-        <input x="12" y="-7" size="4" rotate="true" text="1/2&quot;H"/>
-        <text x="-3" y="-14" size="4" text="bar"/>
-        <terminal x="0.2" y="6.42917" nameHidden="1" number="" name="" orientation="s"/>
+        <line x2="-7.4" x1="-7.4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7.61688" length2="1.5" y1="-3.75773" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-35.7256" width="28.8" height="28.8838" x="-13.4" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.32888" width="12.8" height="9.75805" x="-6.2" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-0.986947" width="9.2" height="7.41612" x="-4.2" antialias="false"/>
+        <line x2="7.8" x1="-7.4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3.32888" length2="1.5" y1="-3.32888" end2="none" antialias="false"/>
+        <line x2="7.8" x1="7.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.91984" length2="1.5" y1="-3.66717" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-36.8966" width="32" height="31.2258" x="-15" antialias="true"/>
+        <line x2="-8.6" x1="0.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-29.0901" length2="1.5" y1="-21.674" end2="none" antialias="false"/>
+        <line x2="0.6" x1="-8.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-22.0643" length2="1.5" y1="-29.4805" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-22.0643" width="2.4" height="2.34193" x="0.2" antialias="true"/>
+        <input text="1" size="3" y="-12.5014" tagg="none" rotate="true" x="-10.2"/>
+        <text text="2" size="3" y="-20.8934" x="-12.2"/>
+        <text text="3" size="3" y="-29.0901" x="-6.2"/>
+        <text text="4" size="3" y="-29.8708" x="4.2"/>
+        <text text="5" size="3" y="-21.2837" x="11.8"/>
+        <text text="6" size="3" y="-10.3547" x="7"/>
+        <input text="1/2&quot;H" size="4" y="-7" tagg="label" rotate="true" x="12"/>
+        <text text="bar" size="4" y="-14" x="-3"/>
+        <terminal orientation="s" y="6.42917" x="0.2"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/manometro3_8macho.elmt b/elements/60_energy/11_water/valves/manometro3_8macho.elmt
index 67cd41505..8be8ff4f3 100644
--- a/elements/60_energy/11_water/valves/manometro3_8macho.elmt
+++ b/elements/60_energy/11_water/valves/manometro3_8macho.elmt
@@ -1,34 +1,35 @@
-<definition width="60" version="0.4" hotspot_x="22" hotspot_y="47" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9A1CCFF0-91B4-450B-B4EB-81D8BAC16061}"/><names>
-        <name lang="es">Manómetro 3/8M</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="60" hotspot_y="47" link_type="simple">
+    <uuid uuid="{009320c1-dbb3-4e9c-9bcd-bbad165be3d9}"/>
+    <names>
         <name lang="it">Manometro 3/8 M</name>
         <name lang="pl">Manometr 3/8"</name>
         <name lang="cs">Manometr 3/8"</name>
+        <name lang="es">Manómetro 3/8M</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="2.38824" x1="-4.79" y2="1.45761" x2="4.03"/>
-        <line 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.992298" x1="-4.79" y2="0.0616689" x2="4.03"/>
-        <line 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.31083" x1="-9.69" y2="-6.91145" x2="-9.69"/>
-        <ellipse width="35.28" x="-17.04" y="-40.4207" antialias="true" height="34.4333" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.82" x="-4.79" y="-1.79959" antialias="false" height="7.44504" 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="-1.79959" x1="-9.69" y2="-1.79959" x2="8.93"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2.20288" x1="8.93" y2="-6.08049" x2="8.93"/>
-        <ellipse width="39.2" x="-19" y="-41.8167" antialias="true" height="37.2252" 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="-23.6694" x1="0.11" y2="-32.5104" x2="-11.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="-32.9757" x1="-11.16" y2="-24.1347" x2="0.11"/>
-        <ellipse width="2.94" x="-0.38" y="-24.1347" antialias="true" height="2.79189" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-13.12" y="-12.7345" size="4" rotate="true" text="1"/>
-        <text x="-15.57" y="-22.7388" size="4" text="2"/>
-        <text x="-8.22" y="-32.5104" size="4" text="3"/>
-        <text x="4.52" y="-33.441" size="4" text="4"/>
-        <text x="13.83" y="-23.2041" size="4" text="5"/>
-        <text x="7.95" y="-10.1753" size="4" text="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="5.18013" x1="-4.79" y2="4.2495" x2="4.03"/>
-        <line 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.78419" x1="-4.79" y2="2.85356" x2="4.03"/>
-        <text x="-3" y="-15" size="4" text="bar"/>
-        <input x="14" y="-4" size="4" rotate="true" text="3/8&quot;M"/>
-        <terminal x="-0.38" y="5.64545" nameHidden="1" number="" name="" orientation="s"/>
+        <line x2="4.03" x1="-4.79" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="1.45761" length2="1.5" y1="2.38824" end2="none" antialias="false"/>
+        <line x2="4.03" x1="-4.79" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0.0616689" length2="1.5" y1="0.992298" end2="none" antialias="false"/>
+        <line x2="-9.69" x1="-9.69" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.91145" length2="1.5" y1="-2.31083" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-40.4207" width="35.28" height="34.4333" x="-17.04" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-1.79959" width="8.82" height="7.44504" x="-4.79" antialias="false"/>
+        <line x2="8.93" x1="-9.69" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1.79959" length2="1.5" y1="-1.79959" end2="none" antialias="false"/>
+        <line x2="8.93" x1="8.93" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.08049" length2="1.5" y1="-2.20288" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-41.8167" width="39.2" height="37.2252" x="-19" antialias="true"/>
+        <line x2="-11.16" x1="0.11" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-32.5104" length2="1.5" y1="-23.6694" end2="none" antialias="false"/>
+        <line x2="0.11" x1="-11.16" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-24.1347" length2="1.5" y1="-32.9757" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-24.1347" width="2.94" height="2.79189" x="-0.38" antialias="true"/>
+        <input text="1" size="4" y="-12.7345" tagg="none" rotate="true" x="-13.12"/>
+        <text text="2" size="4" y="-22.7388" x="-15.57"/>
+        <text text="3" size="4" y="-32.5104" x="-8.22"/>
+        <text text="4" size="4" y="-33.441" x="4.52"/>
+        <text text="5" size="4" y="-23.2041" x="13.83"/>
+        <text text="6" size="4" y="-10.1753" x="7.95"/>
+        <line x2="4.03" x1="-4.79" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.2495" length2="1.5" y1="5.18013" end2="none" antialias="false"/>
+        <line x2="4.03" x1="-4.79" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="2.85356" length2="1.5" y1="3.78419" end2="none" antialias="false"/>
+        <text text="bar" size="4" y="-15" x="-3"/>
+        <input text="3/8&quot;M" size="4" y="-4" tagg="label" rotate="true" x="14"/>
+        <terminal orientation="s" y="5.64545" x="-0.38"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/marsellesa1_2.elmt b/elements/60_energy/11_water/valves/marsellesa1_2.elmt
index e21b6423b..503108f4c 100644
--- a/elements/60_energy/11_water/valves/marsellesa1_2.elmt
+++ b/elements/60_energy/11_water/valves/marsellesa1_2.elmt
@@ -1,28 +1,29 @@
-<definition width="40" version="0.4" hotspot_x="18" hotspot_y="30" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F00696DD-93A4-4A18-8FC2-7FF637B1891A}"/><names>
-        <name lang="es">Marsellesa 1/2</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="18" height="40" hotspot_y="19" link_type="simple">
+    <uuid uuid="{593b82de-7319-4078-a105-3e1224bd38c5}"/>
+    <names>
         <name lang="it">Raccordo 1/2</name>
         <name lang="pl">WZ 1/2"</name>
         <name lang="cs">Spojení 1/2"</name>
+        <name lang="es">Marsellesa 1/2</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="9.1" x="1.35" y="4.47927" antialias="true" height="5.60043" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="5.85" x="-4.5" y="5.03932" antialias="true" height="8.96068" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="6.5" x="5.9" y="-4.48141" antialias="false" height="8.96068" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.05" x="-9.7" y="-8.96175" antialias="false" height="18.4814" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.04145" x1="-1.79482" y2="-5.04145" x2="-9.14711"/>
-        <arc width="5.2" x="-3.85" y="-12.8821" antialias="true" height="7.8406" 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="5.03932" x1="-9.09797" y2="5.03932" x2="-1.84802"/>
-        <arc width="4.55" x="-3.2" y="-5.04145" antialias="true" height="10.0808" 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="-4.48141" x1="10.45" y2="4.47927" x2="9.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="-3.92137" x1="9.15" y2="3.91923" x2="7.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.48141" x1="11.75" y2="4.47927" x2="10.45"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.48141" x1="7.85" y2="4.47927" x2="6.55"/>
-        <arc width="9.1" x="1.35" y="-10.0818" antialias="true" height="5.60043" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <input x="-12" y="-17" size="4" rotate="true" text="1/2&quot;"/>
-        <terminal x="-9.7" y="-0.00106838" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="13.05" y="-0.00106838" nameHidden="1" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="4.47927" width="9.1" height="5.60043" start="-180" angle="-90" x="1.35" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="5.03932" width="5.85" height="8.96068" start="90" angle="-90" x="-4.5" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.48141" width="6.5" height="8.96068" x="5.9" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.96175" width="11.05" height="18.4814" x="-9.7" antialias="false"/>
+        <line x2="-9.14711" x1="-1.79482" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-5.04145" length2="1.5" y1="-5.04145" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.8821" width="5.2" height="7.8406" start="0" angle="-90" x="-3.85" antialias="true"/>
+        <line x2="-1.84802" x1="-9.09797" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.03932" length2="1.5" y1="5.03932" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.04145" width="4.55" height="10.0808" start="90" angle="-180" x="-3.2" antialias="true"/>
+        <line x2="9.15" x1="10.45" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.47927" length2="1.5" y1="-4.48141" end2="none" antialias="false"/>
+        <line x2="7.85" x1="9.15" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.91923" length2="1.5" y1="-3.92137" end2="none" antialias="false"/>
+        <line x2="10.45" x1="11.75" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.47927" length2="1.5" y1="-4.48141" end2="none" antialias="false"/>
+        <line x2="6.55" x1="7.85" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.47927" length2="1.5" y1="-4.48141" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.0818" width="9.1" height="5.60043" start="-90" angle="-90" x="1.35" antialias="true"/>
+        <input text="1/2&quot;" size="4" y="-17" tagg="label" rotate="true" x="-12"/>
+        <terminal orientation="w" y="-0.00106838" x="-9.7"/>
+        <terminal orientation="e" y="-0.00106838" x="13.05"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/marsellesa3_4.elmt b/elements/60_energy/11_water/valves/marsellesa3_4.elmt
index 95236c551..79f83cd15 100644
--- a/elements/60_energy/11_water/valves/marsellesa3_4.elmt
+++ b/elements/60_energy/11_water/valves/marsellesa3_4.elmt
@@ -1,28 +1,29 @@
-<definition width="40" version="0.4" hotspot_x="16" hotspot_y="29" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D69D2B6A-9313-467C-AB09-1D36039D31FE}"/><names>
-        <name lang="es">Marsellesa 3/4</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="16" height="40" hotspot_y="20" link_type="simple">
+    <uuid uuid="{24926d52-d1f6-461b-87b4-6eaaf7d06edc}"/>
+    <names>
         <name lang="it">Raccordo 3/4</name>
         <name lang="pl">WZ 3/4"</name>
         <name lang="cs">Spojení 3/4"</name>
+        <name lang="es">Marsellesa 3/4</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="12.285" x="2.9175" y="5.42182" antialias="true" height="7.39893" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="7.8975" x="-4.98" y="6.16171" antialias="true" height="11.8383" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="8.775" x="9.06" y="-6.41647" antialias="false" height="11.8383" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="14.9175" x="-12" y="-12.3356" antialias="false" height="24.4165" 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.15637" x1="-1.328" y2="-7.15637" x2="-11.2536"/>
-        <arc width="7.02" x="-4.1025" y="-17.5149" antialias="true" height="10.3585" 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="6.16171" x1="-11.1873" y2="6.16171" x2="-1.39983"/>
-        <arc width="6.1425" x="-3.225" y="-7.15637" antialias="true" height="13.3181" 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="-6.41647" x1="15.2025" y2="5.42182" x2="13.4475"/>
-        <line 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.67658" x1="13.4475" y2="4.68192" x2="11.6925"/>
-        <line 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.41647" x1="16.9575" y2="5.42182" x2="15.2025"/>
-        <line 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.41647" x1="11.6925" y2="5.42182" x2="9.9375"/>
-        <arc width="12.285" x="2.9175" y="-13.8154" antialias="true" height="7.39893" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <input x="-12" y="-18" size="4" rotate="true" text="3/4&quot;"/>
-        <terminal x="-12" y="-0.497329" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="18.7125" y="-0.497329" nameHidden="1" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="5.42182" width="12.285" height="7.39893" start="-180" angle="-90" x="2.9175" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="6.16171" width="7.8975" height="11.8383" start="90" angle="-90" x="-4.98" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.41647" width="8.775" height="11.8383" x="9.06" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.3356" width="14.9175" height="24.4165" x="-12" antialias="false"/>
+        <line x2="-11.2536" x1="-1.328" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7.15637" length2="1.5" y1="-7.15637" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-17.5149" width="7.02" height="10.3585" start="0" angle="-90" x="-4.1025" antialias="true"/>
+        <line x2="-1.39983" x1="-11.1873" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.16171" length2="1.5" y1="6.16171" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.15637" width="6.1425" height="13.3181" start="90" angle="-180" x="-3.225" antialias="true"/>
+        <line x2="13.4475" x1="15.2025" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.42182" length2="1.5" y1="-6.41647" end2="none" antialias="false"/>
+        <line x2="11.6925" x1="13.4475" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.68192" length2="1.5" y1="-5.67658" end2="none" antialias="false"/>
+        <line x2="15.2025" x1="16.9575" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.42182" length2="1.5" y1="-6.41647" end2="none" antialias="false"/>
+        <line x2="9.9375" x1="11.6925" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.42182" length2="1.5" y1="-6.41647" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.8154" width="12.285" height="7.39893" start="-90" angle="-90" x="2.9175" antialias="true"/>
+        <input text="3/4&quot;" size="4" y="-18" tagg="label" rotate="true" x="-12"/>
+        <terminal orientation="w" y="-0.497329" x="-12"/>
+        <terminal orientation="e" y="-0.497329" x="18.7125"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/mitigeur_melangeur_03.elmt b/elements/60_energy/11_water/valves/mitigeur_melangeur_03.elmt
index 6a4b19b00..e1ebd6735 100644
--- a/elements/60_energy/11_water/valves/mitigeur_melangeur_03.elmt
+++ b/elements/60_energy/11_water/valves/mitigeur_melangeur_03.elmt
@@ -1,40 +1,42 @@
-<definition width="60" version="0.4" hotspot_x="17" hotspot_y="54" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{CCCD7D88-33BC-4272-A380-80DF0A086BAC}"/><names>
-        <name lang="ar">خلاّط 03 ECS</name>
-        <name lang="en">Mixer 03 ECS</name>
-        <name lang="it">Valvola miscelatrice ACS 3</name>
+<definition orientation="dyyy" type="element" width="60" version="0.5" hotspot_x="18" height="70" hotspot_y="54" link_type="simple">
+    <uuid uuid="{d0d9a9e6-969d-419f-8776-784e92fa226f}"/>
+    <names>
         <name lang="fr">Mitigeur 03 ECS</name>
+        <name lang="it">Valvola miscelatrice ACS 3</name>
+        <name lang="en">Mixer 03 ECS</name>
         <name lang="pl">Mieszacz CWU</name>
-        <name lang="es">Valv Termostatica</name>
         <name lang="cs">Směšovací ventil 03 ECS</name>
+        <name lang="ar">خلاّط 03 ECS</name>
+        <name lang="es">Valv Termostatica</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.69127" x1="6.465" y2="6.69127" x2="17.775"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-17.9566" x1="30.97" y2="-6.58067" x2="30.97"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-17.9566" x1="-6.73" y2="-6.58067" x2="-6.73"/>
-        <polygon y21="10.4832" x15="34.74" y22="10.4832" x16="30.97" y23="10.4832" x17="30.97" x18="17.775" x19="17.775" x20="19.66" x21="19.66" x22="12.12" x23="12.12" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="12.12" x2="4.58" x3="4.58" x4="6.465" x5="6.465" x6="-6.73" x7="-6.73" x8="-10.5" x9="-10.5" y1="10.4832" y2="10.4832" y3="6.69127" y4="6.69127" y5="-6.58067" y6="-6.58067" y7="-4.68468" y8="-4.68468" y10="-19.8526" y9="-19.8526" y11="-17.9566" y12="-17.9566" y13="-19.8526" y14="-19.8526" y15="-4.68468" y16="-4.68468" y17="-6.58067" y18="-6.58067" y19="6.69127" x10="-6.73" x11="-6.73" x12="30.97" antialias="true" x13="30.97" x14="34.74" y20="6.69127"/>
-        <polygon x4="25.315" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12.2686" x1="25.315" y2="-16.0606" x2="21.545" y3="-8.47666" x3="21.545" y4="-12.2686"/>
-        <line 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.892695" x1="10.235" y2="-0.892695" x2="14.005"/>
-        <line 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.2686" x1="0.81" y2="-12.2686" x2="4.58"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.1646" x1="2.695" y2="-10.3726" x2="2.695"/>
-        <line 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.3965" x1="25.315" y2="-38.0205" x2="25.315"/>
-        <line 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.3965" x1="-1.075" y2="-38.0205" x2="-1.075"/>
-        <arc width="26.39" x="-1.075" y="-52.2404" antialias="true" height="5.68797" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="26.39" x="-1.075" y="-37.1245" antialias="false" height="15.1679" 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="-45.6045" x1="21.545" y2="-38.0205" x2="21.545"/>
-        <line 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.6045" x1="17.775" y2="-38.0205" x2="17.775"/>
-        <line 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.6045" x1="14.005" y2="-38.0205" x2="14.005"/>
-        <line 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.6045" x1="6.465" y2="-38.0205" x2="6.465"/>
-        <line 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.6045" x1="2.695" y2="-38.0205" x2="2.695"/>
-        <line 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.6045" x1="10.235" y2="-38.0205" x2="10.235"/>
-        <input x="-2" y="-29.0576" size="5" rotate="true" text="°C"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2.89929" x1="14.005" y2="2.89929" x2="10.235"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-12.2686" x1="-4.845" y2="-12.2686" x2="-1.075"/>
-        <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.1646" x1="-2.96" y2="-10.3726" x2="-2.96"/>
-        <rect width="13" x="6" y="-22" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-10.5" y="-12.2686" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="34.74" y="-12.2686" nameHidden="0" number="" name="" orientation="e"/>
-        <terminal x="12.12" y="10.4832" nameHidden="0" number="" name="" orientation="s"/>
+        <input text="_" size="9" y="-69.45" tagg="label" rotate="true" x="33"/>
+        <line x2="17.775" x1="6.465" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="6.69127" length2="1.5" y1="6.69127" end2="none" antialias="false"/>
+        <line x2="30.97" x1="30.97" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-6.58067" length2="1.5" y1="-17.9566" end2="none" antialias="false"/>
+        <line x2="-6.73" x1="-6.73" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-6.58067" length2="1.5" y1="-17.9566" end2="none" antialias="false"/>
+        <polygon y11="-17.9566" y17="-6.58067" x8="-10.5" x16="30.97" x12="30.97" y6="-6.58067" y22="10.4832" x14="34.74" x1="12.12" y3="6.69127" antialias="true" y21="10.4832" x19="17.775" x23="12.12" y9="-19.8526" x18="17.775" x22="12.12" y18="-6.58067" y1="10.4832" x20="19.66" x17="30.97" x11="-6.73" y20="6.69127" x4="6.465" style="line-style:normal;line-weight:normal;filling:none;color:black" x3="4.58" y2="10.4832" x9="-10.5" y8="-4.68468" y10="-19.8526" y7="-4.68468" y14="-19.8526" y15="-4.68468" x10="-6.73" x13="30.97" x2="4.58" y12="-17.9566" x5="6.465" x7="-6.73" x21="19.66" y23="10.4832" y16="-4.68468" x6="-6.73" y19="6.69127" y13="-19.8526" y5="-6.58067" y4="6.69127" x15="34.74"/>
+        <polygon x2="21.545" x3="21.545" x1="25.315" style="line-style:normal;line-weight:normal;filling:none;color:black" x4="25.315" y2="-16.0606" y4="-12.2686" y1="-12.2686" y3="-8.47666" antialias="true"/>
+        <line x2="14.005" x1="10.235" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-0.892695" length2="1.5" y1="-0.892695" end2="none" antialias="false"/>
+        <line x2="4.58" x1="0.81" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-12.2686" length2="1.5" y1="-12.2686" end2="none" antialias="false"/>
+        <line x2="2.695" x1="2.695" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10.3726" length2="1.5" y1="-14.1646" end2="none" antialias="false"/>
+        <line x2="25.315" x1="25.315" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-38.0205" length2="1.5" y1="-49.3965" end2="none" antialias="false"/>
+        <line x2="-1.075" x1="-1.075" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-38.0205" length2="1.5" y1="-49.3965" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-52.2404" width="26.39" height="5.68797" start="-180" angle="-180" x="-1.075" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-37.1245" width="26.39" height="15.1679" x="-1.075" antialias="false"/>
+        <line x2="21.545" x1="21.545" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-38.0205" length2="1.5" y1="-45.6045" end2="none" antialias="false"/>
+        <line x2="17.775" x1="17.775" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-38.0205" length2="1.5" y1="-45.6045" end2="none" antialias="false"/>
+        <line x2="14.005" x1="14.005" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-38.0205" length2="1.5" y1="-45.6045" end2="none" antialias="false"/>
+        <line x2="6.465" x1="6.465" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-38.0205" length2="1.5" y1="-45.6045" end2="none" antialias="false"/>
+        <line x2="2.695" x1="2.695" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-38.0205" length2="1.5" y1="-45.6045" end2="none" antialias="false"/>
+        <line x2="10.235" x1="10.235" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-38.0205" length2="1.5" y1="-45.6045" end2="none" antialias="false"/>
+        <input text="°C" size="5" y="-29.0576" tagg="none" rotate="true" x="-2"/>
+        <line x2="10.235" x1="14.005" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="2.89929" length2="1.5" y1="2.89929" end2="none" antialias="false"/>
+        <line x2="-1.075" x1="-4.845" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-12.2686" length2="1.5" y1="-12.2686" end2="none" antialias="false"/>
+        <line x2="-2.96" x1="-2.96" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-10.3726" length2="1.5" y1="-14.1646" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-22" width="13" height="4" x="6" antialias="false"/>
+        <terminal orientation="e" y="-12.2686" x="34.74"/>
+        <terminal orientation="s" y="10.4832" x="12.12"/>
+        <terminal orientation="w" y="-12.2686" x="-10.5"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/prescontrol.elmt b/elements/60_energy/11_water/valves/prescontrol.elmt
index 81c34a963..86ee8aab3 100644
--- a/elements/60_energy/11_water/valves/prescontrol.elmt
+++ b/elements/60_energy/11_water/valves/prescontrol.elmt
@@ -1,30 +1,32 @@
-<definition width="50" version="0.4" hotspot_x="22" hotspot_y="26" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{4C956C1A-8157-4F39-B058-132F79289826}"/><names>
-        <name lang="es">Press control</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="21" height="60" hotspot_y="25" link_type="simple">
+    <uuid uuid="{e8971ae4-751a-4e16-a8a4-73be5141178d}"/>
+    <names>
         <name lang="it">Press-control</name>
         <name lang="pl">Regulator ciśnienia</name>
         <name lang="cs">Ovladač tlaku</name>
+        <name lang="es">Press control</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="1.3" x="-16" y="6.42181" antialias="false" height="1.96485" 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="25.4154" x1="-6.25" y2="23.4505" x2="6.1"/>
-        <ellipse width="1.95" x="-1.05" y="-0.782636" antialias="true" height="1.96485" 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="23.4505" x1="-6.25" y2="21.4857" x2="6.1"/>
-        <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.05738" x1="18.45" y2="4.45696" x2="17.8"/>
-        <rect width="13" x="-6.25" y="19.5208" antialias="false" height="8.51435" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20.8" x="-10.15" y="17.556" antialias="false" height="1.96485" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="27.95" x="-14.7" y="-13.8816" antialias="false" height="31.4376" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="27.95" x="-14.7" y="-21.741" antialias="true" height="15.0638" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="6.5" x="13.25" y="-5.36728" antialias="false" height="11.1341" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1.95" x="-1.05" y="-4.05738" antialias="true" height="1.96485" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.85" x="13.9" y="-4.05738" antialias="false" height="8.51435" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="-4.05738" x1="16.5" y2="4.45696" x2="15.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="27.3802" x1="-6.25" y2="25.4154" x2="6.1"/>
-        <rect width="5.2" x="-3" y="-5.36728" antialias="false" height="7.8594" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="1.3" x="-16" y="2.49211" antialias="false" height="1.96485" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-0.4" y="28.6901" nameHidden="0" number="" name="" orientation="s"/>
-        <terminal x="20.4" y="0.527264" nameHidden="1" number="" name="" orientation="e"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="6.42181" width="1.3" height="1.96485" x="-16" antialias="false"/>
+        <input text="_" size="9" y="-24.45" tagg="label" rotate="true" x="13"/>
+        <line x2="6.1" x1="-6.25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="23.4505" length2="1.5" y1="25.4154" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-0.782636" width="1.95" height="1.96485" x="-1.05" antialias="true"/>
+        <line x2="6.1" x1="-6.25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="21.4857" length2="1.5" y1="23.4505" end2="none" antialias="false"/>
+        <line x2="17.8" x1="18.45" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="4.45696" length2="1.5" y1="-4.05738" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="19.5208" width="13" height="8.51435" x="-6.25" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="17.556" width="20.8" height="1.96485" x="-10.15" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.8816" width="27.95" height="31.4376" x="-14.7" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.741" width="27.95" height="15.0638" start="-180" angle="-180" x="-14.7" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.36728" width="6.5" height="11.1341" x="13.25" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.05738" width="1.95" height="1.96485" x="-1.05" antialias="true"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-4.05738" width="5.85" height="8.51435" x="13.9" antialias="false"/>
+        <line x2="15.85" x1="16.5" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="4.45696" length2="1.5" y1="-4.05738" end2="none" antialias="false"/>
+        <line x2="6.1" x1="-6.25" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="25.4154" length2="1.5" y1="27.3802" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-5.36728" width="5.2" height="7.8594" x="-3" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="2.49211" width="1.3" height="1.96485" x="-16" antialias="false"/>
+        <terminal orientation="s" y="28.6901" x="-0.4"/>
+        <terminal orientation="e" y="0.527264" x="20.4"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/purgador1_2macho.elmt b/elements/60_energy/11_water/valves/purgador1_2macho.elmt
index 77f72d7e6..7a9a2a73d 100644
--- a/elements/60_energy/11_water/valves/purgador1_2macho.elmt
+++ b/elements/60_energy/11_water/valves/purgador1_2macho.elmt
@@ -1,30 +1,31 @@
-<definition width="40" version="0.4" hotspot_x="11" hotspot_y="39" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{0D7C9EE8-3FE6-4EB7-963E-1BC9176F84B0}"/><names>
-        <name lang="es">Purgador 1/2 Macho</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="15" height="50" hotspot_y="38" link_type="simple">
+    <uuid uuid="{efc9211f-f523-4aaa-8ec7-92c39b5e5e1f}"/>
+    <names>
         <name lang="it">Sfiato 1/2 M</name>
         <name lang="pl">Odpowietrznik 1/2"</name>
         <name lang="cs">Odvětrávač 1/2"</name>
+        <name lang="es">Purgador 1/2 Macho</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="-2.02225" x1="-3.6" y2="-3.07559" x2="3.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29.7602" x1="5.4" y2="-32.9202" x2="5.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="-29.7602" x1="6.9" y2="-32.9202" x2="6.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="-29.7602" x1="7.8" y2="-32.9202" x2="7.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29.7602" x1="3.9" y2="-32.9202" x2="3.9"/>
-        <rect width="7.8" x="-3.9" y="-3.77782" antialias="false" height="7.72448" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.617802" x1="-3.6" y2="-1.67114" x2="3.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="2.54221" x1="-3.6" y2="1.48887" x2="3.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="1.13776" x1="-3.6" y2="0.0844229" x2="3.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="3.94666" x1="-3.6" y2="2.89332" x2="3.6"/>
-        <rect width="10.8" x="-5.4" y="-8.34228" antialias="false" height="4.56446" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18" x="-9" y="-27.3024" antialias="false" height="18.9601" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.9" x="3.3" y="-29.0579" antialias="false" height="1.75556" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.3" x="2.1" y="-33.9735" antialias="false" height="4.91558" 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.7602" x1="3" y2="-32.9202" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-23.7912" x1="-9" y2="-23.7912" x2="8.7"/>
-        <input x="5" y="-4" size="4" rotate="true" text="1/2&quot;M"/>
-        <terminal x="0" y="4.29777" nameHidden="1" number="" name="" orientation="s"/>
+        <line x2="3.6" x1="-3.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3.07559" length2="1.5" y1="-2.02225" end2="none" antialias="false"/>
+        <line x2="5.4" x1="5.4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-32.9202" length2="1.5" y1="-29.7602" end2="none" antialias="false"/>
+        <line x2="6.9" x1="6.9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-32.9202" length2="1.5" y1="-29.7602" end2="none" antialias="false"/>
+        <line x2="7.8" x1="7.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-32.9202" length2="1.5" y1="-29.7602" end2="none" antialias="false"/>
+        <line x2="3.9" x1="3.9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-32.9202" length2="1.5" y1="-29.7602" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.77782" width="7.8" height="7.72448" x="-3.9" antialias="false"/>
+        <line x2="3.6" x1="-3.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-1.67114" length2="1.5" y1="-0.617802" end2="none" antialias="false"/>
+        <line x2="3.6" x1="-3.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="1.48887" length2="1.5" y1="2.54221" end2="none" antialias="false"/>
+        <line x2="3.6" x1="-3.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0.0844229" length2="1.5" y1="1.13776" end2="none" antialias="false"/>
+        <line x2="3.6" x1="-3.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="2.89332" length2="1.5" y1="3.94666" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.34228" width="10.8" height="4.56446" x="-5.4" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-27.3024" width="18" height="18.9601" x="-9" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-29.0579" width="3.9" height="1.75556" x="3.3" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-33.9735" width="6.3" height="4.91558" x="2.1" antialias="false"/>
+        <line x2="3" x1="3" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-32.9202" length2="1.5" y1="-29.7602" end2="none" antialias="false"/>
+        <line x2="8.7" x1="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-23.7912" length2="1.5" y1="-23.7912" end2="none" antialias="false"/>
+        <input text="1/2&quot;M" size="4" y="-4" tagg="label" rotate="true" x="5"/>
+        <terminal orientation="s" y="4.29777" x="0"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/purgador3_8m.elmt b/elements/60_energy/11_water/valves/purgador3_8m.elmt
index 4b1348918..22f0543fe 100644
--- a/elements/60_energy/11_water/valves/purgador3_8m.elmt
+++ b/elements/60_energy/11_water/valves/purgador3_8m.elmt
@@ -1,30 +1,31 @@
-<definition width="50" version="0.4" hotspot_x="15" hotspot_y="35" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{364D8CA2-E6DF-4D30-9D1E-2EB37A88C97C}"/><names>
-        <name lang="es">Purgador 3/8 Macho</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="14" height="50" hotspot_y="35" link_type="simple">
+    <uuid uuid="{31c907d3-73ad-4c15-a6ff-e9b3aec8fa6e}"/>
+    <names>
         <name lang="it">Sfiato 3/8 M</name>
         <name lang="pl">Odpowietrznik 3/8"</name>
         <name lang="cs">Odvětrávač 3/8"</name>
+        <name lang="es">Purgador 3/8 Macho</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="1.59253" x1="-2.11542" y2="0.771282" x2="3.25138"/>
-        <line 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.5961" x1="6.8" y2="-27.8811" x2="6.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="-24.5961" x1="8.55" y2="-27.8811" x2="8.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="-24.5961" x1="9.6" y2="-27.8811" 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="-24.5961" x1="5.05" y2="-27.8811" x2="5.05"/>
-        <rect width="5.81402" x="-2.33904" y="0.223785" antialias="false" height="6.02247" 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.68752" x1="-2.11542" y2="1.86628" x2="3.25138"/>
-        <line 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.15126" x1="-2.11542" y2="4.33001" x2="3.25138"/>
-        <line 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.05627" x1="-2.11542" y2="3.23502" x2="3.25138"/>
-        <line 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.24626" x1="-2.11542" y2="5.42501" x2="3.25138"/>
-        <rect width="12.6" x="-5.8" y="-2.3312" antialias="false" height="2.55499" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21" x="-10" y="-22.0411" antialias="false" height="19.7099" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.55" x="4.35" y="-23.8661" antialias="false" height="1.82499" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7.35" x="2.95" y="-28.9761" antialias="false" height="5.10997" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24.5961" x1="4" y2="-27.8811" 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="-18.3911" x1="-10" y2="-18.3911" x2="10.65"/>
-        <input x="9" y="0" size="4" rotate="true" text="3/8&quot;M"/>
-        <terminal x="0.567981" y="6.52" nameHidden="1" number="" name="" orientation="s"/>
+        <line x2="3.25138" x1="-2.11542" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0.771282" length2="1.5" y1="1.59253" end2="none" antialias="false"/>
+        <line x2="6.8" x1="6.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-27.8811" length2="1.5" y1="-24.5961" end2="none" antialias="false"/>
+        <line x2="8.55" x1="8.55" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-27.8811" length2="1.5" y1="-24.5961" end2="none" antialias="false"/>
+        <line x2="9.6" x1="9.6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-27.8811" length2="1.5" y1="-24.5961" end2="none" antialias="false"/>
+        <line x2="5.05" x1="5.05" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-27.8811" length2="1.5" y1="-24.5961" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.223785" width="5.81402" height="6.02247" x="-2.33904" antialias="false"/>
+        <line x2="3.25138" x1="-2.11542" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="1.86628" length2="1.5" y1="2.68752" end2="none" antialias="false"/>
+        <line x2="3.25138" x1="-2.11542" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.33001" length2="1.5" y1="5.15126" end2="none" antialias="false"/>
+        <line x2="3.25138" x1="-2.11542" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.23502" length2="1.5" y1="4.05627" end2="none" antialias="false"/>
+        <line x2="3.25138" x1="-2.11542" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.42501" length2="1.5" y1="6.24626" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2.3312" width="12.6" height="2.55499" x="-5.8" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-22.0411" width="21" height="19.7099" x="-10" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-23.8661" width="4.55" height="1.82499" x="4.35" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-28.9761" width="7.35" height="5.10997" x="2.95" antialias="false"/>
+        <line x2="4" x1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-27.8811" length2="1.5" y1="-24.5961" end2="none" antialias="false"/>
+        <line x2="10.65" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-18.3911" length2="1.5" y1="-18.3911" end2="none" antialias="false"/>
+        <input text="3/8&quot;M" size="4" y="0" tagg="label" rotate="true" x="9"/>
+        <terminal orientation="s" y="6.52" x="0.567981"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/racoralpex25-3_4.elmt b/elements/60_energy/11_water/valves/racoralpex25-3_4.elmt
index 57bbd2793..9ad83cb07 100644
--- a/elements/60_energy/11_water/valves/racoralpex25-3_4.elmt
+++ b/elements/60_energy/11_water/valves/racoralpex25-3_4.elmt
@@ -1,24 +1,25 @@
-<definition width="80" version="0.4" hotspot_x="36" hotspot_y="37" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{7B75650A-834B-48FE-B152-0F4DB8FAAC5A}"/><names>
-        <name lang="es">Rácor Alpex25-3/4</name>
+<definition orientation="dyyy" type="element" width="80" version="0.5" hotspot_x="36" height="70" hotspot_y="37" link_type="simple">
+    <uuid uuid="{e595c45e-f972-441f-9c2c-37f09171a1f9}"/>
+    <names>
         <name lang="it">Raccrodo Alpex25-3/4</name>
         <name lang="pl">Króciec Alpex 25-3/4"</name>
         <name lang="cs">Spojení Alpex 25-3/4"</name>
+        <name lang="es">Rácor Alpex25-3/4</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="12.42" x="-19.26" y="7.78229" antialias="true" height="21.0251" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="9.66" x="-6.84" y="-13.2428" antialias="false" height="18.397" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.46" x="-30.3" y="-25.0694" antialias="false" height="43.3643" 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.871" x1="-13.5167" y2="-15.871" x2="-29.1262"/>
-        <arc width="11.04" x="-17.88" y="-34.2679" antialias="true" height="18.397" 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="7.78229" x1="-29.0218" y2="7.78229" x2="-13.6296"/>
-        <arc width="9.66" x="-16.5" y="-15.871" antialias="true" height="23.6532" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-15.81" y="22.9196" size="4" rotate="true" text="rácor 25-3/4"/>
-        <rect width="26.22" x="2.82" y="-15.871" antialias="false" height="23.6532" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.28" x="29.04" y="-11.9287" antialias="false" height="15.7688" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-30.3" y="-4.04433" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="37.32" y="-4.04433" nameHidden="1" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="7.78229" width="12.42" height="21.0251" start="90" angle="-90" x="-19.26" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.2428" width="9.66" height="18.397" x="-6.84" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-25.0694" width="23.46" height="43.3643" x="-30.3" antialias="false"/>
+        <line x2="-29.1262" x1="-13.5167" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-15.871" length2="1.5" y1="-15.871" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-34.2679" width="11.04" height="18.397" start="0" angle="-90" x="-17.88" antialias="true"/>
+        <line x2="-13.6296" x1="-29.0218" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.78229" length2="1.5" y1="7.78229" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.871" width="9.66" height="23.6532" start="90" angle="-180" x="-16.5" antialias="true"/>
+        <input text="rácor 25-3/4" size="4" y="22.9196" tagg="label" rotate="true" x="-15.81"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.871" width="26.22" height="23.6532" x="2.82" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.9287" width="8.28" height="15.7688" x="29.04" antialias="false"/>
+        <terminal orientation="w" y="-4.04433" x="-30.3"/>
+        <terminal orientation="e" y="-4.04433" x="37.32"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/retencion1.elmt b/elements/60_energy/11_water/valves/retencion1.elmt
index e7e787abb..5df7f95aa 100644
--- a/elements/60_energy/11_water/valves/retencion1.elmt
+++ b/elements/60_energy/11_water/valves/retencion1.elmt
@@ -1,19 +1,20 @@
-<definition width="60" version="0.4" hotspot_x="26" hotspot_y="31" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A3B5F091-E075-4B73-B8FB-93BFBDC1109F}"/><names>
-        <name lang="es">Valv. retención 1"</name>
+<definition orientation="dyyy" type="element" width="60" version="0.5" hotspot_x="25" height="40" hotspot_y="19" link_type="simple">
+    <uuid uuid="{12bdf491-f29b-4393-8498-d9ea93104237}"/>
+    <names>
         <name lang="it">Valvola di ritegno 1"</name>
         <name lang="pl">Zawór zwrotny 1"</name>
         <name lang="cs">Zpětný ventil 1"</name>
+        <name lang="es">Valv. retención 1"</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="2.56903" x="25.047" y="-13.0542" antialias="false" height="26.2653" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="42.0269" x="-17.0434" y="-14.1898" antialias="true" height="29.3707" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.56903" x="-19.9111" y="-13.0542" antialias="false" height="26.2653" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.078426" x1="-4.49686" y2="0.078426" x2="10.9173"/>
-        <polygon x4="10.9173" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-2.83994" x1="10.9173" y2="2.99679" x2="10.9173" y3="0.078426" x3="16.0554" y4="-2.83994"/>
-        <input x="-12" y="-19" size="4" rotate="true" text="retención1&quot;"/>
-        <terminal x="-19.9111" y="0.078426" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="27.6161" y="0.078426" nameHidden="0" number="" name="" orientation="e"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.0542" width="2.56903" height="26.2653" x="25.047" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14.1898" width="42.0269" height="29.3707" x="-17.0434" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.0542" width="2.56903" height="26.2653" x="-19.9111" antialias="false"/>
+        <line x2="10.9173" x1="-4.49686" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0.078426" length2="1.5" y1="0.078426" end2="none" antialias="false"/>
+        <polygon x2="10.9173" x3="16.0554" x1="10.9173" style="line-style:normal;line-weight:normal;filling:black;color:black" x4="10.9173" y2="2.99679" y4="-2.83994" y1="-2.83994" y3="0.078426" antialias="false"/>
+        <input text="retención1&quot;" size="4" y="-19" tagg="label" rotate="true" x="-12"/>
+        <terminal orientation="w" y="0.078426" x="-19.9111"/>
+        <terminal orientation="e" y="0.078426" x="27.6161"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/retencion3_4.elmt b/elements/60_energy/11_water/valves/retencion3_4.elmt
index ca5cc1867..6f7cc1ad6 100644
--- a/elements/60_energy/11_water/valves/retencion3_4.elmt
+++ b/elements/60_energy/11_water/valves/retencion3_4.elmt
@@ -1,19 +1,20 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="33" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{5992E65C-CBFA-4AE6-966C-E501D06675E8}"/><names>
-        <name lang="es">Valv. retención 3/4</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="24" height="30" hotspot_y="15" link_type="simple">
+    <uuid uuid="{32db5603-95be-4bb1-b921-0fbb750ec97d}"/>
+    <names>
         <name lang="it">Valvola di ritegno 3/4</name>
         <name lang="pl">Zawór zwrotny 3/4"</name>
         <name lang="cs">Zpětný ventil 3/4"</name>
+        <name lang="es">Valv. retención 3/4</name>
     </names>
     <informations></informations>
     <description>
-        <rect width="2" x="17" y="-9" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="32.7181" x="-15.7675" y="-9.7782" antialias="true" height="20.1282" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-18" y="-9" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-6" y2="0" x2="6"/>
-        <polygon x4="6" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" y1="-2" x1="6" y2="2" x2="6" y3="0" x3="10" y4="-2"/>
-        <input x="-19" y="-16" size="4" rotate="true" text="retencion 3/4&quot;&#xa;"/>
-        <terminal x="-18" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="19" y="0" nameHidden="0" number="" name="" orientation="e"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="2" height="18" x="17" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.7782" width="32.7181" height="20.1282" x="-15.7675" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9" width="2" height="18" x="-18" antialias="false"/>
+        <line x2="6" x1="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="0" length2="1.5" y1="0" end2="none" antialias="false"/>
+        <polygon x2="6" x3="10" x1="6" style="line-style:normal;line-weight:normal;filling:black;color:black" x4="6" y2="2" y4="-2" y1="-2" y3="0" antialias="false"/>
+        <input text="retencion 3/4&quot;&#xa;" size="4" y="-16" tagg="label" rotate="true" x="-19"/>
+        <terminal orientation="w" y="0" x="-18"/>
+        <terminal orientation="e" y="0" x="19"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/tapon1.elmt b/elements/60_energy/11_water/valves/tapon1.elmt
index 4662c0219..b64859092 100644
--- a/elements/60_energy/11_water/valves/tapon1.elmt
+++ b/elements/60_energy/11_water/valves/tapon1.elmt
@@ -1,27 +1,28 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="29" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C0269EBE-DD1A-4DF5-BB01-127E136FDEC2}"/><names>
-        <name lang="es">Tapon 1</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="15" height="60" hotspot_y="23" link_type="simple">
+    <uuid uuid="{aa53fbde-f401-4ca2-a9ba-e2009b7f423b}"/>
+    <names>
         <name lang="it">Tappo 1"</name>
         <name lang="pl">Korek 1"</name>
         <name lang="cs">Uzávěr 1"</name>
+        <name lang="es">Tapon 1</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="9.44814" x="-1.4087" y="14.3859" antialias="true" height="11.1966" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="12.3202" x="8.1112" y="15.5055" antialias="true" height="17.9146" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="12.3202" x="-8.38462" y="-3.52865" antialias="false" height="17.9146" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="12.2056" x="8.22573" y="-12.4859" antialias="false" height="36.9487" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.64832" x1="16.9576" y2="-4.64832" x2="8.83644"/>
-        <arc width="10.9512" x="9.4801" y="-20.3236" antialias="true" height="15.6752" 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="15.5055" x1="8.89068" y2="15.5055" x2="16.8988"/>
-        <arc width="9.5823" x="10.849" y="-4.64832" antialias="true" height="20.1539" 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.52865" x1="0.23944" y2="14.3859" x2="-2.22458"/>
-        <line 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.409" x1="-2.22458" y2="13.2662" x2="-4.6886"/>
-        <line 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.52865" x1="2.70346" y2="14.3859" x2="0.23944"/>
-        <line 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.52865" x1="-4.6886" y2="14.3859" x2="-7.15262"/>
-        <arc width="7.88814" x="0.1513" y="-14.7252" antialias="true" height="11.1966" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <input x="-7" y="-15" size="4" rotate="true" text="tapón 1&quot;"/>
-        <terminal x="-8.6" y="5.82" nameHidden="1" number="" name="" orientation="w"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="14.3859" width="9.44814" height="11.1966" start="90" angle="-90" x="-1.4087" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="15.5055" width="12.3202" height="17.9146" start="90" angle="-90" x="8.1112" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.52865" width="12.3202" height="17.9146" x="-8.38462" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.4859" width="12.2056" height="36.9487" x="8.22573" antialias="false"/>
+        <line x2="8.83644" x1="16.9576" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.64832" length2="1.5" y1="-4.64832" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20.3236" width="10.9512" height="15.6752" start="0" angle="-90" x="9.4801" antialias="true"/>
+        <line x2="16.8988" x1="8.89068" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="15.5055" length2="1.5" y1="15.5055" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.64832" width="9.5823" height="20.1539" start="90" angle="-180" x="10.849" antialias="true"/>
+        <line x2="-2.22458" x1="0.23944" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14.3859" length2="1.5" y1="-3.52865" end2="none" antialias="false"/>
+        <line x2="-4.6886" x1="-2.22458" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="13.2662" length2="1.5" y1="-2.409" end2="none" antialias="false"/>
+        <line x2="0.23944" x1="2.70346" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14.3859" length2="1.5" y1="-3.52865" end2="none" antialias="false"/>
+        <line x2="-7.15262" x1="-4.6886" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14.3859" length2="1.5" y1="-3.52865" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14.7252" width="7.88814" height="11.1966" start="0" angle="-90" x="0.1513" antialias="true"/>
+        <input text="tapón 1&quot;" size="4" y="-15" tagg="label" rotate="true" x="-7"/>
+        <terminal orientation="w" y="5.82" x="-8.6"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/tapon1_2.elmt b/elements/60_energy/11_water/valves/tapon1_2.elmt
index 1a4cba4ff..2cabcaa59 100644
--- a/elements/60_energy/11_water/valves/tapon1_2.elmt
+++ b/elements/60_energy/11_water/valves/tapon1_2.elmt
@@ -1,27 +1,28 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="29" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{FBD91D04-694D-4FD5-AF91-B31EEFB5EB31}"/><names>
-        <name lang="es">Taapon 1/2"</name>
+<definition orientation="dyyy" type="element" width="30" version="0.5" hotspot_x="16" height="40" hotspot_y="20" link_type="simple">
+    <uuid uuid="{0ddbceb7-405e-4ced-8549-e9458d5ac0cd}"/>
+    <names>
         <name lang="it">Tappo 1/2</name>
         <name lang="pl">Korek 1/2"</name>
         <name lang="cs">Uzávěr 1/2"</name>
+        <name lang="es">Taapon 1/2"</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="6.0565" x="-5.0825" y="5.42182" antialias="true" height="7.39893" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="7.8975" x="1.02" y="6.16171" antialias="true" height="11.8383" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="7.8975" x="-9.55425" y="-6.41647" antialias="false" height="11.8383" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7.82408" x="1.09342" y="-12.3356" antialias="false" height="24.4165" 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.15637" x1="6.69078" y2="-7.15637" x2="1.4849"/>
-        <arc width="7.02" x="1.8975" y="-17.5149" antialias="true" height="10.3585" 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="6.16171" x1="1.51967" y2="6.16171" x2="6.6531"/>
-        <arc width="6.1425" x="2.775" y="-7.15637" antialias="true" height="13.3181" 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="-6.41647" x1="-4.026" y2="5.42182" x2="-5.6055"/>
-        <line 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.67658" x1="-5.6055" y2="4.68192" x2="-7.185"/>
-        <line 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.41647" x1="-2.4465" y2="5.42182" x2="-4.026"/>
-        <line 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.41647" x1="-7.185" y2="5.42182" x2="-8.7645"/>
-        <arc width="5.0565" x="-4.0825" y="-13.8154" antialias="true" height="7.39893" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <input x="-10" y="-18" size="4" rotate="true" text="tapon 1/2&quot;"/>
-        <terminal x="-10" y="0" nameHidden="1" number="" name="" orientation="w"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="5.42182" width="6.0565" height="7.39893" start="90" angle="-90" x="-5.0825" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="6.16171" width="7.8975" height="11.8383" start="90" angle="-90" x="1.02" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.41647" width="7.8975" height="11.8383" x="-9.55425" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.3356" width="7.82408" height="24.4165" x="1.09342" antialias="false"/>
+        <line x2="1.4849" x1="6.69078" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-7.15637" length2="1.5" y1="-7.15637" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-17.5149" width="7.02" height="10.3585" start="0" angle="-90" x="1.8975" antialias="true"/>
+        <line x2="6.6531" x1="1.51967" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.16171" length2="1.5" y1="6.16171" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.15637" width="6.1425" height="13.3181" start="90" angle="-180" x="2.775" antialias="true"/>
+        <line x2="-5.6055" x1="-4.026" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.42182" length2="1.5" y1="-6.41647" end2="none" antialias="false"/>
+        <line x2="-7.185" x1="-5.6055" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.68192" length2="1.5" y1="-5.67658" end2="none" antialias="false"/>
+        <line x2="-4.026" x1="-2.4465" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.42182" length2="1.5" y1="-6.41647" end2="none" antialias="false"/>
+        <line x2="-8.7645" x1="-7.185" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.42182" length2="1.5" y1="-6.41647" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.8154" width="5.0565" height="7.39893" start="0" angle="-90" x="-4.0825" antialias="true"/>
+        <input text="tapon 1/2&quot;" size="4" y="-18" tagg="label" rotate="true" x="-10"/>
+        <terminal orientation="w" y="0" x="-10"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/tapon3_4.elmt b/elements/60_energy/11_water/valves/tapon3_4.elmt
index 8ba07a1ce..1a4245c27 100644
--- a/elements/60_energy/11_water/valves/tapon3_4.elmt
+++ b/elements/60_energy/11_water/valves/tapon3_4.elmt
@@ -1,27 +1,28 @@
-<definition width="40" version="0.4" hotspot_x="14" hotspot_y="33" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1B647F76-3DB7-4F48-984C-8AB1C127B9D3}"/><names>
-        <name lang="es">Tapon 3/4</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="17" height="50" hotspot_y="24" link_type="simple">
+    <uuid uuid="{8305b27e-c83c-4f92-b3f8-0fad9c4ea0ef}"/>
+    <names>
         <name lang="it">Tappo 3/4</name>
         <name lang="pl">Korek 3/4"</name>
         <name lang="cs">Uzávěr 3/4"</name>
+        <name lang="es">Tapon 3/4</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="7.87345" x="-3.00725" y="7.13821" antialias="true" height="9.33047" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="10.2668" x="4.926" y="8.07125" antialias="true" height="14.9288" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="10.2668" x="-8.82052" y="-7.79054" antialias="false" height="14.9288" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.1713" x="5.02144" y="-15.2549" antialias="false" height="30.7906" 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.7236" x1="12.298" y2="-8.7236" x2="5.53037"/>
-        <arc width="9.126" x="6.06675" y="-21.7863" antialias="true" height="13.0627" 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.07125" x1="5.57557" y2="8.07125" x2="12.249"/>
-        <arc width="7.98525" x="7.2075" y="-8.7236" antialias="true" height="16.7949" 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="-7.79054" x1="-1.6338" y2="7.13821" x2="-3.68715"/>
-        <line 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.8575" x1="-3.68715" y2="6.20515" x2="-5.7405"/>
-        <line 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.79054" x1="0.41955" y2="7.13821" x2="-1.6338"/>
-        <line 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.79054" x1="-5.7405" y2="7.13821" x2="-7.79385"/>
-        <arc width="6.57345" x="-1.70725" y="-17.121" antialias="true" height="9.33047" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <input x="-8" y="-21" size="4" rotate="true" text="tapón 3/4&quot;"/>
-        <terminal x="-9" y="0" nameHidden="1" number="" name="" orientation="w"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="7.13821" width="7.87345" height="9.33047" start="90" angle="-90" x="-3.00725" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="8.07125" width="10.2668" height="14.9288" start="90" angle="-90" x="4.926" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.79054" width="10.2668" height="14.9288" x="-8.82052" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.2549" width="10.1713" height="30.7906" x="5.02144" antialias="false"/>
+        <line x2="5.53037" x1="12.298" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8.7236" length2="1.5" y1="-8.7236" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.7863" width="9.126" height="13.0627" start="0" angle="-90" x="6.06675" antialias="true"/>
+        <line x2="12.249" x1="5.57557" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="8.07125" length2="1.5" y1="8.07125" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.7236" width="7.98525" height="16.7949" start="90" angle="-180" x="7.2075" antialias="true"/>
+        <line x2="-3.68715" x1="-1.6338" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.13821" length2="1.5" y1="-7.79054" end2="none" antialias="false"/>
+        <line x2="-5.7405" x1="-3.68715" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.20515" length2="1.5" y1="-6.8575" end2="none" antialias="false"/>
+        <line x2="-1.6338" x1="0.41955" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.13821" length2="1.5" y1="-7.79054" end2="none" antialias="false"/>
+        <line x2="-7.79385" x1="-5.7405" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.13821" length2="1.5" y1="-7.79054" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-17.121" width="6.57345" height="9.33047" start="0" angle="-90" x="-1.70725" antialias="true"/>
+        <input text="tapón 3/4&quot;" size="4" y="-21" tagg="label" rotate="true" x="-8"/>
+        <terminal orientation="w" y="0" x="-9"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/te-rosca-3_4.elmt b/elements/60_energy/11_water/valves/te-rosca-3_4.elmt
index 1d26c4426..7babbdac9 100644
--- a/elements/60_energy/11_water/valves/te-rosca-3_4.elmt
+++ b/elements/60_energy/11_water/valves/te-rosca-3_4.elmt
@@ -1,44 +1,46 @@
-<definition width="70" version="0.4" hotspot_x="35" hotspot_y="31" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{941F851D-6FBC-4F46-860F-475C52F44072}"/><names>
-        <name lang="es">Te roscar3/4</name>
+<definition orientation="dyyy" type="element" width="70" version="0.5" hotspot_x="35" height="50" hotspot_y="31" link_type="simple">
+    <uuid uuid="{cb9d3d44-af80-4040-8759-aae785690289}"/>
+    <names>
         <name lang="it">T filettato 3/4</name>
         <name lang="pl">Trójnik 3/4"</name>
         <name lang="cs">Téčko se závitem 3/4"</name>
+        <name lang="es">Te roscar3/4</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="6" x="13" y="-14" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="6" x="-21" y="-14" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="10" x="19" y="-11.472" antialias="false" height="24.8393" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="6" x="-16" y="-17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="6" x="13" y="10" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="10" x="-31" y="-11.472" antialias="false" height="24.8393" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7.8197" x="20.1803" y="-7" antialias="false" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="6" x="-21" y="10" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="22.1402" y2="-7" x2="25.0801"/>
-        <rect width="7.8197" x="-29.8197" y="-7" antialias="false" height="15" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="24" x="-13" y="-27.472" antialias="false" height="9.8393" 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="8" x1="24.1002" y2="-7" x2="28.02"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="20.1803" y2="-7" x2="23.1202"/>
-        <arc width="6" x="8" y="-17" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <rect width="18" x="-10" y="-25.042" antialias="false" height="6.04203" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-22.7763" x1="-10" y2="-24.2868" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-21.2658" x1="-10" y2="-22.7763" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-19.7553" x1="-10" y2="-21.2658" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="-27.8598" y2="-7" x2="-24.9199"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="-25.8998" y2="-7" x2="-21.98"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8" x1="-29.8197" y2="-7" x2="-26.8798"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-18" y2="10" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-18" y2="-8" x2="-11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="8.90512" y2="-8" x2="16.1028"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14" x1="-10" 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="-14" x1="8" 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="-8" x1="8" y2="-3" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="-10" y2="-3" x2="-4"/>
-        <text x="-8" y="6" size="4" text="Te 3/4&quot;H"/>
-        <terminal x="-30" y="1" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-1" y="-27" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="29" y="1" nameHidden="1" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14" width="6" height="6" start="0" angle="-90" x="13" antialias="true"/>
+        <input text="_" size="9" y="15.55" tagg="label" rotate="true" x="-7"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14" width="6" height="6" start="-90" angle="-90" x="-21" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.472" width="10" height="24.8393" x="19" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-17" width="6" height="6" start="90" angle="-90" x="-16" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="10" width="6" height="6" start="90" angle="-90" x="13" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.472" width="10" height="24.8393" x="-31" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-7" width="7.8197" height="15" x="20.1803" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="10" width="6" height="6" start="-180" angle="-90" x="-21" antialias="true"/>
+        <line x2="25.0801" x1="22.1402" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="8" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-7" width="7.8197" height="15" x="-29.8197" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-27.472" width="24" height="9.8393" x="-13" antialias="false"/>
+        <line x2="28.02" x1="24.1002" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="8" end2="none" antialias="false"/>
+        <line x2="23.1202" x1="20.1803" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="8" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-17" width="6" height="6" start="-180" angle="-90" x="8" antialias="true"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-25.042" width="18" height="6.04203" x="-10" antialias="false"/>
+        <line x2="8" x1="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-24.2868" length2="1.5" y1="-22.7763" end2="none" antialias="false"/>
+        <line x2="8" x1="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-22.7763" length2="1.5" y1="-21.2658" end2="none" antialias="false"/>
+        <line x2="8" x1="-10" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-21.2658" length2="1.5" y1="-19.7553" end2="none" antialias="false"/>
+        <line x2="-24.9199" x1="-27.8598" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="8" end2="none" antialias="false"/>
+        <line x2="-21.98" x1="-25.8998" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="8" end2="none" antialias="false"/>
+        <line x2="-26.8798" x1="-29.8197" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-7" length2="1.5" y1="8" end2="none" antialias="false"/>
+        <line x2="15" x1="-18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="10" length2="1.5" y1="10" end2="none" antialias="false"/>
+        <line x2="-11" x1="-18" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8" length2="1.5" y1="-8" end2="none" antialias="false"/>
+        <line x2="16.1028" x1="8.90512" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8" length2="1.5" y1="-8" end2="none" antialias="false"/>
+        <line x2="-10" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8" length2="1.5" y1="-14" end2="none" antialias="false"/>
+        <line x2="8" x1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8" length2="1.5" y1="-14" end2="none" antialias="false"/>
+        <line x2="2" x1="8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3" length2="1.5" y1="-8" end2="none" antialias="false"/>
+        <line x2="-4" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3" length2="1.5" y1="-8" end2="none" antialias="false"/>
+        <text text="Te 3/4&quot;H" size="4" y="6" x="-8"/>
+        <terminal orientation="w" y="1" x="-30"/>
+        <terminal orientation="e" y="1" x="29"/>
+        <terminal orientation="n" y="-27" x="-1"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/te-rosca1.elmt b/elements/60_energy/11_water/valves/te-rosca1.elmt
index 8e083ecdd..0f0e93fee 100644
--- a/elements/60_energy/11_water/valves/te-rosca1.elmt
+++ b/elements/60_energy/11_water/valves/te-rosca1.elmt
@@ -1,44 +1,46 @@
-<definition width="80" version="0.4" hotspot_x="41" hotspot_y="38" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EC32A56C-6F65-4404-A24A-5400B5398E7A}"/><names>
-        <name lang="es">Te roscar 1"</name>
+<definition orientation="dyyy" type="element" width="80" version="0.5" hotspot_x="40" height="60" hotspot_y="39" link_type="simple">
+    <uuid uuid="{fb6be142-e174-44fc-bc83-cb45bcba43ca}"/>
+    <names>
         <name lang="it">T filettato 1"</name>
         <name lang="pl">Trójnik 1"</name>
         <name lang="cs">Téčko se závitem 1"</name>
+        <name lang="es">Te roscar 1"</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="6.72" x="14.56" y="-18.2615" antialias="true" height="7.4523" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="6.72" x="-23.52" y="-18.2615" antialias="true" height="7.4523" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="11.2" x="21.28" y="-15.1216" antialias="false" height="30.8517" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="6.72" x="-17.92" y="-21.9877" antialias="true" height="7.4523" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="6.72" x="14.56" y="11.5477" antialias="true" height="7.4523" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="11.2" x="-34.72" y="-15.1216" antialias="false" height="30.8517" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.75806" x="22.6019" y="-9.56716" antialias="false" height="18.6308" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="6.72" x="-23.52" y="11.5477" antialias="true" height="7.4523" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <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="9.0636" x1="24.797" y2="-9.56716" x2="28.0897"/>
-        <rect width="8.75806" x="-33.3981" y="-9.56716" antialias="false" height="18.6308" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="26.88" x="-14.56" y="-34.9944" antialias="false" height="12.2209" 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="9.0636" x1="26.9922" y2="-9.56716" x2="31.3824"/>
-        <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="9.0636" x1="22.6019" y2="-9.56716" x2="25.8946"/>
-        <arc width="6.72" x="8.96" y="-21.9877" antialias="true" height="7.4523" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <rect width="20.16" x="-11.2" y="-31.9762" antialias="false" height="7.50451" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-29.1621" x1="-11.2" y2="-31.0382" x2="8.96"/>
-        <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.286" x1="-11.2" y2="-29.1621" x2="8.96"/>
-        <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.4099" x1="-11.2" y2="-27.286" x2="8.96"/>
-        <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="9.0636" x1="-31.203" y2="-9.56716" x2="-27.9103"/>
-        <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="9.0636" x1="-29.0078" y2="-9.56716" x2="-24.6176"/>
-        <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="9.0636" x1="-33.3981" y2="-9.56716" x2="-30.1054"/>
-        <line 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.5477" x1="-20.16" y2="11.5477" x2="16.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.8092" x1="-20.16" y2="-10.8092" x2="-12.32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.8092" x1="9.97373" y2="-10.8092" x2="18.0351"/>
-        <line 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.2615" x1="-11.2" y2="-10.8092" x2="-11.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="-18.2615" x1="8.96" y2="-10.8092" x2="8.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="-10.8092" x1="8.96" y2="-4.59896" x2="2.24"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.8092" x1="-11.2" y2="-4.59896" x2="-4.48"/>
-        <text x="-19" y="6" size="4" text="Te 1&quot;H"/>
-        <terminal x="-33.6" y="0.369246" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-1.12" y="-34.4082" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="32.48" y="0.369246" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="10.55" tagg="label" rotate="true" x="-7"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-18.2615" width="6.72" height="7.4523" start="0" angle="-90" x="14.56" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-18.2615" width="6.72" height="7.4523" start="-90" angle="-90" x="-23.52" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.1216" width="11.2" height="30.8517" x="21.28" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.9877" width="6.72" height="7.4523" start="90" angle="-90" x="-17.92" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="11.5477" width="6.72" height="7.4523" start="90" angle="-90" x="14.56" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.1216" width="11.2" height="30.8517" x="-34.72" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-9.56716" width="8.75806" height="18.6308" x="22.6019" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="11.5477" width="6.72" height="7.4523" start="-180" angle="-90" x="-23.52" antialias="true"/>
+        <line x2="28.0897" x1="24.797" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-9.56716" length2="1.5" y1="9.0636" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-9.56716" width="8.75806" height="18.6308" x="-33.3981" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-34.9944" width="26.88" height="12.2209" x="-14.56" antialias="false"/>
+        <line x2="31.3824" x1="26.9922" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-9.56716" length2="1.5" y1="9.0636" end2="none" antialias="false"/>
+        <line x2="25.8946" x1="22.6019" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-9.56716" length2="1.5" y1="9.0636" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.9877" width="6.72" height="7.4523" start="-180" angle="-90" x="8.96" antialias="true"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-31.9762" width="20.16" height="7.50451" x="-11.2" antialias="false"/>
+        <line x2="8.96" x1="-11.2" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-31.0382" length2="1.5" y1="-29.1621" end2="none" antialias="false"/>
+        <line x2="8.96" x1="-11.2" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-29.1621" length2="1.5" y1="-27.286" end2="none" antialias="false"/>
+        <line x2="8.96" x1="-11.2" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-27.286" length2="1.5" y1="-25.4099" end2="none" antialias="false"/>
+        <line x2="-27.9103" x1="-31.203" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-9.56716" length2="1.5" y1="9.0636" end2="none" antialias="false"/>
+        <line x2="-24.6176" x1="-29.0078" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-9.56716" length2="1.5" y1="9.0636" end2="none" antialias="false"/>
+        <line x2="-30.1054" x1="-33.3981" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-9.56716" length2="1.5" y1="9.0636" end2="none" antialias="false"/>
+        <line x2="16.8" x1="-20.16" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="11.5477" length2="1.5" y1="11.5477" end2="none" antialias="false"/>
+        <line x2="-12.32" x1="-20.16" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10.8092" length2="1.5" y1="-10.8092" end2="none" antialias="false"/>
+        <line x2="18.0351" x1="9.97373" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10.8092" length2="1.5" y1="-10.8092" end2="none" antialias="false"/>
+        <line x2="-11.2" x1="-11.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10.8092" length2="1.5" y1="-18.2615" end2="none" antialias="false"/>
+        <line x2="8.96" x1="8.96" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-10.8092" length2="1.5" y1="-18.2615" end2="none" antialias="false"/>
+        <line x2="2.24" x1="8.96" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.59896" length2="1.5" y1="-10.8092" end2="none" antialias="false"/>
+        <line x2="-4.48" x1="-11.2" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.59896" length2="1.5" y1="-10.8092" end2="none" antialias="false"/>
+        <text text="Te 1&quot;H" size="4" y="6" x="-19"/>
+        <terminal orientation="e" y="0.369246" x="32.48"/>
+        <terminal orientation="n" y="-34.4082" x="-1.12"/>
+        <terminal orientation="w" y="0.369246" x="-33.6"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/te-rosca1_2.elmt b/elements/60_energy/11_water/valves/te-rosca1_2.elmt
index 448bdda1e..5aeadeba6 100644
--- a/elements/60_energy/11_water/valves/te-rosca1_2.elmt
+++ b/elements/60_energy/11_water/valves/te-rosca1_2.elmt
@@ -1,44 +1,46 @@
-<definition width="60" version="0.4" hotspot_x="29" hotspot_y="25" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F9E08E9D-ADA6-4EB2-AE0E-2DE916F2B412}"/><names>
-        <name lang="es">Te roscar1/2</name>
+<definition orientation="dyyy" type="element" width="60" version="0.5" hotspot_x="30" height="40" hotspot_y="25" link_type="simple">
+    <uuid uuid="{00425959-78bc-4e42-b5d4-bf075837bd4e}"/>
+    <names>
         <name lang="it">T Filettato 1/2</name>
         <name lang="pl">Trójnik 1/2"</name>
         <name lang="cs">Téčko se závitem 1/2"</name>
+        <name lang="es">Te roscar1/2</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <arc width="4.8" x="11" y="-10.8333" antialias="true" height="4.56667" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="4.8" x="-16.2" y="-10.8333" antialias="true" height="4.56667" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="8" x="15.8" y="-8.90924" antialias="false" height="18.9055" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="4.8" x="-12.2" y="-13.1167" antialias="true" height="4.56667" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="4.8" x="11" y="7.43333" antialias="true" height="4.56667" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="8" x="-24.2" y="-8.90924" antialias="false" height="18.9055" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.25576" x="16.7442" y="-5.50556" antialias="false" height="11.4167" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="4.8" x="-16.2" y="7.43333" antialias="true" height="4.56667" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.91111" x1="18.3122" y2="-5.50556" x2="20.6641"/>
-        <rect width="6.25576" x="-23.2558" y="-5.50556" antialias="false" height="11.4167" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="19.2" x="-9.8" y="-21.087" antialias="false" height="7.4888" 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="5.91111" x1="19.8802" y2="-5.50556" x2="23.016"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.91111" x1="16.7442" y2="-5.50556" x2="19.0962"/>
-        <arc width="4.8" x="7" y="-13.1167" antialias="true" height="4.56667" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <rect width="14.4" x="-7.4" y="-19.2375" antialias="false" height="4.59866" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-17.5131" x1="-7.4" y2="-18.6627" 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="-16.3634" x1="-7.4" y2="-17.5131" 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="-15.2138" x1="-7.4" y2="-16.3634" 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="5.91111" x1="-21.6878" y2="-5.50556" x2="-19.3359"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.91111" x1="-20.1198" y2="-5.50556" x2="-16.984"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.91111" x1="-23.2558" y2="-5.50556" x2="-20.9038"/>
-        <line 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.43333" x1="-13.8" y2="7.43333" x2="12.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="-6.26667" x1="-13.8" y2="-6.26667" x2="-8.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="-6.26667" x1="7.7241" y2="-6.26667" x2="13.4822"/>
-        <line 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.8333" x1="-7.4" y2="-6.26667" x2="-7.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10.8333" x1="7" y2="-6.26667" 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="-6.26667" x1="7" y2="-2.46111" 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="-6.26667" x1="-7.4" y2="-2.46111" x2="-2.6"/>
-        <text x="-14" y="5" size="4" text="Te 1/2&quot;H"/>
-        <terminal x="-23.4" y="0.583333" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-0.2" y="-20.7278" nameHidden="1" number="" name="" orientation="n"/>
-        <terminal x="23.8" y="0.583333" nameHidden="1" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="4.55" tagg="label" rotate="true" x="-7"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.8333" width="4.8" height="4.56667" start="0" angle="-90" x="11" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.8333" width="4.8" height="4.56667" start="-90" angle="-90" x="-16.2" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.90924" width="8" height="18.9055" x="15.8" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.1167" width="4.8" height="4.56667" start="90" angle="-90" x="-12.2" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="7.43333" width="4.8" height="4.56667" start="90" angle="-90" x="11" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.90924" width="8" height="18.9055" x="-24.2" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-5.50556" width="6.25576" height="11.4167" x="16.7442" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="7.43333" width="4.8" height="4.56667" start="-180" angle="-90" x="-16.2" antialias="true"/>
+        <line x2="20.6641" x1="18.3122" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-5.50556" length2="1.5" y1="5.91111" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-5.50556" width="6.25576" height="11.4167" x="-23.2558" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.087" width="19.2" height="7.4888" x="-9.8" antialias="false"/>
+        <line x2="23.016" x1="19.8802" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-5.50556" length2="1.5" y1="5.91111" end2="none" antialias="false"/>
+        <line x2="19.0962" x1="16.7442" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-5.50556" length2="1.5" y1="5.91111" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.1167" width="4.8" height="4.56667" start="-180" angle="-90" x="7" antialias="true"/>
+        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-19.2375" width="14.4" height="4.59866" x="-7.4" antialias="false"/>
+        <line x2="7" x1="-7.4" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-18.6627" length2="1.5" y1="-17.5131" end2="none" antialias="false"/>
+        <line x2="7" x1="-7.4" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-17.5131" length2="1.5" y1="-16.3634" end2="none" antialias="false"/>
+        <line x2="7" x1="-7.4" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-16.3634" length2="1.5" y1="-15.2138" end2="none" antialias="false"/>
+        <line x2="-19.3359" x1="-21.6878" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-5.50556" length2="1.5" y1="5.91111" end2="none" antialias="false"/>
+        <line x2="-16.984" x1="-20.1198" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-5.50556" length2="1.5" y1="5.91111" end2="none" antialias="false"/>
+        <line x2="-20.9038" x1="-23.2558" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end1="none" y2="-5.50556" length2="1.5" y1="5.91111" end2="none" antialias="false"/>
+        <line x2="12.6" x1="-13.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.43333" length2="1.5" y1="7.43333" end2="none" antialias="false"/>
+        <line x2="-8.2" x1="-13.8" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.26667" length2="1.5" y1="-6.26667" end2="none" antialias="false"/>
+        <line x2="13.4822" x1="7.7241" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.26667" length2="1.5" y1="-6.26667" end2="none" antialias="false"/>
+        <line x2="-7.4" x1="-7.4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.26667" length2="1.5" y1="-10.8333" end2="none" antialias="false"/>
+        <line x2="7" x1="7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-6.26667" length2="1.5" y1="-10.8333" end2="none" antialias="false"/>
+        <line x2="2.2" x1="7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-2.46111" length2="1.5" y1="-6.26667" end2="none" antialias="false"/>
+        <line x2="-2.6" x1="-7.4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-2.46111" length2="1.5" y1="-6.26667" end2="none" antialias="false"/>
+        <text text="Te 1/2&quot;H" size="4" y="5" x="-14"/>
+        <terminal orientation="e" y="0.583333" x="23.8"/>
+        <terminal orientation="n" y="-20.7278" x="-0.2"/>
+        <terminal orientation="w" y="0.583333" x="-23.4"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/valv-bola1-m-m.elmt b/elements/60_energy/11_water/valves/valv-bola1-m-m.elmt
index 9250981b6..bc4cf3780 100644
--- a/elements/60_energy/11_water/valves/valv-bola1-m-m.elmt
+++ b/elements/60_energy/11_water/valves/valv-bola1-m-m.elmt
@@ -1,41 +1,43 @@
-<definition width="90" version="0.4" hotspot_x="44" hotspot_y="36" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B61110F8-FE27-4D85-9AE3-4446D55C9094}"/><names>
-        <name lang="es">Valv bola 1"M-M</name>
+<definition orientation="dyyy" type="element" width="90" version="0.5" hotspot_x="44" height="70" hotspot_y="36" link_type="simple">
+    <uuid uuid="{749c5514-592d-4bbd-b0b4-e4f6d008dce9}"/>
+    <names>
         <name lang="it">Valvola a sfera 1/2 M-M</name>
         <name lang="pl">Zawór kulowy 1"</name>
         <name lang="cs">Kulový ventil 1"</name>
+        <name lang="es">Valv bola 1"M-M</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="26.312" x="-11.888" y="-20.8113" antialias="true" height="19.8824" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="3.289" x="14.424" y="-10.3468" antialias="false" height="19.8824" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.578" x="17.713" y="-16.6254" antialias="false" height="33.4862" 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="10.582" x1="-25.044" y2="-10.3468" x2="-27.5108"/>
-        <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="11.6284" x1="39.9138" y2="-9.30039" x2="37.447"/>
-        <line 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.25394" x1="17.8853" y2="-8.25394" x2="23.641"/>
-        <line 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.44269" x1="18.3473" y2="7.44269" x2="23.6724"/>
-        <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="11.6284" x1="36.6248" y2="-9.30039" x2="34.158"/>
-        <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="10.582" x1="-28.333" y2="-10.3468" x2="-30.7998"/>
-        <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="10.582" x1="-35.7332" y2="-10.3468" x2="-38.2"/>
-        <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="11.6284" x1="29.2245" y2="-9.30039" x2="26.7578"/>
-        <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="10.582" x1="-32.4443" y2="-10.3468" x2="-34.911"/>
-        <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="11.6284" x1="32.5135" y2="-9.30039" x2="30.0467"/>
-        <rect width="13.156" x="26.7578" y="-8.25394" antialias="false" height="19.8824" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="13.156" x="-38.2" y="-9.30039" antialias="false" height="19.8824" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="15.6227" x="24.291" y="-10.3468" antialias="false" height="24.0681" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.6228" x="-38.2" y="-11.3933" antialias="false" height="24.0681" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.578" x="-22.5772" y="-16.6254" antialias="false" height="33.4862" 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.25394" x1="-21.9273" y2="-8.25394" x2="-16.1715"/>
-        <line 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.44269" x1="-21.943" y2="7.44269" x2="-16.6179"/>
-        <arc width="26.312" x="-11.888" y="0.117605" antialias="true" height="19.8824" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <rect width="11.5115" x="-4.48775" y="-26.0434" antialias="false" height="5.23222" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="40.2903" x="-3.6655" y="-33.3686" antialias="false" height="3.13933" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.289" x="-0.3765" y="-30.2293" antialias="false" height="4.18577" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.11125" x="-15.9992" y="-10.3468" antialias="false" height="19.8824" 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="-25.3991" x1="-1.19875" y2="-21.2134" x2="-1.19875"/>
-        <line 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.9575" x1="4.557" y2="-21.3065" x2="4.557"/>
-        <text x="-9" y="28" size="4" text="1&quot; MM"/>
-        <terminal x="-38.2" y="0.117605" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="39.9138" y="0.117605" nameHidden="0" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="30.55" tagg="label" rotate="true" x="-7"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20.8113" width="26.312" height="19.8824" start="-180" angle="-180" x="-11.888" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.3468" width="3.289" height="19.8824" x="14.424" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-16.6254" width="6.578" height="33.4862" x="17.713" antialias="false"/>
+        <line x2="-27.5108" x1="-25.044" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-10.3468" length2="1.5" y1="10.582" end2="none" antialias="false"/>
+        <line x2="37.447" x1="39.9138" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-9.30039" length2="1.5" y1="11.6284" end2="none" antialias="false"/>
+        <line x2="23.641" x1="17.8853" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8.25394" length2="1.5" y1="-8.25394" end2="none" antialias="false"/>
+        <line x2="23.6724" x1="18.3473" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.44269" length2="1.5" y1="7.44269" end2="none" antialias="false"/>
+        <line x2="34.158" x1="36.6248" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-9.30039" length2="1.5" y1="11.6284" end2="none" antialias="false"/>
+        <line x2="-30.7998" x1="-28.333" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-10.3468" length2="1.5" y1="10.582" end2="none" antialias="false"/>
+        <line x2="-38.2" x1="-35.7332" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-10.3468" length2="1.5" y1="10.582" end2="none" antialias="false"/>
+        <line x2="26.7578" x1="29.2245" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-9.30039" length2="1.5" y1="11.6284" end2="none" antialias="false"/>
+        <line x2="-34.911" x1="-32.4443" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-10.3468" length2="1.5" y1="10.582" end2="none" antialias="false"/>
+        <line x2="30.0467" x1="32.5135" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-9.30039" length2="1.5" y1="11.6284" end2="none" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-8.25394" width="13.156" height="19.8824" x="26.7578" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-9.30039" width="13.156" height="19.8824" x="-38.2" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.3468" width="15.6227" height="24.0681" x="24.291" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.3933" width="15.6228" height="24.0681" x="-38.2" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-16.6254" width="6.578" height="33.4862" x="-22.5772" antialias="false"/>
+        <line x2="-16.1715" x1="-21.9273" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-8.25394" length2="1.5" y1="-8.25394" end2="none" antialias="false"/>
+        <line x2="-16.6179" x1="-21.943" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.44269" length2="1.5" y1="7.44269" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.117605" width="26.312" height="19.8824" start="0" angle="-180" x="-11.888" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-26.0434" width="11.5115" height="5.23222" x="-4.48775" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-33.3686" width="40.2903" height="3.13933" x="-3.6655" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-30.2293" width="3.289" height="4.18577" x="-0.3765" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.3468" width="4.11125" height="19.8824" x="-15.9992" antialias="false"/>
+        <line x2="-1.19875" x1="-1.19875" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-21.2134" length2="1.5" y1="-25.3991" end2="none" antialias="false"/>
+        <line x2="4.557" x1="4.557" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-21.3065" length2="1.5" y1="-25.9575" end2="none" antialias="false"/>
+        <text text="1&quot; MM" size="4" y="28" x="-9"/>
+        <terminal orientation="w" y="0.117605" x="-38.2"/>
+        <terminal orientation="e" y="0.117605" x="39.9138"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/valv-bola1_2h-h.elmt b/elements/60_energy/11_water/valves/valv-bola1_2h-h.elmt
index ad561d24e..73886f7f5 100644
--- a/elements/60_energy/11_water/valves/valv-bola1_2h-h.elmt
+++ b/elements/60_energy/11_water/valves/valv-bola1_2h-h.elmt
@@ -1,39 +1,41 @@
-<definition width="50" version="0.4" hotspot_x="23" hotspot_y="18" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A11DC7E9-6747-4CA8-A1DB-7E08BC56F8B9}"/><names>
-        <name lang="es">Valv bola 1/2H-H</name>
+<definition orientation="dyyy" type="element" width="60" version="0.5" hotspot_x="28" height="40" hotspot_y="17" link_type="simple">
+    <uuid uuid="{c0fce429-1d1d-4a87-8afc-3f8425f16e0a}"/>
+    <names>
         <name lang="it">Valvola a sfera 1/2 F-F</name>
         <name lang="pl">Zawór kulowy 1/2"</name>
         <name lang="cs">Kulový ventil 1/2"</name>
+        <name lang="es">Valv bola 1/2H-H</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="16.8" x="-6.5" y="-8.75712" antialias="true" height="8.6509" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="4.2" x="12.925" y="3.99156" antialias="true" height="3.18718" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4.2" x="-13.325" y="3.99156" antialias="true" height="3.18718" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="10.5" x="12.925" y="-6.48062" antialias="false" height="13.6594" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.625" x="10.3" y="-4.20404" antialias="false" height="8.6509" 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.29341" x1="15.4054" y2="-3.29341" x2="23.0566"/>
-        <line 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.99156" x1="15.4131" y2="3.99156" x2="23.0483"/>
-        <arc width="4.2" x="12.925" y="-3.29341" antialias="true" height="7.28496" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="4.2" x="12.925" y="-6.48062" antialias="true" height="3.18718" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="10.5" x="-19.625" y="-6.48062" antialias="false" height="13.6594" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="16.8" x="-6.5" y="0.349076" antialias="true" height="8.6509" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <rect width="7.35" x="-1.775" y="-11.0337" antialias="false" height="2.27656" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="25.725" x="-1.25" y="-14.2209" antialias="false" height="1.36594" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.1" x="0.85" y="-12.8549" antialias="false" height="1.82124" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.625" x="-9.125" y="-4.20404" antialias="false" height="8.6509" 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.0337" x1="0.325" y2="-9.21244" x2="0.325"/>
-        <line 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.0337" x1="4" y2="-9.21244" 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="-3.29341" x1="-19.2446" y2="-3.29341" x2="-11.5934"/>
-        <line 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.99156" x1="-19.237" y2="3.99156" x2="-11.6017"/>
-        <arc width="4.2" x="-13.325" y="-3.29341" antialias="true" height="7.28496" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="4.2" x="-13.325" y="-6.48062" antialias="true" height="3.18718" 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="-6.48062" x1="-19.1" y2="-3.29341" x2="-19.625"/>
-        <line 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.99156" x1="-19.625" y2="7.17874" x2="-19.1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.48062" x1="22.9" y2="-3.29341" x2="23.425"/>
-        <line 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.99156" x1="23.425" y2="7.17874" x2="22.9"/>
-        <text x="-7" y="16" size="4" text="1/2&quot;HH"/>
-        <terminal x="-19.1" y="0.349076" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="22.9" y="0.349076" nameHidden="0" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="15.55" tagg="label" rotate="true" x="-2"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.75712" width="16.8" height="8.6509" start="-180" angle="-180" x="-6.5" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="3.99156" width="4.2" height="3.18718" start="-90" angle="-180" x="12.925" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="3.99156" width="4.2" height="3.18718" start="90" angle="-180" x="-13.325" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.48062" width="10.5" height="13.6594" x="12.925" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.20404" width="2.625" height="8.6509" x="10.3" antialias="false"/>
+        <line x2="23.0566" x1="15.4054" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3.29341" length2="1.5" y1="-3.29341" end2="none" antialias="false"/>
+        <line x2="23.0483" x1="15.4131" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.99156" length2="1.5" y1="3.99156" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.29341" width="4.2" height="7.28496" start="-90" angle="-180" x="12.925" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.48062" width="4.2" height="3.18718" start="-90" angle="-180" x="12.925" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.48062" width="10.5" height="13.6594" x="-19.625" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.349076" width="16.8" height="8.6509" start="0" angle="-180" x="-6.5" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.0337" width="7.35" height="2.27656" x="-1.775" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14.2209" width="25.725" height="1.36594" x="-1.25" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.8549" width="2.1" height="1.82124" x="0.85" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.20404" width="2.625" height="8.6509" x="-9.125" antialias="false"/>
+        <line x2="0.325" x1="0.325" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.21244" length2="1.5" y1="-11.0337" end2="none" antialias="false"/>
+        <line x2="4" x1="4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.21244" length2="1.5" y1="-11.0337" end2="none" antialias="false"/>
+        <line x2="-11.5934" x1="-19.2446" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3.29341" length2="1.5" y1="-3.29341" end2="none" antialias="false"/>
+        <line x2="-11.6017" x1="-19.237" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.99156" length2="1.5" y1="3.99156" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.29341" width="4.2" height="7.28496" start="90" angle="-180" x="-13.325" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.48062" width="4.2" height="3.18718" start="90" angle="-180" x="-13.325" antialias="true"/>
+        <line x2="-19.625" x1="-19.1" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3.29341" length2="1.5" y1="-6.48062" end2="none" antialias="false"/>
+        <line x2="-19.1" x1="-19.625" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.17874" length2="1.5" y1="3.99156" end2="none" antialias="false"/>
+        <line x2="23.425" x1="22.9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3.29341" length2="1.5" y1="-6.48062" end2="none" antialias="false"/>
+        <line x2="22.9" x1="23.425" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.17874" length2="1.5" y1="3.99156" end2="none" antialias="false"/>
+        <text text="1/2&quot;HH" size="4" y="16" x="-7"/>
+        <terminal orientation="e" y="0.349076" x="22.9"/>
+        <terminal orientation="w" y="0.349076" x="-19.1"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/valv-bola1_2m-m.elmt b/elements/60_energy/11_water/valves/valv-bola1_2m-m.elmt
index 33160e50b..4fd651ddf 100644
--- a/elements/60_energy/11_water/valves/valv-bola1_2m-m.elmt
+++ b/elements/60_energy/11_water/valves/valv-bola1_2m-m.elmt
@@ -1,41 +1,43 @@
-<definition width="60" version="0.4" hotspot_x="29" hotspot_y="19" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{734D8C84-3638-4947-8ABA-8A603AA0EBC8}"/><names>
-        <name lang="es">Valv bola 1/2M-M</name>
+<definition orientation="dyyy" type="element" width="70" version="0.5" hotspot_x="33" height="40" hotspot_y="18" link_type="simple">
+    <uuid uuid="{0b317718-9732-479f-915b-e80b0a4862b2}"/>
+    <names>
         <name lang="it">Valvola a sfera 1/2 M-M</name>
         <name lang="pl">Zawór kulowy 1/2"</name>
         <name lang="cs">Kulový ventil 1/2"</name>
+        <name lang="es">Valv bola 1/2M-M</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="17.6" x="-7.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="10.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="12.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="5.57387" x1="-16.1" y2="-4.26197" x2="-17.75"/>
-        <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="6.06566" x1="27.35" y2="-3.77018" x2="25.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="-3.27839" x1="13.05" y2="-3.27839" x2="16.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.09849" x1="12.9243" y2="4.09849" x2="16.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="6.06566" x1="25.15" y2="-3.77018" x2="23.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.57387" x1="-18.3" y2="-4.26197" x2="-19.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="5.57387" x1="-23.25" y2="-4.26197" x2="-24.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="6.06566" x1="20.2" y2="-3.77018" x2="18.55"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="5.57387" x1="-21.05" y2="-4.26197" x2="-22.7"/>
-        <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="6.06566" x1="22.4" y2="-3.77018" x2="20.75"/>
-        <rect width="8.8" x="18.55" y="-3.27839" antialias="false" height="9.34405" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="8.8" x="-24.9" y="-3.77018" antialias="false" height="9.34405" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="10.45" x="16.9" y="-4.26197" antialias="false" height="11.3112" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.45" x="-24.9" y="-4.75377" antialias="false" height="11.3112" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.4" x="-14.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="-3.27839" x1="-14.45" y2="-3.27839" x2="-10.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="-14.0257" y2="4.09849" x2="-10.4638"/>
-        <arc width="17.6" x="-7.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="-2.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="-1.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.4" y="-13.606" antialias="false" height="1.96717" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.75" x="-10.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="-0.15" y2="-9.67169" x2="-0.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="3.7" y2="-9.67169" x2="3.7"/>
-        <text x="-8" y="15" size="4" text="1/2&quot;MM"/>
-        <terminal x="-24.9" y="0.655948" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="27.35" y="0.655948" nameHidden="0" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="12.55" tagg="label" rotate="true" x="-5"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.1799" width="17.6" height="9.34405" start="-180" angle="-180" x="-7.3" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.26197" width="2.2" height="9.34405" x="10.3" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.21273" width="4.4" height="15.7374" x="12.5" antialias="false"/>
+        <line x2="-17.75" x1="-16.1" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-4.26197" length2="1.5" y1="5.57387" end2="none" antialias="false"/>
+        <line x2="25.7" x1="27.35" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.77018" length2="1.5" y1="6.06566" end2="none" antialias="false"/>
+        <line x2="16.9" x1="13.05" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3.27839" length2="1.5" y1="-3.27839" end2="none" antialias="false"/>
+        <line x2="16.4862" x1="12.9243" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.09849" length2="1.5" y1="4.09849" end2="none" antialias="false"/>
+        <line x2="23.5" x1="25.15" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.77018" length2="1.5" y1="6.06566" end2="none" antialias="false"/>
+        <line x2="-19.95" x1="-18.3" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-4.26197" length2="1.5" y1="5.57387" end2="none" antialias="false"/>
+        <line x2="-24.9" x1="-23.25" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-4.26197" length2="1.5" y1="5.57387" end2="none" antialias="false"/>
+        <line x2="18.55" x1="20.2" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.77018" length2="1.5" y1="6.06566" end2="none" antialias="false"/>
+        <line x2="-22.7" x1="-21.05" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-4.26197" length2="1.5" y1="5.57387" end2="none" antialias="false"/>
+        <line x2="20.75" x1="22.4" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-3.77018" length2="1.5" y1="6.06566" end2="none" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-3.27839" width="8.8" height="9.34405" x="18.55" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-3.77018" width="8.8" height="9.34405" x="-24.9" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.26197" width="10.45" height="11.3112" x="16.9" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.75377" width="10.45" height="11.3112" x="-24.9" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.21273" width="4.4" height="15.7374" x="-14.45" antialias="false"/>
+        <line x2="-10.6" x1="-14.45" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-3.27839" length2="1.5" y1="-3.27839" end2="none" antialias="false"/>
+        <line x2="-10.4638" x1="-14.0257" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="4.09849" length2="1.5" y1="4.09849" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.655948" width="17.6" height="9.34405" start="0" angle="-180" x="-7.3" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.6389" width="7.7" height="2.45896" x="-2.35" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.0814" width="26.95" height="1.47538" x="-1.8" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.606" width="2.2" height="1.96717" x="0.4" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.26197" width="2.75" height="9.34405" x="-10.05" antialias="false"/>
+        <line x2="-0.15" x1="-0.15" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.67169" length2="1.5" y1="-11.6389" end2="none" antialias="false"/>
+        <line x2="3.7" x1="3.7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.67169" length2="1.5" y1="-11.6389" end2="none" antialias="false"/>
+        <text text="1/2&quot;MM" size="4" y="15" x="-8"/>
+        <terminal orientation="e" y="0.655948" x="27.35"/>
+        <terminal orientation="w" y="0.655948" x="-24.9"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/valv-bola1h-h.elmt b/elements/60_energy/11_water/valves/valv-bola1h-h.elmt
index 28bfc0a74..bd22a93f3 100644
--- a/elements/60_energy/11_water/valves/valv-bola1h-h.elmt
+++ b/elements/60_energy/11_water/valves/valv-bola1h-h.elmt
@@ -1,39 +1,41 @@
-<definition width="70" version="0.4" hotspot_x="32" hotspot_y="25" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{8C8932D0-2C2F-4432-AF19-6E02B848EC06}"/><names>
-        <name lang="es">Valv bola 1"H-H</name>
+<definition orientation="dyyy" type="element" width="70" version="0.5" hotspot_x="32" height="60" hotspot_y="29" link_type="simple">
+    <uuid uuid="{8e60accf-34a8-45b7-8adb-5c5a4d9ebe78}"/>
+    <names>
         <name lang="it">Valvola a sfera 1" F-F</name>
         <name lang="pl">Zawór kulowy 1"</name>
         <name lang="cs">Kulový ventil 1"</name>
+        <name lang="es">Valv bola 1"H-H</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="24.0616" x="-9.02898" y="-13.8681" antialias="true" height="14.0639" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="5.60291" x="18.5344" y="6.85774" antialias="true" height="5.18144" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="5.6029" x="-18.1337" y="6.85774" antialias="true" height="5.18144" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="14.0073" x="18.5344" y="-10.167" antialias="false" height="22.2062" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.50182" x="15.0326" y="-7.70297" antialias="false" height="16.5378" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.98555" x1="21.8434" y2="-4.98555" x2="32.0503"/>
-        <line 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.85774" x1="21.8536" y2="6.85774" x2="32.0392"/>
-        <arc width="5.60291" x="18.5344" y="-4.98555" antialias="true" height="11.8433" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="5.60291" x="18.5344" y="-10.167" antialias="true" height="5.18144" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="14.0073" x="-26.5381" y="-10.167" antialias="false" height="22.2062" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="24.0616" x="-9.02898" y="0.936065" antialias="true" height="14.0639" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <rect width="9.80507" x="-1.62572" y="-17.5691" antialias="false" height="3.70103" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="34.3178" x="-0.925351" y="-22.7505" antialias="false" height="2.22062" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.80145" x="1.8761" y="-20.5299" antialias="false" height="2.96082" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.50182" x="-12.5308" y="-7.08449" antialias="false" height="15.9193" 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.5691" x1="1.17574" y2="-14.6082" x2="1.17574"/>
-        <line 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.5691" x1="6.07828" y2="-14.6082" x2="6.07828"/>
-        <line 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.98555" x1="-26.0306" y2="-4.98555" x2="-15.8237"/>
-        <line 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.85774" x1="-26.0204" y2="6.85774" x2="-15.8347"/>
-        <arc width="5.6029" x="-18.1337" y="-4.98555" antialias="true" height="11.8433" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="5.6029" x="-18.1337" y="-10.167" antialias="true" height="5.18144" 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="-10.167" x1="-25.8377" y2="-4.98555" x2="-26.5381"/>
-        <line 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.85774" x1="-26.5381" y2="12.0392" x2="-25.8377"/>
-        <line 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.167" x1="31.8414" y2="-4.98555" x2="32.5417"/>
-        <line 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.85774" x1="32.5417" y2="12.0392" x2="31.8414"/>
-        <text x="-6" y="21" size="4" text="1&quot;HH"/>
-        <terminal x="-26.6" y="0.775039" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="32.8578" y="0.775039" nameHidden="0" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="20.55" tagg="label" rotate="true" x="-2"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.8681" width="24.0616" height="14.0639" start="-180" angle="-180" x="-9.02898" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="6.85774" width="5.60291" height="5.18144" start="-90" angle="-180" x="18.5344" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="6.85774" width="5.6029" height="5.18144" start="90" angle="-180" x="-18.1337" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.167" width="14.0073" height="22.2062" x="18.5344" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.70297" width="3.50182" height="16.5378" x="15.0326" antialias="false"/>
+        <line x2="32.0503" x1="21.8434" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.98555" length2="1.5" y1="-4.98555" end2="none" antialias="false"/>
+        <line x2="32.0392" x1="21.8536" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.85774" length2="1.5" y1="6.85774" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.98555" width="5.60291" height="11.8433" start="-90" angle="-180" x="18.5344" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.167" width="5.60291" height="5.18144" start="-90" angle="-180" x="18.5344" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.167" width="14.0073" height="22.2062" x="-26.5381" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.936065" width="24.0616" height="14.0639" start="0" angle="-180" x="-9.02898" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-17.5691" width="9.80507" height="3.70103" x="-1.62572" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-22.7505" width="34.3178" height="2.22062" x="-0.925351" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20.5299" width="2.80145" height="2.96082" x="1.8761" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.08449" width="3.50182" height="15.9193" x="-12.5308" antialias="false"/>
+        <line x2="1.17574" x1="1.17574" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-14.6082" length2="1.5" y1="-17.5691" end2="none" antialias="false"/>
+        <line x2="6.07828" x1="6.07828" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-14.6082" length2="1.5" y1="-17.5691" end2="none" antialias="false"/>
+        <line x2="-15.8237" x1="-26.0306" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.98555" length2="1.5" y1="-4.98555" end2="none" antialias="false"/>
+        <line x2="-15.8347" x1="-26.0204" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="6.85774" length2="1.5" y1="6.85774" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.98555" width="5.6029" height="11.8433" start="90" angle="-180" x="-18.1337" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.167" width="5.6029" height="5.18144" start="90" angle="-180" x="-18.1337" antialias="true"/>
+        <line x2="-26.5381" x1="-25.8377" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.98555" length2="1.5" y1="-10.167" end2="none" antialias="false"/>
+        <line x2="-25.8377" x1="-26.5381" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="12.0392" length2="1.5" y1="6.85774" end2="none" antialias="false"/>
+        <line x2="32.5417" x1="31.8414" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.98555" length2="1.5" y1="-10.167" end2="none" antialias="false"/>
+        <line x2="31.8414" x1="32.5417" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="12.0392" length2="1.5" y1="6.85774" end2="none" antialias="false"/>
+        <text text="1&quot;HH" size="4" y="21" x="-6"/>
+        <terminal orientation="e" y="0.775039" x="32.8578"/>
+        <terminal orientation="w" y="0.775039" x="-26.6"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/valv-bola3_4h-h.elmt b/elements/60_energy/11_water/valves/valv-bola3_4h-h.elmt
index 38ea13034..04db5fa8d 100644
--- a/elements/60_energy/11_water/valves/valv-bola3_4h-h.elmt
+++ b/elements/60_energy/11_water/valves/valv-bola3_4h-h.elmt
@@ -1,39 +1,41 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="24" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{081BBB2B-5933-4FCE-942A-329C17350164}"/><names>
-        <name lang="es">Valv bola 3/4H-H</name>
+<definition orientation="dyyy" type="element" width="50" version="0.5" hotspot_x="25" height="50" hotspot_y="23" link_type="simple">
+    <uuid uuid="{e28e57fb-f853-4e51-ba8a-c6cf8c896cfa}"/>
+    <names>
         <name lang="it">Valvola a sfera 3/4 F-F</name>
         <name lang="pl">Zawór kulowy 3/4"</name>
         <name lang="cs">Kulový ventil 3/4"</name>
+        <name lang="es">Valv bola 3/4H-H</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="15.876" x="-7.653" y="-12.1907" antialias="true" height="11.7852" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="3.969" x="10.7036" y="5.17697" antialias="true" height="4.34192" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="3.969" x="-14.1026" y="5.17697" antialias="true" height="4.34192" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="9.9225" x="10.7036" y="-9.08935" antialias="false" height="18.6082" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.48062" x="8.223" y="-7.02452" antialias="false" height="13.8583" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.74741" x1="13.0476" y2="-4.74741" x2="20.278"/>
-        <line 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.17697" x1="13.0549" y2="5.17697" x2="20.2702"/>
-        <arc width="3.969" x="10.7036" y="-4.74741" antialias="true" height="9.9244" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="3.969" x="10.7036" y="-9.08935" antialias="true" height="4.34192" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="9.9225" x="-20.0561" y="-9.08935" antialias="false" height="18.6082" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.876" x="-7.653" y="0.214773" antialias="true" height="11.7852" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <rect width="6.94575" x="-3.18787" y="-15.2921" antialias="false" height="3.10137" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24.3101" x="-2.69175" y="-19.634" antialias="false" height="1.86082" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.9845" x="-0.70725" y="-17.7732" antialias="false" height="2.4811" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.48063" x="-10.1336" y="-6.50625" antialias="false" height="13.34" 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.2921" x1="-1.20338" y2="-12.811" x2="-1.20338"/>
-        <line 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.2921" x1="2.2695" y2="-12.811" x2="2.2695"/>
-        <line 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.74741" x1="-19.6966" y2="-4.74741" x2="-12.4662"/>
-        <line 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.17697" x1="-19.6894" y2="5.17697" x2="-12.4741"/>
-        <arc width="3.969" x="-14.1026" y="-4.74741" antialias="true" height="9.9244" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="3.969" x="-14.1026" y="-9.08935" antialias="true" height="4.34192" 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="-9.08935" x1="-19.56" y2="-4.74741" x2="-20.0561"/>
-        <line 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.17697" x1="-20.0561" y2="9.51888" x2="-19.56"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9.08935" x1="20.13" y2="-4.74741" x2="20.6261"/>
-        <line 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.17697" x1="20.6261" y2="9.51888" x2="20.13"/>
-        <text x="-10" y="20" size="4" text="3/4&quot;HH"/>
-        <terminal x="-20.1" y="0.0798366" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="20.85" y="0.0798366" nameHidden="0" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.1907" width="15.876" height="11.7852" start="-180" angle="-180" x="-7.653" antialias="true"/>
+        <input text="_" size="9" y="20.55" tagg="label" rotate="true" x="-7"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="5.17697" width="3.969" height="4.34192" start="-90" angle="-180" x="10.7036" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="5.17697" width="3.969" height="4.34192" start="90" angle="-180" x="-14.1026" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.08935" width="9.9225" height="18.6082" x="10.7036" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.02452" width="2.48062" height="13.8583" x="8.223" antialias="false"/>
+        <line x2="20.278" x1="13.0476" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.74741" length2="1.5" y1="-4.74741" end2="none" antialias="false"/>
+        <line x2="20.2702" x1="13.0549" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.17697" length2="1.5" y1="5.17697" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.74741" width="3.969" height="9.9244" start="-90" angle="-180" x="10.7036" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.08935" width="3.969" height="4.34192" start="-90" angle="-180" x="10.7036" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.08935" width="9.9225" height="18.6082" x="-20.0561" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.214773" width="15.876" height="11.7852" start="0" angle="-180" x="-7.653" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.2921" width="6.94575" height="3.10137" x="-3.18787" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-19.634" width="24.3101" height="1.86082" x="-2.69175" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-17.7732" width="1.9845" height="2.4811" x="-0.70725" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.50625" width="2.48063" height="13.34" x="-10.1336" antialias="false"/>
+        <line x2="-1.20338" x1="-1.20338" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-12.811" length2="1.5" y1="-15.2921" end2="none" antialias="false"/>
+        <line x2="2.2695" x1="2.2695" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-12.811" length2="1.5" y1="-15.2921" end2="none" antialias="false"/>
+        <line x2="-12.4662" x1="-19.6966" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.74741" length2="1.5" y1="-4.74741" end2="none" antialias="false"/>
+        <line x2="-12.4741" x1="-19.6894" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.17697" length2="1.5" y1="5.17697" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.74741" width="3.969" height="9.9244" start="90" angle="-180" x="-14.1026" antialias="true"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.08935" width="3.969" height="4.34192" start="90" angle="-180" x="-14.1026" antialias="true"/>
+        <line x2="-20.0561" x1="-19.56" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.74741" length2="1.5" y1="-9.08935" end2="none" antialias="false"/>
+        <line x2="-19.56" x1="-20.0561" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.51888" length2="1.5" y1="5.17697" end2="none" antialias="false"/>
+        <line x2="20.6261" x1="20.13" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.74741" length2="1.5" y1="-9.08935" end2="none" antialias="false"/>
+        <line x2="20.13" x1="20.6261" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.51888" length2="1.5" y1="5.17697" end2="none" antialias="false"/>
+        <text text="3/4&quot;HH" size="4" y="20" x="-10"/>
+        <terminal orientation="w" y="0.0798366" x="-20.1"/>
+        <terminal orientation="e" y="0.0798366" x="20.85"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/valv-bola3_4m-m.elmt b/elements/60_energy/11_water/valves/valv-bola3_4m-m.elmt
index b355a2196..5391ed7b3 100644
--- a/elements/60_energy/11_water/valves/valv-bola3_4m-m.elmt
+++ b/elements/60_energy/11_water/valves/valv-bola3_4m-m.elmt
@@ -1,41 +1,43 @@
-<definition width="80" version="0.4" hotspot_x="39" hotspot_y="28" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{8CB6DE25-4B43-449E-8BE4-25D776B76D89}"/><names>
-        <name lang="es">Valv bola 3/4M-M</name>
+<definition orientation="dyyy" type="element" width="80" version="0.5" hotspot_x="39" height="60" hotspot_y="28" link_type="simple">
+    <uuid uuid="{42ffb5d0-a501-476b-8f97-a4231085413e}"/>
+    <names>
         <name lang="it">Valvola a sfera 3/4 M-M</name>
         <name lang="pl">Zawór kulowy 3/4"</name>
         <name lang="cs">Kulový ventil 3/4"</name>
+        <name lang="es">Valv bola 3/4M-M</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="22.88" x="-10.62" y="-14.1372" antialias="true" height="15.1694" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="2.86" x="12.26" y="-6.15328" antialias="false" height="15.1694" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.72" x="15.12" y="-10.9436" antialias="false" height="25.5484" 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="9.8145" x1="-22.06" y2="-6.15328" x2="-24.205"/>
-        <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="10.6129" x1="34.425" y2="-5.3549" x2="32.28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.55649" x1="15.835" y2="-4.55649" x2="20.84"/>
-        <line 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.41934" x1="15.6715" y2="7.41934" x2="20.3021"/>
-        <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="10.6129" x1="31.565" y2="-5.3549" x2="29.42"/>
-        <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="9.8145" x1="-24.92" y2="-6.15328" x2="-27.065"/>
-        <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="9.8145" x1="-31.355" y2="-6.15328" x2="-33.5"/>
-        <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="10.6129" x1="25.13" y2="-5.3549" x2="22.985"/>
-        <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="9.8145" x1="-28.495" y2="-6.15328" x2="-30.64"/>
-        <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="10.6129" x1="27.99" y2="-5.3549" x2="25.845"/>
-        <rect width="11.44" x="22.985" y="-4.55649" antialias="false" height="15.1694" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="11.44" x="-33.5" y="-5.3549" antialias="false" height="15.1694" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="13.585" x="20.84" y="-6.15328" antialias="false" height="18.3629" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.585" x="-33.5" y="-6.95166" antialias="false" height="18.3629" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.72" x="-19.915" y="-10.9436" antialias="false" height="25.5484" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.55649" x1="-19.915" y2="-4.55649" x2="-14.91"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.41934" x1="-19.3635" y2="7.41934" x2="-14.7329"/>
-        <arc width="22.88" x="-10.62" y="1.83062" antialias="true" height="15.1694" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <rect width="10.01" x="-4.185" y="-18.1291" antialias="false" height="3.99194" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="35.035" x="-3.47" y="-23.7178" antialias="false" height="2.39517" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.86" x="-0.61" y="-21.3227" antialias="false" height="3.19356" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.575" x="-14.195" y="-6.15328" antialias="false" height="15.1694" 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.1291" x1="-1.325" y2="-14.9356" x2="-1.325"/>
-        <line 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.1291" x1="3.68" y2="-14.9356" x2="3.68"/>
-        <text x="-10" y="25" size="4" text="3/4&quot; MM"/>
-        <terminal x="-33.5" y="1.83062" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="34.425" y="1.83062" nameHidden="0" number="" name="" orientation="e"/>
+        <input text="_" size="9" y="20.55" tagg="label" rotate="true" x="-7"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14.1372" width="22.88" height="15.1694" start="-180" angle="-180" x="-10.62" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.15328" width="2.86" height="15.1694" x="12.26" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.9436" width="5.72" height="25.5484" x="15.12" antialias="false"/>
+        <line x2="-24.205" x1="-22.06" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-6.15328" length2="1.5" y1="9.8145" end2="none" antialias="false"/>
+        <line x2="32.28" x1="34.425" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.3549" length2="1.5" y1="10.6129" end2="none" antialias="false"/>
+        <line x2="20.84" x1="15.835" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.55649" length2="1.5" y1="-4.55649" end2="none" antialias="false"/>
+        <line x2="20.3021" x1="15.6715" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.41934" length2="1.5" y1="7.41934" end2="none" antialias="false"/>
+        <line x2="29.42" x1="31.565" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.3549" length2="1.5" y1="10.6129" end2="none" antialias="false"/>
+        <line x2="-27.065" x1="-24.92" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-6.15328" length2="1.5" y1="9.8145" end2="none" antialias="false"/>
+        <line x2="-33.5" x1="-31.355" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-6.15328" length2="1.5" y1="9.8145" end2="none" antialias="false"/>
+        <line x2="22.985" x1="25.13" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.3549" length2="1.5" y1="10.6129" end2="none" antialias="false"/>
+        <line x2="-30.64" x1="-28.495" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-6.15328" length2="1.5" y1="9.8145" end2="none" antialias="false"/>
+        <line x2="25.845" x1="27.99" style="line-style:dotted;line-weight:normal;filling:none;color:red" length1="1.5" end1="none" y2="-5.3549" length2="1.5" y1="10.6129" end2="none" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-4.55649" width="11.44" height="15.1694" x="22.985" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-5.3549" width="11.44" height="15.1694" x="-33.5" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.15328" width="13.585" height="18.3629" x="20.84" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.95166" width="13.585" height="18.3629" x="-33.5" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.9436" width="5.72" height="25.5484" x="-19.915" antialias="false"/>
+        <line x2="-14.91" x1="-19.915" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-4.55649" length2="1.5" y1="-4.55649" end2="none" antialias="false"/>
+        <line x2="-14.7329" x1="-19.3635" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="7.41934" length2="1.5" y1="7.41934" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="1.83062" width="22.88" height="15.1694" start="0" angle="-180" x="-10.62" antialias="true"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-18.1291" width="10.01" height="3.99194" x="-4.185" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-23.7178" width="35.035" height="2.39517" x="-3.47" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.3227" width="2.86" height="3.19356" x="-0.61" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.15328" width="3.575" height="15.1694" x="-14.195" antialias="false"/>
+        <line x2="-1.325" x1="-1.325" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-14.9356" length2="1.5" y1="-18.1291" end2="none" antialias="false"/>
+        <line x2="3.68" x1="3.68" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-14.9356" length2="1.5" y1="-18.1291" end2="none" antialias="false"/>
+        <text text="3/4&quot; MM" size="4" y="25" x="-10"/>
+        <terminal orientation="w" y="1.83062" x="-33.5"/>
+        <terminal orientation="e" y="1.83062" x="34.425"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/valv-pie3_4.elmt b/elements/60_energy/11_water/valves/valv-pie3_4.elmt
index 0c078e71d..b38d890c1 100644
--- a/elements/60_energy/11_water/valves/valv-pie3_4.elmt
+++ b/elements/60_energy/11_water/valves/valv-pie3_4.elmt
@@ -1,38 +1,40 @@
-<definition width="40" version="0.4" hotspot_x="20" hotspot_y="16" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{5F368000-0B60-44FC-B892-595DE1FA0396}"/><names>
-        <name lang="es">Valv Pié 3/4Hembra</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="19" height="50" hotspot_y="16" link_type="simple">
+    <uuid uuid="{4d98e9a1-9f71-4970-ae28-760e2006c574}"/>
+    <names>
         <name lang="it">Valvola di piede 3/4 F</name>
         <name lang="pl">Zawór nożny 3/4"</name>
         <name lang="cs">Nožní ventil 3/4"</name>
+        <name lang="es">Valv Pié 3/4Hembra</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="26.52" x="-13.0192" y="13.0847" antialias="false" height="1.65384" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="26.52" x="-13.0192" y="18.377" antialias="false" height="1.65384" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13.0847" x1="11.9616" y2="12.0924" x2="11.9616"/>
-        <line 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.1078" x1="11.9616" y2="9.1155" x2="11.9616"/>
-        <rect width="26.52" x="-13.0192" y="15.7308" antialias="false" height="1.65384" 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.377" x1="11.9616" y2="17.3847" x2="11.9616"/>
-        <line 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.0231" x1="11.9616" y2="20.0308" x2="11.9616"/>
-        <line 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.7308" x1="11.4416" y2="14.7385" x2="11.4416"/>
-        <line 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.0231" x1="-10.9184" y2="20.0308" x2="-10.9184"/>
-        <line 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.377" x1="-10.9184" y2="17.3847" x2="-10.9184"/>
-        <line 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.0847" x1="-10.9184" y2="12.0924" x2="-10.9184"/>
-        <line 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.7308" x1="-11.4384" y2="14.7385" x2="-11.4384"/>
-        <rect width="17.68" x="-8.8592" y="-11.3921" antialias="false" height="8.26918" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="14.56" x="-7.2992" y="-11.3921" antialias="false" height="6.28457" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="20.8" x="-10.4192" y="-3.1229" antialias="false" height="3.9692" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="26.52" x="-13.0192" y="0.8463" antialias="false" height="8.26918" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="26.52" x="-13.0192" y="10.4386" antialias="false" height="1.65384" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.1078" x1="-10.9184" y2="9.1155" x2="-10.9184"/>
-        <line 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.3538" x1="13.5008" y2="21.3538" x2="-13.0192"/>
-        <line 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.2712" x1="-13.04" y2="22.7664" x2="-13.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="22.6769" x1="-13.0192" y2="24" x2="-11.4592"/>
-        <line 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.3538" x1="13.5008" y2="22.6769" x2="13.5008"/>
-        <line 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.0077" x1="13.5008" y2="24" x2="11.9408"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24" x1="-11.4592" y2="24" x2="11.9408"/>
-        <text x="-15" y="29" size="4" text="Valv.pié3/4H"/>
-        <terminal x="-0.0192" y="-11.0613" nameHidden="1" number="" name="" orientation="n"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="13.0847" width="26.52" height="1.65384" x="-13.0192" antialias="false"/>
+        <input text="_" size="9" y="30.55" tagg="label" rotate="true" x="-7"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="18.377" width="26.52" height="1.65384" x="-13.0192" antialias="false"/>
+        <line x2="11.9616" x1="11.9616" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="12.0924" length2="1.5" y1="13.0847" end2="none" antialias="false"/>
+        <line x2="11.9616" x1="11.9616" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.1155" length2="1.5" y1="10.1078" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="15.7308" width="26.52" height="1.65384" x="-13.0192" antialias="false"/>
+        <line x2="11.9616" x1="11.9616" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="17.3847" length2="1.5" y1="18.377" end2="none" antialias="false"/>
+        <line x2="11.9616" x1="11.9616" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="20.0308" length2="1.5" y1="21.0231" end2="none" antialias="false"/>
+        <line x2="11.4416" x1="11.4416" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14.7385" length2="1.5" y1="15.7308" end2="none" antialias="false"/>
+        <line x2="-10.9184" x1="-10.9184" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="20.0308" length2="1.5" y1="21.0231" end2="none" antialias="false"/>
+        <line x2="-10.9184" x1="-10.9184" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="17.3847" length2="1.5" y1="18.377" end2="none" antialias="false"/>
+        <line x2="-10.9184" x1="-10.9184" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="12.0924" length2="1.5" y1="13.0847" end2="none" antialias="false"/>
+        <line x2="-11.4384" x1="-11.4384" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="14.7385" length2="1.5" y1="15.7308" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.3921" width="17.68" height="8.26918" x="-8.8592" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-11.3921" width="14.56" height="6.28457" x="-7.2992" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.1229" width="20.8" height="3.9692" x="-10.4192" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.8463" width="26.52" height="8.26918" x="-13.0192" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="10.4386" width="26.52" height="1.65384" x="-13.0192" antialias="false"/>
+        <line x2="-10.9184" x1="-10.9184" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="9.1155" length2="1.5" y1="10.1078" end2="none" antialias="false"/>
+        <line x2="-13.0192" x1="13.5008" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="21.3538" length2="1.5" y1="21.3538" end2="none" antialias="false"/>
+        <line x2="-13.04" x1="-13.04" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="22.7664" length2="1.5" y1="21.2712" end2="none" antialias="false"/>
+        <line x2="-11.4592" x1="-13.0192" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="24" length2="1.5" y1="22.6769" end2="none" antialias="false"/>
+        <line x2="13.5008" x1="13.5008" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="22.6769" length2="1.5" y1="21.3538" end2="none" antialias="false"/>
+        <line x2="11.9408" x1="13.5008" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="24" length2="1.5" y1="23.0077" end2="none" antialias="false"/>
+        <line x2="11.9408" x1="-11.4592" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="24" length2="1.5" y1="24" end2="none" antialias="false"/>
+        <text text="Valv.pié3/4H" size="4" y="29" x="-15"/>
+        <terminal orientation="n" y="-11.0613" x="-0.0192"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/valvpie1hembra.elmt b/elements/60_energy/11_water/valves/valvpie1hembra.elmt
index 7f5e41619..c8b2eda2a 100644
--- a/elements/60_energy/11_water/valves/valvpie1hembra.elmt
+++ b/elements/60_energy/11_water/valves/valvpie1hembra.elmt
@@ -1,38 +1,40 @@
-<definition width="40" version="0.4" hotspot_x="19" hotspot_y="7" height="60" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{AD2E4D56-4B5F-4817-9E99-5FF2740C31B6}"/><names>
-        <name lang="es">Valv Pié 1"Hembra</name>
+<definition orientation="dyyy" type="element" width="40" version="0.5" hotspot_x="18" height="60" hotspot_y="6" link_type="simple">
+    <uuid uuid="{4c42e78d-8d63-4bd6-9764-be566d2153fc}"/>
+    <names>
         <name lang="it">Valvola di piede 1 F</name>
         <name lang="pl">Zawór nożny 1"</name>
         <name lang="cs">Nožní ventil 1"</name>
+        <name lang="es">Valv Pié 1"Hembra</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <rect width="27.8662" x="-13.9382" y="28.3467" antialias="false" height="1.92702" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="27.8662" x="-13.9382" y="34.513" antialias="false" height="1.92702" 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="28.3467" x1="12.3107" y2="27.1905" x2="12.3107"/>
-        <line 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.878" x1="12.3107" y2="23.7218" x2="12.3107"/>
-        <rect width="27.8662" x="-13.9382" y="31.4299" antialias="false" height="1.92702" 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="34.513" x1="12.3107" y2="33.3569" x2="12.3107"/>
-        <line 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.5962" x1="12.3107" y2="36.4402" x2="12.3107"/>
-        <line 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.4299" x1="11.7643" y2="30.2737" x2="11.7643"/>
-        <line 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.5962" x1="-11.7307" y2="36.4402" x2="-11.7307"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="34.513" x1="-11.7307" y2="33.3569" x2="-11.7307"/>
-        <line 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.3467" x1="-11.7307" y2="27.1905" x2="-11.7307"/>
-        <line 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.4299" x1="-12.2771" y2="30.2737" x2="-12.2771"/>
-        <rect width="18.5774" x="-9.567" y="-0.173212" antialias="false" height="9.6351" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.299" x="-7.9278" y="-0.173212" antialias="false" height="7.32267" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
-        <rect width="21.8558" x="-11.2062" y="9.46188" antialias="false" height="4.62485" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="27.8662" x="-13.9382" y="14.0867" antialias="false" height="9.6351" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="27.8662" x="-13.9382" y="25.2634" antialias="false" height="1.92702" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="24.878" x1="-11.7307" y2="23.7218" x2="-11.7307"/>
-        <line 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.9818" x1="13.928" y2="37.9818" x2="-13.9382"/>
-        <line 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.8853" x1="-13.96" y2="39.6276" x2="-13.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="39.5234" x1="-13.9382" y2="41.065" x2="-12.299"/>
-        <line 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.9818" x1="13.928" y2="39.5234" x2="13.928"/>
-        <line 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.9086" x1="13.928" y2="41.065" x2="12.2888"/>
-        <line 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.065" x1="-12.299" y2="41.065" x2="12.2888"/>
-        <text x="-12" y="46" size="4" text="Valv.pié1&quot;H"/>
-        <terminal x="0.024" y="0.142278" nameHidden="1" number="" name="" orientation="n"/>
+        <input text="_" size="9" y="45.55" tagg="label" rotate="true" x="-12"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="28.3467" width="27.8662" height="1.92702" x="-13.9382" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="34.513" width="27.8662" height="1.92702" x="-13.9382" antialias="false"/>
+        <line x2="12.3107" x1="12.3107" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="27.1905" length2="1.5" y1="28.3467" end2="none" antialias="false"/>
+        <line x2="12.3107" x1="12.3107" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="23.7218" length2="1.5" y1="24.878" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="31.4299" width="27.8662" height="1.92702" x="-13.9382" antialias="false"/>
+        <line x2="12.3107" x1="12.3107" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="33.3569" length2="1.5" y1="34.513" end2="none" antialias="false"/>
+        <line x2="12.3107" x1="12.3107" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="36.4402" length2="1.5" y1="37.5962" end2="none" antialias="false"/>
+        <line x2="11.7643" x1="11.7643" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="30.2737" length2="1.5" y1="31.4299" end2="none" antialias="false"/>
+        <line x2="-11.7307" x1="-11.7307" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="36.4402" length2="1.5" y1="37.5962" end2="none" antialias="false"/>
+        <line x2="-11.7307" x1="-11.7307" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="33.3569" length2="1.5" y1="34.513" end2="none" antialias="false"/>
+        <line x2="-11.7307" x1="-11.7307" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="27.1905" length2="1.5" y1="28.3467" end2="none" antialias="false"/>
+        <line x2="-12.2771" x1="-12.2771" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="30.2737" length2="1.5" y1="31.4299" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-0.173212" width="18.5774" height="9.6351" x="-9.567" antialias="false"/>
+        <rect style="line-style:dotted;line-weight:normal;filling:none;color:red" y="-0.173212" width="15.299" height="7.32267" x="-7.9278" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="9.46188" width="21.8558" height="4.62485" x="-11.2062" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="14.0867" width="27.8662" height="9.6351" x="-13.9382" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="25.2634" width="27.8662" height="1.92702" x="-13.9382" antialias="false"/>
+        <line x2="-11.7307" x1="-11.7307" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="23.7218" length2="1.5" y1="24.878" end2="none" antialias="false"/>
+        <line x2="-13.9382" x1="13.928" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="37.9818" length2="1.5" y1="37.9818" end2="none" antialias="false"/>
+        <line x2="-13.96" x1="-13.96" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="39.6276" length2="1.5" y1="37.8853" end2="none" antialias="false"/>
+        <line x2="-12.299" x1="-13.9382" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="41.065" length2="1.5" y1="39.5234" end2="none" antialias="false"/>
+        <line x2="13.928" x1="13.928" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="39.5234" length2="1.5" y1="37.9818" end2="none" antialias="false"/>
+        <line x2="12.2888" x1="13.928" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="41.065" length2="1.5" y1="39.9086" end2="none" antialias="false"/>
+        <line x2="12.2888" x1="-12.299" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="41.065" length2="1.5" y1="41.065" end2="none" antialias="false"/>
+        <text text="Valv.pié1&quot;H" size="4" y="46" x="-12"/>
+        <terminal orientation="n" y="0.142278" x="0.024"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/valves/valvula-flotador.elmt b/elements/60_energy/11_water/valves/valvula-flotador.elmt
index 6181290b7..2eb1b2746 100644
--- a/elements/60_energy/11_water/valves/valvula-flotador.elmt
+++ b/elements/60_energy/11_water/valves/valvula-flotador.elmt
@@ -1,30 +1,32 @@
-<definition width="160" version="0.4" hotspot_x="14" hotspot_y="27" height="70" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B8FD77E5-7F7F-49DA-9125-4225146E220D}"/><names>
-        <name lang="es">Valvula flotador3/4"</name>
+<definition orientation="dyyy" type="element" width="160" version="0.5" hotspot_x="14" height="70" hotspot_y="27" link_type="simple">
+    <uuid uuid="{29875ae1-a025-4591-8d13-a9eeea4b42dd}"/>
+    <names>
         <name lang="it">Valvola a galleggiante 3/4</name>
         <name lang="pl">Zawór pływakowy 3/4"</name>
         <name lang="cs">Plovákový ventil 3/4"</name>
+        <name lang="es">Valvula flotador3/4"</name>
     </names>
     <informations></informations>
     <description>
-        <arc width="55.3904" x="-10.15" y="-10.2902" antialias="true" height="49.6" 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="-8.27135" x1="3.09529" y2="3.09878" x2="4.94951"/>
-        <line 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.27135" x1="6.49468" y2="3.09878" x2="8.34891"/>
-        <line 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.27135" x1="9.58505" y2="3.09878" x2="11.4393"/>
-        <rect width="12.3614" x="-0.613139" y="-9.40836" antialias="false" height="13.6442" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.13387" x="11.7483" y="-11.4509" antialias="false" height="18.7607" 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.27135" x1="0.00493295" y2="3.09878" x2="1.85915"/>
-        <rect width="19.7152" x="26.464" y="15.3098" antialias="false" height="5.6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="19.7152" x="8.6264" y="6.50982" antialias="true" height="16" 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="-9.49018" x1="26.464" y2="-9.49018" x2="55.5674"/>
-        <line 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.70982" x1="43.3627" y2="5.70982" x2="55.5674"/>
-        <arc width="15.9599" x="48.0568" y="-9.49018" antialias="true" height="15.2" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <ellipse width="4.6941" x="52.7509" y="-7.89018" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.69018" x1="64.0168" y2="12.9098" x2="122.224"/>
-        <line 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.49018" x1="64.0168" y2="15.3098" x2="120.346"/>
-        <ellipse width="20.654" x="120.346" y="9.70982" antialias="true" height="15.2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="5" y="-17" size="4" text="V. flotador3/4&quot;M"/>
-        <terminal x="-1.23121" y="-2.58629" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="22.2555" y="-2.58629" nameHidden="0" number="" name="" orientation="e"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.2902" width="55.3904" height="49.6" start="90" angle="-90" x="-10.15" antialias="true"/>
+        <input text="_" size="9" y="-19.45" tagg="label" rotate="true" x="73"/>
+        <line x2="4.94951" x1="3.09529" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.09878" length2="1.5" y1="-8.27135" end2="none" antialias="false"/>
+        <line x2="8.34891" x1="6.49468" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.09878" length2="1.5" y1="-8.27135" end2="none" antialias="false"/>
+        <line x2="11.4393" x1="9.58505" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.09878" length2="1.5" y1="-8.27135" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.40836" width="12.3614" height="13.6442" x="-0.613139" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.4509" width="6.13387" height="18.7607" x="11.7483" antialias="false"/>
+        <line x2="1.85915" x1="0.00493295" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="3.09878" length2="1.5" y1="-8.27135" end2="none" antialias="false"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="15.3098" width="19.7152" height="5.6" x="26.464" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="6.50982" width="19.7152" height="16" start="90" angle="-90" x="8.6264" antialias="true"/>
+        <line x2="55.5674" x1="26.464" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="-9.49018" length2="1.5" y1="-9.49018" end2="none" antialias="false"/>
+        <line x2="55.5674" x1="43.3627" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="5.70982" length2="1.5" y1="5.70982" end2="none" antialias="false"/>
+        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.49018" width="15.9599" height="15.2" start="90" angle="-180" x="48.0568" antialias="true"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.89018" width="4.6941" height="4" x="52.7509" antialias="true"/>
+        <line x2="122.224" x1="64.0168" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="12.9098" length2="1.5" y1="-4.69018" end2="none" antialias="false"/>
+        <line x2="120.346" x1="64.0168" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" y2="15.3098" length2="1.5" y1="-1.49018" end2="none" antialias="false"/>
+        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" y="9.70982" width="20.654" height="15.2" x="120.346" antialias="true"/>
+        <text text="V. flotador3/4&quot;M" size="4" y="-17" x="5"/>
+        <terminal orientation="w" y="-2.58629" x="-1.23121"/>
+        <terminal orientation="e" y="-2.58629" x="22.2555"/>
     </description>
 </definition>