diff --git a/elements/10_electric/20_manufacturers_articles/abb/20_frequency_drives/ssabb_psexx_a.elmt b/elements/10_electric/20_manufacturers_articles/abb/20_frequency_drives/ssabb_psexx_a.elmt
index 1a019ad2a..92fb8c898 100644
--- a/elements/10_electric/20_manufacturers_articles/abb/20_frequency_drives/ssabb_psexx_a.elmt
+++ b/elements/10_electric/20_manufacturers_articles/abb/20_frequency_drives/ssabb_psexx_a.elmt
@@ -1,6 +1,6 @@
 <definition width="470" version="0.4" hotspot_x="5" hotspot_y="7" height="120" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="en">SS ABB PSE 18...370</name>
+        <name lang="en">ABB PSE</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
diff --git a/elements/10_electric/20_manufacturers_articles/abb/20_frequency_drives/ssabb_pstxx_a.elmt b/elements/10_electric/20_manufacturers_articles/abb/20_frequency_drives/ssabb_pstxx_a.elmt
index 554264b99..d89868f12 100644
--- a/elements/10_electric/20_manufacturers_articles/abb/20_frequency_drives/ssabb_pstxx_a.elmt
+++ b/elements/10_electric/20_manufacturers_articles/abb/20_frequency_drives/ssabb_pstxx_a.elmt
@@ -1,7 +1,6 @@
 <definition width="470" version="0.4" hotspot_x="5" hotspot_y="7" height="120" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="en">SS ABB PST 30...300</name>
-        <name lang="pl">PST 30...300</name>
+        <name lang="en">ABB PST</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
diff --git a/elements/10_electric/20_manufacturers_articles/april/qet_directory b/elements/10_electric/20_manufacturers_articles/april/qet_directory
index db3db9643..9803fee91 100644
--- a/elements/10_electric/20_manufacturers_articles/april/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/april/qet_directory
@@ -1,6 +1,6 @@
 <qet-directory>
     <names>
-        <name lang="en">APRIL</name>
+        <name lang="en">April</name>
         <name lang="pl">APRIL</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/grifo-aparatos/qet_directory b/elements/60_energy/11_water/grifo-aparatos/qet_directory
index 7d29131fb..e34169c4f 100644
--- a/elements/60_energy/11_water/grifo-aparatos/qet_directory
+++ b/elements/60_energy/11_water/grifo-aparatos/qet_directory
@@ -5,7 +5,7 @@
         <name lang="it">Rubinetti e apparecchi</name>
         <name lang="es">Grifos-Aparatos</name>
         <name lang="el">Βρύσες και εξαρτήματα</name>
-        name lang="pl">Armatura i urządzenia</name>
+        <name lang="pl">Armatura i urządzenia</name>
         <name lang="fr">Robinets et accessoires</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/roscar-valvulas/brida-pn10-rosca1h.elmt b/elements/60_energy/11_water/roscar-valvulas/brida-pn10-rosca1h.elmt
index fb039159f..668c92218 100644
--- a/elements/60_energy/11_water/roscar-valvulas/brida-pn10-rosca1h.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/brida-pn10-rosca1h.elmt
@@ -1,8 +1,10 @@
-<definition width="30" version="0.4" hotspot_x="14" hotspot_y="18" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="20" version="0.4" hotspot_x="12" hotspot_y="19" height="40" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">BridaPN10-1"H</name>
+        <name lang="en">Flange PN 10-1"</name>
         <name lang="it">Flangia PN10-1" F</name>
+        <name lang="fr">Bride PN 10-1"</name>
         <name lang="pl">Kołnierz PN 10-1"</name>
+        <name lang="es">BridaPN10-1"H</name>
     </names>
     <informations></informations>
     <description>
@@ -17,8 +19,8 @@
         <rect width="6.32225" x="-6.6" y="-3.95312" antialias="false" height="9.2696" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="2.662" x="-0.27775" y="-13.3764" antialias="false" height="27.3764" 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.46849" x1="-0.27775" y2="-8.46849" x2="2.0515"/>
