diff --git a/elements/12energie/eaux/grifo-aparatos/qet_directory b/elements/12energie/eaux/grifo-aparatos/qet_directory
index 5e59a467a..6bf6c153a 100644
--- a/elements/12energie/eaux/grifo-aparatos/qet_directory
+++ b/elements/12energie/eaux/grifo-aparatos/qet_directory
@@ -1,6 +1,7 @@
 <qet-directory>
     <names>
-        <name lang="es">Grifos-Aparatos</name>
+        <name lang="en">Faucets and fixtures</name>
         <name lang="it">Rubinetti e apparecchi</name>
+        <name lang="es">Grifos-Aparatos</name>
     </names>
 </qet-directory>
diff --git a/elements/12energie/eaux/multicapa/codoalpex-16.elmt b/elements/12energie/eaux/multicapa/codoalpex-16.elmt
index de57aa3a0..081e8f43a 100644
--- a/elements/12energie/eaux/multicapa/codoalpex-16.elmt
+++ b/elements/12energie/eaux/multicapa/codoalpex-16.elmt
@@ -1,5 +1,7 @@
-<definition width="60" version="0.4" hotspot_x="34" hotspot_y="41" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="34" hotspot_y="41" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow Alpex 16</name>
+        <name lang="fr">Coude Alpex 16</name>
         <name lang="es">Codo Alpex 16</name>
         <name lang="it">Gomito Alpex 16</name>
     </names>
@@ -17,7 +19,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <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" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10" y="-32.6871" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-27.1212" y="0" orientation="w"/>
+        <terminal x="10" y="-32.6871" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/codoalpex20.elmt b/elements/12energie/eaux/multicapa/codoalpex20.elmt
index aad10b62e..d9efc1730 100644
--- a/elements/12energie/eaux/multicapa/codoalpex20.elmt
+++ b/elements/12energie/eaux/multicapa/codoalpex20.elmt
@@ -1,5 +1,7 @@
-<definition width="70" version="0.4" hotspot_x="33" hotspot_y="42" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="33" hotspot_y="42" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow Alpex 20</name>
+        <name lang="fr">Coude Alpex 20</name>
         <name lang="es">Codo Alpex 20</name>
         <name lang="it">Gomito Alpex 20</name>
     </names>
@@ -17,7 +19,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <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" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="17.7555" y="-34.6065" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-27.9174" y="6.25662" orientation="w"/>
+        <terminal x="17.7555" y="-34.6065" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/codoalpex25.elmt b/elements/12energie/eaux/multicapa/codoalpex25.elmt
index c94a86e48..4adabe7b6 100644
--- a/elements/12energie/eaux/multicapa/codoalpex25.elmt
+++ b/elements/12energie/eaux/multicapa/codoalpex25.elmt
@@ -1,5 +1,7 @@
-<definition width="80" version="0.4" hotspot_x="35" hotspot_y="55" height="80" type="element" ic="true" orientation="dyyy">
+<definition width="80" version="0.4" hotspot_x="35" hotspot_y="55" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow Alpex 25</name>
+        <name lang="fr">Coude Alpex 25</name>
         <name lang="es">Codo Alpex 25</name>
         <name lang="it">Gomito Alpex 25</name>
     </names>
@@ -17,7 +19,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <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" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="25" y="-48.642" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-30.5174" y="0.80461" orientation="w"/>
+        <terminal x="25" y="-48.642" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/codoalpex32.elmt b/elements/12energie/eaux/multicapa/codoalpex32.elmt
index ceca6ab3e..935cbd179 100644
--- a/elements/12energie/eaux/multicapa/codoalpex32.elmt
+++ b/elements/12energie/eaux/multicapa/codoalpex32.elmt
@@ -1,5 +1,7 @@
-<definition width="100" version="0.4" hotspot_x="38" hotspot_y="65" height="90" type="element" ic="true" orientation="dyyy">
+<definition width="100" version="0.4" hotspot_x="38" hotspot_y="65" height="90" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow Alpex 32</name>
+        <name lang="fr">Coude Alpex 32</name>
         <name lang="es">Codo Alpex 32</name>
         <name lang="it">Gomito Alpex 32</name>
     </names>
