diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circul-bridas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomb-circul-bridas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circul-bridas.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomb-circul-bridas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-agua-vert.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-agua-vert.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-agua-vert.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-horiz1.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-horiz1.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-horiz1.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-pozo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-pozo.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/bomba-pozo.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/calentador-gas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/calentador-gas.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/calentador-gas.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/calentador-gas.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-gasoil.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/deposito-gasoil.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/esquemas calefaccion/deposito-gasoil.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/deposito-gasoil.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/acs-viv-retorno.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/acs-viv-retorno.elmt
deleted file mode 100644
index 1903ca2be..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/acs-viv-retorno.elmt
+++ /dev/null
@@ -1,24 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="9" hotspot_y="16" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F4AB313B-95E8-4987-810C-5A4CCE465C4C}"/><names>
-        <name lang="es">ACS +retorno a vivienda</name>
-        <name lang="en">DHW +return to house</name>
-        <name lang="ca">ACS +retorn a 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:dashed;line-weight:normal;filling:none;color:black" y1="-0.332274" x1="3.1904" y2="-0.332274" x2="16.6437"/>
-        <line 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.55405" x1="-4.63607" y2="-7.55405" x2="12.8224"/>
-        <line 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.55405" x1="13.4" y2="1.11208" x2="20.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.44515" x1="16.2" y2="-3.22099" x2="26"/>
-        <arc width="16.8" x="9.2" y="-8.99841" antialias="true" height="14.4436" style="line-style:normal;line-weight:normal;filling:none;color:black" start="10" angle="-110"/>
-        <line 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.332274" x1="28.8" y2="4.00079" x2="38.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8.33386" x1="20.4" y2="17" x2="24.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.44515" x1="26" y2="12.6669" x2="33"/>
-        <line 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.55644" x1="27.4" y2="6.88951" x2="33"/>
-        <line 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.88951" x1="23.2" y2="12.6669" x2="27.4"/>
-        <input x="16" y="-10" size="4" rotate="true" text="ACS" tagg="label"/>
-        <terminal x="-4.8" y="-7.55405" orientation="w"/>
-        <terminal x="-4.8" y="-0.332274" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/aerotermo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/aerotermo2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/aerotermo.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/aerotermo2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/bobine2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/bobine2.elmt
deleted file mode 100644
index 748374958..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/bobine2.elmt
+++ /dev/null
@@ -1,26 +0,0 @@
-<definition orientation="dyyy" type="element" height="40" link_type="simple" width="30" hotspot_y="24" version="0.5" hotspot_x="15">
-<uuid uuid="{0FE29FE9-D96E-43B7-8C53-AACEE1100E1F}"/><names>
-        <name lang="ru">Обмотка</name>
-        <name lang="pt">Bobine</name>
-        <name lang="fr">Bobine</name>
-        <name lang="cs">Cívka</name>
-        <name lang="en">Coil</name>
-        <name lang="es">Bobina</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input text="A2" rotate="true" size="4" tagg="none" x="-17" y="8"/>
-        <input text="A1" rotate="true" size="4" tagg="none" x="-16" y="-10"/>
-        <line end2="none" x1="1.77636e-15" y1="-15.5011" x2="1.77636e-15" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="-9.47518" end1="none" length2="1.5"/>
-        <line end2="none" x1="1.77636e-15" y1="3.75593" x2="1.77636e-15" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="9.78185" end1="none" length2="1.5"/>
-        <line end2="none" x1="9" y1="2.57667" x2="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="-9.47518" end1="none" length2="1.5"/>
-        <line end2="none" x1="-9" y1="2.57667" x2="9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="2.57667" end1="none" length2="1.5"/>
-        <input text="" size="9" tagg="none" x="12" y="-1.64148"/>
-        <line end2="none" x1="9" y1="-9.47518" x2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="-9.47518" end1="none" length2="1.5"/>
-        <line end2="none" x1="-9" y1="-9.47518" x2="-9" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" antialias="false" y2="2.57667" end1="none" length2="1.5"/>
-        <input text="KM_" rotate="true" size="4" tagg="label" x="9" y="-1"/>
-        <terminal orientation="n" x="1.77636e-15" y="-16.1037"/>
-        <terminal orientation="s" x="1.77636e-15" y="9.20518"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_continuite.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_continuite.elmt
deleted file mode 100644
index a64ce5a90..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_continuite.elmt
+++ /dev/null
@@ -1,20 +0,0 @@
-<definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="30" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{CFD303D2-E8C7-41E3-91F7-A9FC5F91B92C}"/><names>
-        <name lang="ru">Клеммное соединение</name>
-        <name lang="pt">Terminal de combinação</name>
-        <name lang="en">Terminal block</name>
-        <name lang="fr">Borne continuité</name>
-        <name lang="es">Punto de combinación</name>
-        <name lang="cs">Spojovací svorka</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-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="10" x1="0" y2="3" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-3" x2="0"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <input x="2" y="1.5" size="5" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-10" orientation="n"/>
-        <terminal x="0" y="10" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_finale.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_finale.elmt
deleted file mode 100644
index cda539485..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/borne_finale.elmt
+++ /dev/null
@@ -1,18 +0,0 @@
-<definition width="10" version="0.4" hotspot_x="4" hotspot_y="15" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{17DF210F-C1F0-4F37-BAEE-6690CC573A5E}"/><names>
-        <name lang="ru">Клеммник</name>
-        <name lang="pt">Terminal de fim</name>
-        <name lang="en">Terminal block</name>
-        <name lang="fr">Borne finale</name>
-        <name lang="es">Punto de unión</name>
-        <name lang="cs">Koncová svorka</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input x="4" y="4" size="5" text="_" tagg="label"/>
-        <line 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="-3" x2="0"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="0" y="-10" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple.elmt
deleted file mode 100644
index c3cd496d1..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple.elmt
+++ /dev/null
@@ -1,19 +0,0 @@
-<definition width="20" version="0.4" hotspot_x="11" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D0CC280D-849B-4E40-80B1-1666AED89B5B}"/><names>
-        <name lang="ru">Проктой контакт (НР)</name>
-        <name lang="pt">Contacto simples (NO)</name>
-        <name lang="en">Simple contact</name>
-        <name lang="fr">Contact simple</name>
-        <name lang="es">Contactor simple</name>
-        <name lang="cs">Jednoduché spojení</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="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="-20" x1="0" y2="-10" x2="0"/>
-        <input x="5" y="15.5" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple_nf.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple_nf.elmt
deleted file mode 100644
index f606644f1..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/con_simple_nf.elmt
+++ /dev/null
@@ -1,20 +0,0 @@
-<definition width="20" version="0.4" hotspot_x="8" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C9C6013B-0DF9-4234-B279-1C200AF09C46}"/><names>
-        <name lang="ru">Проктой контакт (НЗ)</name>
-        <name lang="pt">Contacto simples (NC)</name>
-        <name lang="en">Simple contact (NC)</name>
-        <name lang="fr">Contact simple (NF)</name>
-        <name lang="es">Contactor simple (NC)</name>
-        <name lang="cs">Jednoduché spojení (NC)</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="5" y2="10" x2="0" y3="20" x3="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="0" y2="-9" 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="-20" x1="0" y2="-9" x2="0"/>
-        <input x="8" y="12.5" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/foot_no_nc.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/foot_no_nc.elmt
deleted file mode 100644
index 26ce1d396..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/foot_no_nc.elmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="21" hotspot_y="25" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{493F67D2-58EB-473F-882B-4A6B3F44896F}"/><names>
-        <name lang="ar">مفتاح بدوّاسة (NO/NC)</name>
-        <name lang="el">Ποδοδιακόπτης, ανοικτή και κλειστή επαφή</name>
-        <name lang="en">Foot Switch (NO/NC)</name>
-        <name lang="it">Comando a pedale (NO/NC)</name>
-        <name lang="fr">Interrupteur a pedale (NO/NC)</name>
-        <name lang="pl">Łącznik wielozestykowy napędzany nogą</name>
-        <name lang="es">Doble interruptor A/C</name>
-        <name lang="nl">Voetschakelaar (NO/NC)</name>
-        <name lang="cs">Pedálový spínač (NO/NC)</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="-9" x1="20" y2="-9" x2="27"/>
-        <input x="-2" y="-14.5" size="5" rotate="true" text="13" tagg="none"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="2" x1="-19" y2="-4" x2="-13" y3="4" x3="-13"/>
-        <input x="17" y="-14.5" size="5" rotate="true" text="21" tagg="none"/>
-        <input x="18" y="17.5" size="5" rotate="true" text="22" tagg="none"/>
-        <input x="-2" y="17.5" size="5" rotate="true" text="14" tagg="none"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="20" y2="10" x2="20" y3="-10" x3="26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:thin;filling:none;color:black" y1="0" x1="-13" y2="0" 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="-20" x1="20" y2="-9" x2="20"/>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="20" x1="0" y2="10" x2="0" y3="-10" x3="-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="-20" x1="0" y2="-9" x2="0"/>
-        <input x="27" y="5.5" size="6" text="_" tagg="label"/>
-        <terminal x="0" y="-20" orientation="n"/>
-        <terminal x="0" y="20" orientation="s"/>
-        <terminal x="20" y="-20" orientation="n"/>
-        <terminal x="20" y="20" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_n.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_n.elmt
deleted file mode 100644
index 0931cc977..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_n.elmt
+++ /dev/null
@@ -1,17 +0,0 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dnnn">
-<uuid uuid="{538CBDB3-56D6-4A98-9280-A4C4868D57EE}"/><names>
-        <name lang="ru">Нейтраль</name>
-        <name lang="en">Neutral source</name>
-        <name lang="fr">Source neutre</name>
-        <name lang="es">Fuente neutro</name>
-        <name lang="cs">Nulový zdroj</name>
-        <name lang="pt">Fonte de neutro</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
-        <text x="-12" y="3" size="5" text="N"/>
-        <terminal x="10" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_p.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_p.elmt
deleted file mode 100644
index 4178d61f6..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/frio/src_p.elmt
+++ /dev/null
@@ -1,17 +0,0 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dnnn">
-<uuid uuid="{F5C63761-1730-4820-8E25-529930E663D3}"/><names>
-        <name lang="ru">Фаза</name>
-        <name lang="en">Phase source</name>
-        <name lang="fr">Source phase</name>
-        <name lang="es">Fuente fase</name>
-        <name lang="cs">Fázový zdroj</name>
-        <name lang="pt">Fonte de fase</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
-        <text x="-12" y="3" size="5" text="L"/>
-        <terminal x="10" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_1pn.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_1pn.elmt
deleted file mode 100644
index 6c314aba1..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_1pn.elmt
+++ /dev/null
@@ -1,20 +0,0 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
-<uuid uuid="{4C31B850-3566-475A-9246-6AB021B70FF9}"/><names>
-        <name lang="ru">Однополюсный + нейтраль</name>
-        <name lang="en">Single-pole source + neutral</name>
-        <name lang="fr">Source unipolaire + neutre</name>
-        <name lang="es">Fuente unipolo + neutro</name>
-        <name lang="cs">Jednopólový zdroj + nulový</name>
-        <name lang="pt">Fonte unipolar + neutro</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="10" x2="10"/>
-        <text x="-12" y="13" size="5" text="N"/>
-        <text x="-12" y="3" size="5" text="L"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="10" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_3pn.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_3pn.elmt
deleted file mode 100644
index 24297e850..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Electricosfrio/fuerza/src_3pn.elmt
+++ /dev/null
@@ -1,26 +0,0 @@
-<definition width="30" version="0.1" hotspot_x="15" hotspot_y="35" height="60" type="element" orientation="dnnn">
-<uuid uuid="{1A2B0439-CCC8-4EC3-BA8D-4653C471429C}"/><names>
-        <name lang="ru">Трёхполюсный + нейтраль</name>
-        <name lang="en">Three-pole source + neutral</name>
-        <name lang="fr">Source tripolaire + neutre</name>
-        <name lang="es">Fuente tripolar + neutro</name>
-        <name lang="cs">Třípólový zdroj + nulový</name>
-        <name lang="pt">Fonte tripolar + neutro</name>
-    </names>
-    <informations>Author: The QElectroTech team&#xd;&#xd;&#xd;&#xd;&#xd;
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="0" y2="0" x2="10"/>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="0" y2="-10" x2="10"/>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="0" y2="10" x2="10"/>
-        <text x="-12" y="13" size="5" text="N"/>
-        <text x="-12" y="3" size="5" text="L3"/>
-        <text x="-12" y="-7" size="5" text="L2"/>
-        <text x="-12" y="-17" size="5" text="L1"/>
-        <line antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-20" x2="10"/>
-        <terminal x="10" y="-20" orientation="e"/>
-        <terminal x="10" y="-10" orientation="e"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="10" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circu-doble-bridas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circu-doble-bridas.elmt
deleted file mode 100644
index a2433f679..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomb-circu-doble-bridas.elmt
+++ /dev/null
@@ -1,84 +0,0 @@
-<definition width="50" hotspot_y="21" height="40" type="element" version="0.4" orientation="dyyy" hotspot_x="23" link_type="simple">
-<uuid uuid="{8776D0E5-25DA-4D39-BF32-796551662A3C}"/><names>
-        <name lang="es">Bomba circuladora-doble brida</name>
-	<name lang="en">Circulating double w/flanges pump</name>
-        <name lang="ca">Bomba circu-2 brides</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="0.8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.11229" x="-17.6" height="13.8328"/>
-        <line x1="6.8" antialias="false" y1="-2.11229" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-3.57049" end2="none" length2="1.5" end1="none" x2="5.2"/>
-        <arc start="0" width="21.6" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-10.8615" x="-9.2" height="11.6657" angle="-90"/>
-        <line x1="6" antialias="false" y1="13.1989" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="11.7407" end2="none" length2="1.5" end1="none" x2="4.4"/>
-        <line x1="-5.2" antialias="false" y1="-6.48691" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-6.48691" end2="none" length2="1.5" end1="none" x2="-2.8"/>
-        <line x1="-6" antialias="false" y1="8.82427" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="8.82427" end2="none" length2="1.5" end1="none" x2="-3.6"/>
-        <line x1="-2.8" antialias="false" y1="-2.84139" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-4.2996" end2="none" length2="1.5" end1="none" x2="-1.2"/>
-        <line x1="-3.6" antialias="false" y1="12.4698" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="11.0116" end2="none" length2="1.5" end1="none" x2="-2"/>
-        <line x1="-16.4" antialias="false" y1="2.01323" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="2.01323" end2="none" length2="1.5" end1="none" x2="-14"/>
-        <ellipse width="9.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.8615" x="-2.8" height="8.02014"/>
-        <ellipse width="14.4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.0488" x="-5.2" height="12.3948"/>
-        <rect width="1.2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6.11229" x="19.2" height="13.8328"/>
-        <ellipse width="3.2" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-7.94512" x="0.4" height="2.91641"/>
-        <line x1="2" antialias="false" y1="-12.8544" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-11.0722" end2="none" length2="1.5" end1="none" x2="2"/>
-        <line x1="2" antialias="false" y1="-2.84139" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-0.654079" end2="none" length2="1.5" end1="none" x2="2"/>
-        <line x1="-16.4" antialias="false" y1="-1.90318" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-1.90318" end2="none" length2="1.5" end1="none" x2="-14"/>
-        <line x1="6.8" antialias="false" y1="-6.48691" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-6.48691" end2="none" length2="1.5" end1="none" x2="9.2"/>
-        <line x1="5.2" antialias="false" y1="-10.1324" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-11.5906" end2="none" length2="1.5" end1="none" x2="6.8"/>
-        <line x1="-2" antialias="false" y1="-9.40332" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-10.8615" end2="none" length2="1.5" end1="none" x2="-3.6"/>
-        <line x1="-1.2" antialias="false" y1="-12.3197" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-10.8615" end2="none" length2="1.5" end1="none" x2="-0.4"/>
-        <ellipse width="9.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="4.44965" x="-3.6" height="8.02014"/>
-        <line x1="3.6" antialias="false" y1="-3.57049" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-1.38318" end2="none" length2="1.5" end1="none" x2="4.4"/>
-        <line x1="3.6" antialias="false" y1="-10.8615" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-12.3197" end2="none" length2="1.5" end1="none" x2="4.4"/>
-        <ellipse width="14.4" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="2.26234" x="-6" height="12.3948"/>
-        <line x1="6" antialias="false" y1="-8.67422" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-10.1324" end2="none" length2="1.5" end1="none" x2="8.4"/>
-        <ellipse width="3.2" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" y="7.36606" x="-0.4" height="2.91641"/>
-        <line x1="6.8" antialias="false" y1="-7.21601" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-7.21601" end2="none" length2="1.5" end1="none" x2="8.4"/>
-        <line x1="1.2" antialias="false" y1="2.45677" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="4.23902" end2="none" length2="1.5" end1="none" x2="1.2"/>
-        <line x1="6" antialias="false" y1="-5.0287" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-4.2996" end2="none" length2="1.5" end1="none" x2="8.4"/>
-        <line x1="1.2" antialias="false" y1="12.4698" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="14.6571" end2="none" length2="1.5" end1="none" x2="1.2"/>
-        <line x1="6" antialias="false" y1="8.82427" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="8.82427" end2="none" length2="1.5" end1="none" x2="8.4"/>
-        <line x1="-5.2" antialias="false" y1="-8.67422" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-7.94512" end2="none" length2="1.5" end1="none" x2="-2.8"/>
-        <line x1="4.4" antialias="false" y1="5.17875" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="3.72054" end2="none" length2="1.5" end1="none" x2="6"/>
-        <line x1="-4.4" antialias="false" y1="-4.2996" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-5.0287" end2="none" length2="1.5" end1="none" x2="-2.8"/>
-        <line x1="-2.8" antialias="false" y1="5.90785" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="4.44965" end2="none" length2="1.5" end1="none" x2="-4.4"/>
-        <line x1="-1.2" antialias="false" y1="-1.38318" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-2.84139" end2="none" length2="1.5" end1="none" x2="-0.4"/>
-        <line x1="0.4" antialias="false" y1="-5.7578" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="-7.21601" end2="none" length2="1.5" end1="none" x2="3.6"/>
-        <line x1="-2" antialias="false" y1="2.99144" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="4.44965" end2="none" length2="1.5" end1="none" x2="-1.2"/>
-        <line x1="2.8" antialias="false" y1="11.7407" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="13.928" end2="none" length2="1.5" end1="none" x2="3.6"/>
-        <arc start="-180" width="17.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-14.507" x="-6.8" height="13.1239" angle="-180"/>
-        <line x1="2.8" antialias="false" y1="4.44965" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="2.99144" end2="none" length2="1.5" end1="none" x2="3.6"/>
-        <arc start="-90" width="15.2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.2362" x="-6.8" height="16.0403" angle="-90"/>
-        <line x1="5.2" antialias="false" y1="6.63696" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="5.17875" end2="none" length2="1.5" end1="none" x2="7.6"/>
-        <line x1="6" antialias="false" y1="8.09517" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="8.09517" end2="none" length2="1.5" end1="none" x2="7.6"/>
-        <line x1="11.4399" antialias="false" y1="-7.94512" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-7.94512" end2="none" length2="1.5" end1="none" x2="13.3734"/>
-        <line x1="5.2" antialias="false" y1="10.2825" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="11.0116" end2="none" length2="1.5" end1="none" x2="7.6"/>
-        <line x1="-6" antialias="false" y1="6.63696" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="7.36606" end2="none" length2="1.5" end1="none" x2="-3.6"/>
-        <line x1="-5.2" antialias="false" y1="11.0116" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="10.2825" end2="none" length2="1.5" end1="none" x2="-3.6"/>
-        <line x1="-2" antialias="false" y1="13.928" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="12.4698" end2="none" length2="1.5" end1="none" x2="-1.2"/>
-        <line x1="-0.4" antialias="false" y1="9.55337" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="8.09517" end2="none" length2="1.5" end1="none" x2="2.8"/>
-        <line x1="11.3866" antialias="false" y1="10.2825" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="10.2825" end2="none" length2="1.5" end1="none" x2="12.6311"/>
-        <arc start="-180" width="17.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.804129" x="-7.6" height="13.1239" angle="-180"/>
-        <arc start="-90" width="15.2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="0.075025" x="-7.6" height="16.0403" angle="-90"/>
-        <arc start="0" width="21.6" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y="4.44965" x="-10" height="11.6657" angle="-90"/>
-        <line x1="14" antialias="false" y1="-7.94512" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-6.48691" end2="none" length2="1.5" end1="none" x2="15.6"/>
-        <line x1="15.6" antialias="false" y1="-6.48691" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-0.654079" end2="none" length2="1.5" end1="none" x2="15.6"/>
-        <line x1="16.478" antialias="false" y1="-0.924975" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="-0.924975" end2="none" length2="1.5" end1="none" x2="19.2488"/>
-        <line x1="12.4" antialias="false" y1="10.2825" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="8.82427" end2="none" length2="1.5" end1="none" x2="15.6"/>
-        <line x1="15.6" antialias="false" y1="8.82427" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="2.99144" end2="none" length2="1.5" end1="none" x2="15.6"/>
-        <line x1="19.2488" antialias="false" y1="3.26234" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" y2="3.26234" end2="none" length2="1.5" end1="none" x2="16.478"/>
-        <line x1="12.4" antialias="false" y1="-4.2996" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="5.90785" end2="none" length2="1.5" end1="none" x2="12.4"/>
-        <line x1="10" antialias="false" y1="7.36606" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="7.36606" end2="none" length2="1.5" end1="none" x2="11.6"/>
-        <polygon x1="-6.8" x5="-13.2" antialias="false" closed="false" y1="-8.67422" y5="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-2.11229" x3="-10.8" y2="-8.67422" x4="-13.2" x2="-9.2" y4="-2"/>
-        <polygon x1="-13.2" x5="-7.6" antialias="false" closed="false" y1="2" y5="10.2825" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="10.2825" x3="-9.2" y2="2.26234" x4="-7.6" x2="-10.8" y4="10.2825"/>
-        <line x1="10.8" antialias="false" y1="7.36606" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="5.90785" end2="none" length2="1.5" end1="none" x2="12.4"/>
-        <line x1="-6" antialias="false" y1="-2.84139" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="0.075025" end2="none" length2="1.5" end1="none" x2="-9.2"/>
-        <line x1="-9.2" antialias="false" y1="0.075025" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" y2="2.99144" end2="none" length2="1.5" end1="none" x2="-6.8"/>
-        <rect width="3.2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15.7779" x="0.2" height="2.91641"/>
-        <polygon x1="-6.2" x5="-0.6" antialias="false" closed="false" y1="-15.9451" y5="-17.4033" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-15.216" x3="-3.8" y2="-17.4033" x4="-0.6" x2="-3" y4="-17.4033"/>
-        <input y="19.3963" rotate="true" x="-7.6" size="4" tagg="label" text="_"/>
-        <terminal y="0" x="-18" orientation="w"/>
-        <terminal y="1" x="21" orientation="e"/>
-        <terminal y="-17" x="2" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-circuladora.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-circuladora.elmt
deleted file mode 100644
index b5d22b892..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/bomba-circuladora.elmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<definition width="50" hotspot_y="21" hotspot_x="24" type="element" orientation="dyyy" version="0.5" link_type="simple" height="40">
-<uuid uuid="{5436C828-D73E-4941-A6AC-97966A3121AF}"/><names>
-        <name lang="es">Bomba circuladora</name>
-	<name lang="en">Circulating pump</name>
-        <name lang="ca">Bomba circuladora</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line y1="13.0284" end1="none" x1="15" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="18" antialias="false" y2="13.0284" length2="1.5"/>
-        <line y1="13.0284" end1="none" x1="-18" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-15" antialias="false" y2="13.0284" length2="1.5"/>
-        <polygon y1="3.06945" x3="7" y4="1.82462" x5="9" x4="9" x1="-8" y5="1.82462" closed="false" y3="-18.0933" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="-6" antialias="false" y2="-18.0933"/>
-        <rect width="4" y="8.04891" style="line-style:normal;line-weight:normal;filling:none;color:black" x="11" antialias="false" height="4.97946"/>
-        <rect width="4" y="5.55918" style="line-style:normal;line-weight:normal;filling:none;color:black" x="15" antialias="false" height="9.95894"/>
-        <line y1="8.04891" end1="none" x1="15" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="18" antialias="false" y2="8.04891" length2="1.5"/>
-        <line y1="-15.6035" end1="none" x1="-4" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-5" antialias="false" y2="0.579701" length2="1.5"/>
-        <line y1="-15.6035" end1="none" x1="5" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="7" antialias="false" y2="0.579701" length2="1.5"/>
-        <line y1="-15.6035" end1="none" x1="3" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="4" antialias="false" y2="0.579701" length2="1.5"/>
-        <rect width="4" y="8.04891" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-14" antialias="false" height="4.97946"/>
-        <rect width="4" y="5.55918" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-18" antialias="false" height="9.95894"/>
-        <line y1="-15.6035" end1="none" x1="-1" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="-2" antialias="false" y2="0.579701" length2="1.5"/>
-        <line y1="8.04891" end1="none" x1="-18" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" x2="-15" antialias="false" y2="8.04891" length2="1.5"/>
-        <rect width="3" y="-15.6035" style="line-style:normal;line-weight:normal;filling:none;color:black" x="7" antialias="false" height="3.73459"/>
-        <line y1="-15.6035" end1="none" x1="-6" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="7" antialias="false" y2="-15.6035" length2="1.5"/>
-        <line y1="0.579701" end1="none" x1="-8" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" x2="9" antialias="false" y2="0.579701" length2="1.5"/>
-        <polygon x5="11" x8="-8" x9="-10" closed="false" y10="13.0284" y1="13.0284" x3="6" y9="5.55918" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15.5181" antialias="false" x4="8" y6="8.04891" y7="3.06945" y4="14.2732" y3="15.5181" x7="10" x10="-10" x1="-10" y5="13.0284" x2="-5" x6="11" y8="3.06945"/>
-        <polygon y1="-13.1137" x3="3" y4="-6.88948" x5="2" x4="2" x1="2" y5="-6.88948" closed="false" y3="-11.8689" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="1" antialias="false" y2="-9.37915"/>
-        <input size="4" text="_" y="22.3649" tagg="label" x="-7" rotate="true"/>
-        <terminal y="10" orientation="w" x="-20"/>
-        <terminal y="10" orientation="e" x="20"/>
-        <terminal y="-14.3587" orientation="e" x="11"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termo-electrico.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termo-electrico.elmt
deleted file mode 100644
index 024b65a40..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termo-electrico.elmt
+++ /dev/null
@@ -1,40 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="29" hotspot_y="34" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{AA992F41-6486-463D-92B1-D56C817E7918}"/><names>
-        <name lang="es">Calentador Termo Electrico</name>
-	<name lang="en">Thermo electric boiler</name>
-        <name lang="ca">Escalfador eléctric</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="38.8288" x1="7.4" y2="38.4249" x2="11.18"/>
-        <arc width="9.786" x="-10.62" y="39.3811" antialias="true" height="2.57749" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="38.8288" x1="-22.18" y2="38.4249" x2="-18.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37.2133" x1="-15.88" y2="40.4441" x2="-15.88"/>
-        <rect width="4.158" x="14.118" y="-4.38275" antialias="false" height="6.46153" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="37.0986" x="-22.842" y="-26.4691" antialias="false" height="59.4061" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="37.0986" x="-22.3338" y="-29.5048" antialias="true" height="6.5043" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="39.2326" x1="-15.04" y2="40.848" x2="-15.88"/>
-        <ellipse width="1.848" x="15.504" y="-1.55583" antialias="true" height="1.21154" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.2" x="-22.18" y="35.598" antialias="false" height="5.25" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <arc width="37.0986" x="-22.842" y="29.9013" antialias="true" height="6.5043" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="39.2326" x1="-16.72" y2="40.848" x2="-15.88"/>
-        <rect width="4.2" x="7.4" y="35.598" antialias="false" height="5.25" style="line-style:normal;line-weight:normal;filling:blue;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="40.4441" x1="-22.18" y2="40.0403" x2="-18.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="40.4441" x1="7.4" y2="40.0403" x2="11.18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="39.6364" x1="-22.18" y2="39.2326" x2="-18.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="39.6364" x1="7.4" y2="39.2326" x2="11.18"/>
-        <ellipse width="1.68" x="-8.52" y="37.9201" antialias="true" height="1.51442" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <rect width="0.16" x="-2.8" y="37.9201" antialias="false" height="2.01922" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40.949" x1="-10.62" y2="36.4056" x2="-10.62"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="40.949" x1="-0.96" y2="36.4056" x2="-0.96"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="37.2133" x1="4.88" y2="40.4441" x2="4.88"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36.8095" x1="4.88" y2="38.4249" x2="4.04"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="36.8095" x1="4.88" y2="38.4249" x2="5.72"/>
-        <rect width="4.158" x="-27" y="-5.19046" antialias="false" height="6.46153" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="1.848" x="-25.614" y="-2.36352" antialias="true" height="1.21154" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-10" y="6" size="4" rotate="true" text="_L" tagg="label"/>
-        <terminal x="9.5" y="40.4441" orientation="s"/>
-        <terminal x="-20.08" y="40.0403" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon-2placas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon-2placas.elmt
deleted file mode 100644
index 17672c0a1..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon-2placas.elmt
+++ /dev/null
@@ -1,66 +0,0 @@
-<definition width="130" version="0.4" hotspot_x="31" hotspot_y="80" height="130" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1CB90822-F8FF-47C9-BBA9-082DC1E9E75E}"/><names>
-        <name lang="es">Termosifón solar 2</name>
-	<name lang="en">Solar thermosyphon 2</name>
-        <name lang="ca">Solar temosifó 2</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="51.6" x="36" y="-42.9288" antialias="false" height="84.7476" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-59" x1="-21" y2="-59" x2="-13"/>
-        <rect width="51.6" x="-20" y="-42.9288" antialias="false" height="84.7476" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <rect width="3" x="88" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="6" x="-24" y="-58.9" antialias="true" height="17.05" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="3" x="32" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="10" x="-26" y="-62" antialias="true" height="23.25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="9" x="-12" y="-71" antialias="true" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="6" x="85" y="28" antialias="true" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="6" x="87" y="-36" antialias="false" height="4" 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="-70.9529" x1="56" y2="-47.051" x2="56"/>
-        <rect width="5" x="63" y="-54" antialias="false" height="3" 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="34.8971" x1="64.8" y2="-37.6958" x2="64.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-47" x1="54" y2="-43" x2="54"/>
-        <arc width="10" x="83" y="26" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="6" x="31" y="-36" antialias="false" height="4" 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="34.8971" x1="8.8" y2="-37.6958" 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="34.8971" x1="73.8" y2="-37.6958" x2="73.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="34.8971" x1="46.8" y2="-37.6958" x2="46.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-47" x1="3" y2="-43" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="81.6" y2="-37.6958" x2="81.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="17.8" y2="-37.6958" x2="17.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="34.8971" x1="55.8" y2="-37.6958" x2="55.8"/>
-        <rect width="46.8" x="38.4" y="-40.0065" antialias="false" height="78.9029" 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="34.8971" x1="-9.2" y2="-37.6958" x2="-9.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="60" y2="-37.6958" x2="60"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="25.6" y2="-37.6958" x2="25.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="-0.2" y2="-37.6958" x2="-0.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="51" y2="-37.6958" x2="51"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="69" y2="-37.6958" x2="69"/>
-        <rect width="46.8" x="-17.6" y="-40.0065" antialias="false" height="78.9029" 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="34.8971" x1="78" y2="-37.6958" x2="78"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="4" y2="-37.6958" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="42" y2="-37.6958" x2="42"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="-5" y2="-37.6958" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="13" y2="-37.6958" 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="34.8971" x1="22" y2="-37.6958" x2="22"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-47" x1="56" y2="-43" x2="56"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="-14" y2="-37.6958" x2="-14"/>
-        <arc width="9" x="55" y="-71" antialias="true" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="56" x="39" y="44" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-71" x1="-6.117" y2="-71" x2="59.1267"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-47" x1="-7.096" y2="-47" x2="59.104"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-71" x1="-5" y2="-48" x2="-5"/>
-        <rect width="5" x="63" y="-67" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-47" x1="5" y2="-43" x2="5"/>
-        <rect width="3.6" x="46" y="-75.8687" antialias="false" height="4.86869" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.8" x="46.6" y="-77.0859" antialias="false" height="1.21717" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="-26" y="-36" antialias="false" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="3" x="-23" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="67" x="-28" y="44" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <input x="20" y="-56.5" size="4" rotate="true" text="_L" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-62" x1="-21" y2="-62" x2="-13"/>
-        <terminal x="69" y="-65.5" orientation="e"/>
-        <terminal x="69" y="-52.5" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon1placa.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon1placa.elmt
deleted file mode 100644
index 947f08798..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/termosifon1placa.elmt
+++ /dev/null
@@ -1,47 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="37" hotspot_y="80" height="130" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{3E2ABBFC-472E-40B4-9430-2BA640712E6E}"/><names>
-        <name lang="es">Termosifón solar 1</name>
-	<name lang="en">Solar thermosyphon 1</name>	
-        <name lang="ca">Solar temosifó 1</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="51.6" x="-20" y="-42.9288" antialias="false" height="84.7476" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <rect width="3" x="32" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="9" x="-34" y="-71" antialias="true" height="24" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <arc width="6" x="-23" y="-52" antialias="true" height="11" 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:thin;filling:none;color:black" y1="-70.9529" x1="34" y2="-47.051" x2="34"/>
-        <rect width="5" x="41" y="-54" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="6" x="29" y="28" antialias="true" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="6" x="31" y="-36" antialias="false" height="4" 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="34.8971" x1="8.8" y2="-37.6958" x2="8.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-47" x1="25" y2="-43" x2="25"/>
-        <arc width="10" x="27" y="26" antialias="true" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="17.8" y2="-37.6958" x2="17.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="34.8971" x1="-9.2" y2="-37.6958" x2="-9.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="25.6" y2="-37.6958" x2="25.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="-0.2" y2="-37.6958" x2="-0.2"/>
-        <rect width="46.8" x="-17.6" y="-40.0065" antialias="false" height="78.9029" 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="34.8971" x1="4" y2="-37.6958" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="-5" y2="-37.6958" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="34.8971" x1="13" y2="-37.6958" 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="34.8971" x1="22" y2="-37.6958" 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="34.8971" x1="-14" y2="-37.6958" x2="-14"/>
-        <arc width="9" x="33" y="-71" antialias="true" height="24" 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="-71" x1="-28.117" y2="-71" x2="37.1267"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-47" x1="-29.096" y2="-47" x2="37.104"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-71" x1="-27" y2="-48" x2="-27"/>
-        <rect width="5" x="41" y="-67" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="-25" y="-54" antialias="true" height="15" 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="-47" x1="27" y2="-43" x2="27"/>
-        <rect width="3.6" x="24" y="-75.8687" antialias="false" height="4.86869" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.8" x="24.6" y="-77.0859" antialias="false" height="1.21717" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="-26" y="-36" antialias="false" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="3" x="-23" y="-32" antialias="false" height="76" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="67" x="-28" y="44" antialias="false" height="2" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <input x="-2" y="-56.5" size="4" rotate="true" text="_L" tagg="label"/>
-        <terminal x="47" y="-65.5" orientation="e"/>
-        <terminal x="47" y="-52.5" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/inodoro2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/inodoro2.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/grifo-aparatos/inodoro2.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/sanitarios/inodoro2.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/brida-pn10-rosca1m.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/bridE-pn10-.elmt
similarity index 100%
rename from elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/brida-pn10-rosca1m.elmt
rename to elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-acero/bridE-pn10-.elmt
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-viv-retorno.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-viv-retorno.elmt
deleted file mode 100644
index af79bdb92..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-viv-retorno.elmt
+++ /dev/null
@@ -1,24 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="15" hotspot_y="27" height="50" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F7015FA9-D3DB-48FF-8406-3138CABCA156}"/><names>
-        <name lang="es">ACS +retorno para vivienda</name>
-	<name lang="en">DHW +return line for house</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="-0.332274" x1="3.1904" y2="-0.332274" x2="16.6437"/>
-        <text x="-5" y="7" size="6" text="ret."/>
-        <line 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.55405" x1="-4.69893" y2="-7.55405" x2="11.8905"/>
-        <line 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.55405" x1="13.4" y2="1.11208" x2="20.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.44515" x1="16.2" y2="-3.22099" x2="26"/>
-        <arc width="16.8" x="9.2" y="-8.99841" antialias="true" height="14.4436" style="line-style:normal;line-weight:normal;filling:none;color:black" start="10" angle="-110"/>
-        <line 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.332274" x1="28.8" y2="4.00079" x2="38.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8.33386" x1="20.4" y2="17" x2="24.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5.44515" x1="26" y2="12.6669" x2="33"/>
-        <line 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.55644" x1="27.4" y2="6.88951" x2="33"/>
-        <line 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.88951" x1="23.2" y2="12.6669" x2="27.4"/>
-        <text x="-7.6" y="-11.8871" size="6" text="ACS"/>
-        <terminal x="-4.8" y="-7.55405" nameHidden="1" number="" name="" orientation="w"/>
-        <terminal x="-4.8" y="-0.332274" nameHidden="1" number="" name="" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-vivienda.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-vivienda.elmt
deleted file mode 100644
index 4b65ee598..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/acs-vivienda.elmt
+++ /dev/null
@@ -1,22 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="7" hotspot_y="25" height="40" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{71CE2200-B8F1-4BD4-A5E0-F737A209090A}"/><names>
-        <name lang="es">ACS a consumo</name>
-	<name lang="en">DHW to consume</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.7505" x1="-1.80893" y2="-9.7505" x2="10.8764"/>
-        <line 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.7505" x1="11.5" y2="-1.72091" x2="19"/>
-        <line 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.29388" x1="14.5" y2="-5.7357" x2="25"/>
-        <arc width="18" x="7" y="-11.0888" antialias="true" height="13.3826" style="line-style:normal;line-weight:normal;filling:none;color:black" start="10" angle="-110"/>
-        <line 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.05917" x1="28" y2="0.955619" x2="38.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="4.97041" x1="19" y2="13" x2="23.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2.29388" x1="25" y2="8.98521" x2="32.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-0.382645" x1="26.5" y2="3.63215" x2="32.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3.63215" x1="22" y2="8.98521" x2="26.5"/>
-        <text x="-3.5" y="-15.1036" size="5" text="ACS"/>
-        <polygon x4="7" y5="-4" x5="12" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-2" y2="-4" x2="12" y3="-5" x3="7" y4="-3"/>
-        <terminal x="-2" y="-10" nameHidden="1" number="" name="" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/captador-solar-terraza-d.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/captador-solar-terraza-d.elmt
index 8f7110b87..24d7d8ca2 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/captador-solar-terraza-d.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/captador-solar-terraza-d.elmt
@@ -3,6 +3,7 @@
         <name lang="es">Captador solar terraza 2</name>
         <name lang="en">Terrace solar capturator 2</name>
         <name lang="ca">Captador solar terrassa 2</name>