-        <input x="-9" y="20" size="4" rotate="true" text="Brida"/>
-        <terminal x="-7" y="0" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="3" y="0" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-9" y="20" size="4" rotate="true" text="Brida" tagg="label"/>
+        <terminal x="-7" y="0" orientation="w"/>
+        <terminal x="3" y="0" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/casquillo1_2-3_4.elmt b/elements/60_energy/11_water/roscar-valvulas/casquillo1_2-3_4.elmt
index 7cb7fbb87..f01445d74 100644
--- a/elements/60_energy/11_water/roscar-valvulas/casquillo1_2-3_4.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/casquillo1_2-3_4.elmt
@@ -1,8 +1,10 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="34" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="30" version="0.4" hotspot_x="12" hotspot_y="15" height="30" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Casquillo 1/2-3/4</name>
+        <name lang="en">Reduction 1/2 "-3/4"</name>
         <name lang="it">Innesto 1/2 - 3/4</name>
+        <name lang="fr">Reduction 1/2"-3/4"</name>
         <name lang="pl">Mufa 1/2"-3/4"</name>
+        <name lang="es">Casquillo 1/2-3/4</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -16,8 +18,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="-10.1963" x1="7.90625" y2="9.42181" x2="5.27375"/>
         <line 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.1963" x1="0.00875" y2="9.42181" x2="-2.62375"/>
         <line 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.41647" x1="1.2025" y2="5.42182" x2="-0.5525"/>
-        <input x="-10" y="-19.5" size="4" rotate="true" text="casquillo"/>
-        <terminal x="10" y="0" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="-5" y="0" nameHidden="1" number="" name="" orientation="w"/>
+        <input x="-10" y="-19.5" size="4" rotate="true" text="casquillo" tagg="label"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="-5" y="0" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/casquillo3_4-1.elmt b/elements/60_energy/11_water/roscar-valvulas/casquillo3_4-1.elmt
index eb2856c87..714c575c4 100644
--- a/elements/60_energy/11_water/roscar-valvulas/casquillo3_4-1.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/casquillo3_4-1.elmt
@@ -1,8 +1,10 @@
-<definition width="40" version="0.4" hotspot_x="20" hotspot_y="39" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="30" version="0.4" hotspot_x="14" hotspot_y="20" height="40" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Casquillo 3/4-1"</name>
+        <name lang="en">Reduction 3/4"-1"</name>
         <name lang="it">Innesto 3/4 - 1"</name>
+        <name lang="fr">Reduction 3/4"-1"</name>
         <name lang="pl">Mufa 3/4"-1"</name>
+        <name lang="es">Casquillo 3/4-1"</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -16,8 +18,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="-16.0606" x1="8.25594" y2="15.4218" x2="4.49146"/>
         <line 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.0606" x1="-3.03749" y2="15.4218" x2="-6.80196"/>
         <line 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.99484" x1="-1.33043" y2="9.00277" x2="-3.84008"/>
-        <input x="-15" y="-26" size="4" rotate="true" text="casquillo"/>
-        <terminal x="11.25" y="0.302061" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="-10.2" y="0.302061" nameHidden="1" number="" name="" orientation="w"/>
+        <input x="-15" y="-26" size="4" rotate="true" text="casquillo" tagg="label"/>
+        <terminal x="11.25" y="0.302061" orientation="e"/>
+        <terminal x="-10.2" y="0.302061" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/codo-rosca1.elmt b/elements/60_energy/11_water/roscar-valvulas/codo-rosca1.elmt
index 5fe230fdb..a75e57529 100644
--- a/elements/60_energy/11_water/roscar-valvulas/codo-rosca1.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/codo-rosca1.elmt
@@ -1,8 +1,10 @@
-<definition width="80" version="0.4" hotspot_x="53" hotspot_y="51" height="90" type="element" ic="true" orientation="dyyy">
+<definition width="80" version="0.4" hotspot_x="53" hotspot_y="51" height="80" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Codo roscar1"</name>
+        <name lang="en">Elbow 1"</name>
         <name lang="it">Gomito filettato 1"</name>
+        <name lang="fr">Coude 1"</name>
         <name lang="pl">Kolanko gwintowane 1"</name>