@@ -17,7 +19,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <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" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="35.8112" y="-59.35" nameHidden="0" number="" name="" orientation="n"/>
+        <terminal x="-29.8946" y="-1.28306" orientation="w"/>
+        <terminal x="35.8112" y="-59.35" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/colector-aseo.elmt b/elements/12energie/eaux/multicapa/colector-aseo.elmt
index ebdb56f15..bc339eb55 100644
--- a/elements/12energie/eaux/multicapa/colector-aseo.elmt
+++ b/elements/12energie/eaux/multicapa/colector-aseo.elmt
@@ -1,5 +1,7 @@
-<definition width="100" version="0.4" hotspot_x="47" hotspot_y="41" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="100" version="0.4" hotspot_x="47" hotspot_y="41" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Te Alpex 20-16-20</name>
+        <name lang="fr">Te Alpex 20-16-20</name>
         <name lang="es">Te Alpex 20-16-20</name>
         <name lang="it">T Alpex 20-16-20</name>
     </names>
@@ -22,8 +24,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="2" x="-18" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
         <rect width="2" x="20" y="-14" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
         <rect width="20" x="-9" y="-17" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-40" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="0.9426" y="-35.8823" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="46.415" y="-0.39891" nameHidden="1" number="" name="" orientation="e"/>
+        <terminal x="-40" y="0" orientation="w"/>
+        <terminal x="0.9426" y="-35.8823" orientation="n"/>
+        <terminal x="46.415" y="-0.39891" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/colector-aseo20-16.elmt b/elements/12energie/eaux/multicapa/colector-aseo20-16.elmt
index 3c0e6e16a..1f56dafef 100644
--- a/elements/12energie/eaux/multicapa/colector-aseo20-16.elmt
+++ b/elements/12energie/eaux/multicapa/colector-aseo20-16.elmt
@@ -1,5 +1,7 @@
-<definition width="100" version="0.4" hotspot_x="45" hotspot_y="73" height="120" type="element" ic="true" orientation="dyyy">
+<definition width="100" version="0.4" hotspot_x="45" hotspot_y="73" height="120" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">collector Aeo20-16</name>
+        <name lang="fr">collecteur Aeo20-16</name>
         <name lang="es">Colecto Aeo20-16</name>
         <name lang="it">Collettore Aeo20-16</name>
     </names>
@@ -45,10 +47,10 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="10" y2="-21" x2="7"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-3" y2="-21" x2="0"/>
         <text x="-27" y="-16" size="4" text="16"/>
-        <terminal x="-38" y="-18" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="2.9426" y="-64.5426" nameHidden="0" number="" name="" orientation="n"/>
-        <terminal x="48.415" y="-18.3989" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="-38" y="30" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="47" y="30" nameHidden="1" number="" name="" orientation="e"/>
+        <terminal x="-38" y="-18" orientation="w"/>
+        <terminal x="2.9426" y="-64.5426" orientation="n"/>
+        <terminal x="48.415" y="-18.3989" orientation="e"/>
+        <terminal x="-38" y="30" orientation="w"/>
+        <terminal x="47" y="30" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/curvaalpex16.elmt b/elements/12energie/eaux/multicapa/curvaalpex16.elmt
index e33f0b939..0c32de4a6 100644
--- a/elements/12energie/eaux/multicapa/curvaalpex16.elmt
+++ b/elements/12energie/eaux/multicapa/curvaalpex16.elmt
@@ -1,5 +1,7 @@
-<definition width="80" version="0.4" hotspot_x="46" hotspot_y="34" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="80" version="0.4" hotspot_x="46" hotspot_y="34" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow Alpex16</name>
+        <name lang="fr">Coude Alpex16</name>
         <name lang="es">CurvaAlpex16</name>
         <name lang="it">Curva Alpex 16</name>
     </names>