+        <name lang="fr">Capteur solaire incliné 2</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/purgador1_2macho.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/purgador1_2macho.elmt
index 39e918aff..9f94dbe5a 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/purgador1_2macho.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/purgador1_2macho.elmt
@@ -3,6 +3,7 @@
         <name lang="es">Purgador</name>
         <name lang="en">Purger</name>
         <name lang="ca">Purgador</name>
+        <name lang="fr">Purgeur</name>
     </names>
     <informations>Rafael Ferrando.
 Mantenimiento de Instalaciones Térmicas</informations>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/qet_directory b/elements/60_energy/11_water/plomberie_chauffage/chaufferie/qet_directory
deleted file mode 100644
index 04dbeed9a..000000000
--- a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/qet_directory
+++ /dev/null
@@ -1,6 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="fr">Chaufferie</name>
-        <name lang="it">Locale caldaia</name>
-    </names>
-</qet-directory>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/alimentation_auto.elmt b/elements/60_energy/11_water/plomberie_chauffage/e-c-s/alimentation_auto.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/chaufferie/alimentation_auto.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/e-c-s/alimentation_auto.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/clapet_anti_retour.elmt b/elements/60_energy/11_water/plomberie_chauffage/e-c-s/clapet_anti_retour.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/chaufferie/clapet_anti_retour.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/e-c-s/clapet_anti_retour.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/soupape_3_bars.elmt b/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/chaufferie/soupape_3_bars.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/soupape_3_bars_mano.elmt b/elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars_mano.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/chaufferie/soupape_3_bars_mano.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/e-c-s/soupape_3_bars_mano.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/pompage_filtration/clapet_anti_retour.elmt b/elements/60_energy/11_water/plomberie_chauffage/pompage_filtration/clapet_anti_retour.elmt
deleted file mode 100644
index 0e6f1a24e..000000000
--- a/elements/60_energy/11_water/plomberie_chauffage/pompage_filtration/clapet_anti_retour.elmt
+++ /dev/null
@@ -1,39 +0,0 @@
-<definition type="element" orientation="dyyy" height="30" hotspot_x="24" hotspot_y="15" version="0.51" width="50" link_type="simple">
-    <uuid uuid="{5602fd65-f7ff-4639-b35b-652fa0e3d8c2}"/>
-    <names>
-        <name lang="fr">Clapet anti-retour</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <polygon antialias="false" x1="-13" y4="9" y5="-9" y1="-9" x4="-13" x3="13" x2="13" x5="-13" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="9" closed="false" y2="-9"/>
-        <polygon antialias="false" x1="-20" y4="7" y6="7" y5="7" y1="7" x4="-13" x6="-20" x3="-13" x2="-20" x5="-20" style="line-style:normal;line-weight:normal;filling:white;color:black" y3="-7" y2="-7"/>
-        <polygon antialias="false" x1="13" y4="7" y6="-7" y5="-7" y1="-7" x4="13" x6="13" x3="20" x7="13" x2="20" x5="13" y7="-7" style="line-style:normal;line-weight:normal;filling:white;color:black" y3="7" y2="-7"/>
-        <line length1="1.5" antialias="false" x1="-15" end1="none" y1="-5" length2="1.5" end2="none" x2="-20" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-5"/>
-        <line length1="1.5" antialias="false" x1="20" end1="none" y1="-4" length2="1.5" end2="none" x2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-4"/>
-        <line length1="1.5" antialias="false" x1="-20" end1="none" y1="3" length2="1.5" end2="none" x2="-15" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="3"/>
-        <line length1="1.5" antialias="false" x1="15" end1="none" y1="4" length2="1.5" end2="none" x2="20" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="4"/>
-        <input y="21" x="-7" tagg="label" text="_" rotate="true" size="9"/>
-        <arc height="8" y="-5" angle="-180" antialias="true" x="-17" start="90" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="6" y="-11" angle="90" antialias="true" x="-17" start="270" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="6" y="3" angle="90" antialias="true" x="-17" start="0" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="6" y="-10" angle="90" antialias="true" x="13" start="180" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="8" y="-4" angle="-180" antialias="true" x="13" start="-90" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <arc height="6" y="4" angle="90" antialias="true" x="13" start="90" style="line-style:normal;line-weight:thin;filling:none;color:black" width="4"/>
-        <line length1="1.5" antialias="false" x1="10" end1="none" y1="-9" length2="1.5" end2="none" x2="10" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="9"/>
-        <line length1="1.5" antialias="false" x1="-4" end1="none" y1="-1" length2="1.5" end2="none" x2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-1"/>
-        <line length1="1.5" antialias="false" x1="3" end1="none" y1="-1" length2="1.5" end2="none" x2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2"/>
-        <line length1="1.5" antialias="false" x1="7" end1="none" y1="-2" length2="1.5" end2="none" x2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0"/>
-        <line length1="1.5" antialias="false" x1="5" end1="none" y1="0" length2="1.5" end2="none" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2"/>
-        <line length1="1.5" antialias="false" x1="5" end1="none" y1="2" length2="1.5" end2="none" x2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1"/>
-        <line length1="1.5" antialias="false" x1="3" end1="none" y1="1" length2="1.5" end2="none" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1"/>
-        <line length1="1.5" antialias="false" x1="5" end1="none" y1="-2" length2="1.5" end2="none" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2"/>
-        <line length1="1.5" antialias="false" x1="5" end1="none" y1="2" length2="1.5" end2="none" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2"/>
-        <line length1="1.5" antialias="false" x1="-4" end1="none" y1="1" length2="1.5" end2="none" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2"/>
-        <line length1="1.5" antialias="false" x1="-4" end1="none" y1="-1" length2="1.5" end2="none" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-2"/>
-        <line length1="1.5" antialias="false" x1="-4" end1="none" y1="-2" length2="1.5" end2="none" x2="-7" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="0"/>
-        <line length1="1.5" antialias="false" x1="-7" end1="none" y1="0" length2="1.5" end2="none" x2="-4" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="2"/>
-        <terminal orientation="w" y="0" x="-20"/>
-        <terminal orientation="e" y="0" x="20"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-dmf.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-dmf.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-dmf.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-dmf.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-gmf.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-gmf.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100-gmf.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100-gmf.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/coude-87-100.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/coude-87-100.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nicoll_ch6.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/nicoll_ch6.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nicoll_ch6.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/nicoll_ch6.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/qet_directory b/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/qet_directory
new file mode 100644
index 000000000..9a6e06700
--- /dev/null
+++ b/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-100/qet_directory
@@ -0,0 +1,5 @@
+<qet-directory>
+    <names>
+        <name lang="fr">Raccords PVC 100</name>
+    </names>
+</qet-directory>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nic_ch4.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-40/nic_ch4.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/nic_ch4.elmt
rename to elements/60_energy/11_water/plomberie_chauffage/raccords_pvc/raccord-pvc-40/nic_ch4.elmt
diff --git a/elements/60_energy/31_solar_thermal/base_distrib/qet_directory b/elements/60_energy/31_solar_thermal/base_distrib/qet_directory
index 99534cfb9..6822bfbef 100644
--- a/elements/60_energy/31_solar_thermal/base_distrib/qet_directory
+++ b/elements/60_energy/31_solar_thermal/base_distrib/qet_directory
@@ -1,7 +1,7 @@
 <qet-directory>
     <names>
         <name lang="de">Grundschema</name>