+        <name lang="es">Codo roscar1"</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -23,8 +25,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:thin;filling:none;color:black" y1="13.909" x1="-31.7138" y2="-7.01728" x2="-27.6297"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13.909" x1="-28.9911" y2="-7.01728" x2="-23.5456"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13.909" x1="-34.4365" y2="-7.01728" x2="-30.3525"/>
-        <input x="-16" y="28" size="4" rotate="true" text="codo 1&quot;"/>
-        <terminal x="-34.687" y="4.14343" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="1.43201" y="-34.919" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-16" y="28" size="4" rotate="true" text="codo 1&quot;" tagg="label"/>
+        <terminal x="-34.687" y="4.14343" orientation="w"/>
+        <terminal x="1.43201" y="-34.919" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/codo-rosca1_2.elmt b/elements/60_energy/11_water/roscar-valvulas/codo-rosca1_2.elmt
index 89c8538bb..5dc9a57a9 100644
--- a/elements/60_energy/11_water/roscar-valvulas/codo-rosca1_2.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/codo-rosca1_2.elmt
@@ -1,8 +1,10 @@
-<definition width="40" version="0.4" hotspot_x="22" hotspot_y="18" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="23" hotspot_y="19" height="40" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Codo roscar1/2</name>
+        <name lang="en">Elbow 1/2"</name>
         <name lang="it">Gomito filettato 1/2"</name>
+        <name lang="fr">Coude 1/2"</name>
         <name lang="pl">Kolanko gwintowane 1/2"</name>
+        <name lang="es">Codo roscar1/2</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -23,8 +25,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:thin;filling:none;color:black" y1="12.7767" x1="-11.3517" y2="2.98313" x2="-9.49952"/>
         <line 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.7767" x1="-10.1169" y2="2.98313" x2="-7.64738"/>
         <line 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.7767" x1="-12.5864" y2="2.98313" x2="-10.7343"/>
-        <input x="-13" y="23" size="4" rotate="true" text="codo1/2"/>
-        <terminal x="-12.7" y="8.20639" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="3.68" y="-10.075" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-13" y="23" size="4" rotate="true" text="codo1/2" tagg="label"/>
+        <terminal x="-12.7" y="8.20639" orientation="w"/>
+        <terminal x="3.68" y="-10.075" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/codo-rosca3_4.elmt b/elements/60_energy/11_water/roscar-valvulas/codo-rosca3_4.elmt
index 90fd465ee..e71663616 100644
--- a/elements/60_energy/11_water/roscar-valvulas/codo-rosca3_4.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/codo-rosca3_4.elmt
@@ -1,8 +1,10 @@
-<definition width="70" version="0.4" hotspot_x="29" hotspot_y="25" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="30" hotspot_y="27" height="60" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Codo roscar3/4</name>
+        <name lang="en">Elbow 3/4</name>
         <name lang="it">Gomito filettato 3/4"</name>
+        <name lang="fr">Coude 3/4</name>
         <name lang="pl">Kolanko gwintowane 3/4"</name>
+        <name lang="es">Codo roscar3/4</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -23,8 +25,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:thin;filling:none;color:black" y1="21" x1="-13.8598" y2="6" x2="-10.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="21" x1="-11.8998" y2="6" x2="-7.97997"/>
         <line 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" x1="-15.8197" y2="6" x2="-12.8798"/>
-        <input x="6" y="25" size="4" rotate="true" text="codo 3/4_"/>
-        <terminal x="-16" y="14" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="10" y="-14" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="6" y="25" size="4" rotate="true" text="codo 3/4_" tagg="label"/>
+        <terminal x="-16" y="14" orientation="w"/>
+        <terminal x="10" y="-14" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/enalce3t1hembra.elmt b/elements/60_energy/11_water/roscar-valvulas/enalce3t1hembra.elmt
index 08b59c420..7d7c1d067 100644
--- a/elements/60_energy/11_water/roscar-valvulas/enalce3t1hembra.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/enalce3t1hembra.elmt
@@ -1,8 +1,8 @@
-<definition width="40" version="0.4" hotspot_x="19" hotspot_y="22" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="40" version="0.4" hotspot_x="19" hotspot_y="25" height="50" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Enlace 3tuercas 1"H</name>
         <name lang="it">Giunto 3 pezzi 1" F</name>
         <name lang="pl">Śrubunek 3-częściowy 1"</name>