@@ -16,7 +18,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line 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" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="4" y="-21" nameHidden="1" number="" name="" orientation="n"/>
+        <terminal x="-31" y="16" orientation="w"/>
+        <terminal x="4" y="-21" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/curvaalpex20.elmt b/elements/12energie/eaux/multicapa/curvaalpex20.elmt
index d91729825..b940f14fe 100644
--- a/elements/12energie/eaux/multicapa/curvaalpex20.elmt
+++ b/elements/12energie/eaux/multicapa/curvaalpex20.elmt
@@ -1,5 +1,7 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="42" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="90" version="0.4" hotspot_x="46" hotspot_y="43" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow Alpex 20</name>
+        <name lang="fr">Coude Alpex 20</name>
         <name lang="es">CurvaAlpex20</name>
         <name lang="it">Curva Alpex 20</name>
     </names>
@@ -16,7 +18,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line 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" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10.9" y="-28.14" nameHidden="1" number="" name="" orientation="n"/>
+        <terminal x="-29.35" y="15.15" orientation="w"/>
+        <terminal x="10.9" y="-28.14" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/curvaalpex25.elmt b/elements/12energie/eaux/multicapa/curvaalpex25.elmt
index 21e993d82..722ef5d97 100644
--- a/elements/12energie/eaux/multicapa/curvaalpex25.elmt
+++ b/elements/12energie/eaux/multicapa/curvaalpex25.elmt
@@ -1,5 +1,7 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="53" height="80" type="element" ic="true" orientation="dyyy">
+<definition width="90" version="0.4" hotspot_x="46" hotspot_y="53" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow Alpex 25</name>
+        <name lang="fr">Coude Alpex 25</name>
         <name lang="es">CurvaAlpex25</name>
         <name lang="it">Curva Alpex 25</name>
     </names>
@@ -16,7 +18,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line 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" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="21.48" y="-37.149" nameHidden="1" number="" name="" orientation="n"/>
+        <terminal x="-26.82" y="14.0775" orientation="w"/>
+        <terminal x="21.48" y="-37.149" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/curvaalpex32.elmt b/elements/12energie/eaux/multicapa/curvaalpex32.elmt
index d408d64f1..accf2c37b 100644
--- a/elements/12energie/eaux/multicapa/curvaalpex32.elmt
+++ b/elements/12energie/eaux/multicapa/curvaalpex32.elmt
@@ -1,5 +1,7 @@
-<definition width="110" version="0.4" hotspot_x="51" hotspot_y="47" height="80" type="element" ic="true" orientation="dyyy">
+<definition width="110" version="0.4" hotspot_x="51" hotspot_y="47" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
+        <name lang="en">Elbow Alpex 32</name>
+        <name lang="fr">Coude Alpex 32</name>
         <name lang="es">CurvaAlpex32</name>
         <name lang="it">Curva Alpex 32</name>
     </names>
@@ -16,7 +18,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line 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" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="14.48" y="-31.992" nameHidden="1" number="" name="" orientation="n"/>
+        <terminal x="-33.82" y="22.62" orientation="w"/>
+        <terminal x="14.48" y="-31.992" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/llave-pasoalpex20.elmt b/elements/12energie/eaux/multicapa/llave-pasoalpex20.elmt
index 2a8b1dcc2..fd5ce6caf 100644
--- a/elements/12energie/eaux/multicapa/llave-pasoalpex20.elmt
+++ b/elements/12energie/eaux/multicapa/llave-pasoalpex20.elmt
@@ -1,7 +1,9 @@
-<definition width="60" version="0.4" hotspot_x="33" hotspot_y="37" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="33" hotspot_y="34" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Lllave Alpex20</name>
+        <name lang="en">Valve Alpex 20</name>
         <name lang="it">Valvola Alpex 20</name>