-        <name lang="fr">schema de base</name>
+        <name lang="fr">Schéma de base</name>
         <name lang="ar">مُخططات أساسية</name>
         <name lang="en">Basic scheme</name>
         <name lang="cs">Základní nákres</name>
diff --git a/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_puisage_01.elmt b/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_puisage_01.elmt
deleted file mode 100644
index ea18cc2a7..000000000
--- a/elements/60_energy/31_solar_thermal/eau_sanitaire/robinet_puisage_01.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="30" hotspot_x="16" type="element" link_type="simple" orientation="dyyy" version="0.5" height="20" hotspot_y="8">
-    <uuid uuid="{072b6cfb-fa19-4412-a137-dd531e9e8d67}"/>
-    <names>
-        <name lang="cs">Baterie</name>
-        <name lang="pl">Bateria</name>
-        <name lang="it">Rubinetto</name>
-        <name lang="en">Faucet</name>
-        <name lang="nl">Tappunt</name>
-        <name lang="ar">حنفيّة</name>
-        <name lang="fr">Robinet de Puisage</name>
-        <name lang="es">Grifo</name>
-    </names>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <input tagg="label" rotate="true" size="9" y="-5.45" x="10" text="_"/>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-1" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-1" x1="-10" x2="1"/>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" antialias="false" length2="1.5" end1="none" length1="1.5" y1="0" x1="-10" x2="0"/>
-        <arc width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="0" x="-6" height="4"/>
-        <arc width="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" antialias="true" angle="-90" y="-0.8" x="-5" height="5.6"/>
-        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="5" x2="4"/>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-3" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-3" x1="-1" x2="3"/>
-        <line end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-3" antialias="false" length2="1.5" end1="none" length1="1.5" y1="-1" x1="1" x2="1"/>
-        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="8" x2="9"/>
-        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="7" x2="7"/>
-        <line end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="7" antialias="false" length2="1.5" end1="none" length1="1.5" y1="3" x1="6" x2="6"/>
-        <terminal y="0" x="-10" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/31_solar_thermal/expansion_soupape/qet_directory b/elements/60_energy/31_solar_thermal/expansion_soupape/qet_directory
index 391034fe8..3a6dc5d1d 100644
--- a/elements/60_energy/31_solar_thermal/expansion_soupape/qet_directory
+++ b/elements/60_energy/31_solar_thermal/expansion_soupape/qet_directory
@@ -1,12 +1,12 @@
 <qet-directory>
     <names>
         <name lang="de">Ausdehnungstechnik</name>