+        <name lang="es">Enlace 3tuercas 1"H</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -18,8 +18,8 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <arc width="5.049" x="1.564" y="-18.9932" antialias="true" height="12.9801" 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.61597" x1="-1.85826" y2="7.61597" x2="3.86897"/>
         <arc width="3.927" x="-4.607" y="-6.01313" antialias="true" height="13.6291" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <input x="-14" y="18" size="4" rotate="true" text="enlace1&quot;"/>
-        <terminal x="-11.9" y="-0.172097" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="12.784" y="-0.172097" nameHidden="1" number="" name="" orientation="e"/>
+        <input x="-14" y="18" size="4" rotate="true" text="enlace1&quot;" tagg="label"/>
+        <terminal x="-11.9" y="-0.172097" orientation="w"/>
+        <terminal x="12.784" y="-0.172097" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/filtro1_2h-h.elmt b/elements/60_energy/11_water/roscar-valvulas/filtro1_2h-h.elmt
index df8c11aaa..bf8e70542 100644
--- a/elements/60_energy/11_water/roscar-valvulas/filtro1_2h-h.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/filtro1_2h-h.elmt
@@ -1,4 +1,4 @@
-<definition width="50" version="0.4" hotspot_x="25" hotspot_y="28" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="25" hotspot_y="28" height="40" link_type="simple" type="element" orientation="dyyy">
     <names>
         <name lang="ar">مُرشّح بغربال</name>
         <name lang="en">Filter Screens</name>
@@ -32,8 +32,8 @@
         <rect width="6.6" x="-18" y="-7.33154" antialias="false" height="16.3315" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="5.72" x="-18" y="-5.51694" antialias="false" height="12.7023" 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.91205" x1="-18" y2="7.1854" x2="-16.24"/>
-        <input x="-16" y="13" size="4" rotate="true" text="filtro 1/2&quot;"/>
-        <terminal x="-18" y="-0.0730726" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="18.08" y="-0.0730726" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-16" y="13" size="4" rotate="true" text="filtro 1/2&quot;" tagg="label"/>
+        <terminal x="-18" y="-0.0730726" orientation="w"/>
+        <terminal x="18.08" y="-0.0730726" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/filtro3_4-hembra.elmt b/elements/60_energy/11_water/roscar-valvulas/filtro3_4-hembra.elmt
index db8871ba2..04b53eae7 100644
--- a/elements/60_energy/11_water/roscar-valvulas/filtro3_4-hembra.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/filtro3_4-hembra.elmt
@@ -1,4 +1,4 @@
-<definition width="60" version="0.4" hotspot_x="27" hotspot_y="36" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="29" hotspot_y="34" height="50" link_type="simple" type="element" orientation="dyyy">
     <names>
         <name lang="ar">مُرشّح بغربال</name>
         <name lang="en">Filter Screens</name>
@@ -32,8 +32,8 @@
         <rect width="7.92" x="-20.6" y="-8.11007" antialias="false" height="20.1101" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="6.864" x="-20.6" y="-5.87563" antialias="false" height="15.6411" style="line-style:dotted;line-weight:normal;filling:none;color:red"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:red" y1="-5.13081" x1="-20.6" y2="9.76556" x2="-18.488"/>
-        <input x="-23" y="17.5" size="9" rotate="true" text="filtro3/4&quot;"/>
-        <terminal x="-20.6" y="0.827747" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="22.696" y="0.827747" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-23" y="17.5" size="9" rotate="true" text="filtro3/4&quot;" tagg="label"/>
+        <terminal x="-20.6" y="0.827747" orientation="w"/>
+        <terminal x="22.696" y="0.827747" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/grifo-manguera.elmt b/elements/60_energy/11_water/roscar-valvulas/grifo-manguera.elmt
index 81c26f8be..917dfe2a3 100644
--- a/elements/60_energy/11_water/roscar-valvulas/grifo-manguera.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/grifo-manguera.elmt
@@ -1,8 +1,10 @@
-<definition width="70" version="0.4" hotspot_x="29" hotspot_y="20" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="70" version="0.4" hotspot_x="29" hotspot_y="21" height="50" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Grifo-manguera</name>
+        <name lang="en">Faucet</name>
         <name lang="it">Rubinetto</name>
+        <name lang="fr">Robinet</name>
         <name lang="pl">Zawór</name>
+        <name lang="es">Grifo-manguera</name>
     </names>
     <informations></informations>
     <description>