+        <name lang="fr">Alpex Valve 20</name>
+        <name lang="es">Lllave Alpex20</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -15,16 +17,16 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="11" x="-8" y="-30.825" antialias="false" height="9.825" 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.4214" x1="0" y2="-23.1054" 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="-29.4214" x1="-5" y2="-23.1054" x2="-5"/>
-        <polygon x4="3" y5="-21" x5="-9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-21" x1="-9" y2="-13" x2="-23" y3="-13" x3="17" y4="-21"/>
+        <polygon x4="3" y5="-21" x5="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21" x1="-9" y2="-13" x2="-23" y3="-13" x3="17" y4="-21"/>
         <rect width="12" x="9" y="-6" antialias="false" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="2" x="21" y="-4" antialias="false" height="7" 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" x1="-13" y2="3" 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="-4" x1="-11.797" y2="-4" x2="-8.13656"/>
         <line 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="-6" y2="-6" 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="-6" x1="-6" y2="-4" 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="-6" x1="0" y2="-4" x2="2"/>
-        <text x="-19" y="15" size="4" text="Llave paso 20"/>
-        <terminal x="-28" y="0" nameHidden="232" number="" name="" orientation="w"/>
-        <terminal x="22" y="0" nameHidden="144" number="" name="" orientation="e"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-6" y2="-4" x2="-8"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="0" y2="-4" x2="2"/>
+        <input x="-21" y="16" size="4" rotate="true" text="Llave paso 20" tagg="none"/>
+        <terminal x="-28" y="0" orientation="w"/>
+        <terminal x="22" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/llavealpex25.elmt b/elements/12energie/eaux/multicapa/llavealpex25.elmt
index a5103f077..18b2fbc3a 100644
--- a/elements/12energie/eaux/multicapa/llavealpex25.elmt
+++ b/elements/12energie/eaux/multicapa/llavealpex25.elmt
@@ -1,7 +1,9 @@
-<definition width="70" version="0.4" hotspot_x="36" hotspot_y="36" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="36" hotspot_y="36" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Lllave Alpex25</name>
+        <name lang="en">Valve Alpex 25</name>
         <name lang="it">Valvola Alpex 25</name>
+        <name lang="fr">Alpex Valve 25</name>
+        <name lang="es">Lllave Alpex25</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -15,16 +17,16 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="11" x="-7" y="-33.825" antialias="false" height="9.825" 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="-32.4214" x1="1" y2="-26.1054" 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="-32.4214" x1="-4" y2="-26.1054" x2="-4"/>
-        <polygon x4="4" y5="-24" x5="-8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-24" x1="-8" y2="-16" x2="-22" y3="-16" x3="18" y4="-24"/>
+        <polygon x4="4" y5="-24" x5="-8" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-8" y2="-16" x2="-22" y3="-16" x3="18" y4="-24"/>
         <rect width="13.2" x="11.9" y="-7.25" antialias="false" height="13.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="2.2" x="25.1" y="-4.75" antialias="false" height="8.75" 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="-12.3" y2="4" x2="9.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="-4.75" x1="-10.9767" y2="-4.75" x2="-6.95021"/>
         <line 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="-4.6" y2="-7.25" x2="-4.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="-7.25" x1="-4.6" y2="-4.75" 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="-7.25" x1="2" y2="-4.75" x2="4.2"/>
-        <text x="-18" y="19" size="4" text="Llave paso 25"/>
-        <terminal x="-28.8" y="0.25" nameHidden="232" number="" name="" orientation="w"/>
-        <terminal x="26.2" y="0.25" nameHidden="144" number="" name="" orientation="e"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.25" x1="-4.6" y2="-4.75" x2="-6.8"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.25" x1="2" y2="-4.75" x2="4.2"/>
+        <input x="-19" y="18" size="4" rotate="true" text="Llave paso 25" tagg="none"/>
+        <terminal x="-28.8" y="0.25" orientation="w"/>
+        <terminal x="26.2" y="0.25" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/llavealpex32.elmt b/elements/12energie/eaux/multicapa/llavealpex32.elmt
index 38c00a014..58e996f1a 100644
--- a/elements/12energie/eaux/multicapa/llavealpex32.elmt
+++ b/elements/12energie/eaux/multicapa/llavealpex32.elmt
@@ -1,7 +1,9 @@
-<definition width="80" version="0.4" hotspot_x="35" hotspot_y="42" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="80" version="0.4" hotspot_x="35" hotspot_y="43" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Lllave Alpex32</name>
+        <name lang="en">Valve Alpex 32</name>
         <name lang="it">Valvola Alpex 32</name>