-        <name lang="fr">accesoire</name>
-        <name lang="en">accesories</name>
+        <name lang="fr">Accessoires</name>
+        <name lang="en">Accesories</name>
         <name lang="ar">توسعة و صمّامات</name>
         <name lang="pl">Naczynia i zawory</name>
         <name lang="cs">Nádoby a uzávěry</name>
         <name lang="it">Vasi di espansione</name>
-        <name lang="nl">accesoires</name>
+        <name lang="nl">Accesoires</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/chaudiere_bois.elmt b/elements/60_energy/31_solar_thermal/productions/chaudiere_bois.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/chaufferie/chaudiere_bois.elmt
rename to elements/60_energy/31_solar_thermal/productions/chaudiere_bois.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/chaudiere_fioul.elmt b/elements/60_energy/31_solar_thermal/productions/chaudiere_fioul.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/chaufferie/chaudiere_fioul.elmt
rename to elements/60_energy/31_solar_thermal/productions/chaudiere_fioul.elmt
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/vase_ferme.elmt b/elements/60_energy/31_solar_thermal/productions/vase_ferme.elmt
similarity index 100%
rename from elements/60_energy/11_water/plomberie_chauffage/chaufferie/vase_ferme.elmt
rename to elements/60_energy/31_solar_thermal/productions/vase_ferme.elmt
diff --git a/elements/60_energy/31_solar_thermal/vanne/qet_directory b/elements/60_energy/31_solar_thermal/vanne/qet_directory
index ce63e5a9f..6fa686b33 100644
--- a/elements/60_energy/31_solar_thermal/vanne/qet_directory
+++ b/elements/60_energy/31_solar_thermal/vanne/qet_directory
@@ -1,7 +1,7 @@
 <qet-directory>
     <names>
         <name lang="de">Ventile</name>
-        <name lang="fr">vannes clapets soupapes</name>
+        <name lang="fr">Vannes clapets soupapes</name>
         <name lang="en">Valves</name>
         <name lang="es">Válvulas</name>
         <name lang="ar">صمّامات</name>