@@ -34,7 +36,7 @@
         <polygon x4="35" y5="11" x5="35" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="11" x1="27" y2="21" x2="28" y3="21" x3="34" y4="11"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="14" x1="28" y2="14" x2="34"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="18" x1="28" y2="18" x2="34"/>
-        <input x="-24" y="18" size="4" rotate="true" text="grifo manguera3/4"/>
-        <terminal x="-23.9" y="0.667065" nameHidden="0" number="" name="" orientation="w"/>
+        <input x="-24" y="18" size="4" rotate="true" text="grifo manguera3/4" tagg="label"/>
+        <terminal x="-23.9" y="0.667065" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/grupo-seg-termo.elmt b/elements/60_energy/11_water/roscar-valvulas/grupo-seg-termo.elmt
index cc91c692b..cdc665230 100644
--- a/elements/60_energy/11_water/roscar-valvulas/grupo-seg-termo.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/grupo-seg-termo.elmt
@@ -1,8 +1,10 @@
-<definition width="60" version="0.4" hotspot_x="15" hotspot_y="34" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="30" version="0.4" hotspot_x="15" hotspot_y="34" height="50" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Grupo seguridad termo3/4</name>
+        <name lang="en">Safety group 3/4</name>
         <name lang="it">Gruppo di sicurezza termo 3/4</name>
+        <name lang="fr">Groupe de securité 3/4</name>
         <name lang="pl">Zawór bezpieczeństwa 3/4"</name>
+        <name lang="es">Grupo seguridad termo3/4</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -29,8 +31,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="-13" x1="-10" y2="-14" x2="-8"/>
         <rect width="3" x="-1" y="-16" antialias="false" height="13" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <circle x="-2" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="5"/>
-        <input x="11" y="-9" size="4" rotate="true" text="grupo&#xa;termo 3/4&quot;"/>
-        <terminal x="0.376" y="11.1004" nameHidden="1" number="" name="" orientation="s"/>
-        <terminal x="1" y="-30" nameHidden="0" number="" name="" orientation="n"/>
+        <input x="11" y="-9" size="4" rotate="true" text="grupo&#xa;termo 3/4&quot;" tagg="label"/>
+        <terminal x="0.376" y="11.1004" orientation="s"/>
+        <terminal x="1" y="-30" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/latiguillo-1_2.elmt b/elements/60_energy/11_water/roscar-valvulas/latiguillo-1_2.elmt
index 35eb02a68..9b10f7d56 100644
--- a/elements/60_energy/11_water/roscar-valvulas/latiguillo-1_2.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/latiguillo-1_2.elmt
@@ -1,8 +1,10 @@
-<definition width="60" version="0.4" hotspot_x="25" hotspot_y="41" height="60" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="29" hotspot_y="38" height="50" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Latiguillo 1/2</name>
+        <name lang="en">Flexible tube 1/2</name>
         <name lang="it">Tubo flessibile 1/2</name>
+        <name lang="fr">Flexible 1/2</name>
         <name lang="pl">Wąż giętki 1/2"</name>
+        <name lang="es">Latiguillo 1/2</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -33,8 +35,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:thin;filling:none;color:black" y1="-4.81291" x1="6.15" y2="2.31923" x2="3.95"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9.75055" x1="12.75" y2="-10.8478" x2="21.55"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5.36154" x1="7.25" y2="-3.71566" x2="16.6"/>
-        <input x="-6" y="6" size="4" rotate="true" text="latiguillo 1/2H"/>
-        <terminal x="-11.725" y="-0.543913" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="18.8" y="-17.4313" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-6" y="6" size="4" rotate="true" text="latiguillo 1/2H" tagg="label"/>
+        <terminal x="-11.725" y="-0.543913" orientation="w"/>
+        <terminal x="18.8" y="-17.4313" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/latiguillo3_4.elmt b/elements/60_energy/11_water/roscar-valvulas/latiguillo3_4.elmt
index b86982f07..211ead996 100644
--- a/elements/60_energy/11_water/roscar-valvulas/latiguillo3_4.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/latiguillo3_4.elmt
@@ -1,8 +1,10 @@
-<definition width="50" version="0.4" hotspot_x="19" hotspot_y="44" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="19" hotspot_y="43" height="60" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Latiguillo 3/4"</name>
+        <name lang="en">Flexible tube 3/4"</name>
         <name lang="it">Tubo flessibile 3/4</name>