+        <name lang="fr">Alpex Valve 32</name>
+        <name lang="es">Lllave Alpex32</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -15,16 +17,16 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="12.65" x="-2.43" y="-39.1098" antialias="false" height="11.3097" 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="-37.4941" x1="6.77" y2="-30.2237" x2="6.77"/>
         <line 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.4941" x1="1.02" y2="-30.2237" x2="1.02"/>
-        <polygon x4="10.22" y5="-27.8001" x5="-3.58" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-27.8001" x1="-3.58" y2="-18.5912" x2="-19.68" y3="-18.5912" x3="26.32" y4="-27.8001"/>
+        <polygon x4="10.22" y5="-27.8001" x5="-3.58" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-27.8001" x1="-3.58" y2="-18.5912" x2="-19.68" y3="-18.5912" x3="26.32" y4="-27.8001"/>
         <rect width="15.18" x="19.305" y="-8.51895" antialias="false" height="15.8278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="2.53" x="34.485" y="-5.64117" antialias="false" height="10.0722" 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.43107" x1="-8.525" y2="4.43107" x2="16.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="-5.64117" x1="-7.83491" y2="-5.64117" x2="-2.55506"/>
         <line 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.5912" x1="0.33" y2="-8.51895" x2="0.33"/>
-        <line 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.51895" x1="0.33" y2="-5.64117" 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="-8.51895" x1="7.92" y2="-5.64117" x2="10.45"/>
-        <text x="-15.08" y="21.6978" size="4" text="Llave paso 32"/>
-        <terminal x="-27.5" y="0.1144" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="35.75" y="0.1144" nameHidden="1" number="" name="" orientation="e"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.51895" x1="0.33" y2="-5.64117" x2="-2.2"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.51895" x1="7.92" y2="-5.64117" x2="10.45"/>
+        <input x="-16" y="19" size="4" rotate="true" text="Llave paso 32" tagg="none"/>
+        <terminal x="-27.5" y="0.1144" orientation="w"/>
+        <terminal x="35.75" y="0.1144" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/manguito-codoalpex16-1_2h.elmt b/elements/12energie/eaux/multicapa/manguito-codoalpex16-1_2h.elmt
index 74da2f991..58bfb7160 100644
--- a/elements/12energie/eaux/multicapa/manguito-codoalpex16-1_2h.elmt
+++ b/elements/12energie/eaux/multicapa/manguito-codoalpex16-1_2h.elmt
@@ -1,7 +1,9 @@
-<definition width="60" version="0.4" hotspot_x="34" hotspot_y="31" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="30" hotspot_y="32" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Manguito-Codo Alpex 16-1/2H</name>
+        <name lang="en">Elbow fitting Alpex 16-1/2H</name>
         <name lang="it">Manicotto-gomito Alpex 16-1/2" H </name>
+        <name lang="fr">Raccord Coude Alpex 16-1/2H</name>
+        <name lang="es">Manguito-Codo Alpex 16-1/2H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -14,7 +16,6 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="2" x="-26" y="-4" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="17" x="-24" y="-7" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="10" x="-6" y="-13" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-16" y="16" size="4" text="manguito codo&#xa;16-1/2&quot;H"/>
         <rect width="12" x="4" y="-25" antialias="false" height="9" style="line-style:normal;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:red" y1="-23" x1="4" y2="-24" 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="-12" x1="2" y2="-9" x2="4"/>
@@ -26,7 +27,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line 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="7" y2="10" 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="-1" y2="6" x2="2"/>
         <rect width="2" x="-7" y="-9" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-26" y="1" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10" y="-25" nameHidden="0" number="" name="" orientation="n"/>
+        <input x="-17" y="32" size="4" rotate="true" text="manguito codo&#xa;16-1/2&quot;H" tagg="none"/>
+        <terminal x="-26" y="1" orientation="w"/>
+        <terminal x="10" y="-25" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/manguito-codoalpex20-1_2h.elmt b/elements/12energie/eaux/multicapa/manguito-codoalpex20-1_2h.elmt
index f69e76c4c..bd4bf5282 100644
--- a/elements/12energie/eaux/multicapa/manguito-codoalpex20-1_2h.elmt
+++ b/elements/12energie/eaux/multicapa/manguito-codoalpex20-1_2h.elmt
@@ -1,7 +1,9 @@
-<definition width="60" version="0.4" hotspot_x="36" hotspot_y="30" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="34" hotspot_y="32" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Manguito-Codo Alpex 20-1/2H</name>
+        <name lang="en">Elbow fitting Alpex 20-1/2 "H</name>
         <name lang="it">Manicotto-gomito Alpex 20-1/2" H </name>
+        <name lang="fr">Raccord coude Alpex 20-1/2" H </name>
+        <name lang="es">Manguito-Codo Alpex 20-1/2H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -19,13 +21,13 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <line 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.25051" x1="5.26934" y2="10.5305" x2="5.26934"/>
         <rect width="18.5588" x="-25.5588" y="-10.0415" antialias="false" height="20.4415" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="10" x="-6" y="-14" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <text x="-17" y="19" size="4" text="manguito codo&#xa;16-1/2&quot;H"/>
         <rect width="12" x="4" y="-26" antialias="false" height="9" style="line-style:normal;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:red" y1="-24" x1="4" y2="-25" x2="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="2" y2="-10" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="16" y2="-13" x2="18"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="2" y2="-10" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="16" y2="-13" x2="18"/>
         <rect width="2" x="-7" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-27.9256" y="0.17923" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10" y="-26" nameHidden="0" number="" name="" orientation="n"/>
+        <input x="-13" y="32" size="4" rotate="true" text="manguito codo&#xa;16-1/2&quot;H" tagg="none"/>
+        <terminal x="-27.9256" y="0.17923" orientation="w"/>
+        <terminal x="10" y="-26" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/manguito-codoalpex20-3_4h.elmt b/elements/12energie/eaux/multicapa/manguito-codoalpex20-3_4h.elmt
index 784142401..1a91b0fad 100644
--- a/elements/12energie/eaux/multicapa/manguito-codoalpex20-3_4h.elmt
+++ b/elements/12energie/eaux/multicapa/manguito-codoalpex20-3_4h.elmt
@@ -1,7 +1,9 @@
-<definition width="70" version="0.4" hotspot_x="33" hotspot_y="36" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="80" version="0.4" hotspot_x="32" hotspot_y="32" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Manguito-Codo Alpex 20-3/4H</name>
+        <name lang="en">Elbow fitting Alpex 20-3/4H</name>
         <name lang="it">Manicotto-gomito Alpex 20-3/4" H </name>
+        <name lang="fr">Raccord coude Alpex 20-3/4H</name>
+        <name lang="es">Manguito-Codo Alpex 20-3/4H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -14,13 +16,13 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="2.36678" x="-27.9256" y="-6.20875" antialias="false" height="12.776" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="18.5588" x="-25.5588" y="-10.0415" antialias="false" height="20.4415" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="10" x="-6" 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="10" size="4" text="manguito codo&#xa;16-3/4&quot;H"/>
         <rect width="14.5252" x="2.75398" y="-27.334" antialias="false" height="9.92352" style="line-style:normal;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:red" y1="-25.1287" x1="2.75398" y2="-26.2314" x2="17.2791"/>
-        <line 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="1" y2="-10" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="16" y2="-13" x2="19"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="1" y2="-10" x2="4"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="16" y2="-13" x2="19"/>
         <rect width="2" x="-7" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-27.9256" y="0.17923" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10" y="-28" nameHidden="0" number="" name="" orientation="n"/>