+        <name lang="fr">Flexible 3/4"</name>
         <name lang="pl">Wąż giętki 3/4"</name>
+        <name lang="es">Latiguillo 3/4"</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -33,8 +35,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:thin;filling:none;color:black" y1="-4.32091" x1="9.8975" y2="3.53731" x2="7.8675"/>
         <line 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.7612" x1="15.9875" y2="-10.9701" x2="24.1075"/>
         <line 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.92538" x1="10.9125" y2="-3.11195" x2="19.54"/>
-        <input x="-6" y="13" size="4" rotate="true" text="latiguillo 3/4"/>
-        <terminal x="-6.59625" y="0.382688" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="21.5" y="-18.208" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-6" y="13" size="4" rotate="true" text="latiguillo 3/4" tagg="label"/>
+        <terminal x="-6.59625" y="0.382688" orientation="w"/>
+        <terminal x="21.5" y="-18.208" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/latiguillo3_8.elmt b/elements/60_energy/11_water/roscar-valvulas/latiguillo3_8.elmt
index 65cc3e953..d0b5881d3 100644
--- a/elements/60_energy/11_water/roscar-valvulas/latiguillo3_8.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/latiguillo3_8.elmt
@@ -1,8 +1,10 @@
-<definition width="50" version="0.4" hotspot_x="17" hotspot_y="30" height="50" type="element" ic="true" orientation="dyyy">
+<definition width="30" version="0.4" hotspot_x="13" hotspot_y="28" height="40" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Latiguillo 3/8</name>
+        <name lang="en">Flexible tube 3/8"</name>
         <name lang="it">Tubo flessibile 3/8</name>
+        <name lang="fr">Flexible 3/8"</name>
         <name lang="pl">Wąż giętki 3/8"</name>
+        <name lang="es">Latiguillo 3/8</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -33,8 +35,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:thin;filling:none;color:black" y1="-3.19161" x1="4.7675" y2="1.63994" x2="3.5775"/>
         <line 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.53652" x1="8.3375" y2="-7.27983" x2="13.0975"/>
         <line 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.56327" x1="5.3625" y2="-2.44829" x2="10.42"/>
-        <input x="-8" y="7" size="4" rotate="true" text="latiguillo 3/8"/>
-        <terminal x="-4.90125" y="-0.299648" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="11.75" y="-11.6069" nameHidden="1" number="" name="" orientation="n"/>
+        <input x="-8" y="7" size="4" rotate="true" text="latiguillo 3/8" tagg="label"/>
+        <terminal x="-4.90125" y="-0.299648" orientation="w"/>
+        <terminal x="11.75" y="-11.6069" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/llave-latiguillo.elmt b/elements/60_energy/11_water/roscar-valvulas/llave-latiguillo.elmt
index 67b822a0e..64b686fbf 100644
--- a/elements/60_energy/11_water/roscar-valvulas/llave-latiguillo.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/llave-latiguillo.elmt
@@ -1,8 +1,10 @@
-<definition width="50" version="0.4" hotspot_x="22" hotspot_y="36" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="30" version="0.4" hotspot_x="11" hotspot_y="25" height="60" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Llave latiguillo</name>
+        <name lang="en">Valve</name>
         <name lang="it">Valvola</name>
+        <name lang="fr">Soupape</name>
         <name lang="pl">Zawór</name>
+        <name lang="es">Llave latiguillo</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
@@ -37,8 +39,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="3.37242" x1="9" y2="4.66861" x2="7.5"/>
         <rect width="9.5" x="-4" y="-11.5337" antialias="false" height="1.94428" 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.7009" x1="-4.5" y2="-6.99709" x2="-4.5"/>