+        <input x="0" y="24" size="4" rotate="true" text="manguito codo&#xa;16-3/4&quot;H" tagg="none"/>
+        <terminal x="-27.9256" y="0.17923" orientation="w"/>
+        <terminal x="10" y="-28" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/manguito16-1_2h.elmt b/elements/12energie/eaux/multicapa/manguito16-1_2h.elmt
index 03d28d2e7..05dcc5aa2 100644
--- a/elements/12energie/eaux/multicapa/manguito16-1_2h.elmt
+++ b/elements/12energie/eaux/multicapa/manguito16-1_2h.elmt
@@ -1,7 +1,9 @@
-<definition width="50" version="0.4" hotspot_x="35" hotspot_y="16" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="34" hotspot_y="14" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Manguito16-1/2"H</name>
+        <name lang="en">Sleeve 16-1/2 "H</name>
         <name lang="it">Manicotto 16-1/2" H</name>
+        <name lang="fr">Manchon 16-1/2 "H</name>
+        <name lang="es">Manguito16-1/2"H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -9,14 +11,14 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="4.2" x="-6.8" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="2.1" x="-29.9" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="18.9" x="-27.8" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-23" y="17" size="3" text="manguito 16-1/2&quot;H"/>
         <rect width="11.424" x="-2.39" y="-7.96398" antialias="false" height="14.2165" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="8.064" x="0.97" y="-6.77928" antialias="false" height="11.8471" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="5.06777" x1="2.314" y2="-6.18693" x2="3.658"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="5.06777" x1="4.33" y2="-6.77928" x2="6.346"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="5.06777" x1="6.346" y2="-6.77928" x2="9.034"/>
         <rect width="2.1" x="-8.9" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-29.9" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-23" y="20" size="3" rotate="true" text="manguito 16-1/2&quot;H" tagg="none"/>
+        <terminal x="-29.9" y="0" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/manguitoalpex20-1_2h.elmt b/elements/12energie/eaux/multicapa/manguitoalpex20-1_2h.elmt
index ff856dcdd..b8b4cb39d 100644
--- a/elements/12energie/eaux/multicapa/manguitoalpex20-1_2h.elmt
+++ b/elements/12energie/eaux/multicapa/manguitoalpex20-1_2h.elmt
@@ -1,7 +1,9 @@
-<definition width="60" version="0.4" hotspot_x="26" hotspot_y="16" height="40" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="26" hotspot_y="17" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Manguito20-1/2"H</name>
+        <name lang="en">Sleeve 20-1/2 "H</name>
         <name lang="it">Manicotto 20-1/2" H</name>
+        <name lang="fr">Manchon 20-1/2 "H</name>
+        <name lang="es">Manguito20-1/2"H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -9,14 +11,14 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="6.12995" x="9.94966" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="2.74746" x="-19.365" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="24.3672" x="-16.6176" y="-10.3414" antialias="false" height="21.2163" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-8.8435" y="18" size="3" text="manguito 20-1/2&quot;H"/>
         <rect width="11.968" x="15.5765" y="-7.96398" antialias="false" height="16.2165" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="8.448" x="19.0965" y="-5.77928" antialias="false" height="11.8471" style="line-style:normal;line-weight:normal;filling:none;color:red"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.06777" x1="20.5045" y2="-5.18693" x2="21.9125"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.06777" x1="22.6165" y2="-5.77928" x2="24.7285"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.06777" x1="24.7285" y2="-5.77928" x2="27.5445"/>
         <rect width="2.2" x="7.6565" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-20" y="0" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="28" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-8" y="21.5" size="3" rotate="true" text="manguito 20-1/2&quot;H" tagg="none"/>
+        <terminal x="-20" y="0" orientation="w"/>
+        <terminal x="28" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/manguitoalpex20-3_4h.elmt b/elements/12energie/eaux/multicapa/manguitoalpex20-3_4h.elmt
index 072d22b07..a43a7dbe6 100644
--- a/elements/12energie/eaux/multicapa/manguitoalpex20-3_4h.elmt
+++ b/elements/12energie/eaux/multicapa/manguitoalpex20-3_4h.elmt
@@ -1,7 +1,9 @@
-<definition width="60" version="0.4" hotspot_x="35" hotspot_y="19" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="35" hotspot_y="15" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Manguito20-3/4"H</name>
+        <name lang="en">Sleeve 20-3/4" H</name>
         <name lang="it">Manicotto 20-3/4" H</name>
+        <name lang="fr">Manchon 20-3/4" H</name>
+        <name lang="es">Manguito20-3/4"H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -9,14 +11,14 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="4.66359" x="-1.91531" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="2.49769" x="-29.565" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="23.152" x="-27.0674" y="-10.3414" antialias="false" height="21.2163" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-22" y="22" size="4" text="manguito 20-3/4&quot;H"/>
         <rect width="11.968" x="3.00035" y="-10.4862" antialias="false" height="19.8247" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="8.448" x="6.52035" y="-8.00078" antialias="false" height="14.8539" style="line-style:normal;line-weight:normal;filling:none;color:red"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.85306" x1="7.92835" y2="-7.25809" x2="9.33635"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.85306" x1="10.0404" y2="-8.00078" x2="12.1524"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.85306" x1="12.1524" y2="-8.00078" x2="14.9683"/>
         <rect width="2" x="-4" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-29.565" y="0.266721" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="15.9803" y="0.499088" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-15" y="21" size="3" rotate="true" text="manguito 20-3/4&quot;H" tagg="none"/>
+        <terminal x="-29.565" y="0.266721" orientation="w"/>
+        <terminal x="15.9803" y="0.499088" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/manguitoalpex25-1h.elmt b/elements/12energie/eaux/multicapa/manguitoalpex25-1h.elmt
index 4042a0047..1726a8624 100644
--- a/elements/12energie/eaux/multicapa/manguitoalpex25-1h.elmt
+++ b/elements/12energie/eaux/multicapa/manguitoalpex25-1h.elmt
@@ -1,7 +1,9 @@
-<definition width="70" version="0.4" hotspot_x="35" hotspot_y="24" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="35" hotspot_y="24" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
     <names>
-        <name lang="es">Manguito25-1"H</name>
+        <name lang="en">Sleeve 25-1" H</name>
         <name lang="it">Manicotto 25-1" H</name>
+        <name lang="fr">Manchon 25-1" H</name>
+        <name lang="es">Manguito25-1"H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -9,14 +11,14 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <rect width="5.36313" x="10.2321" y="-8.5422" antialias="false" height="18.3799" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="3.88427" x="-30.5279" y="-9.5422" antialias="false" height="18.3799" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="32.7399" x="-26.6438" y="-15.0562" antialias="false" height="29.4079" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-20" y="27" size="4" text="manguito 25-1&quot;H"/>
         <rect width="13.7632" x="15.8851" y="-12.8708" antialias="false" height="24.7068" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="9.7152" x="19.9332" y="-10.8118" antialias="false" height="20.589" style="line-style:normal;line-weight:normal;filling:none;color:red"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="9.77704" x1="21.5524" y2="-9.7824" x2="23.1716"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="9.77704" x1="23.9812" y2="-10.8118" x2="26.41"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="9.77704" x1="26.41" y2="-10.8118" x2="29.6483"/>
         <rect width="3" x="8" y="-18" antialias="false" height="36" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-30.5279" y="-0.35228" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="30" y="-1" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-12" y="23" size="3" rotate="true" text="manguito 25-1&quot;H" tagg="none"/>
+        <terminal x="-30.5279" y="-0.35228" orientation="w"/>
+        <terminal x="30" y="-1" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/12energie/eaux/multicapa/qet_directory b/elements/12energie/eaux/multicapa/qet_directory
index af583f2dd..dd99a637f 100644
--- a/elements/12energie/eaux/multicapa/qet_directory
+++ b/elements/12energie/eaux/multicapa/qet_directory
@@ -1,6 +1,7 @@
 <qet-directory>
     <names>
-        <name lang="es">MulticapaAlpex</name>
+        <name lang="en">Fittings</name>
         <name lang="it">Raccorderia</name>
+        <name lang="es">MulticapaAlpex</name>
     </names>
 </qet-directory>