-        <input x="-16" y="-24" size="4" rotate="true" text="llave latiguillo"/>
-        <terminal x="12.5" y="0.131947" nameHidden="1" number="" name="" orientation="e"/>
-        <terminal x="0.5" y="26.7038" nameHidden="1" number="" name="" orientation="s"/>
+        <input x="-16" y="-24" size="4" rotate="true" text="llave latiguillo" tagg="label"/>
+        <terminal x="12.5" y="0.131947" orientation="e"/>
+        <terminal x="0.5" y="26.7038" orientation="s"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/llavereg1.elmt b/elements/60_energy/11_water/roscar-valvulas/llavereg1.elmt
index 4102b6528..8709b98a4 100644
--- a/elements/60_energy/11_water/roscar-valvulas/llavereg1.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/llavereg1.elmt
@@ -1,8 +1,10 @@
-<definition width="60" version="0.4" hotspot_x="25" hotspot_y="59" height="90" type="element" ic="true" orientation="dyyy">
+<definition width="60" version="0.4" hotspot_x="25" hotspot_y="60" height="80" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Valv compuerta 1!</name>
+        <name lang="en">Valve</name>
         <name lang="it">Valvola di regolazione 1"</name>
+        <name lang="fr">Vanne</name>
         <name lang="pl">Zawór regulacyjny 1"</name>
+        <name lang="es">Valv compuerta 1!</name>
     </names>
     <informations></informations>
     <description>
@@ -35,8 +37,8 @@
         <rect width="9.1" x="0.529978" y="-39.2681" antialias="false" height="7.44065" 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.6563" x1="-3.96039" y2="-20.3852" x2="-3.96039"/>
         <rect width="24.2242" x="-7.35606" y="-23.9968" antialias="false" height="2.60423" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-21" y="19" size="4" rotate="true" text="valv.compuerta1&quot;"/>
-        <terminal x="-20.8333" y="-1.79741" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="31.5782" y="-1.79741" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-21" y="19" size="4" rotate="true" text="valv.compuerta1&quot;" tagg="label"/>
+        <terminal x="-20.8333" y="-1.79741" orientation="w"/>
+        <terminal x="31.5782" y="-1.79741" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/llavereg3_4.elmt b/elements/60_energy/11_water/roscar-valvulas/llavereg3_4.elmt
index cee327f6e..166afe416 100644
--- a/elements/60_energy/11_water/roscar-valvulas/llavereg3_4.elmt
+++ b/elements/60_energy/11_water/roscar-valvulas/llavereg3_4.elmt
@@ -1,8 +1,10 @@
-<definition width="60" version="0.4" hotspot_x="27" hotspot_y="43" height="70" type="element" ic="true" orientation="dyyy">
+<definition width="50" version="0.4" hotspot_x="26" hotspot_y="43" height="60" link_type="simple" type="element" orientation="dyyy">
     <names>
-        <name lang="es">Valv compuerta 3/4</name>
+        <name lang="en">Valve 3/4"</name>
         <name lang="it">Valvola di regolazione 3/4"</name>
+        <name lang="fr">Vanne 3/4"</name>
         <name lang="pl">Zawór regulacyjny 3/4"</name>
+        <name lang="es">Valv compuerta 3/4</name>
     </names>
     <informations></informations>
     <description>
@@ -35,8 +37,8 @@
         <rect width="7" x="-5" y="-29" antialias="false" 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.928" x1="-8.45413" y2="-13.7732" x2="-8.45413"/>
         <rect width="18.634" x="-11.0662" y="-16.6855" antialias="false" height="2.1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-22" y="17" size="4" rotate="true" text="valv.compuerta3/4"/>
-        <terminal x="-21.4333" y="1.21567" nameHidden="0" number="" name="" orientation="w"/>
-        <terminal x="18.8833" y="1.21567" nameHidden="0" number="" name="" orientation="e"/>
+        <input x="-22" y="17" size="4" rotate="true" text="valv.compuerta3/4" tagg="label"/>
+        <terminal x="-21.4333" y="1.21567" orientation="w"/>
+        <terminal x="18.8833" y="1.21567" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/roscar-valvulas/qet_directory b/elements/60_energy/11_water/roscar-valvulas/qet_directory
index a4c7f2f91..abafebe1c 100644
--- a/elements/60_energy/11_water/roscar-valvulas/qet_directory
+++ b/elements/60_energy/11_water/roscar-valvulas/qet_directory
@@ -5,5 +5,6 @@
         <name lang="it">Filettati</name>
         <name lang="pl">Zawory i złączki</name>
         <name lang="fr">Vannes</name>
+        <name lang="en">Valves and Accessories</name>
     </names>
 </qet-directory>